Commit 871b04df authored by Andreas Rönnquist's avatar Andreas Rönnquist

Merge tag 'upstream/1.02'

Upstream version 1.02
parents e5c4f140 244ba14c
......@@ -2,6 +2,14 @@
ChangeLog:
----------
1.02
* Also mention installing required liblua5.1-0-dev in INSTALL
1.01
* Add GPL header in several more places
* Remove date and version from man-page
* Some formatting fixes
1.00
* Remove functionality to rename and the required files
* Remove GTK_STOCK stuff to make it build cleanly on GTK3
......@@ -314,3 +322,9 @@ ChangeLog:
0.1
* Initial release
--------------------------------------------------------------------------------
Copyright (C) 2010-2014 Andreas Rönnquist
This file is distributed under the same license
as the sciteproj package, see COPYING file.
--------------------------------------------------------------------------------
#
# Copyright (C) 2010-2014 Andreas Rönnquist
# This file is distributed under the same license
# as the sciteproj package, see COPYING file.
#
Installation:
-------------
......@@ -7,12 +13,14 @@ to build are:
pkg-config
libgtk-3-dev
liblua5.1-0-dev
gettext
or if you are still using GTK version 2:
pkg-config
libgtk2.0-dev
liblua5.1-0-dev
gettext
Then the build process is simple - to build the program, just type
......@@ -48,3 +56,4 @@ This can be changed using PREFIX variable:
make install PREFIX=/usr
#
# Copyright (C) 2009-2014 Andreas Rönnquist
# This file is distributed under the same license
# as the sciteproj package, see COPYING file.
#
CC=gcc
SRC=src
BIN=bin
......
#
# Copyright (C) 2010-2014 Andreas Rönnquist
# This file is distributed under the same license
# as the sciteproj package, see COPYING file.
#
SciteProj
=========
......@@ -151,3 +157,39 @@ Credits
SciteProj is based on the program ScitePM written by Roy Wood and Martin
Andrews, and is developed by Andreas Rönnquist <gusnan (at) gusnan (dot) se>.
-----------------------------------
graphics/sciteproj.xpm
is based on the SciTE logo, which is licensed under the following license:
License for Scintilla and SciTE
Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation.
NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY
SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
OR PERFORMANCE OF THIS SOFTWARE.
(see http://sourceforge.net/p/scintilla/scite/ci/default/tree/License.txt)
-----------------------------------
graphics/dir-open.xpm
graphics/dir-close.xpm
These icons are created by the Tango Desktop Project, and released under
Public Domain, see at the bottom of http://tango.freedesktop.org/ for
details.
#
# Copyright (C) 2010-2014 Andreas Rönnquist
# This file is distributed under the same license
# as the sciteproj package, see COPYING file.
#
Information for new translators
......
#
# Sciteproj po makefile
# $Id$
# Copyright (C) 2009-2014 Andreas Rönnquist
# This file is distributed under the same license
# as the sciteproj package, see COPYING file.
#
ifndef PREFIX
ifdef INSTALL_PREFIX
PREFIX=$(INSTALL_PREFIX)
......
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# sciteproj pot
# Copyright (C) 2014, Andreas Rönnquist <gusnan@gusnan.se>
# This file is distributed under the same license as the sciteproj package.
# Andreas Rönnquist <gusnan@gusnan.se>, 2014.
#
#, fuzzy
msgid ""
......
.TH sciteproj 1 "4 August 2014" "Version 1.00"
\.
\. Copyright (C) 2010-2014 Andreas Rönnquist
\. This file is distributed under the same license
\. as the sciteproj package, see COPYING file.
\.
.TH sciteproj 1 "" ""
.SH NAME
SciteProj - a Project Manager for the SciTE editor
.SH DESCRIPTION
......
......@@ -147,7 +147,7 @@ void create_about_dialog()
#endif
// Show SciteProj copyrights
copyrightstring=g_strdup_printf("Copyright (C) 2008-2012 Andreas Rönnquist <gusnan@gusnan.se>");
copyrightstring=g_strdup_printf("Copyright (C) 2008-2014 Andreas Rönnquist <gusnan@gusnan.se>");
copyright_label=gtk_label_new(copyrightstring);
gtk_label_set_selectable(GTK_LABEL(copyright_label),FALSE);
......
......@@ -393,7 +393,7 @@ gboolean relative_path_to_abs_path(gchar *relativePath, gchar **absPath, const g
}
}
// On linux check if first character is '/', and on windows check for something
// On GNU/Linux check if first character is '/', and on windows check for something
// like "C:" in the beginning of the string
if (relativePath[0] == G_DIR_SEPARATOR) {
g_set_error(err, APP_SCITEPROJ_ERROR, -1, "%s: Specified path, '%s', is absolute", __func__ , relativePath);
......
/**
* scite_utils_linux.c - Code for working with Scite (Linux version)
* scite_utils_linux.c - Code for working with Scite (GNU/Linux version)
*
* Copyright 2006 Roy Wood, 2009-2012 Andreas Rönnquist
*
......@@ -841,7 +841,7 @@ gboolean check_if_scite_exists()
/**
* init_scite_connection
* currently doesn't do anything on Linux
* currently doesn't do anything on GNU/Linux
*/
void init_scite_connection()
{
......
/**
* scite_utils_linux.h - Code for working with Scite (Linux version)
* scite_utils_linux.h - Code for working with Scite (GNU/Linux version)
*
* Copyright 2006 Roy Wood, 2009-2011 Andreas Rönnquist
*
......
/**
* statusbar.c - statusbar for SciteProj
*
* Copyright 2009-2012 Andreas Rönnquist
* Copyright 2009-2014 Andreas Rönnquist
*
* This file is part of SciteProj.
*
......@@ -31,7 +31,7 @@
#define APP_SCITEPROJ_ERROR g_quark_from_static_string("APP_GUI_ERROR")
GtkWidget *statusbar=NULL;
GtkWidget *statusbar = NULL;
guint context_id;
......@@ -41,7 +41,7 @@ guint context_id;
*/
gboolean init_statusbar(GtkWidget *widget,GtkWidget *next_to,GError **err)
{
statusbar=gtk_statusbar_new();
statusbar = gtk_statusbar_new();
if (!statusbar) {
g_set_error(err, APP_SCITEPROJ_ERROR, -1, "%s: Could not init statusbar", __func__);
......@@ -78,30 +78,30 @@ void set_statusbar_text(const gchar *text)
{
if (statusbar) {
int co=0;
int co = 0;
// new string - fill it with characters from text indata, but skip
// non-showable characters.
gchar *newstring=(gchar*)(g_malloc((int)(strlen(text)+1)));
int newco=0;
for (co=0;co<(int)strlen(text);co++) {
int newco = 0;
for (co = 0; co < (int)strlen(text); co++) {
if (text[co]!='\n') {
newstring[newco]=text[co];
newco++;
}
}
newstring[newco]='\0';
newstring[newco] = '\0';
// Pop what message that was previously on the statusbar stack
gtk_statusbar_pop(GTK_STATUSBAR(statusbar),context_id);
gtk_statusbar_pop(GTK_STATUSBAR(statusbar), context_id);
// Push the new message (the statusbar will show the message that
// is on top of the statusbar stack, the one pushed will be shown)
// We popped the last one, because we don't take advantage of the
// context_id system of the statusbar.
gtk_statusbar_push(GTK_STATUSBAR(statusbar),context_id,newstring);
gtk_statusbar_push(GTK_STATUSBAR(statusbar), context_id, newstring);
g_free(newstring);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment