Commits November 2007

commits@lists.geany.org

3 participants
83 discussions

SF.net SVN: geany: [2072] trunk
by eht16＠users.sourceforge.net 27 Nov '07

27 Nov '07

Revision: 2072 http://geany.svn.sourceforge.net/geany/?rev=2072&view=rev Author: eht16 Date: 2007-11-27 07:18:57 -0800 (Tue, 27 Nov 2007) Log Message: ----------- Fix syntax colouring bug when using '?>' in a PHP comment (closes #1838854). Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/LexHTML.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-25 13:48:22 UTC (rev 2071) +++ trunk/ChangeLog 2007-11-27 15:18:57 UTC (rev 2072) @@ -1,3 +1,9 @@ +2007-11-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * scintilla/LexHTML.cxx: Fix syntax colouring bug when using '?>' in + a PHP comment (closes #1838854). + + 2007-11-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/document.c: Display character which caused a failed encoding Modified: trunk/scintilla/LexHTML.cxx =================================================================== --- trunk/scintilla/LexHTML.cxx 2007-11-25 13:48:22 UTC (rev 2071) +++ trunk/scintilla/LexHTML.cxx 2007-11-27 15:18:57 UTC (rev 2072) @@ -815,7 +815,7 @@ ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) && ( ((scriptLanguage != eScriptNone) && stateAllowsTermination(state) && ((ch == '%') || (ch == '?'))) - ) && (chNext == '>')) || + ) && (chNext == '>') && (! isCommentASPState(state))) || ((scriptLanguage == eScriptSGML) && (ch == '>') && (state != SCE_H_SGML_COMMENT))) { if (state == SCE_H_ASPAT) { aspScript = segIsScriptingIndicator(styler, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2071] trunk
by eht16＠users.sourceforge.net 25 Nov '07

25 Nov '07

Revision: 2071 http://geany.svn.sourceforge.net/geany/?rev=2071&view=rev Author: eht16 Date: 2007-11-25 05:48:22 -0800 (Sun, 25 Nov 2007) Log Message: ----------- Display character which caused a failed encoding conversion when saving a file. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-23 16:37:03 UTC (rev 2070) +++ trunk/ChangeLog 2007-11-25 13:48:22 UTC (rev 2071) @@ -1,3 +1,9 @@ +2007-11-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c: Display character which caused a failed encoding + conversion when saving a file. + + 2007-11-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/symbols.c, tagmanager/basic.c: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-11-23 16:37:03 UTC (rev 2070) +++ trunk/src/document.c 2007-11-25 13:48:22 UTC (rev 2071) @@ -1186,20 +1186,30 @@ { GError *conv_error = NULL; gchar* conv_file_contents = NULL; + gsize bytes_read; gsize conv_len; // try to convert it from UTF-8 to original encoding conv_file_contents = g_convert(data, len-1, doc_list[idx].encoding, "UTF-8", - NULL, &conv_len, &conv_error); + &bytes_read, &conv_len, &conv_error); if (conv_error != NULL) { + gchar *context = NULL; + + if (conv_error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) + { + context = g_malloc(4); // read 3 bytes from Sci + '\0' + sci_get_text_range(doc_list[idx].sci, bytes_read, bytes_read + 3, context); + } dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." - "\nError message: %s\n"), - doc_list[idx].encoding, conv_error->message); - geany_debug("encoding error: %s)", conv_error->message); + "\nError message: %s\nThe error occurred at \"%s\"."), + doc_list[idx].encoding, conv_error->message, + (context != NULL) ? context : _("unknown")); + geany_debug("encoding error: %s", conv_error->message); g_error_free(conv_error); + g_free(context); g_free(data); return FALSE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2070] trunk
by eht16＠users.sourceforge.net 23 Nov '07

23 Nov '07

Revision: 2070 http://geany.svn.sourceforge.net/geany/?rev=2070&view=rev Author: eht16 Date: 2007-11-23 08:37:03 -0800 (Fri, 23 Nov 2007) Log Message: ----------- Fix plugin separator placement in the Tools menu. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-23 16:05:53 UTC (rev 2069) +++ trunk/ChangeLog 2007-11-23 16:37:03 UTC (rev 2070) @@ -4,6 +4,7 @@ Use FreeBasic specific sections in symbol list. Use Basic parser from CTags SVN and improve the parser for better handling of dim and const keywords. + * src/plugins.c: Fix plugin separator placement in the Tools menu. 2007-11-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2007-11-23 16:05:53 UTC (rev 2069) +++ trunk/src/plugins.c 2007-11-23 16:37:03 UTC (rev 2070) @@ -79,6 +79,7 @@ static GList *plugin_list = NULL; // list of all available, loadable plugins static GList *active_plugin_list = NULL; // list of only actually loaded plugins +static GtkWidget *separator = NULL; static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data); @@ -550,6 +551,9 @@ gtk_widget_show(widget); g_signal_connect((gpointer) widget, "activate", G_CALLBACK(pm_show_dialog), NULL); + separator = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(geany_data.tools_menu), separator); + load_plugin_paths(); plugins_update_tools_menu(); @@ -622,13 +626,9 @@ void plugins_update_tools_menu() { gboolean found; - static GtkWidget *separator = NULL; if (separator == NULL) - { - separator = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(geany_data.tools_menu), separator); - } + return; found = (g_list_find_custom(active_plugin_list, NULL, (GCompareFunc) plugin_has_menu) != NULL); ui_widget_show_hide(separator, found); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2069] trunk
by eht16＠users.sourceforge.net 23 Nov '07

