Commits November 2010

commits@lists.geany.org

4 participants
109 discussions

SF.net SVN: geany:[5434]
by frlan＠users.sourceforge.net 23 Nov '10

23 Nov '10

Revision: 5434 http://geany.svn.sourceforge.net/geany/?rev=5434&view=rev Author: frlan Date: 2010-11-23 17:56:23 +0000 (Tue, 23 Nov 2010) Log Message: ----------- Move unstable branch Added Paths: ----------- branches/unstable/ Removed Paths: ------------- tags/unstable/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5433] trunk/src/editor.c
by ntrel＠users.sourceforge.net 23 Nov '10

23 Nov '10

Revision: 5433 http://geany.svn.sourceforge.net/geany/?rev=5433&view=rev Author: ntrel Date: 2010-11-23 17:40:30 +0000 (Tue, 23 Nov 2010) Log Message: ----------- Typo in editor_get_[indent_]prefs() dox. Modified Paths: -------------- trunk/src/editor.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2010-11-23 17:36:29 UTC (rev 5432) +++ trunk/src/editor.c 2010-11-23 17:40:30 UTC (rev 5433) @@ -418,7 +418,7 @@ /* Gets the prefs for the editor. - * Prefs can be different according to project or filetype. + * Prefs can be different according to project or document. * @warning Always get a fresh result instead of keeping a pointer to it if the editor/project * settings may have changed, or if this function has been called for a different editor. * @param editor The editor, or @c NULL to get the default prefs. @@ -1174,7 +1174,7 @@ /** Gets the indentation prefs for the editor. - * Prefs can be different according to project or filetype. + * Prefs can be different according to project or document. * @warning Always get a fresh result instead of keeping a pointer to it if the editor/project * settings may have changed, or if this function has been called for a different editor. * @param editor The editor, or @c NULL to get the default indent prefs. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5432] trunk
by ntrel＠users.sourceforge.net 23 Nov '10

23 Nov '10

Revision: 5432 http://geany.svn.sourceforge.net/geany/?rev=5432&view=rev Author: ntrel Date: 2010-11-23 17:36:29 +0000 (Tue, 23 Nov 2010) Log Message: ----------- Remove unnecessary 'global' from long line editor pref field names. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c trunk/src/editor.h trunk/src/keybindings.c trunk/src/keyfile.c trunk/src/prefs.c trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-23 17:25:58 UTC (rev 5431) +++ trunk/ChangeLog 2010-11-23 17:36:29 UTC (rev 5432) @@ -19,6 +19,9 @@ Add editor_get_prefs() instead of editor_get_long_line_*() functions. This general function can be extended to support various project and document overrides. + * src/keybindings.c, src/project.c, src/prefs.c, src/keyfile.c, + src/editor.c, src/editor.h: + Remove unnecessary 'global' from long line editor pref field names. 2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2010-11-23 17:25:58 UTC (rev 5431) +++ trunk/src/editor.c 2010-11-23 17:36:29 UTC (rev 5432) @@ -383,13 +383,13 @@ case 1: /* use global settings */ break; case 2: /* custom (enabled) */ - return editor_prefs.long_line_global_type; + return editor_prefs.long_line_type; } - if (!editor_prefs.long_line_global_enabled) + if (!editor_prefs.long_line_enabled) return 2; else - return editor_prefs.long_line_global_type; + return editor_prefs.long_line_type; } @@ -398,7 +398,7 @@ if (app->project && app->project->long_line_behaviour != 1 /* use global settings */) return app->project->long_line_column; else - return editor_prefs.long_line_global_column; + return editor_prefs.long_line_column; } @@ -411,8 +411,8 @@ /* project overrides */ eprefs.indentation = (GeanyIndentPrefs*)editor_get_indent_prefs(NULL); - eprefs.long_line_global_type = editor_get_long_line_type(); - eprefs.long_line_global_column = editor_get_long_line_column(); + eprefs.long_line_type = editor_get_long_line_type(); + eprefs.long_line_column = editor_get_long_line_column(); return &eprefs; } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2010-11-23 17:25:58 UTC (rev 5431) +++ trunk/src/editor.h 2010-11-23 17:36:29 UTC (rev 5432) @@ -102,6 +102,7 @@ /** Default prefs when creating a new editor window. * Some of these can be overridden per document or per project. */ +/* See editor_get_prefs(). */ typedef struct GeanyEditorPrefs { GeanyIndentPrefs *indentation; /* Default indentation prefs. Use editor_get_indent_prefs(). */ @@ -109,10 +110,10 @@ gboolean show_indent_guide; gboolean show_line_endings; /* 0 - line, 1 - background, 2 - disabled. - * This setting may be overriden when a project is opened. Use @c editor_get_prefs(). */ - gint long_line_global_type; - /* This setting may be overriden when a project is opened. Use @c editor_get_prefs(). */ - gint long_line_global_column; + * This setting may be overridden when a project is opened. Use @c editor_get_prefs(). */ + gint long_line_type; + /* This setting may be overridden when a project is opened. Use @c editor_get_prefs(). */ + gint long_line_column; gchar *long_line_color; gboolean show_markers_margin; /* view menu */ gboolean show_linenumber_margin; /* view menu */ @@ -143,8 +144,8 @@ gboolean completion_drops_rest_of_word; gchar *color_scheme; gint show_virtual_space; - /* This setting may be overriden when a project is opened. Use @c editor_get_long_line_type(). */ - gboolean long_line_global_enabled; + /* This setting may be overridden when a project is opened. Use @c editor_get_prefs(). */ + gboolean long_line_enabled; } GeanyEditorPrefs; Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2010-11-23 17:25:58 UTC (rev 5431) +++ trunk/src/keybindings.c 2010-11-23 17:36:29 UTC (rev 5432) @@ -2328,10 +2328,10 @@ /* use line break column if enabled */ column = eprefs->line_break_column; } - else if (eprefs->long_line_global_type != 2) + else if (eprefs->long_line_type != 2) { /* use long line if enabled */ - column = eprefs->long_line_global_column; + column = eprefs->long_line_column; } else { Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2010-11-23 17:25:58 UTC (rev 5431) +++ trunk/src/keyfile.c 2010-11-23 17:36:29 UTC (rev 5432) @@ -375,9 +375,9 @@ g_key_file_set_boolean(config, PACKAGE, "show_line_endings", editor_prefs.show_line_endings); g_key_file_set_boolean(config, PACKAGE, "show_markers_margin", editor_prefs.show_markers_margin); g_key_file_set_boolean(config, PACKAGE, "show_linenumber_margin", editor_prefs.show_linenumber_margin); - g_key_file_set_boolean(config, PACKAGE, "long_line_enabled", editor_prefs.long_line_global_enabled); - g_key_file_set_integer(config, PACKAGE, "long_line_type", editor_prefs.long_line_global_type); - g_key_file_set_integer(config, PACKAGE, "long_line_column", editor_prefs.long_line_global_column); + g_key_file_set_boolean(config, PACKAGE, "long_line_enabled", editor_prefs.long_line_enabled); + g_key_file_set_integer(config, PACKAGE, "long_line_type", editor_prefs.long_line_type); + g_key_file_set_integer(config, PACKAGE, "long_line_column", editor_prefs.long_line_column); g_key_file_set_string(config, PACKAGE, "long_line_color", editor_prefs.long_line_color); /* editor */ @@ -665,15 +665,15 @@ interface_prefs.use_native_windows_dialogs = utils_get_setting_boolean(config, PACKAGE, "use_native_windows_dialogs", FALSE); /* display, editor */ - editor_prefs.long_line_global_enabled = utils_get_setting_boolean(config, PACKAGE, "long_line_enabled", TRUE); - editor_prefs.long_line_global_type = utils_get_setting_integer(config, PACKAGE, "long_line_type", 0); - if (editor_prefs.long_line_global_type == 2) /* backward compatibility */ + editor_prefs.long_line_enabled = utils_get_setting_boolean(config, PACKAGE, "long_line_enabled", TRUE); + editor_prefs.long_line_type = utils_get_setting_integer(config, PACKAGE, "long_line_type", 0); + if (editor_prefs.long_line_type == 2) /* backward compatibility */ { - editor_prefs.long_line_global_type = 0; - editor_prefs.long_line_global_enabled = FALSE; + editor_prefs.long_line_type = 0; + editor_prefs.long_line_enabled = FALSE; } editor_prefs.long_line_color = utils_get_setting_string(config, PACKAGE, "long_line_color", "#C2EBC2"); - editor_prefs.long_line_global_column = utils_get_setting_integer(config, PACKAGE, "long_line_column", 72); + editor_prefs.long_line_column = utils_get_setting_integer(config, PACKAGE, "long_line_column", 72); editor_prefs.symbolcompletion_min_chars = utils_get_setting_integer(config, PACKAGE, "symbolcompletion_min_chars", GEANY_MIN_SYMBOLLIST_CHARS); editor_prefs.symbolcompletion_max_height = utils_get_setting_integer(config, PACKAGE, "symbolcompletion_max_height", GEANY_MAX_SYMBOLLIST_HEIGHT); editor_prefs.line_wrapping = utils_get_setting_boolean(config, PACKAGE, "line_wrapping", FALSE); /* default is off for better performance */ Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2010-11-23 17:25:58 UTC (rev 5431) +++ trunk/src/prefs.c 2010-11-23 17:36:29 UTC (rev 5432) @@ -397,12 +397,12 @@ gtk_font_button_set_font_name(GTK_FONT_BUTTON(widget), interface_prefs.editor_font); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_long_line"); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.long_line_global_column); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.long_line_column); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_long_line"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.long_line_global_enabled); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.long_line_enabled); - switch (editor_prefs.long_line_global_type) + switch (editor_prefs.long_line_type) { case 0: widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_long_line_line"); break; case 1: widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_long_line_background"); break; @@ -864,17 +864,17 @@ interface_prefs.sidebar_openfiles_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_long_line"); - editor_prefs.long_line_global_enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.long_line_enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_long_line_line"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) - editor_prefs.long_line_global_type = 0; + editor_prefs.long_line_type = 0; else /* now only the "background" radio remains */ - editor_prefs.long_line_global_type = 1; + editor_prefs.long_line_type = 1; - if (editor_prefs.long_line_global_column == 0) - editor_prefs.long_line_global_enabled = FALSE; + if (editor_prefs.long_line_column == 0) + editor_prefs.long_line_enabled = FALSE; widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_show_notebook_tabs"); interface_prefs.show_notebook_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -979,7 +979,7 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_long_line"); /* note: use stash for new code - it updates spin buttons itself */ gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); - editor_prefs.long_line_global_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + editor_prefs.long_line_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_folding"); editor_prefs.folding = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2010-11-23 17:25:58 UTC (rev 5431) +++ trunk/src/project.c 2010-11-23 17:36:29 UTC (rev 5432) @@ -635,7 +635,7 @@ project->priv = &priv; project->long_line_behaviour = 1 /* use global settings */; - project->long_line_column = editor_prefs.long_line_global_column; + project->long_line_column = editor_prefs.long_line_column; app->project = project; return project; @@ -998,7 +998,7 @@ p->long_line_behaviour = utils_get_setting_integer(config, "long line marker", "long_line_behaviour", 1 /* follow global */); p->long_line_column = utils_get_setting_integer(config, "long line marker", - "long_line_column", editor_prefs.long_line_global_column); + "long_line_column", editor_prefs.long_line_column); apply_editor_prefs(); build_load_menu(config, GEANY_BCS_PROJ, (gpointer)p); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5431] trunk
by ntrel＠users.sourceforge.net 23 Nov '10

