Commit 8d68d7f6 authored by Andreas Rönnquist's avatar Andreas Rönnquist

New upstream version 1.08

parent e495301f
......@@ -2,6 +2,13 @@
ChangeLog:
----------
1.08
* Fix sizes of properties dialog
* Fix output of GTK warnings in terminal
* Update the text of the recent file menu item
* Update my email address
* Update Swedish translation
1.07
* Fix typo Coudn't/Couldn't
* Fixed more missing NULL-checks
......
......@@ -10,20 +10,20 @@ SciteProj
SciteProj is a Project Manager for usage with the SciTE text editor.
It is based on ScitePM by Roy Wood. It is a "director" of SciTE, using
it's director interface to communicate between SciteProj and SciTE. See
it's director interface to communicate between SciteProj and SciTE. See
http://www.scintilla.org/SciTEDirector.html
for more information. SciteProj is used to browse folders on the harddrive in
customizable ways. Previous versions used to load "projects" from XML files,
but this was dropped, and now sciteproj shows and works directly on your
harddrive contents filterable and sortable as you wish.
harddrive contents filterable and sortable as you wish.
Running
=======
SciteProj will load a configuration from the file sciteprojrc.lua first in the
SciteProj will load a configuration from the file sciteprojrc.lua first in the
directory specified by $XDG_CONFIG_HOME each program start. This is most likely
~/.config/sciteprojrc.lua
......@@ -48,7 +48,7 @@ The options availible in the config file are:
* The window geometry
You can enter wanted window geometry/positioning, which will be applied to
You can enter wanted window geometry/positioning, which will be applied to
the program upon next program start. The variables are xpos, ypos, width and
height.
......@@ -64,31 +64,31 @@ Also, the following options exist:
* use_stock_folder_icon
Should we use the system folder icon, or the ones provided by sciteproj?
The sciteproj one are different icons for opened and closed directory,
while when using the stock ones there are only one icon for folders, open or
while when using the stock ones there are only one icon for folders, open or
closed.
* start_scite
Should SciTE be started simultaneously with sciteproj?
You can open this configuration file by opening the Edit menu and select Edit
Options in that menu. This will open sciteprojrc.lua from the current folder as
You can open this configuration file by opening the Edit menu and select Edit
Options in that menu. This will open sciteprojrc.lua from the current folder as
if it was part of your project and edit it in SciTE.
SciteProj will give you a warning if it isn't able to find the SciTE
executable on SciteProj start. As default SciTE will be searched for in
/usr/bin, /bin, and /usr/local/bin, under the names scite and SciTE. If it
isn't found there you will get a warning upon running. You can also use the
--scite flag when running to locate SciTE, for example
SciteProj will give you a warning if it isn't able to find the SciTE
executable on SciteProj start. As default SciTE will be searched for in
/usr/bin, /bin, and /usr/local/bin, under the names scite and SciTE. If it
isn't found there you will get a warning upon running. You can also use the
--scite flag when running to locate SciTE, for example
sciteproj --scite=/bin/scite
sciteproj --scite=/bin/scite
will look for the scite executable in the /bin/ folder. SciTE will also be
searched for in the path pointed to by the environment variable SciTE_HOME.
By pressing Ctrl+R or choosing "View Recently Opened Files" in the "View" menu,
you split up the project window in two parts, and the new part contain a list
of the most recently opened files in the project. The files in this list are
sorted so the ones you opened latest is at the top of the list (or bottom -
of the most recently opened files in the project. The files in this list are
sorted so the ones you opened latest is at the top of the list (or bottom -
its configurable).
Local folder settings
......@@ -155,8 +155,8 @@ Thats it! Enjoy using sciteproj!
Credits
=======
SciteProj is based on the program ScitePM written by Roy Wood and Martin
Andrews, and is developed by Andreas Rönnquist <gusnan (at) openmailbox (dot) org>.
SciteProj is based on the program ScitePM written by Roy Wood and Martin
Andrews, and is developed by Andreas Rönnquist <andreas (at) ronnquist (dot) net>.
-----------------------------------
graphics/sciteproj.xpm
......
1.07
\ No newline at end of file
1.08
\ No newline at end of file
......@@ -23,7 +23,7 @@ main.c menus.c prefs.c properties_dialog.c recent_files.c remove.c\
scite_utils.c script.c sort.c statusbar.c string_utils.c tree_manipulation.c\
menus.h
XG_ARGS = --keyword=_ --keyword=N_ --keyword=NC_:1c,2 -w 80 --package-name=${NAME} --package-version=${VERSION} --msgid-bugs-address=gusnan@openmailbox.org
XG_ARGS = --keyword=_ --keyword=N_ --keyword=NC_:1c,2 -w 80 --package-name=${NAME} --package-version=${VERSION} --msgid-bugs-address=andreas@ronnquist.net
LANGUAGES = sv
#
......
# sciteproj pot
# Copyright (C) 2014, Andreas Rönnquist <gusnan@openmailbox.org>
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the sciteproj package.
# Andreas Rönnquist <gusnan@openmailbox.org>, 2014.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: sciteproj 1.00\n"
"Report-Msgid-Bugs-To: gusnan@openmailbox.org\n"
"POT-Creation-Date: 2014-08-04 20:02+0200\n"
"Project-Id-Version: sciteproj 1.07\n"
"Report-Msgid-Bugs-To: andreas@ronnquist.net\n"
"POT-Creation-Date: 2017-08-25 18:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -59,16 +59,16 @@ msgstr ""
msgid "version %s"
msgstr ""
#: gui.c:142
#: gui.c:141
msgid "[UNTITLED]"
msgstr ""
#: gui.c:775 recent_files.c:551 scite_utils.c:216
#: gui.c:774 recent_files.c:557 scite_utils.c:216
#, c-format
msgid "Opened %s"
msgstr ""
#: gui.c:788 gui_callbacks.c:96 recent_files.c:564 recent_files.c:605
#: gui.c:787 gui_callbacks.c:95 recent_files.c:570 recent_files.c:611
#, c-format
msgid ""
"Could not open selected file: \n"
......@@ -80,62 +80,62 @@ msgstr ""
msgid "Show program version and quit"
msgstr ""
#: main.c:71
#: main.c:72
msgid "Set a filename for the instance of SciTE to open"
msgstr ""
#: main.c:71
#: main.c:72
msgid "SCITE_FILENAME"
msgstr ""
#: main.c:73
#: main.c:75
msgid "Load a folder"
msgstr ""
#: main.c:75
#: main.c:78
msgid "Start SciTE automatically with SciteProj"
msgstr ""
#: main.c:86
#: main.c:90
msgid "SciTE Project Manager"
msgstr ""
#: main.c:93
#: main.c:97
#, c-format
msgid "option parsing failed: %s"
msgstr ""
#: main.c:137
#: main.c:141
#, c-format
msgid "A folder is expected as parameter to sciteproj..."
msgstr ""
#: main.c:176 main.c:186
#: main.c:180 main.c:190
msgid ""
"Environment variable exists, but doesn't point to a folder containing scite."
msgstr ""
#: main.c:203
#: main.c:207
#, c-format
msgid "Couldn't find a SciTE executable named '%s'!\n"
msgstr ""
#: main.c:204
#: main.c:208
msgid "Checking for SciTE in the standard locations instead.\n"
msgstr ""
#: main.c:217
#: main.c:221
msgid ""
"Warning! Couldn't locate SciTE!\n"
"Program will start, but you won't be able to open SciTE to edit files."
msgstr ""
#: main.c:225
#: main.c:229
#, c-format
msgid "Could not setup the gui: %s"
msgstr ""
#: main.c:231
#: main.c:235
#, c-format
msgid "Not a valid folder!"
msgstr ""
......@@ -165,7 +165,7 @@ msgid "Edit properties"
msgstr ""
#: menus.c:144
msgid "Show Recent Files"
msgid "Show Recently Opened Files"
msgstr ""
#: menus.c:151
......@@ -212,35 +212,35 @@ msgstr ""
msgid "Remove file from this list"
msgstr ""
#: properties_dialog.c:64 properties_dialog.c:67
#: properties_dialog.c:76 properties_dialog.c:79
msgid "Group Properties"
msgstr ""
#: properties_dialog.c:65 properties_dialog.c:159
#: properties_dialog.c:77 properties_dialog.c:171
msgid "OK"
msgstr ""
#: properties_dialog.c:72
#: properties_dialog.c:85
msgid "Group name:"
msgstr ""
#: properties_dialog.c:73
#: properties_dialog.c:86
msgid "Full folder:"
msgstr ""
#: properties_dialog.c:158 properties_dialog.c:161
#: properties_dialog.c:170 properties_dialog.c:173
msgid "File Properties"
msgstr ""
#: properties_dialog.c:185
#: properties_dialog.c:197
msgid "Filename:"
msgstr ""
#: properties_dialog.c:186
#: properties_dialog.c:198
msgid "Path:"
msgstr ""
#: properties_dialog.c:187
#: properties_dialog.c:199
msgid "File size:"
msgstr ""
......
# Swedish translation of SciteProj
# Copyright (C) 2012-2017 Andreas Rönnquist <gusnan@openmailbox.org>
# Copyright (C) 2012-2017 Andreas Rönnquist <andreas@ronnquist.net>
# This file is distributed under the same license as the sciteproj package.
# Andreas Rönnquist <gusnan@openmailbox.org>, 2012-2017.
# Andreas Rönnquist <andreas@ronnquist.net>, 2012-2017.
#
#
msgid ""
msgstr ""
"Project-Id-Version: sciteproj 1.07\n"
"Report-Msgid-Bugs-To: gusnan@openmailbox.org\n"
"POT-Creation-Date: 2014-08-04 20:02+0200\n"
"PO-Revision-Date: 2017-07-04 02:11+0200\n"
"Last-Translator: Andreas Rönnquist <gusnan@openmailbox.org>\n"
"Report-Msgid-Bugs-To: andreas@ronnquist.net\n"
"POT-Creation-Date: 2017-08-25 18:00+0200\n"
"PO-Revision-Date: 2017-08-25 18:01+0200\n"
"Last-Translator: Andreas Rönnquist <andreas@ronnquist.net>\n"
"Language-Team: Swedish\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
......@@ -28,17 +28,31 @@ msgstr "Licens"
#: about.c:203
msgid ""
"SciteProj is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
"SciteProj is free software: you can redistribute it and/or modify it under "
"the terms of the GNU General Public License as published by the Free "
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version.\n"
"\n"
"SciteProj is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
"SciteProj is distributed in the hope that it will be useful, but WITHOUT ANY "
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details.\n"
"\n"
"You should have received a copy of the GNU General Public License along with SciteProj. If not, see <http://www.gnu.org/licenses/>.\n"
"You should have received a copy of the GNU General Public License along with "
"SciteProj. If not, see <http://www.gnu.org/licenses/>.\n"
msgstr ""
"SciteProj är fri mjukvara: du kan redistribuera det och/eller modifiera det enligt villkoren i GNU General Public License som publicerad av the Free Software Foundation; enligt version 3, eller (efter ditt eget val) någon senare version.\n"
"SciteProj är fri mjukvara: du kan redistribuera det och/eller modifiera det "
"enligt villkoren i GNU General Public License som publicerad av the Free "
"Software Foundation; enligt version 3, eller (efter ditt eget val) någon "
"senare version.\n"
"\n"
"SciteProj distribueras med förhoppningen att det kommer att vara användbart, men UTAN NÅGON SOM HELST GARANTI; utan ens den implicita garantin av SÄLJBARHET eller ÄNDAMÅLSENLIGHET FÖR NÅGOT SÄRSKILT SYFTE. Se GNU General Public License för fler detaljer.\n"
"SciteProj distribueras med förhoppningen att det kommer att vara användbart, "
"men UTAN NÅGON SOM HELST GARANTI; utan ens den implicita garantin av "
"SÄLJBARHET eller ÄNDAMÅLSENLIGHET FÖR NÅGOT SÄRSKILT SYFTE. Se GNU General "
"Public License för fler detaljer.\n"
"\n"
"Du bör ha fått en kopia av GNU General Public License tillsammans med detta program; om inte, se <http://www.gnu.org/licenses/>.\n"
"Du bör ha fått en kopia av GNU General Public License tillsammans med detta "
"program; om inte, se <http://www.gnu.org/licenses/>.\n"
#: about.c:250
msgid "SciteProj is based on ScitePM by"
......@@ -61,16 +75,16 @@ msgstr ""
msgid "version %s"
msgstr "version %s"
#: gui.c:142
#: gui.c:141
msgid "[UNTITLED]"
msgstr "[NAMNLÖS]"
#: gui.c:775 recent_files.c:551 scite_utils.c:216
#: gui.c:774 recent_files.c:557 scite_utils.c:216
#, c-format
msgid "Opened %s"
msgstr "Öppnade %s"
#: gui.c:788 gui_callbacks.c:96 recent_files.c:564 recent_files.c:605
#: gui.c:787 gui_callbacks.c:95 recent_files.c:570 recent_files.c:611
#, c-format
msgid ""
"Could not open selected file: \n"
......@@ -85,63 +99,66 @@ msgstr ""
msgid "Show program version and quit"
msgstr "Visa programversion och avsluta"
#: main.c:71
#: main.c:72
msgid "Set a filename for the instance of SciTE to open"
msgstr "Sätt ett filnamn för instansen av SciTE du önskar köra"
#: main.c:71
#: main.c:72
msgid "SCITE_FILENAME"
msgstr "SCITE_FILNAMN"
#: main.c:73
#: main.c:75
msgid "Load a folder"
msgstr "Ladda en mapp"
#: main.c:75
#: main.c:78
msgid "Start SciTE automatically with SciteProj"
msgstr "Starta SciTE automatiskt med SciteProj"
#: main.c:86
#: main.c:90
msgid "SciTE Project Manager"
msgstr "SciTE Projekthanterare"
#: main.c:93
#: main.c:97
#, c-format
msgid "option parsing failed: %s"
msgstr "tolkning av alternativ misslyckades: %s"
#: main.c:137
#: main.c:141
#, c-format
msgid "A folder is expected as parameter to sciteproj..."
msgstr "En mapp väntas som parameter till sciteproj..."
#: main.c:176 main.c:186
msgid "Environment variable exists, but doesn't point to a folder containing scite."
msgstr "Miljövariabeln finns, men hänvisar inte till någon mapp som innehåller scite."
#: main.c:180 main.c:190
msgid ""
"Environment variable exists, but doesn't point to a folder containing scite."
msgstr ""
"Miljövariabeln finns, men hänvisar inte till någon mapp som innehåller scite."
#: main.c:203
#: main.c:207
#, c-format
msgid "Couldn't find a SciTE executable named '%s'!\n"
msgstr "Kunde inte hitta en körbar fil för SciTE med namnet '%s'!\n"
#: main.c:204
#: main.c:208
msgid "Checking for SciTE in the standard locations instead.\n"
msgstr "Kollar efter SciTE på standard-platserna istället.\n"
#: main.c:217
#: main.c:221
msgid ""
"Warning! Couldn't locate SciTE!\n"
"Program will start, but you won't be able to open SciTE to edit files."
msgstr ""
"Varning! Kunde inte hitta SciTE!\n"
"Programmet kommer att starta, men du kommer inte kunna använda SciTE för att editera filer."
"Programmet kommer att starta, men du kommer inte kunna använda SciTE för att "
"editera filer."
#: main.c:225
#: main.c:229
#, c-format
msgid "Could not setup the gui: %s"
msgstr "Kunde inte ställa in GUI: %s"
#: main.c:231
#: main.c:235
#, c-format
msgid "Not a valid folder!"
msgstr "Inte en giltig mapp!"
......@@ -171,8 +188,8 @@ msgid "Edit properties"
msgstr "Editera egenskaper"
#: menus.c:144
msgid "Show Recent Files"
msgstr "Visa senaste filer"
msgid "Show Recently Opened Files"
msgstr "Visa nyligen öppnade filer"
#: menus.c:151
msgid "About"
......@@ -218,35 +235,35 @@ msgstr "Uppdatera mappinnehåll"
msgid "Remove file from this list"
msgstr "Ta bort fil från denna lista"
#: properties_dialog.c:64 properties_dialog.c:67
#: properties_dialog.c:76 properties_dialog.c:79
msgid "Group Properties"
msgstr "Mappegenskaper"
#: properties_dialog.c:65 properties_dialog.c:159
#: properties_dialog.c:77 properties_dialog.c:171
msgid "OK"
msgstr "OK"
#: properties_dialog.c:72
#: properties_dialog.c:85
msgid "Group name:"
msgstr "Gruppnamn:"
#: properties_dialog.c:73
#: properties_dialog.c:86
msgid "Full folder:"
msgstr "Fullt mappnamn:"
#: properties_dialog.c:158 properties_dialog.c:161
#: properties_dialog.c:170 properties_dialog.c:173
msgid "File Properties"
msgstr "Filegenskaper"
#: properties_dialog.c:185
#: properties_dialog.c:197
msgid "Filename:"
msgstr "Filnamn:"
#: properties_dialog.c:186
#: properties_dialog.c:198
msgid "Path:"
msgstr "Sökväg:"
#: properties_dialog.c:187
#: properties_dialog.c:199
msgid "File size:"
msgstr "Filstorlek:"
......@@ -321,3 +338,6 @@ msgstr "Fel:%s"
#: statusbar.c:57
msgid "Welcome to SciteProj\n"
msgstr "Välkommen till SciteProj\n"
#~ msgid "Show Recent Files"
#~ msgstr "Visa senaste filer"
......@@ -34,4 +34,4 @@ Specifies the position and size of the program window on start
.IP "give_scite_focus"
.SH AUTHOR
.B SciteProj
was written by Andreas Rönnquist <gusnan@openmailbox.org>.
was written by Andreas Rönnquist <andreas@ronnquist.net>.
......@@ -147,7 +147,7 @@ void create_about_dialog()
#endif
// Show SciteProj copyrights
copyrightstring = g_strdup_printf("Copyright (C) 2008-2017 Andreas Rönnquist <gusnan@openmailbox.org>");
copyrightstring = g_strdup_printf("Copyright (C) 2008-2017 Andreas Rönnquist <andreas@ronnquist.net>");
copyright_label = gtk_label_new(copyrightstring);
gtk_label_set_selectable(GTK_LABEL(copyright_label), FALSE);
......
......@@ -562,7 +562,7 @@ gchar *clean_folder(gchar *infolder)
int len = strlen(infolder);
if (g_strcmp0(infolder, "./")==0) {
if (g_strcmp0(infolder, "./") == 0) {
result = g_strdup_printf(".");
return result;
......@@ -576,7 +576,7 @@ gchar *clean_folder(gchar *infolder)
}
if (temp[len-1] == G_DIR_SEPARATOR) {
result = g_strndup(temp, len-1);
result = g_strndup(temp, len - 1);
} else {
result = g_strdup(temp);
}
......
......@@ -86,13 +86,13 @@ gboolean load_graphics(GtkWidget *widget, GError **err)
directory_closed_pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)dir_close_xpm);
}
GdkDisplay *default_display = NULL;
default_display = gdk_display_get_default();
standard_cursor=gdk_cursor_new_for_display(default_display, GDK_X_CURSOR);
busy_cursor=gdk_cursor_new_for_display(default_display, GDK_WATCH);
standard_cursor = gdk_cursor_new_for_display(default_display, GDK_X_CURSOR);
busy_cursor = gdk_cursor_new_for_display(default_display, GDK_WATCH);
return TRUE;
}
......
......@@ -997,3 +997,12 @@ void recent_files_switch_visible()
#endif
}
/**
*
*/
void set_dialog_transient(GtkWidget *dialog)
{
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(sMainWindow));
}
\ No newline at end of file
......@@ -56,4 +56,6 @@ gboolean dialog_response_is_exit(gint test);
void recent_files_switch_visible();
void set_dialog_transient(GtkWidget *dialog);
#endif /*__HEADER_GUI_*/
......@@ -211,7 +211,7 @@ void load_tree_at_iter(GtkTreeView *tree_view, GtkTreeIter *iter)
gtk_tree_model_get(tree_model, iter, COLUMN_FILEPATH, &folder_path, -1);
// Load the wanted filter from the LUA config
GSList *filter_list=load_filter_from_lua(folder_path);
GSList *filter_list = load_filter_from_lua(folder_path);
GSList *file_list; //=load_folder_to_list(folder_path, FALSE,
GSList *folder_list;
......@@ -219,7 +219,7 @@ void load_tree_at_iter(GtkTreeView *tree_view, GtkTreeIter *iter)
// default sorting here compare_strings_bigger - since we turn the
// list backwards after
GCompareFunc comparer=get_sort_order_of_folder(folder_path);
GCompareFunc comparer = get_sort_order_of_folder(folder_path);
file_list=load_folder_to_list(folder_path, FALSE, comparer /*file_sort_by_extension_bigger_func*/, filter_list);
......@@ -418,7 +418,7 @@ void refresh_folder_cb()
// First, store all GtkTreePath in a linked list
if (gtk_tree_model_iter_children(tree_model, &child, &iter)) {
int co=0;
int co = 0;
GtkTreePath *tree_path;
GtkTreeIter *temp_iter = &child;
......@@ -461,7 +461,7 @@ void refresh_folder_cb()
-1);
GtkTreeIter new_iter;
if (get_number_of_files_in_folder(folder)>0) {
if (get_number_of_files_in_folder(folder) > 0) {
add_tree_file(temp_iter, ADD_CHILD, "<loading...>", &new_iter, FALSE, NULL);
}
......
......@@ -98,7 +98,7 @@ get_pixbuf_from_file(GFile *file, GtkIconSize size)
GdkPixbuf *
get_pixbuf_from_filename(gchar *filename, GtkIconSize size)
{
GFile *tempfile=g_file_new_for_path(filename);
GFile *tempfile = g_file_new_for_path(filename);
GdkPixbuf *result=get_pixbuf_from_file(tempfile, size);
......
......@@ -58,7 +58,7 @@ gboolean ignore_pattern_matches(gchar *folder_name, const gchar *filename, GSLis
{
gboolean result = FALSE;
gchar *full_filename=g_build_filename(folder_name, filename, NULL);
gchar *full_filename = g_build_filename(folder_name, filename, NULL);
int len = strlen(full_filename);
......
......@@ -141,7 +141,7 @@ int init_menus(GtkWidget *window)
g_signal_connect(G_OBJECT(propertiesMenuItem), "activate", G_CALLBACK(edit_properties_cb), NULL);
showRecentFileMenuItem = gtk_menu_item_new_with_mnemonic(_("Show Recent Files"));
showRecentFileMenuItem = gtk_menu_item_new_with_mnemonic(_("Show Recently Opened Files"));
g_signal_connect(G_OBJECT(showRecentFileMenuItem), "activate", G_CALLBACK(recent_files_switch_visible), NULL);
gtk_widget_add_accelerator(showRecentFileMenuItem, "activate", accelerator_group, GDK_KEY_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
......
......@@ -85,20 +85,20 @@ gchar *default_config_string = (gchar*)"" \
gboolean check_config_string(gchar *in_config)
{
gboolean result = FALSE;
int co=0;
int co = 0;
gdouble tempdouble;
gchar *tempstring = NULL;
int pos=-1;
int pos = -1;
gchar *value=in_config;
gchar *value = in_config;
// clear scite Path
prefs.scite_path = NULL;
for (co=0; co < (int)strlen(in_config); co++) {
for (co = 0; co < (int)strlen(in_config); co++) {
if (in_config[co] == '=') pos=co;
if (pos == -1) {
......@@ -119,34 +119,34 @@ gboolean check_config_string(gchar *in_config)
value = g_strchug(value);
value = g_strchomp(value);
if (g_ascii_strcasecmp(tempstring, "xpos")==0) {
if (g_ascii_strcasecmp(tempstring, "xpos") == 0) {
tempdouble = g_ascii_strtod(value, NULL);
prefs.xpos = (int) tempdouble;
}
if (g_ascii_strcasecmp(tempstring, "ypos")==0) {
if (g_ascii_strcasecmp(tempstring, "ypos") == 0) {
tempdouble = g_ascii_strtod(value, NULL);
prefs.ypos = (int)tempdouble;
}
if (g_ascii_strcasecmp(tempstring, "width")==0) {
if (g_ascii_strcasecmp(tempstring, "width") == 0) {
tempdouble = g_ascii_strtod(value, NULL);
prefs.width = (int)tempdouble;
}
if (g_ascii_strcasecmp(tempstring, "height")==0) {
if (g_ascii_strcasecmp(tempstring, "height") == 0) {
tempdouble = g_ascii_strtod(value, NULL);
prefs.height = (int)tempdouble;
}
if (g_ascii_strcasecmp(tempstring, "give_scite_focus")==0) {
if (g_ascii_strcasecmp(value, "TRUE")==0) {
if (g_ascii_strcasecmp(tempstring, "give_scite_focus") == 0) {
if (g_ascii_strcasecmp(value, "TRUE") == 0) {
prefs.give_scite_focus = TRUE;
}
}
if (g_ascii_strcasecmp(tempstring, "scite_path")==0) {
if (g_ascii_strcasecmp(tempstring, "scite_path") == 0) {
prefs.scite_path = g_strdup_printf("%s", value);
}
......@@ -156,7 +156,7 @@ gboolean check_config_string(gchar *in_config)
}
}
if (g_ascii_strcasecmp(tempstring, "recent_add_to_bottom")==0) {
if (g_ascii_strcasecmp(tempstring, "recent_add_to_bottom") == 0) {
if (g_ascii_strcasecmp(value, "TRUE") == 0) {
prefs.recent_add_to_bottom = TRUE;
}
......@@ -217,7 +217,7 @@ gboolean init_prefs(gchar *target_directory, GError **err)
// First, check the file ~/.config/sciteprojrc.lua
gchar *test_prefs_filename = g_build_filename(g_get_user_config_dir(), "sciteprojrc.lua",NULL);
gchar *test_prefs_filename = g_build_filename(g_get_user_config_dir(), "sciteprojrc.lua", NULL);
if (g_file_test(test_prefs_filename, G_FILE_TEST_IS_REGULAR)) {
......@@ -246,7 +246,7 @@ gboolean init_prefs(gchar *target_directory, GError **err)
// the result of g_get_user_config_dir doesn't need to be freed, so we
// dont need to put it in a pointer of its own.
prefs_filename = g_build_filename(g_get_user_config_dir(), "sciteprojrc",NULL);
prefs_filename = g_build_filename(g_get_user_config_dir(), "sciteprojrc", NULL);
// Check if a config-file exists
if (!g_file_test(prefs_filename, G_FILE_TEST_IS_REGULAR)) {
......@@ -294,7 +294,7 @@ gboolean init_prefs(gchar *target_directory, GError **err)
if (temp != NULL) {
if ((temp[0] != '#') && (strcmp(temp, "")!=0)) {
if ((temp[0] != '#') && (strcmp(temp, "") != 0)) {
// We got a valid string:
// no starting #, and not an empty string.
......@@ -312,7 +312,7 @@ gboolean init_prefs(gchar *target_directory, GError **err)
//if (!load_lua_config(config_string)) {
if (load_lua_config(prefs_filename, config_string)!=0) {
if (load_lua_config(prefs_filename, config_string) != 0) {
printf("error loading LUA config!\n");
}
}
......@@ -355,7 +355,7 @@ gboolean check_for_old_style_config(const gchar *teststring)
// Another way to check is to check for lines starting with # - as a comment
// LUA uses "--", so this is should work to identify oldstyle config.
for (co=0; co<strlen(teststring); co++) {
for (co = 0; co < strlen(teststring); co++) {
if (teststring[co] == '\n') {
//printf("Tecken: %c\n", teststring[co+1]);
......@@ -378,7 +378,7 @@ int load_lua_config(gchar *filename, gchar *full_string)
lua = init_script();
//if (load_script_buffer(lua, config_string)!=0) {
if (load_script_buffer(lua, full_string)!=0) {
if (load_script_buffer(lua, full_string) != 0) {
printf("Error loading file: %s\n", filename);
return FALSE;
}
......
......@@ -102,7 +102,7 @@ void group_properties_gui(GtkTreeModel *tree_model, GtkTreeIter *iter)
gtk_grid_attach(GTK_GRID(table), label2, 0, 1, 1, 1);
gtk_grid_attach(GTK_GRID(table),filename, 1, 0, 4, 1);
gtk_grid_attach(GTK_GRID(table),filepath_label,1,1,4