23 Nov '07

Revision: 2069 http://geany.svn.sourceforge.net/geany/?rev=2069&view=rev Author: eht16 Date: 2007-11-23 08:05:53 -0800 (Fri, 23 Nov 2007) Log Message: ----------- Use FreeBasic specific sections in symbol list. Use Basic parser from CTags SVN and improve the parser for better handling of dim and const keywords. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/tagmanager/basic.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-22 17:48:59 UTC (rev 2068) +++ trunk/ChangeLog 2007-11-23 16:05:53 UTC (rev 2069) @@ -1,3 +1,11 @@ +2007-11-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/symbols.c, tagmanager/basic.c: + Use FreeBasic specific sections in symbol list. + Use Basic parser from CTags SVN and improve the parser for better + handling of dim and const keywords. + + 2007-11-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * po/POTFILES.in, plugins/autosave.c, plugins/Makefile.am, Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-11-22 17:48:59 UTC (rev 2068) +++ trunk/src/symbols.c 2007-11-23 16:05:53 UTC (rev 2069) @@ -663,6 +663,18 @@ NULL); break; } + case GEANY_FILETYPES_BASIC: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_function), _("Functions"), "classviewer-method", + &(tv_iters.tag_variable), _("Variables"), "classviewer-var", + &(tv_iters.tag_macro), _("Constants"), "classviewer-macro", + &(tv_iters.tag_struct), _("Types"), "classviewer-namespace", + &(tv_iters.tag_namespace), _("Labels"), "classviewer-member", + &(tv_iters.tag_other), _("Other"), "classviewer-other", + NULL); + break; + } case GEANY_FILETYPES_D: default: { Modified: trunk/tagmanager/basic.c =================================================================== --- trunk/tagmanager/basic.c 2007-11-22 17:48:59 UTC (rev 2068) +++ trunk/tagmanager/basic.c 2007-11-23 16:05:53 UTC (rev 2069) @@ -31,71 +31,111 @@ K_FUNCTION, K_LABEL, K_TYPE, - K_VARIABLE, - K_ENUM + K_VARIABLE, + K_ENUM } BasicKind; typedef struct { char const *token; BasicKind kind; - int skip; } KeyWord; static kindOption BasicKinds[] = { - {TRUE, 'c', "constant", "constants"}, + {TRUE, 'c', "macro", "constants"}, {TRUE, 'f', "function", "functions"}, - {TRUE, 'l', "label", "labels"}, - {TRUE, 't', "type", "types"}, + {TRUE, 'l', "namespace", "labels"}, + {TRUE, 't', "struct", "types"}, {TRUE, 'v', "variable", "variables"}, - {TRUE, 'g', "enum", "enumerations"} + {TRUE, 'g', "externvar", "enumerations"} }; -static KeyWord blitzbasic_keywords[] = { - {"const", K_CONST, 0}, - {"global", K_VARIABLE, 0}, - {"dim", K_VARIABLE, 0}, - {"function", K_FUNCTION, 0}, - {"type", K_TYPE, 0}, - {NULL, 0, 0} -}; - -static KeyWord purebasic_keywords[] = { - {"newlist", K_VARIABLE, 0}, - {"global", K_VARIABLE, 0}, - {"dim", K_VARIABLE, 0}, - {"procedure", K_FUNCTION, 0}, - {"interface", K_TYPE, 0}, - {"structure", K_TYPE, 0}, - {NULL, 0, 0} -}; - static KeyWord freebasic_keywords[] = { - {"const", K_CONST, 0}, - {"dim as", K_VARIABLE, 1}, - {"dim", K_VARIABLE, 0}, - {"common", K_VARIABLE, 0}, - {"function", K_FUNCTION, 0}, - {"sub", K_FUNCTION, 0}, - {"private sub", K_FUNCTION, 0}, - {"public sub", K_FUNCTION, 0}, - {"private function", K_FUNCTION, 0}, - {"public function", K_FUNCTION, 0}, - {"type", K_TYPE, 0}, - {"enum", K_ENUM, 0}, - {NULL, 0, 0} + {"dim", K_VARIABLE}, // must always be the first + {"common", K_VARIABLE}, // must always be the second + {"const", K_CONST}, // must always be the third + {"function", K_FUNCTION}, + {"sub", K_FUNCTION}, + {"private sub", K_FUNCTION}, + {"public sub", K_FUNCTION}, + {"private function", K_FUNCTION}, + {"public function", K_FUNCTION}, + {"type", K_TYPE}, + {"enum", K_ENUM}, + {NULL, 0} }; /* * FUNCTION DEFINITIONS */ +/* Match the name of a dim or const starting at pos. */ +static int extract_dim (char const *pos, vString * name, BasicKind kind) +{ + while (isspace (*pos)) + pos++; + + vStringClear (name); + + if (strncasecmp (pos, "shared", 6) == 0) + pos += 6; // skip keyword "shared" + + while (isspace (*pos)) + pos++; + + // capture "dim as String str" + if (strncasecmp (pos, "as", 2) == 0) + { + pos += 2; // skip keyword "as" + + while (isspace (*pos)) + pos++; + while (!isspace (*pos)) // skip next part which is a type + pos++; + while (isspace (*pos)) + pos++; + // now we are at the name + } + + // capture "dim as foo ptr bar" + if (strncasecmp (pos, "ptr", 3) == 0) + { + pos += 3; // skip keyword "ptr" + + while (isspace (*pos)) + pos++; + } + + for (; *pos && !isspace (*pos) && *pos != '(' && *pos != ','; pos++) + vStringPut (name, *pos); + vStringTerminate (name); + makeSimpleTag (name, BasicKinds, kind); + + // if the line contains a ',', we have multiple declarations + while (*pos && strchr (pos, ',')) + { + while (*pos != ',') // skip all we don't need(e.g. "..., new_array(5), " we skip "(5)") + pos++; + while (isspace (*pos) || *pos == ',') + pos++; + + vStringClear (name); + for (; *pos && !isspace (*pos) && *pos != '(' && *pos != ','; pos++) + vStringPut (name, *pos); + vStringTerminate (name); + makeSimpleTag (name, BasicKinds, kind); + } + + vStringDelete (name); + return 1; +} + /* Match the name of a tag (function, variable, type, ...) starting at pos. */ static char const *extract_name (char const *pos, vString * name) { while (isspace (*pos)) pos++; vStringClear (name); - for (; *pos && !isspace (*pos) && *pos != '(' && *pos != ','; pos++) + for (; *pos && !isspace (*pos) && *pos != '(' && *pos != ',' && *pos != '='; pos++) vStringPut (name, *pos); vStringTerminate (name); return pos; @@ -114,12 +154,18 @@ } name = vStringNew (); p += i; - for (j = 0; j < 1 + kw->skip; j++) + if (kw == &freebasic_keywords[0] || + kw == &freebasic_keywords[1] || + kw == &freebasic_keywords[2]) + return extract_dim (p, name, kw->kind); // extract_dim adds the found tag(s) + + for (j = 0; j < 1; j++) { - p = extract_name (p, name); - } + p = extract_name (p, name); + } makeSimpleTag (name, BasicKinds, kw->kind); vStringDelete (name); + return 1; } @@ -138,23 +184,13 @@ } } -/* Match a ".label" style label. */ -static void match_dot_label (char const *p) +static void findBasicTags (void) { - if (*p == '.') - { - vString *name = vStringNew (); - extract_name (p + 1, name); - makeSimpleTag (name, BasicKinds, K_LABEL); - vStringDelete (name); - } -} - -static void findBasicTags (KeyWord const keywords[], - void (*label) (const char *)) -{ const char *line; + KeyWord *keywords; + keywords = freebasic_keywords; + while ((line = (const char *) fileReadLine ()) != NULL) { const char *p = line; @@ -172,55 +208,18 @@ if (match_keyword (p, kw)) break; /* Is it a label? */ - label (p); + match_colon_label (p); } } -static void findBlitzBasicTags (void) -{ - findBasicTags (blitzbasic_keywords, match_dot_label); -} - -static void findPureBasicTags (void) -{ - findBasicTags (purebasic_keywords, match_colon_label); -} - -static void findFreeBasicTags (void) -{ - findBasicTags (freebasic_keywords, match_colon_label); -} - -parserDefinition *BlitzBasicParser (void) -{ - static char const *extensions[] = { "bb", NULL }; - parserDefinition *def = parserNew ("BlitzBasic"); - def->kinds = BasicKinds; - def->kindCount = KIND_COUNT (BasicKinds); - def->extensions = extensions; - def->parser = findBlitzBasicTags; - return def; -} - -parserDefinition *PureBasicParser (void) -{ - static char const *extensions[] = { "pb", NULL }; - parserDefinition *def = parserNew ("PureBasic"); - def->kinds = BasicKinds; - def->kindCount = KIND_COUNT (BasicKinds); - def->extensions = extensions; - def->parser = findPureBasicTags; - return def; -} - parserDefinition *FreeBasicParser (void) { - static char const *extensions[] = { "bas", "bi", NULL }; + static char const *extensions[] = { "bas", "bi", "bb", "pb", NULL }; parserDefinition *def = parserNew ("FreeBasic"); def->kinds = BasicKinds; def->kindCount = KIND_COUNT (BasicKinds); def->extensions = extensions; - def->parser = findFreeBasicTags; + def->parser = findBasicTags; return def; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2068] trunk
by eht16＠users.sourceforge.net 22 Nov '07