23 Nov '10

Revision: 5431 http://geany.svn.sourceforge.net/geany/?rev=5431&view=rev Author: ntrel Date: 2010-11-23 17:25:58 +0000 (Tue, 23 Nov 2010) Log Message: ----------- Add editor_get_prefs() instead of editor_get_long_line_*() functions. This general function can be extended to support various project and document overrides. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c trunk/src/editor.h trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-23 16:23:22 UTC (rev 5430) +++ trunk/ChangeLog 2010-11-23 17:25:58 UTC (rev 5431) @@ -15,6 +15,10 @@ doc/geany.html: Add gio_unsafe_save_backup hidden pref (patch by Lex Trotman, thanks). + * src/keybindings.c, src/editor.c, src/editor.h: + Add editor_get_prefs() instead of editor_get_long_line_*() + functions. This general function can be extended to support + various project and document overrides. 2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2010-11-23 16:23:22 UTC (rev 5430) +++ trunk/src/editor.c 2010-11-23 17:25:58 UTC (rev 5431) @@ -373,7 +373,7 @@ } -gint editor_get_long_line_type(void) +static gint editor_get_long_line_type(void) { if (app->project) switch (app->project->long_line_behaviour) @@ -393,7 +393,7 @@ } -gint editor_get_long_line_column(void) +static gint editor_get_long_line_column(void) { if (app->project && app->project->long_line_behaviour != 1 /* use global settings */) return app->project->long_line_column; @@ -402,6 +402,44 @@ } +static const GeanyEditorPrefs * +get_default_prefs(void) +{ + static GeanyEditorPrefs eprefs; + + eprefs = editor_prefs; + + /* project overrides */ + eprefs.indentation = (GeanyIndentPrefs*)editor_get_indent_prefs(NULL); + eprefs.long_line_global_type = editor_get_long_line_type(); + eprefs.long_line_global_column = editor_get_long_line_column(); + return &eprefs; +} + + +/* Gets the prefs for the editor. + * Prefs can be different according to project or filetype. + * @warning Always get a fresh result instead of keeping a pointer to it if the editor/project + * settings may have changed, or if this function has been called for a different editor. + * @param editor The editor, or @c NULL to get the default prefs. + * @return The prefs. */ +const GeanyEditorPrefs *editor_get_prefs(GeanyEditor *editor) +{ + static GeanyEditorPrefs eprefs; + const GeanyEditorPrefs *dprefs = get_default_prefs(); + + /* Return the address of the default prefs to allow returning default and editor + * pref pointers without invalidating the contents of either. */ + if (editor == NULL) + return dprefs; + + eprefs = *dprefs; + eprefs.indentation = (GeanyIndentPrefs*)editor_get_indent_prefs(editor); + /* add other editor & document overrides as needed */ + return &eprefs; +} + + void editor_toggle_fold(GeanyEditor *editor, gint line, gint modifiers) { ScintillaObject *sci; @@ -1136,7 +1174,7 @@ /** Gets the indentation prefs for the editor. - * In future, the prefs might be different according to project or filetype. + * Prefs can be different according to project or filetype. * @warning Always get a fresh result instead of keeping a pointer to it if the editor/project * settings may have changed, or if this function has been called for a different editor. * @param editor The editor, or @c NULL to get the default indent prefs. Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2010-11-23 16:23:22 UTC (rev 5430) +++ trunk/src/editor.h 2010-11-23 17:25:58 UTC (rev 5431) @@ -104,14 +104,14 @@ * Some of these can be overridden per document or per project. */ typedef struct GeanyEditorPrefs { - GeanyIndentPrefs *indentation; /*< Default indentation prefs. @see editor_get_indent_prefs(). */ + GeanyIndentPrefs *indentation; /* Default indentation prefs. Use editor_get_indent_prefs(). */ gboolean show_white_space; gboolean show_indent_guide; gboolean show_line_endings; - /* 0 - line, 1 - background. This setting may be overriden when a project is opened. Use - * @c editor_get_long_line_type(). */ + /* 0 - line, 1 - background, 2 - disabled. + * This setting may be overriden when a project is opened. Use @c editor_get_prefs(). */ gint long_line_global_type; - /* This setting may be overriden when a project is opened. Use @c editor_get_long_line_column(). */ + /* This setting may be overriden when a project is opened. Use @c editor_get_prefs(). */ gint long_line_global_column; gchar *long_line_color; gboolean show_markers_margin; /* view menu */ @@ -229,10 +229,8 @@ void editor_snippets_free(void); -/* 0 - line, 1 - background, 2 - disabled */ -gint editor_get_long_line_type(void); +const GeanyEditorPrefs *editor_get_prefs(GeanyEditor *editor); -gint editor_get_long_line_column(void); /* General editing functions */ Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2010-11-23 16:23:22 UTC (rev 5430) +++ trunk/src/keybindings.c 2010-11-23 17:25:58 UTC (rev 5431) @@ -2321,16 +2321,17 @@ ScintillaObject *sci = editor->sci; gboolean sel; gint column = -1; + const GeanyEditorPrefs *eprefs = editor_get_prefs(editor); if (editor->line_breaking) { /* use line break column if enabled */ - column = editor_prefs.line_break_column; + column = eprefs->line_break_column; } - else if (editor_get_long_line_type() != 2) + else if (eprefs->long_line_global_type != 2) { /* use long line if enabled */ - column = editor_get_long_line_column(); + column = eprefs->long_line_global_column; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5430] trunk
by ntrel＠users.sourceforge.net 23 Nov '10