22 Nov '07

Revision: 2068 http://geany.svn.sourceforge.net/geany/?rev=2068&view=rev Author: eht16 Date: 2007-11-22 09:48:59 -0800 (Thu, 22 Nov 2007) Log Message: ----------- Enable Shift+click on a fold point to unfold all possibly folded children (same as the pref "Unfold all children of a fold point"). Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/editor.c trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-22 17:03:53 UTC (rev 2067) +++ trunk/ChangeLog 2007-11-22 17:48:59 UTC (rev 2068) @@ -2,6 +2,9 @@ * po/POTFILES.in, plugins/autosave.c, plugins/Makefile.am, plugins/makefile.win32: New plugin: Auto Save. + * geany.glade, src/editor.c, src/interface.c: + Enable Shift+click on a fold point to unfold all possibly folded + children (same as the pref "Unfold all children of a fold point"). 2007-11-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-11-22 17:03:53 UTC (rev 2067) +++ trunk/geany.glade 2007-11-22 17:48:59 UTC (rev 2068) @@ -5873,7 +5873,7 @@ <child> <widget class="GtkCheckButton" id="check_unfold_children"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Unfold all children of a fold point when unfolding it.</property> + <property name="tooltip" translatable="yes">Unfold all children of a fold point when unfolding it. The same behaviour can be reached when holding the shift key while clicking on the fold symbol.</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Unfold all children of a fold point</property> <property name="use_underline">True</property> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-11-22 17:03:53 UTC (rev 2067) +++ trunk/src/editor.c 2007-11-22 17:48:59 UTC (rev 2068) @@ -124,7 +124,7 @@ gint line = SSM(sci, SCI_LINEFROMPOSITION, nt->position, 0); SSM(sci, SCI_TOGGLEFOLD, line, 0); - if (editor_prefs.unfold_all_children && + if ((editor_prefs.unfold_all_children || (nt->modifiers & SCMOD_SHIFT)) && SSM(sci, SCI_GETLINEVISIBLE, line + 1, 0)) { // unfold all children of the current fold point gint last_line = SSM(sci, SCI_GETLASTCHILD, line, -1); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-11-22 17:03:53 UTC (rev 2067) +++ trunk/src/interface.c 2007-11-22 17:48:59 UTC (rev 2068) @@ -3650,7 +3650,7 @@ check_unfold_children = gtk_check_button_new_with_mnemonic (_("Unfold all children of a fold point")); gtk_widget_show (check_unfold_children); gtk_box_pack_start (GTK_BOX (vbox17), check_unfold_children, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_unfold_children, _("Unfold all children of a fold point when unfolding it."), NULL); + gtk_tooltips_set_tip (tooltips, check_unfold_children, _("Unfold all children of a fold point when unfolding it. The same behaviour can be reached when holding the shift key while clicking on the fold symbol."), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_unfold_children), FALSE); check_indicators = gtk_check_button_new_with_mnemonic (_("Use indicators to show compile errors")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2067] trunk
by eht16＠users.sourceforge.net 22 Nov '07

22 Nov '07

Revision: 2067 http://geany.svn.sourceforge.net/geany/?rev=2067&view=rev Author: eht16 Date: 2007-11-22 09:03:53 -0800 (Thu, 22 Nov 2007) Log Message: ----------- New plugin: Auto Save. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/Makefile.am trunk/plugins/makefile.win32 trunk/po/POTFILES.in Added Paths: ----------- trunk/plugins/autosave.c Property Changed: ---------------- trunk/plugins/svndiff.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-21 18:54:31 UTC (rev 2066) +++ trunk/ChangeLog 2007-11-22 17:03:53 UTC (rev 2067) @@ -1,3 +1,9 @@ +2007-11-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * po/POTFILES.in, plugins/autosave.c, plugins/Makefile.am, + plugins/makefile.win32: New plugin: Auto Save. + + 2007-11-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/editor.c: Fix crash when trying to add a multiline comment in Modified: trunk/plugins/Makefile.am =================================================================== --- trunk/plugins/Makefile.am 2007-11-21 18:54:31 UTC (rev 2066) +++ trunk/plugins/Makefile.am 2007-11-22 17:03:53 UTC (rev 2067) @@ -12,6 +12,7 @@ export_la_LDFLAGS = -module -avoid-version svndiff_la_LDFLAGS = -module -avoid-version vcdiff_la_LDFLAGS = -module -avoid-version +autosave_la_LDFLAGS = -module -avoid-version filebrowser_la_LDFLAGS = -module -avoid-version if PLUGINS @@ -23,6 +24,7 @@ export.la \ svndiff.la \ vcdiff.la \ + autosave.la \ filebrowser.la # Plugins not to be installed @@ -35,6 +37,7 @@ export_la_SOURCES = export.c svndiff_la_SOURCES = svndiff.c vcdiff_la_SOURCES = vcdiff.c +autosave_la_SOURCES = autosave.c filebrowser_la_SOURCES = filebrowser.c demoplugin_la_LIBADD = $(GTK_LIBS) @@ -42,7 +45,8 @@ htmlchars_la_LIBADD = $(GTK_LIBS) export_la_LIBADD = $(GTK_LIBS) svndiff_la_LIBADD = $(GTK_LIBS) -vcdiff_la_LIBADD = $(GTK_LIBS) +vcdiff_la_LIBADD = $(GTK_LIBS) +autosave_la_LIBAD = $(GTK_LIBS) filebrowser_la_LIBADD = $(GTK_LIBS) endif # PLUGINS Added: trunk/plugins/autosave.c =================================================================== --- trunk/plugins/autosave.c (rev 0) +++ trunk/plugins/autosave.c 2007-11-22 17:03:53 UTC (rev 2067) @@ -0,0 +1,202 @@ +/* + * autosave.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com> + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * $Id$ + */ + + +#include "geany.h" +#include "support.h" +#include "document.h" + +#include "plugindata.h" +#include "pluginmacros.h" + + +PluginFields *plugin_fields; +GeanyData *geany_data; + + +VERSION_CHECK(32) + +PLUGIN_INFO(_("Auto Save"), _("Save automatically all open files in a given time interval."), + VERSION, _("The Geany developer team")) + + +static gint interval; +static gboolean print_msg; +static gboolean save_all; +static guint src_id = G_MAXUINT; +static gchar *config_file; + + +gboolean auto_save(gpointer data) +{ + gint cur_idx = documents->get_cur_idx(); + gint i, idx, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); + gint saved_files = 0; + + if (save_all) + { + for (i = 0; i < max; i++) + { + idx = documents->get_n_idx(i); + + // skip current file to save it lastly, skip files without name + if (idx != cur_idx && doc_list[idx].file_name != NULL) + if (documents->save_file(idx, FALSE)) + saved_files++; + } + } + // finally save current file, do it after all other files to get correct window title and + // symbol list + if (doc_list[cur_idx].file_name != NULL) + if (documents->save_file(cur_idx, FALSE)) + saved_files++; + + if (saved_files > 0 && print_msg) + ui->set_statusbar(FALSE, _("Autosave: Saved %d files automatically."), saved_files); + + return TRUE; +} + + +void set_timeout() +{ + if (src_id != G_MAXUINT) + g_source_remove(src_id); + src_id = g_timeout_add(interval * 1000, (GSourceFunc)auto_save, NULL); + +} + + +void init(GeanyData *data) +{ + GKeyFile *config = g_key_file_new(); + GError *error = NULL; + config_file = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + "autosave", G_DIR_SEPARATOR_S, "autosave.conf", NULL); + + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + interval = g_key_file_get_integer(config, "autosave", "interval", &error); + if (error != NULL) + { + g_error_free(error); + interval = 300; + } + print_msg = g_key_file_get_boolean(config, "autosave", "print_messages", NULL); + save_all = g_key_file_get_boolean(config, "autosave", "save_all", NULL); + + set_timeout(); + + g_key_file_free(config); +} + + +void configure(GtkWidget *parent) +{ + GtkWidget *dialog, *label, *spin, *vbox, *hbox, *checkbox, *radio1, *radio2; + + dialog = gtk_dialog_new_with_buttons(_("Auto Save"), + GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + vbox = ui->dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_widget_set_name(dialog, "GeanyDialog"); + gtk_box_set_spacing(GTK_BOX(vbox), 6); + + label = gtk_label_new("Auto save interval:"); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_container_add(GTK_CONTAINER(vbox), label); + + spin = gtk_spin_button_new_with_range(1, 1800, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), interval); + + label = gtk_label_new("seconds"); + + hbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(hbox), spin, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); + + checkbox = gtk_check_button_new_with_label( + _("Print status message if files have been automatcally saved")); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), print_msg); + gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 5); + + radio1 = gtk_radio_button_new_with_label(NULL, + _("Save only current open file")); + gtk_button_set_focus_on_click(GTK_BUTTON(radio1), FALSE); + gtk_container_add(GTK_CONTAINER(vbox), radio1); + + radio2 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio1), + _("Save all open files")); + gtk_button_set_focus_on_click(GTK_BUTTON(radio2), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio2), save_all); + gtk_container_add(GTK_CONTAINER(vbox), radio2); + + gtk_widget_show_all(vbox); + + // run the dialog and check for the response code + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(config_file); + + interval = gtk_spin_button_get_value_as_int((GTK_SPIN_BUTTON(spin))); + print_msg = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox)); + save_all = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio2)); + + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + + g_key_file_set_integer(config, "autosave", "interval", interval); + g_key_file_set_boolean(config, "autosave", "print_messages", print_msg); + g_key_file_set_boolean(config, "autosave", "save_all", save_all); + + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils->mkdir(config_dir, TRUE) != 0) + { + dialogs->show_msgbox(GTK_MESSAGE_ERROR, + _("Plugin configuration directory could not be created.")); + } + else + { + // write config to file + data = g_key_file_to_data(config, NULL, NULL); + utils->write_file(config_file, data); + g_free(data); + } + + set_timeout(); // apply the changes + + g_free(config_dir); + g_key_file_free(config); + } + gtk_widget_destroy(dialog); +} + + +void cleanup() +{ + g_source_remove(src_id); + g_free(config_file); +} Property changes on: trunk/plugins/autosave.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/plugins/makefile.win32 =================================================================== --- trunk/plugins/makefile.win32 2007-11-21 18:54:31 UTC (rev 2066) +++ trunk/plugins/makefile.win32 2007-11-22 17:03:53 UTC (rev 2067) @@ -46,6 +46,8 @@ classbuilder.dll \ export.dll \ svndiff.dll \ + vcdiff.dll \ + autosave.dll \ filebrowser.dll clean: Property changes on: trunk/plugins/svndiff.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2007-11-21 18:54:31 UTC (rev 2066) +++ trunk/po/POTFILES.in 2007-11-22 17:03:53 UTC (rev 2067) @@ -21,6 +21,7 @@ src/notebook.c src/plugins.c src/prefs.c +src/printing.c src/project.c src/sciwrappers.c src/search.c @@ -39,3 +40,4 @@ plugins/export.c plugins/vcdiff.c plugins/filebrowser.c +plugins/autosave.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2066] trunk/po
by frlan＠users.sourceforge.net 21 Nov '07