23 Nov '10

Revision: 5430 http://geany.svn.sourceforge.net/geany/?rev=5430&view=rev Author: ntrel Date: 2010-11-23 16:23:22 +0000 (Tue, 23 Nov 2010) Log Message: ----------- Add gio_unsafe_save_backup hidden pref (patch by Lex Trotman, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/document.c trunk/src/document.h trunk/src/keyfile.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-23 13:43:36 UTC (rev 5429) +++ trunk/ChangeLog 2010-11-23 16:23:22 UTC (rev 5430) @@ -11,6 +11,10 @@ * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade: Don't use 'Enable' in pref labels when unnecessary. Rename XML/HTML tag autocompletion -> auto-closing. + * src/keyfile.c, src/document.c, src/document.h, doc/geany.txt, + doc/geany.html: + Add gio_unsafe_save_backup hidden pref (patch by Lex Trotman, + thanks). 2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-11-23 13:43:36 UTC (rev 5429) +++ trunk/doc/geany.html 2010-11-23 16:23:22 UTC (rev 5430) @@ -4959,6 +4959,11 @@ disk won't run out of free space.</td> <td>false</td> </tr> +<tr><td>gio_unsafe_save_backup</td> +<td>Make a backup when using GIO unsafe file +saving. Backup is named <cite>filename~</cite>.</td> +<td>false</td> +</tr> <tr><td><strong>Search related</strong></td> <td> </td> <td> </td> @@ -6367,7 +6372,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-11-23 13:39 UTC. +Generated on: 2010-11-23 16:18 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2010-11-23 13:43:36 UTC (rev 5429) +++ trunk/doc/geany.txt 2010-11-23 16:23:22 UTC (rev 5430) @@ -4225,6 +4225,8 @@ break things seriously. The better approach would be to ensure your disk won't run out of free space. +gio_unsafe_save_backup Make a backup when using GIO unsafe file false + saving. Backup is named `filename~`. **Search related** find_selection_type See `Find selection`_. 0 **Build Menu related** Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2010-11-23 13:43:36 UTC (rev 5429) +++ trunk/src/document.c 2010-11-23 16:23:22 UTC (rev 5430) @@ -1721,7 +1721,7 @@ /* Use GIO API to save file (GVFS-safe) */ fp = g_file_new_for_path(locale_filename); - g_file_replace_contents(fp, data, len, NULL, FALSE, + g_file_replace_contents(fp, data, len, NULL, file_prefs.gio_unsafe_save_backup, G_FILE_CREATE_NONE, NULL, NULL, &error); g_object_unref(fp); #else Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2010-11-23 13:43:36 UTC (rev 5429) +++ trunk/src/document.h 2010-11-23 16:23:22 UTC (rev 5430) @@ -60,6 +60,7 @@ gboolean cmdline_new_files; /* New file if command-line filename doesn't exist */ gboolean use_safe_file_saving; gboolean ensure_convert_new_lines; + gboolean gio_unsafe_save_backup; } GeanyFilePrefs; Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2010-11-23 13:43:36 UTC (rev 5429) +++ trunk/src/keyfile.c 2010-11-23 16:23:22 UTC (rev 5430) @@ -189,6 +189,8 @@ "complete_snippets_whilst_editing", FALSE); stash_group_add_boolean(group, &file_prefs.use_safe_file_saving, "use_safe_file_saving", FALSE); + stash_group_add_boolean(group, &file_prefs.gio_unsafe_save_backup, + "gio_unsafe_save_backup", FALSE); /* for backwards-compatibility */ stash_group_add_integer(group, &editor_prefs.indentation->hard_tab_width, "indent_hard_tab_width", 8); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5429] trunk
by ntrel＠users.sourceforge.net 23 Nov '10