21 Nov '07

Revision: 2066 http://geany.svn.sourceforge.net/geany/?rev=2066&view=rev Author: frlan Date: 2007-11-21 10:54:31 -0800 (Wed, 21 Nov 2007) Log Message: ----------- A little typo fixed Modified Paths: -------------- trunk/po/ChangeLog trunk/po/it.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2007-11-21 18:54:12 UTC (rev 2065) +++ trunk/po/ChangeLog 2007-11-21 18:54:31 UTC (rev 2066) @@ -1,3 +1,8 @@ +2007-11-21 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * it.po: Fixed a little typo (Thanks to Guido Mureddu for reporting) + + 2007-11-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * sv.po: Update of Swedish translation (Thanks to Tony Mattsson) Modified: trunk/po/it.po =================================================================== --- trunk/po/it.po 2007-11-21 18:54:12 UTC (rev 2065) +++ trunk/po/it.po 2007-11-21 18:54:31 UTC (rev 2066) @@ -10,8 +10,8 @@ "Project-Id-Version: geany 0.12\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-09-11 21:25+0200\n" -"PO-Revision-Date: 2007-09-26 12:26+0100\n" -"Last-Translator: Max <M.Baldinelli(a)agora.it>\n" +"PO-Revision-Date: 2007-11-20 18:13+0100\n" +"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -2188,7 +2188,7 @@ #: ../src/interface.c:3461 msgid "Tab Width:" -msgstr "Larghezza della scheda:" +msgstr "Dimensione delle tabulazioni:" #: ../src/interface.c:3468 msgid "Auto indentation mode:" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2065] trunk
by eht16＠users.sourceforge.net 21 Nov '07