23 Nov '10

Revision: 5429 http://geany.svn.sourceforge.net/geany/?rev=5429&view=rev Author: ntrel Date: 2010-11-23 13:43:36 +0000 (Tue, 23 Nov 2010) Log Message: ----------- Don't use 'Enable' in pref labels when unnecessary. Rename XML/HTML tag autocompletion -> auto-closing. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-23 13:17:42 UTC (rev 5428) +++ trunk/ChangeLog 2010-11-23 13:43:36 UTC (rev 5429) @@ -8,6 +8,9 @@ Definition look for a tag declaration instead, as this is more useful. Likewise make Go to Tag Declaration search for a tag definition in this case also. + * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade: + Don't use 'Enable' in pref labels when unnecessary. + Rename XML/HTML tag autocompletion -> auto-closing. 2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-11-23 13:17:42 UTC (rev 5428) +++ trunk/doc/geany.html 2010-11-23 13:43:36 UTC (rev 5429) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-11-22" /> +<meta name="date" content="2010-11-23" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-11-22</td></tr> +<td>2010-11-23</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.20</td></tr> </tbody> @@ -2263,13 +2263,13 @@ <dl class="docutils"> <dt>Line wrapping</dt> <dd>Show long lines wrapped around to new display lines.</dd> -<dt>Enable "smart" home key</dt> +<dt>"Smart" home key</dt> <dd>Whether to move the cursor to the first non-whitespace character on the line when you hit the home key on your keyboard. Pressing it again will go to the very start of the line.</dd> <dt>Disable Drag and Drop</dt> <dd>Do not allow the dragging and dropping of selected text in documents.</dd> -<dt>Enable folding</dt> +<dt>Code folding</dt> <dd>Allow groups of lines in a document to be collapsed for easier navigation/editing.</dd> <dt>Fold/Unfold all children of a fold point</dt> @@ -2352,8 +2352,9 @@ <dd>Whether to replace special keywords after typing Tab into a pre-defined text snippet. See <a class="reference" href="#user-definable-snippets">User-definable snippets</a>.</dd> -<dt>XML/HTML tag autocompletion</dt> -<dd>When you open an XML tag automatically generate its completion tag.</dd> +<dt>XML/HTML tag auto-closing</dt> +<dd>When you open an XML/HTML tag automatically generate its +completion tag.</dd> <dt>Automatic continuation multi-line comments</dt> <dd><p class="first">Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment. @@ -6366,7 +6367,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-11-23 13:12 UTC. +Generated on: 2010-11-23 13:39 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2010-11-23 13:17:42 UTC (rev 5428) +++ trunk/doc/geany.txt 2010-11-23 13:43:36 UTC (rev 5429) @@ -1921,7 +1921,7 @@ Line wrapping Show long lines wrapped around to new display lines. -Enable "smart" home key +"Smart" home key Whether to move the cursor to the first non-whitespace character on the line when you hit the home key on your keyboard. Pressing it again will go to the very start of the line. @@ -1929,7 +1929,7 @@ Disable Drag and Drop Do not allow the dragging and dropping of selected text in documents. -Enable folding +Code folding Allow groups of lines in a document to be collapsed for easier navigation/editing. @@ -2019,8 +2019,9 @@ pre-defined text snippet. See `User-definable snippets`_. -XML/HTML tag autocompletion - When you open an XML tag automatically generate its completion tag. +XML/HTML tag auto-closing + When you open an XML/HTML tag automatically generate its + completion tag. Automatic continuation multi-line comments Continue automatically multi-line comments in languages like C, C++ Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2010-11-23 13:17:42 UTC (rev 5428) +++ trunk/geany.glade 2010-11-23 13:43:36 UTC (rev 5429) @@ -5673,7 +5673,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">When "smart" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position.</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Enable "smart" home key</property> + <property name="label" translatable="yes">"Smart" home key</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5711,9 +5711,8 @@ <child> <widget class="GtkCheckButton" id="check_folding"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to enable folding the code</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Enable folding</property> + <property name="label" translatable="yes">Code folding</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -6391,7 +6390,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Insert matching closing tag for XML/HTML</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">XML/HTML tag autocompletion</property> + <property name="label" translatable="yes">XML/HTML tag auto-closing</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -6738,7 +6737,7 @@ <child> <widget class="GtkCheckButton" id="check_autoclose_squote"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Auto-close simple quote when typing an opening one</property> + <property name="tooltip" translatable="yes">Auto-close single quote when typing an opening one</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Single quotes ' '</property> <property name="use_underline">True</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2010-11-23 13:17:42 UTC (rev 5428) +++ trunk/src/interface.c 2010-11-23 13:43:36 UTC (rev 5429) @@ -3699,7 +3699,7 @@ gtk_box_pack_start (GTK_BOX (vbox17), check_line_wrapping, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_line_wrapping, _("Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines."), NULL); - check_smart_home = gtk_check_button_new_with_mnemonic (_("Enable \"smart\" home key")); + check_smart_home = gtk_check_button_new_with_mnemonic (_("\"Smart\" home key")); gtk_widget_show (check_smart_home); gtk_box_pack_start (GTK_BOX (vbox17), check_smart_home, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_smart_home, _("When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position."), NULL); @@ -3709,10 +3709,9 @@ gtk_box_pack_start (GTK_BOX (vbox17), check_disable_dnd, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_disable_dnd, _("Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window"), NULL); - check_folding = gtk_check_button_new_with_mnemonic (_("Enable folding")); + check_folding = gtk_check_button_new_with_mnemonic (_("Code folding")); gtk_widget_show (check_folding); gtk_box_pack_start (GTK_BOX (vbox17), check_folding, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_folding, _("Whether to enable folding the code"), NULL); check_unfold_children = gtk_check_button_new_with_mnemonic (_("Fold/unfold all children of a fold point")); gtk_widget_show (check_unfold_children); @@ -3908,7 +3907,7 @@ gtk_box_pack_start (GTK_BOX (vbox19), check_complete_snippets, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_complete_snippets, _("Type a defined short character sequence and complete it to a more complex string using a single keypress"), NULL); - check_xmltag = gtk_check_button_new_with_mnemonic (_("XML/HTML tag autocompletion")); + check_xmltag = gtk_check_button_new_with_mnemonic (_("XML/HTML tag auto-closing")); gtk_widget_show (check_xmltag); gtk_box_pack_start (GTK_BOX (vbox19), check_xmltag, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_xmltag, _("Insert matching closing tag for XML/HTML"), NULL); @@ -4016,7 +4015,7 @@ gtk_table_attach (GTK_TABLE (table16), check_autoclose_squote, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, check_autoclose_squote, _("Auto-close simple quote when typing an opening one"), NULL); + gtk_tooltips_set_tip (tooltips, check_autoclose_squote, _("Auto-close single quote when typing an opening one"), NULL); check_autoclose_cbracket = gtk_check_button_new_with_mnemonic (_("Curly brackets { }")); gtk_widget_show (check_autoclose_cbracket); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5428] trunk
by ntrel＠users.sourceforge.net 23 Nov '10

23 Nov '10

Revision: 5428 http://geany.svn.sourceforge.net/geany/?rev=5428&view=rev Author: ntrel Date: 2010-11-23 13:17:42 +0000 (Tue, 23 Nov 2010) Log Message: ----------- If the current word's tag is on the current line, make Go to Tag Definition look for a tag declaration instead, as this is more useful. Likewise make Go to Tag Declaration search for a tag definition in this case also. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-23 12:50:24 UTC (rev 5427) +++ trunk/ChangeLog 2010-11-23 13:17:42 UTC (rev 5428) @@ -3,6 +3,11 @@ * src/interface.c, src/keybindings.c, src/callbacks.c, src/callbacks.h, geany.glade: Add 'Mark All' Search menu command. + * src/symbols.c, doc/geany.txt, doc/geany.html: + If the current word's tag is on the current line, make Go to Tag + Definition look for a tag declaration instead, as this is more + useful. Likewise make Go to Tag Declaration search for a tag + definition in this case also. 2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-11-23 12:50:24 UTC (rev 5427) +++ trunk/doc/geany.html 2010-11-23 13:17:42 UTC (rev 5428) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-11-17" /> +<meta name="date" content="2010-11-22" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-11-17</td></tr> +<td>2010-11-22</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.20</td></tr> </tbody> @@ -1732,7 +1732,14 @@ current word is either the word nearest the edit cursor, or the word underneath the popup menu click position when the popup menu is used.</p> +<div class="note"> +<p class="first admonition-title">Note</p> +<p class="last">If the current word's tag is on the current line, Geany will try +to look for a tag declaration instead, as this is more useful. +Likewise 'Go to tag declaration' will search for a tag definition +in this case also.</p> </div> +</div> <div class="section"> <h3><a class="toc-backref" href="#id73" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> <p>Like Go to tag definition, but for a forward declaration such as a @@ -6359,7 +6366,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-11-22 12:42 UTC. +Generated on: 2010-11-23 13:12 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2010-11-23 12:50:24 UTC (rev 5427) +++ trunk/doc/geany.txt 2010-11-23 13:17:42 UTC (rev 5428) @@ -1357,7 +1357,13 @@ or the word underneath the popup menu click position when the popup menu is used. +.. note:: + If the current word's tag is on the current line, Geany will try + to look for a tag declaration instead, as this is more useful. + Likewise 'Go to tag declaration' will search for a tag definition + in this case also. + Go to tag declaration ^^^^^^^^^^^^^^^^^^^^^ Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2010-11-23 12:50:24 UTC (rev 5427) +++ trunk/src/symbols.c 2010-11-23 13:17:42 UTC (rev 5428) @@ -1542,7 +1542,7 @@ } -gboolean symbols_goto_tag(const gchar *name, gboolean definition) +static gboolean goto_tag(const gchar *name, gboolean definition) { const gint forward_types = tm_tag_prototype_t | tm_tag_externvar_t; gint type; @@ -1565,18 +1565,38 @@ GeanyDocument *new_doc = document_find_by_real_path( tmtag->atts.entry.file->work_object.file_name); - /* not found in opened document, should open */ - if (new_doc == NULL) + if (new_doc) { + /* If we are already on the tag line, swap definition/declaration */ + if (new_doc == old_doc && + tmtag->atts.entry.line == (guint)sci_get_current_line(old_doc->editor->sci) + 1) + { + if (goto_tag(name, !definition)) + return TRUE; + } + } + else + { + /* not found in opened document, should open */ new_doc = document_open_file(tmtag->atts.entry.file->work_object.file_name, FALSE, NULL, NULL); } if (navqueue_goto_line(old_doc, new_doc, tmtag->atts.entry.line)) return TRUE; } + return FALSE; +} + + +gboolean symbols_goto_tag(const gchar *name, gboolean definition) +{ + if (goto_tag(name, definition)) + return TRUE; + /* if we are here, there was no match and we are beeping ;-) */ utils_beep(); - if (type == forward_types) + + if (!definition) ui_set_statusbar(FALSE, _("Forward declaration \"%s\" not found."), name); else ui_set_statusbar(FALSE, _("Definition of \"%s\" not found."), name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5427] trunk
by ntrel＠users.sourceforge.net 23 Nov '10

23 Nov '10