21 Nov '07

Revision: 2065 http://geany.svn.sourceforge.net/geany/?rev=2065&view=rev Author: eht16 Date: 2007-11-21 10:54:12 -0800 (Wed, 21 Nov 2007) Log Message: ----------- Remove ununsed function project_save(). Fix typo in plugin API at utils_mkdir(). Add document_get_n_idx() to the plugin API. Fix display of plugin separator in the Tools menu when only plugins without menu item are loaded. Add three new signals: project_open, project_save, project_close. On Shutdown close the project before plugins are unloaded to let plugins work on the last project closed event. Modified Paths: -------------- trunk/ChangeLog trunk/src/geanyobject.c trunk/src/geanyobject.h trunk/src/main.c trunk/src/plugindata.h trunk/src/plugins.c trunk/src/project.c trunk/src/project.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-21 17:20:26 UTC (rev 2064) +++ trunk/ChangeLog 2007-11-21 18:54:12 UTC (rev 2065) @@ -5,6 +5,16 @@ * src/symbols.c, src/treeviews.c, src/treeviews.h: Revert the change to make symbol sections bold and use some small indentation when expanders are hidden. + * src/geanyobject.c, src/geanyobject.h, src/main.c, src/plugindata.h, + src/plugins.c, src/project.c, src/project.h: + Remove ununsed function project_save(). + Fix typo in plugin API at utils_mkdir(). + Add document_get_n_idx() to the plugin API. + Fix display of plugin separator in the Tools menu when only plugins + without menu item are loaded. + Add three new signals: project_open, project_save, project_close. + On Shutdown close the project before plugins are unloaded to let + plugins work on the last project closed event. 2007-11-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/geanyobject.c =================================================================== --- trunk/src/geanyobject.c 2007-11-21 17:20:26 UTC (rev 2064) +++ trunk/src/geanyobject.c 2007-11-21 18:54:12 UTC (rev 2065) @@ -116,6 +116,33 @@ gtk_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); + + geany_object_signals[GCB_PROJECT_OPEN] = g_signal_new ( + "project-open", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, project_open), + NULL, NULL, + gtk_marshal_NONE__INT, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + geany_object_signals[GCB_PROJECT_SAVE] = g_signal_new ( + "project-save", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, project_save), + NULL, NULL, + gtk_marshal_NONE__INT, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + geany_object_signals[GCB_PROJECT_CLOSE] = g_signal_new ( + "project-close", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, project_close), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); } @@ -146,7 +173,7 @@ } -void geany_object_finalize(GObject *object) +static void geany_object_finalize(GObject *object) { GeanyObject *self; Modified: trunk/src/geanyobject.h =================================================================== --- trunk/src/geanyobject.h 2007-11-21 17:20:26 UTC (rev 2064) +++ trunk/src/geanyobject.h 2007-11-21 18:54:12 UTC (rev 2065) @@ -38,6 +38,9 @@ GCB_DOCUMENT_OPEN, GCB_DOCUMENT_SAVE, GCB_DOCUMENT_ACTIVATE, + GCB_PROJECT_OPEN, + GCB_PROJECT_SAVE, + GCB_PROJECT_CLOSE, GCB_MAX } GeanyCallbackId; @@ -71,10 +74,13 @@ void (*document_open)(gint idx); void (*document_save)(gint idx); void (*document_activate)(gint idx); + void (*project_open)(GKeyFile *keyfile); + void (*project_save)(GKeyFile *keyfile); + void (*project_close)(); }; GType geany_object_get_type (void); -GObject* geany_object_new (void); +GObject* geany_object_new (void); G_END_DECLS Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-11-21 17:20:26 UTC (rev 2064) +++ trunk/src/main.c 2007-11-21 18:54:12 UTC (rev 2065) @@ -795,12 +795,13 @@ socket_finalize(); #endif + if (app->project != NULL) + project_close(FALSE); + #ifdef HAVE_PLUGINS if (want_plugins) plugins_free(); #endif - if (app->project != NULL) - project_close(FALSE); navqueue_free(); keybindings_free(); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2007-11-21 17:20:26 UTC (rev 2064) +++ trunk/src/plugindata.h 2007-11-21 18:54:12 UTC (rev 2065) @@ -61,21 +61,39 @@ * * "document-new" * Sent when a new document is created. + * Handler: void user_function(GObject *obj, gint idx, gpointer user_data); * * "document-open" * Sent when a file is opened. + * Handler: void user_function(GObject *obj, gint idx, gpointer user_data); * * "document-save" * Sent when a file is saved. + * Handler: void user_function(GObject *obj, gint idx, gpointer user_data); * * "document-activate" * Sent when switching notebook pages. + * Handler: void user_function(GObject *obj, gint idx, gpointer user_data); + * + * "project-open" + * Sent after a project is opened but before session files are loaded. + * Handler: void user_function(GObject *obj, GKeyFile *config, gpointer user_data); + * + * "project-save" + * Sent when a project is saved(happens when the project is created, the properties + * dialog is closed or Geany is exited). This signal is emitted shortly before Geany + * will write the contents of the GKeyFile to the disc. + * Handler: void user_function(GObject *obj, GKeyFile *config, gpointer user_data); + * + * "project-close" + * Sent after a project is closed. + * Handler: void user_function(GObject *obj, gpointer user_data); */ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 31; +static const gint api_version = 32; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields @@ -192,6 +210,7 @@ { gint (*new_file) (const gchar *filename, struct filetype *ft, const gchar *text); gint (*get_cur_idx) (); + gint (*get_n_idx) (guint i); struct document* (*get_current) (); gboolean (*save_file)(gint idx, gboolean force); gint (*open_file)(const gchar *locale_filename, gboolean readonly, @@ -262,7 +281,7 @@ gchar* (*get_locale_from_utf8) (const gchar *utf8_text); gchar* (*get_utf8_from_locale) (const gchar *locale_text); gchar* (*remove_ext_from_filename) (const gchar *filename); - gint (*utils_mkdir) (const gchar *path, gboolean create_parent_dirs); + gint (*mkdir) (const gchar *path, gboolean create_parent_dirs); } UtilsFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2007-11-21 17:20:26 UTC (rev 2064) +++ trunk/src/plugins.c 2007-11-21 18:54:12 UTC (rev 2065) @@ -79,13 +79,13 @@ static GList *plugin_list = NULL; // list of all available, loadable plugins static GList *active_plugin_list = NULL; // list of only actually loaded plugins -static GtkWidget *separator = NULL; // separator in the Tools menu static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data); static DocumentFuncs doc_funcs = { &document_new_file, &document_get_cur_idx, + &document_get_n_idx, &document_get_current, &document_save_file, &document_open_file, @@ -456,8 +456,8 @@ remove_callbacks(plugin); active_plugin_list = g_list_remove(active_plugin_list, plugin); + geany_debug("Unloaded: %s", plugin->filename); } - geany_debug("Unloaded: %s", plugin->filename); } @@ -467,13 +467,8 @@ g_return_if_fail(plugin); g_return_if_fail(plugin->module); - if (g_list_find(active_plugin_list, plugin) != NULL) - { // only do cleanup if the plugin was actually loaded - if (plugin->cleanup) - plugin->cleanup(); + plugin_unload(plugin); - remove_callbacks(plugin); - } if (! g_module_close(plugin->module)) g_warning("%s: %s", plugin->filename, g_module_error()); @@ -555,9 +550,6 @@ gtk_widget_show(widget); g_signal_connect((gpointer) widget, "activate", G_CALLBACK(pm_show_dialog), NULL); - separator = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(geany_data.tools_menu), separator); - load_plugin_paths(); plugins_update_tools_menu(); @@ -599,6 +591,7 @@ g_list_free(active_plugin_list); g_object_unref(geany_object); + geany_object = NULL; // to mark the object as invalid for any code which tries to emit signals } @@ -616,12 +609,29 @@ } +static gint +plugin_has_menu(Plugin *a, Plugin *b) +{ + if (((PluginFields)a->fields).menu_item != NULL) + return 0; + + return 1; +} + + void plugins_update_tools_menu() { + gboolean found; + static GtkWidget *separator = NULL; + if (separator == NULL) - return; + { + separator = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(geany_data.tools_menu), separator); + } - ui_widget_show_hide(separator, g_list_length(active_plugin_list) > 0); + found = (g_list_find_custom(active_plugin_list, NULL, (GCompareFunc) plugin_has_menu) != NULL); + ui_widget_show_hide(separator, found); } Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-11-21 17:20:26 UTC (rev 2064) +++ trunk/src/project.c 2007-11-21 18:54:12 UTC (rev 2065) @@ -43,6 +43,7 @@ #endif #include "build.h" #include "document.h" +#include "geanyobject.h" ProjectPrefs project_prefs = {NULL}; @@ -290,16 +291,6 @@ } -void project_save() -{ - g_return_if_fail(app->project != NULL); - - write_config(); - - ui_set_statusbar(TRUE, _("Project \"%s\" saved."), app->project->name); -} - - // open_default will make function reload default session files on close void project_close(gboolean open_default) { @@ -331,6 +322,11 @@ configuration_open_files(); } + if (geany_object) + { + g_signal_emit_by_name(geany_object, "project-close"); + } + tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); update_ui(); } @@ -872,6 +868,10 @@ // fetch session files too configuration_load_session_files(config); + if (geany_object) + { + g_signal_emit_by_name(geany_object, "project-open", config); + } g_key_file_free(config); update_ui(); @@ -912,6 +912,10 @@ /// TODO maybe it is useful to store relative file names if base_path is relative configuration_save_session_files(config); + if (geany_object) + { + g_signal_emit_by_name(geany_object, "project-save", config); + } // write the file data = g_key_file_to_data(config, NULL, NULL); ret = (utils_write_file(filename, data) == 0); Modified: trunk/src/project.h =================================================================== --- trunk/src/project.h 2007-11-21 17:20:26 UTC (rev 2064) +++ trunk/src/project.h 2007-11-21 18:54:12 UTC (rev 2065) @@ -53,8 +53,6 @@ void project_open(); -void project_save(); - void project_close(gboolean open_default); void project_properties(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2064] trunk
by eht16＠users.sourceforge.net 21 Nov '07