Revision: 5427 http://geany.svn.sourceforge.net/geany/?rev=5427&view=rev Author: ntrel Date: 2010-11-23 12:50:24 +0000 (Tue, 23 Nov 2010) Log Message: ----------- Add 'Mark All' Search menu command. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-22 21:29:52 UTC (rev 5426) +++ trunk/ChangeLog 2010-11-23 12:50:24 UTC (rev 5427) @@ -1,3 +1,10 @@ +2010-11-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/keybindings.c, src/callbacks.c, + src/callbacks.h, geany.glade: + Add 'Mark All' Search menu command. + + 2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * doc/geany.txt, doc/geany.html: Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2010-11-22 21:29:52 UTC (rev 5426) +++ trunk/geany.glade 2010-11-23 12:50:24 UTC (rev 5427) @@ -67,7 +67,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3984"> + <widget class="GtkImage" id="image4011"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -144,7 +144,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3985"> + <widget class="GtkImage" id="image4012"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -165,7 +165,7 @@ <signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3986"> + <widget class="GtkImage" id="image4013"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -185,7 +185,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3987"> + <widget class="GtkImage" id="image4014"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -272,7 +272,7 @@ <signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3988"> + <widget class="GtkImage" id="image4015"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -293,7 +293,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3989"> + <widget class="GtkImage" id="image4016"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -433,7 +433,7 @@ <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3990"> + <widget class="GtkImage" id="image4017"> <property name="visible">True</property> <property name="stock">gtk-cut</property> <property name="icon_size">1</property> @@ -454,7 +454,7 @@ <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3991"> + <widget class="GtkImage" id="image4018"> <property name="visible">True</property> <property name="stock">gtk-copy</property> <property name="icon_size">1</property> @@ -611,7 +611,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3992"> + <widget class="GtkImage" id="image4019"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -632,7 +632,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3993"> + <widget class="GtkImage" id="image4020"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -697,7 +697,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3994"> + <widget class="GtkImage" id="image4021"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -782,7 +782,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3995"> + <widget class="GtkImage" id="image4022"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -814,7 +814,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3996"> + <widget class="GtkImage" id="image4023"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -853,7 +853,7 @@ <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3997"> + <widget class="GtkImage" id="image4024"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -874,7 +874,7 @@ <signal name="activate" handler="on_plugin_preferences1_activate" last_modification_time="Wed, 28 Oct 2009 17:17:31 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3998"> + <widget class="GtkImage" id="image4025"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -942,7 +942,7 @@ <signal name="activate" handler="on_find_in_files1_activate" last_modification_time="Thu, 06 Jul 2006 11:31:09 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3999"> + <widget class="GtkImage" id="image4026"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -963,7 +963,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4000"> + <widget class="GtkImage" id="image4027"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -990,7 +990,7 @@ <signal name="activate" handler="on_next_message1_activate" last_modification_time="Tue, 05 Dec 2006 11:15:02 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4001"> + <widget class="GtkImage" id="image4028"> <property name="visible">True</property> <property name="stock">gtk-go-down</property> <property name="icon_size">1</property> @@ -1011,7 +1011,7 @@ <signal name="activate" handler="on_previous_message1_activate" last_modification_time="Wed, 25 Jun 2008 12:10:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4002"> + <widget class="GtkImage" id="image4029"> <property name="visible">True</property> <property name="stock">gtk-go-up</property> <property name="icon_size">1</property> @@ -1062,7 +1062,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4003"> + <widget class="GtkImage" id="image4030"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -1133,6 +1133,21 @@ </child> <child> + <widget class="GtkMenuItem" id="mark_all1"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Mark All</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_mark_all1_activate" last_modification_time="Tue, 23 Nov 2010 12:45:26 GMT"/> + </widget> + </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separator60"> + <property name="visible">True</property> + </widget> + </child> + + <child> <widget class="GtkMenuItem" id="goto_tag_definition1"> <property name="visible">True</property> <property name="label" translatable="yes">Go to _Tag Definition</property> @@ -1175,7 +1190,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4004"> + <widget class="GtkImage" id="image4031"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1747,7 +1762,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4005"> + <widget class="GtkImage" id="image4032"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1768,7 +1783,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4006"> + <widget class="GtkImage" id="image4033"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1797,7 +1812,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4007"> + <widget class="GtkImage" id="image4034"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1870,7 +1885,7 @@ <signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4008"> + <widget class="GtkImage" id="image4035"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1890,7 +1905,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4009"> + <widget class="GtkImage" id="image4036"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -1917,7 +1932,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4010"> + <widget class="GtkImage" id="image4037"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1969,7 +1984,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4011"> + <widget class="GtkImage" id="image4038"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2010-11-22 21:29:52 UTC (rev 5426) +++ trunk/src/callbacks.c 2010-11-23 12:50:24 UTC (rev 5427) @@ -2371,3 +2371,11 @@ ui_document_show_hide(NULL); } + +void +on_mark_all1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_MARKALL); +} + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2010-11-22 21:29:52 UTC (rev 5426) +++ trunk/src/callbacks.h 2010-11-23 12:50:24 UTC (rev 5427) @@ -653,3 +653,7 @@ on_reset_indentation1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_mark_all1_activate (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2010-11-22 21:29:52 UTC (rev 5426) +++ trunk/src/interface.c 2010-11-23 12:50:24 UTC (rev 5427) @@ -38,7 +38,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image3984; + GtkWidget *image4011; GtkWidget *separator12; GtkWidget *menu_open1; GtkWidget *menu_open_selected_file1; @@ -47,11 +47,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image3985; + GtkWidget *image4012; GtkWidget *menu_reload1; - GtkWidget *image3986; + GtkWidget *image4013; GtkWidget *menu_reload_as1; - GtkWidget *image3987; + GtkWidget *image4014; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -62,9 +62,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image3988; + GtkWidget *image4015; GtkWidget *menu_close_all1; - GtkWidget *image3989; + GtkWidget *image4016; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -82,9 +82,9 @@ GtkWidget *commands2; GtkWidget *commands2_menu; GtkWidget *cut_current_line_s_1; - GtkWidget *image3990; + GtkWidget *image4017; GtkWidget *copy_current_line_s_1; - GtkWidget *image3991; + GtkWidget *image4018; GtkWidget *delete_current_line_s_1; GtkWidget *duplicate_line_or_selection1; GtkWidget *separator49; @@ -103,9 +103,9 @@ GtkWidget *menu_toggle_line_commentation1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image3992; + GtkWidget *image4019; GtkWidget *menu_decrease_indent1; - GtkWidget *image3993; + GtkWidget *image4020; GtkWidget *smart_line_indent1; GtkWidget *separator37; GtkWidget *send_selection_to2; @@ -113,7 +113,7 @@ GtkWidget *invisible13; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image3994; + GtkWidget *image4021; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_function_description2; @@ -123,18 +123,18 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image3995; + GtkWidget *image4022; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image3996; + GtkWidget *image4023; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; - GtkWidget *image3997; + GtkWidget *image4024; GtkWidget *plugin_preferences1; - GtkWidget *image3998; + GtkWidget *image4025; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; @@ -142,20 +142,20 @@ GtkWidget *find_previous1; GtkWidget *separator54; GtkWidget *find_in_files1; - GtkWidget *image3999; + GtkWidget *image4026; GtkWidget *replace1; - GtkWidget *image4000; + GtkWidget *image4027; GtkWidget *separator35; GtkWidget *next_message1; - GtkWidget *image4001; + GtkWidget *image4028; GtkWidget *previous_message1; - GtkWidget *image4002; + GtkWidget *image4029; GtkWidget *separator51; GtkWidget *go_to_next_marker1; GtkWidget *go_to_previous_marker1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image4003; + GtkWidget *image4030; GtkWidget *more1; GtkWidget *more1_menu; GtkWidget *find_nextsel1; @@ -164,12 +164,14 @@ GtkWidget *find_usage1; GtkWidget *find_document_usage1; GtkWidget *separator55; + GtkWidget *mark_all1; + GtkWidget *separator60; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image4004; + GtkWidget *image4031; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -238,12 +240,12 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image4005; + GtkWidget *image4032; GtkWidget *project_open1; - GtkWidget *image4006; + GtkWidget *image4033; GtkWidget *recent_projects1; GtkWidget *project_close1; - GtkWidget *image4007; + GtkWidget *image4034; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *separator59; @@ -252,18 +254,18 @@ GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_reload_configuration1; - GtkWidget *image4008; + GtkWidget *image4035; GtkWidget *configuration_files1; - GtkWidget *image4009; + GtkWidget *image4036; GtkWidget *separator47; GtkWidget *menu_choose_color1; - GtkWidget *image4010; + GtkWidget *image4037; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image4011; + GtkWidget *image4038; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -333,9 +335,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image3984 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3984); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3984); + image4011 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4011); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image4011); separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); @@ -371,25 +373,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); - image3985 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3985); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3985); + image4012 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4012); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image4012); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image3986 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3986); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3986); + image4013 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4013); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image4013); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1); - image3987 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3987); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3987); + image4014 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4014); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image4014); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -432,17 +434,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1); - image3988 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3988); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3988); + image4015 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4015); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image4015); menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All")); gtk_widget_show (menu_close_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); - image3989 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3989); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3989); + image4016 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4016); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image4016); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -514,17 +516,17 @@ gtk_widget_show (cut_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1); - image3990 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3990); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3990); + image4017 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4017); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image4017); copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Copy Current Line(s)")); gtk_widget_show (copy_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1); - image3991 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3991); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3991); + image4018 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4018); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image4018); delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Delete Current Line(s)")); gtk_widget_show (delete_current_line_s_1); @@ -601,17 +603,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image3992 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3992); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3992); + image4019 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4019); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image4019); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image3993 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3993); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3993); + image4020 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4020); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image4020); smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("_Smart Line Indent")); gtk_widget_show (smart_line_indent1); @@ -641,9 +643,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image3994 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3994); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3994); + image4021 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4021); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image4021); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -681,9 +683,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image3995 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3995); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3995); + image4022 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4022); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image4022); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -695,9 +697,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image3996 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3996); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3996); + image4023 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4023); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image4023); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -714,17 +716,17 @@ gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1); - image3997 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3997); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3997); + image4024 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4024); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image4024); plugin_preferences1 = gtk_image_menu_item_new_with_mnemonic (_("P_lugin Preferences")); gtk_widget_show (plugin_preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), plugin_preferences1); - image3998 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3998); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3998); + image4025 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4025); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image4025); search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); @@ -754,17 +756,17 @@ gtk_widget_show (find_in_files1); gtk_container_add (GTK_CONTAINER (search1_menu), find_in_files1); - image3999 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3999); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_in_files1), image3999); + image4026 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4026); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_in_files1), image4026); replace1 = gtk_image_menu_item_new_with_mnemonic (_("_Replace")); gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image4000 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4000); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image4000); + image4027 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4027); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image4027); separator35 = gtk_separator_menu_item_new (); gtk_widget_show (separator35); @@ -775,17 +777,17 @@ gtk_widget_show (next_message1); gtk_container_add (GTK_CONTAINER (search1_menu), next_message1); - image4001 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4001); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (next_message1), image4001); + image4028 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4028); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (next_message1), image4028); previous_message1 = gtk_image_menu_item_new_with_mnemonic (_("Pr_evious Message")); gtk_widget_show (previous_message1); gtk_container_add (GTK_CONTAINER (search1_menu), previous_message1); - image4002 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4002); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (previous_message1), image4002); + image4029 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4029); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (previous_message1), image4029); separator51 = gtk_separator_menu_item_new (); gtk_widget_show (separator51); @@ -809,9 +811,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image4003 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4003); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image4003); + image4030 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4030); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image4030); more1 = gtk_menu_item_new_with_mnemonic (_("_More")); gtk_widget_show (more1); @@ -846,6 +848,15 @@ gtk_container_add (GTK_CONTAINER (more1_menu), separator55); gtk_widget_set_sensitive (separator55, FALSE); + mark_all1 = gtk_menu_item_new_with_mnemonic (_("_Mark All")); + gtk_widget_show (mark_all1); + gtk_container_add (GTK_CONTAINER (more1_menu), mark_all1); + + separator60 = gtk_separator_menu_item_new (); + gtk_widget_show (separator60); + gtk_container_add (GTK_CONTAINER (more1_menu), separator60); + gtk_widget_set_sensitive (separator60, FALSE); + goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition")); gtk_widget_show (goto_tag_definition1); gtk_container_add (GTK_CONTAINER (more1_menu), goto_tag_definition1); @@ -865,9 +876,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); - image4004 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4004); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image4004); + image4031 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4031); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image4031); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -1161,17 +1172,17 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image4005 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4005); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image4005); + image4032 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4032); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image4032); project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1); - image4006 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4006); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image4006); + image4033 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4033); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image4033); recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects")); gtk_widget_show (recent_projects1); @@ -1181,9 +1192,9 @@ gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1); - image4007 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4007); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image4007); + image4034 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4034); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image4034); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -1219,17 +1230,17 @@ gtk_widget_show (menu_reload_configuration1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1); - image4008 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4008); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image4008); + image4035 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4035); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image4035); configuration_files1 = gtk_image_menu_item_new_with_mnemonic (_("C_onfiguration Files")); gtk_widget_show (configuration_files1); gtk_container_add (GTK_CONTAINER (tools1_menu), configuration_files1); - image4009 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4009); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image4009); + image4036 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4036); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image4036); separator47 = gtk_separator_menu_item_new (); gtk_widget_show (separator47); @@ -1240,9 +1251,9 @@ gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); - image4010 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4010); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image4010); + image4037 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4037); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image4037); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1263,9 +1274,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1); - image4011 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4011); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image4011); + image4038 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4038); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image4038); website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1604,6 +1615,9 @@ g_signal_connect ((gpointer) find_document_usage1, "activate", G_CALLBACK (on_find_document_usage1_activate), NULL); + g_signal_connect ((gpointer) mark_all1, "activate", + G_CALLBACK (on_mark_all1_activate), + NULL); g_signal_connect ((gpointer) goto_tag_definition1, "activate", G_CALLBACK (on_goto_tag_definition1), NULL); @@ -1801,7 +1815,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image3984, "image3984"); + GLADE_HOOKUP_OBJECT (window1, image4011, "image4011"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); GLADE_HOOKUP_OBJECT (window1, menu_open1, "menu_open1"); GLADE_HOOKUP_OBJECT (window1, menu_open_selected_file1, "menu_open_selected_file1"); @@ -1810,11 +1824,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image3985, "image3985"); + GLADE_HOOKUP_OBJECT (window1, image4012, "image4012"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image3986, "image3986"); + GLADE_HOOKUP_OBJECT (window1, image4013, "image4013"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image3987, "image3987"); + GLADE_HOOKUP_OBJECT (window1, image4014, "image4014"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1825,9 +1839,9 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1"); - GLADE_HOOKUP_OBJECT (window1, image3988, "image3988"); + GLADE_HOOKUP_OBJECT (window1, image4015, "image4015"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image3989, "image3989"); + GLADE_HOOKUP_OBJECT (window1, image4016, "image4016"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1845,9 +1859,9 @@ GLADE_HOOKUP_OBJECT (window1, commands2, "commands2"); GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu"); GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3990, "image3990"); + GLADE_HOOKUP_OBJECT (window1, image4017, "image4017"); GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3991, "image3991"); + GLADE_HOOKUP_OBJECT (window1, image4018, "image4018"); GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1"); GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1"); GLADE_HOOKUP_OBJECT (window1, separator49, "separator49"); @@ -1866,9 +1880,9 @@ GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3992, "image3992"); + GLADE_HOOKUP_OBJECT (window1, image4019, "image4019"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3993, "image3993"); + GLADE_HOOKUP_OBJECT (window1, image4020, "image4020"); GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); @@ -1876,7 +1890,7 @@ GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image3994, "image3994"); + GLADE_HOOKUP_OBJECT (window1, image4021, "image4021"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_function_description2, "insert_function_description2"); @@ -1886,18 +1900,18 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image3995, "image3995"); + GLADE_HOOKUP_OBJECT (window1, image4022, "image4022"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image3996, "image3996"); + GLADE_HOOKUP_OBJECT (window1, image4023, "image4023"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); - GLADE_HOOKUP_OBJECT (window1, image3997, "image3997"); + GLADE_HOOKUP_OBJECT (window1, image4024, "image4024"); GLADE_HOOKUP_OBJECT (window1, plugin_preferences1, "plugin_preferences1"); - GLADE_HOOKUP_OBJECT (window1, image3998, "image3998"); + GLADE_HOOKUP_OBJECT (window1, image4025, "image4025"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); @@ -1905,20 +1919,20 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, separator54, "separator54"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); - GLADE_HOOKUP_OBJECT (window1, image3999, "image3999"); + GLADE_HOOKUP_OBJECT (window1, image4026, "image4026"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image4000, "image4000"); + GLADE_HOOKUP_OBJECT (window1, image4027, "image4027"); GLADE_HOOKUP_OBJECT (window1, separator35, "separator35"); GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); - GLADE_HOOKUP_OBJECT (window1, image4001, "image4001"); + GLADE_HOOKUP_OBJECT (window1, image4028, "image4028"); GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); - GLADE_HOOKUP_OBJECT (window1, image4002, "image4002"); + GLADE_HOOKUP_OBJECT (window1, image4029, "image4029"); GLADE_HOOKUP_OBJECT (window1, separator51, "separator51"); GLADE_HOOKUP_OBJECT (window1, go_to_next_marker1, "go_to_next_marker1"); GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image4003, "image4003"); + GLADE_HOOKUP_OBJECT (window1, image4030, "image4030"); GLADE_HOOKUP_OBJECT (window1, more1, "more1"); GLADE_HOOKUP_OBJECT (window1, more1_menu, "more1_menu"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); @@ -1927,12 +1941,14 @@ GLADE_HOOKUP_OBJECT (window1, find_usage1, "find_usage1"); GLADE_HOOKUP_OBJECT (window1, find_document_usage1, "find_document_usage1"); GLADE_HOOKUP_OBJECT (window1, separator55, "separator55"); + GLADE_HOOKUP_OBJECT (window1, mark_all1, "mark_all1"); + GLADE_HOOKUP_OBJECT (window1, separator60, "separator60"); GLADE_HOOKUP_OBJECT (window1, goto_tag_definition1, "goto_tag_definition1"); GLADE_HOOKUP_OBJECT (window1, goto_tag_declaration1, "goto_tag_declaration1"); GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image4004, "image4004"); + GLADE_HOOKUP_OBJECT (window1, image4031, "image4031"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -1998,12 +2014,12 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image4005, "image4005"); + GLADE_HOOKUP_OBJECT (window1, image4032, "image4032"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image4006, "image4006"); + GLADE_HOOKUP_OBJECT (window1, image4033, "image4033"); GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image4007, "image4007"); + GLADE_HOOKUP_OBJECT (window1, image4034, "image4034"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, separator59, "separator59"); @@ -2012,18 +2028,18 @@ GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1"); - GLADE_HOOKUP_OBJECT (window1, image4008, "image4008"); + GLADE_HOOKUP_OBJECT (window1, image4035, "image4035"); GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1"); - GLADE_HOOKUP_OBJECT (window1, image4009, "image4009"); + GLADE_HOOKUP_OBJECT (window1, image4036, "image4036"); GLADE_HOOKUP_OBJECT (window1, separator47, "separator47"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image4010, "image4010"); + GLADE_HOOKUP_OBJECT (window1, image4037, "image4037"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); - GLADE_HOOKUP_OBJECT (window1, image4011, "image4011"); + GLADE_HOOKUP_OBJECT (window1, image4038, "image4038"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1"); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2010-11-22 21:29:52 UTC (rev 5426) +++ trunk/src/keybindings.c 2010-11-23 12:50:24 UTC (rev 5427) @@ -412,7 +412,7 @@ keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, NULL, 0, 0, "popup_finddocumentusage", _("Find Document Usage"), LW(find_document_usage1)); keybindings_set_item(group, GEANY_KEYS_SEARCH_MARKALL, NULL, - GDK_m, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "find_markall", _("Mark All"), NULL); + GDK_m, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "find_markall", _("_Mark All"), LW(mark_all1)); group = ADD_KB_GROUP(GOTO, _("Go to"), cb_func_goto_action); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5426] tags/unstable/
by eht16＠users.sourceforge.net 22 Nov '10

22 Nov '10

Revision: 5426 http://geany.svn.sourceforge.net/geany/?rev=5426&view=rev Author: eht16 Date: 2010-11-22 21:29:52 +0000 (Mon, 22 Nov 2010) Log Message: ----------- create unstable branch Added Paths: ----------- tags/unstable/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5425] trunk
by ntrel＠users.sourceforge.net 22 Nov '10

22 Nov '10

Revision: 5425 http://geany.svn.sourceforge.net/geany/?rev=5425&view=rev Author: ntrel Date: 2010-11-22 16:51:16 +0000 (Mon, 22 Nov 2010) Log Message: ----------- Warn about preprocessor testing GEANY_API_VERSION below 200 because those tests will always fail. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugindata.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-22 16:44:04 UTC (rev 5424) +++ trunk/ChangeLog 2010-11-22 16:51:16 UTC (rev 5425) @@ -11,6 +11,9 @@ * src/plugindata.h: Make GEANY_API_VERSION, GEANY_ABI_VERSION macros instead of enums so you can protect code with '#if GEANY_API_VERSION >= 200'. + * src/plugindata.h: + Warn about preprocessor testing GEANY_API_VERSION below 200 because + those tests will always fail. 2010-11-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2010-11-22 16:44:04 UTC (rev 5424) +++ trunk/src/plugindata.h 2010-11-22 16:51:16 UTC (rev 5425) @@ -50,6 +50,9 @@ * @code #if GEANY_API_VERSION >= 200 * some_newer_function(); * #endif @endcode + * + * @warning You should not test for values below 200 as previously + * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ #define GEANY_API_VERSION 200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2010