21 Nov '07

Revision: 2064 http://geany.svn.sourceforge.net/geany/?rev=2064&view=rev Author: eht16 Date: 2007-11-21 09:20:26 -0800 (Wed, 21 Nov 2007) Log Message: ----------- Revert the change to make symbol sections bold and use some small indentation when expanders are hidden. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/src/treeviews.c trunk/src/treeviews.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-21 17:14:58 UTC (rev 2063) +++ trunk/ChangeLog 2007-11-21 17:20:26 UTC (rev 2064) @@ -2,6 +2,9 @@ * src/editor.c: Fix crash when trying to add a multiline comment in filetypes which don't support it. + * src/symbols.c, src/treeviews.c, src/treeviews.h: + Revert the change to make symbol sections bold and use some small + indentation when expanders are hidden. 2007-11-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-11-21 17:14:58 UTC (rev 2063) +++ trunk/src/symbols.c 2007-11-21 17:20:26 UTC (rev 2064) @@ -489,12 +489,11 @@ if (G_IS_OBJECT(icon)) { gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_ICON, icon, - SYMBOLS_COLUMN_NAME, title, SYMBOLS_COLUMN_FONT_WEIGHT, PANGO_WEIGHT_SEMIBOLD, -1); + SYMBOLS_COLUMN_NAME, title, -1); g_object_unref(icon); } else - gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, - SYMBOLS_COLUMN_FONT_WEIGHT, PANGO_WEIGHT_SEMIBOLD, -1); + gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, -1); } va_end(args); } @@ -829,8 +828,7 @@ gtk_tree_store_set(doc_list[idx].tag_store, &iter, SYMBOLS_COLUMN_ICON, icon, SYMBOLS_COLUMN_NAME, buf, - SYMBOLS_COLUMN_LINE, symbol->line, - SYMBOLS_COLUMN_FONT_WEIGHT, PANGO_WEIGHT_NORMAL, -1); + SYMBOLS_COLUMN_LINE, symbol->line, -1); if (G_LIKELY(G_IS_OBJECT(icon))) g_object_unref(icon); Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2007-11-21 17:14:58 UTC (rev 2063) +++ trunk/src/treeviews.c 2007-11-21 17:20:26 UTC (rev 2064) @@ -103,8 +103,7 @@ g_object_set(icon_renderer, "xalign", 0.0, NULL); gtk_tree_view_column_pack_start(column, text_renderer, TRUE); - gtk_tree_view_column_set_attributes(column, text_renderer, "text", SYMBOLS_COLUMN_NAME, - "weight", SYMBOLS_COLUMN_FONT_WEIGHT, NULL); + gtk_tree_view_column_set_attributes(column, text_renderer, "text", SYMBOLS_COLUMN_NAME, NULL); g_object_set(text_renderer, "yalign", 0.5, NULL); gtk_tree_view_column_set_title(column, _("Symbols")); @@ -123,6 +122,8 @@ #if GTK_CHECK_VERSION(2, 12, 0) gtk_tree_view_set_show_expanders(GTK_TREE_VIEW(tree), prefs.show_symbol_list_expanders); + if (! prefs.show_symbol_list_expanders) + gtk_tree_view_set_level_indentation(GTK_TREE_VIEW(tree), 10); #endif // selection handling @@ -181,7 +182,7 @@ if (doc_list[idx].tag_tree == NULL) { doc_list[idx].tag_store = gtk_tree_store_new( - SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT); + SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT); doc_list[idx].tag_tree = gtk_tree_view_new(); prepare_taglist(doc_list[idx].tag_tree, doc_list[idx].tag_store); gtk_widget_show(doc_list[idx].tag_tree); Modified: trunk/src/treeviews.h =================================================================== --- trunk/src/treeviews.h 2007-11-21 17:14:58 UTC (rev 2063) +++ trunk/src/treeviews.h 2007-11-21 17:20:26 UTC (rev 2064) @@ -42,7 +42,6 @@ SYMBOLS_COLUMN_ICON, SYMBOLS_COLUMN_NAME, SYMBOLS_COLUMN_LINE, - SYMBOLS_COLUMN_FONT_WEIGHT, SYMBOLS_N_COLUMNS, }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2063] trunk
by eht16＠users.sourceforge.net 21 Nov '07

21 Nov '07

Revision: 2063 http://geany.svn.sourceforge.net/geany/?rev=2063&view=rev Author: eht16 Date: 2007-11-21 09:14:58 -0800 (Wed, 21 Nov 2007) Log Message: ----------- Fix crash when trying to add a multiline comment in filetypes which don't support it. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-20 19:23:42 UTC (rev 2062) +++ trunk/ChangeLog 2007-11-21 17:14:58 UTC (rev 2063) @@ -1,3 +1,9 @@ +2007-11-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/editor.c: Fix crash when trying to add a multiline comment in + filetypes which don't support it. + + 2007-11-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * geany.glade, plugins/*.c src/callbacks.c, src/callbacks.h, Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-11-20 19:23:42 UTC (rev 2062) +++ trunk/src/editor.c 2007-11-21 17:14:58 UTC (rev 2063) @@ -2220,6 +2220,9 @@ gint pos; gboolean have_multiline_comment = FALSE; + if (doc_list[idx].file_type == NULL || doc_list[idx].file_type->comment_open == NULL) + return; + if (doc_list[idx].file_type->comment_close != NULL && strlen(doc_list[idx].file_type->comment_close) > 0) have_multiline_comment = TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2007