Commits July 2008

commits@lists.geany.org

3 participants
105 discussions

SF.net SVN: geany:[2804] trunk
by ntrel＠users.sourceforge.net 23 Jul '08

23 Jul '08

Revision: 2804 http://geany.svn.sourceforge.net/geany/?rev=2804&view=rev Author: ntrel Date: 2008-07-23 13:48:13 +0000 (Wed, 23 Jul 2008) Log Message: ----------- Add doxygen file header for generating MainFuncs API documentation. Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-23 11:46:02 UTC (rev 2803) +++ trunk/ChangeLog 2008-07-23 13:48:13 UTC (rev 2804) @@ -3,6 +3,8 @@ * src/utils.c, src/utils.h, src/plugindata.h, src/callbacks.c, src/plugins.c, src/main.c, src/main.h, plugins/pluginmacros.h: Move utils_reload_configuration() to main.c. + * src/main.c: + Add doxygen file header for generating MainFuncs API documentation. 2008-07-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-07-23 11:46:02 UTC (rev 2803) +++ trunk/src/main.c 2008-07-23 13:48:13 UTC (rev 2804) @@ -21,8 +21,10 @@ * $Id$ */ -/* - * Program initialization and cleanup. +/** + * @file: main.h + * Main program-related commands. + * Handles program initialization and cleanup. */ #include <signal.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2803] trunk
by ntrel＠users.sourceforge.net 23 Jul '08

23 Jul '08

Revision: 2803 http://geany.svn.sourceforge.net/geany/?rev=2803&view=rev Author: ntrel Date: 2008-07-23 11:46:02 +0000 (Wed, 23 Jul 2008) Log Message: ----------- Move utils_reload_configuration() to main.c. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/pluginmacros.h trunk/src/callbacks.c trunk/src/main.c trunk/src/main.h trunk/src/plugindata.h trunk/src/plugins.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/ChangeLog 2008-07-23 11:46:02 UTC (rev 2803) @@ -1,3 +1,10 @@ +2008-07-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/utils.h, src/plugindata.h, src/callbacks.c, + src/plugins.c, src/main.c, src/main.h, plugins/pluginmacros.h: + Move utils_reload_configuration() to main.c. + + 2008-07-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * scintilla/LexHTML.cxx: Modified: trunk/plugins/pluginmacros.h =================================================================== --- trunk/plugins/pluginmacros.h 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/plugins/pluginmacros.h 2008-07-23 11:46:02 UTC (rev 2803) @@ -49,6 +49,7 @@ #define p_filetypes geany_functions->p_filetypes /**< See filetypes.h */ #define p_highlighting geany_functions->p_highlighting /**< See highlighting.h */ #define p_keybindings geany_functions->p_keybindings /**< See keybindings.h */ +#define p_main geany_functions->p_main /**< See main.h */ #define p_msgwindow geany_functions->p_msgwindow /**< See msgwindow.h */ #define p_navqueue geany_functions->p_navqueue /**< See navqueue.h */ #define p_sci geany_functions->p_sci /**< See sciwrappers.h */ Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/src/callbacks.c 2008-07-23 11:46:02 UTC (rev 2803) @@ -2222,6 +2222,6 @@ on_menu_reload_configuration1_activate (GtkMenuItem *menuitem, gpointer user_data) { - utils_reload_configuration(); + main_reload_configuration(); } Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/src/main.c 2008-07-23 11:46:02 UTC (rev 2803) @@ -1021,3 +1021,42 @@ n = 1; return malloc(n); } + + +/** + * Reloads most of Geany's configuration files without restarting. Currently the following + * files are reloaded: all template files, also new file templates and the 'New (with template)' + * menus will be updated, Snippets (snippets.conf), filetype extensions (filetype_extensions.conf), + * and 'settings' and 'build_settings' sections of the filetype definition files. + * + * Plugins may call this function if they changed any of these files (e.g. a configuration file + * editor plugin). + * + **/ +void main_reload_configuration(void) +{ + guint i; + + /* reload templates */ + templates_free_templates(); + templates_init(); + + /* reload snippets */ + editor_snippets_free(); + editor_snippets_init(); + + /* reload filetype extensions */ + configuration_read_filetype_extensions(); + + /* save possibly changed commands before re-reading them */ + filetypes_save_commands(); + + /* reload filetype configs */ + for (i = 0; i < filetypes_array->len; i++) + { + /* filetypes_load_config() will skip not loaded filetypes */ + filetypes_load_config(i, TRUE); + } + + ui_set_statusbar(TRUE, _("Configuration files reloaded.")); +} Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/src/main.h 2008-07-23 11:46:02 UTC (rev 2803) @@ -55,4 +55,6 @@ gboolean main_handle_filename(gchar *locale_filename); +void main_reload_configuration(void); + #endif Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/src/plugindata.h 2008-07-23 11:46:02 UTC (rev 2803) @@ -36,12 +36,12 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 79; +static const gint api_version = 80; /* 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 * are only appended, as this doesn't affect existing fields. */ -static const gint abi_version = 42; +static const gint abi_version = 43; /** Check the plugin can be loaded by Geany. * This performs runtime checks that try to ensure: @@ -190,6 +190,7 @@ struct FiletypeFuncs *p_filetypes; /**< See filetypes.h */ struct NavQueueFuncs *p_navqueue; /**< See navqueue.h */ struct EditorFuncs *p_editor; /**< See editor.h */ + struct MainFuncs *p_main; /**< See main.h */ } GeanyFunctions; @@ -300,11 +301,18 @@ gboolean (*spawn_async) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error); - void (*reload_configuration) (void); } UtilsFuncs; +/* See main.h */ +typedef struct MainFuncs +{ + void (*reload_configuration) (void); +} +MainFuncs; + + /* See ui_utils.h */ typedef struct UIUtilsFuncs { Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/src/plugins.c 2008-07-23 11:46:02 UTC (rev 2803) @@ -55,6 +55,7 @@ #include "highlighting.h" #include "keybindings.h" #include "navqueue.h" +#include "main.h" #ifdef G_OS_WIN32 @@ -171,7 +172,6 @@ &utils_get_setting_string, &utils_spawn_sync, &utils_spawn_async, - &utils_reload_configuration }; static UIUtilsFuncs uiutils_funcs = { @@ -239,6 +239,10 @@ &navqueue_goto_line }; +static MainFuncs main_funcs = { + &main_reload_configuration +}; + static GeanyFunctions geany_functions = { &doc_funcs, &sci_funcs, @@ -255,7 +259,8 @@ &highlighting_funcs, &filetype_funcs, &navqueue_funcs, - &editor_funcs + &editor_funcs, + &main_funcs }; static GeanyData geany_data; Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/src/utils.c 2008-07-23 11:46:02 UTC (rev 2803) @@ -1523,42 +1523,3 @@ #endif return result; } - - -/** - * Reloads most of Geany's configuration files without restarting. Currently the following - * files are reloaded: all template files, also new file templates and the 'New (with template)' - * menus will be updated, Snippets (snippets.conf), filetype extensions (filetype_extensions.conf), - * and 'settings' and 'build_settings' sections of the filetype definition files. - * - * Plugins may call this function if they changed any of these files (e.g. a configuration file - * editor plugin). - * - **/ -void utils_reload_configuration(void) -{ - guint i; - - /* reload templates */ - templates_free_templates(); - templates_init(); - - /* reload snippets */ - editor_snippets_free(); - editor_snippets_init(); - - /* reload filetype extensions */ - configuration_read_filetype_extensions(); - - /* save possibly changed commands before re-reading them */ - filetypes_save_commands(); - - /* reload filetype configs */ - for (i = 0; i < filetypes_array->len; i++) - { - /* filetypes_load_config() will skip not loaded filetypes */ - filetypes_load_config(i, TRUE); - } - - ui_set_statusbar(TRUE, _("Configuration files reloaded.")); -} Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2008-07-22 16:54:02 UTC (rev 2802) +++ trunk/src/utils.h 2008-07-23 11:46:02 UTC (rev 2803) @@ -141,6 +141,4 @@ GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error); -void utils_reload_configuration(void); - #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2802] branches/dynamic-editor-menu
by eht16＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 2802 http://geany.svn.sourceforge.net/geany/?rev=2802&view=rev Author: eht16 Date: 2008-07-22 16:54:02 +0000 (Tue, 22 Jul 2008) Log Message: ----------- Build the editor popup menu with GtkUIManager instead of Glade. This makes it configurable for users by editing an XML file. Modified Paths: -------------- branches/dynamic-editor-menu/Makefile.am branches/dynamic-editor-menu/geany.glade branches/dynamic-editor-menu/src/Makefile.am branches/dynamic-editor-menu/src/callbacks.c branches/dynamic-editor-menu/src/callbacks.h branches/dynamic-editor-menu/src/dialogs.c branches/dynamic-editor-menu/src/editor.c branches/dynamic-editor-menu/src/interface.c branches/dynamic-editor-menu/src/interface.h branches/dynamic-editor-menu/src/keybindings.c branches/dynamic-editor-menu/src/main.c branches/dynamic-editor-menu/src/tools.c branches/dynamic-editor-menu/src/ui_utils.c branches/dynamic-editor-menu/src/ui_utils.h branches/dynamic-editor-menu/wscript Added Paths: ----------- branches/dynamic-editor-menu/src/ui_manager.c branches/dynamic-editor-menu/src/ui_manager.h Modified: branches/dynamic-editor-menu/Makefile.am =================================================================== --- branches/dynamic-editor-menu/Makefile.am 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/Makefile.am 2008-07-22 16:54:02 UTC (rev 2802) @@ -19,6 +19,7 @@ data/html_entities.tags \ $(srcdir)/data/filetypes.* \ data/filetype_extensions.conf \ + data/ui_editor_menu.xml \ data/snippets.conf EXTRA_DIST = \ @@ -63,6 +64,7 @@ $(INSTALL_DATA) $(srcdir)/data/pascal.tags $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/latex.tags $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/html_entities.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) $(srcdir)/data/ui_editor_menu.xml $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \ for file in $(srcdir)/data/*; do \ if test -f $$file; then \ Modified: branches/dynamic-editor-menu/geany.glade =================================================================== --- branches/dynamic-editor-menu/geany.glade 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/geany.glade 2008-07-22 16:54:02 UTC (rev 2802) @@ -2641,527 +2641,6 @@ </child> </widget> -<widget class="GtkMenu" id="edit_menu1"> - <property name="visible">True</property> - - <child> - <widget class="GtkImageMenuItem" id="undo1"> - <property name="visible">True</property> - <property name="label">gtk-undo</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_undo1_activate" last_modification_time="Sat, 30 Apr 2005 21:47:27 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="redo1"> - <property name="visible">True</property> - <property name="label">gtk-redo</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_redo1_activate" last_modification_time="Sat, 30 Apr 2005 21:47:27 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator2"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="cut1"> - <property name="visible">True</property> - <property name="label">gtk-cut</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_cut1_activate" last_modification_time="Sat, 30 Apr 2005 21:47:27 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="copy1"> - <property name="visible">True</property> - <property name="label">gtk-copy</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_copy1_activate" last_modification_time="Sat, 30 Apr 2005 21:47:27 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="paste1"> - <property name="visible">True</property> - <property name="label">gtk-paste</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_paste1_activate" last_modification_time="Sat, 30 Apr 2005 21:47:27 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="delete1"> - <property name="visible">True</property> - <property name="label">gtk-delete</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_delete1_activate" last_modification_time="Sat, 30 Apr 2005 21:47:27 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator3"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="menu_select_all2"> - <property name="visible">True</property> - <property name="label" translatable="yes">Select _All</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_menu_select_all1_activate" last_modification_time="Fri, 30 Jun 2006 13:35:07 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator26"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="menu_open_selected_file2"> - <property name="visible">True</property> - <property name="label" translatable="yes">Open Selected F_ile</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_menu_open_selected_file1_activate" last_modification_time="Wed, 24 Jan 2007 18:48:44 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator36"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="menu_format2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Format</property> - <property name="use_underline">True</property> - - <child> - <widget class="GtkMenu" id="menu_format2_menu"> - - <child> - <widget class="GtkMenuItem" id="toggle_case1"> - <property name="visible">True</property> - <property name="label" translatable="yes">T_oggle Case of Selection</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_toggle_case1_activate" last_modification_time="Thu, 06 Sep 2007 18:17:18 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator30"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="menu_comment_line2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Comment Line(s)</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_menu_comment_line1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="menu_uncomment_line2"> - <property name="visible">True</property> - <property name="label" translatable="yes">U_ncomment Line(s)</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_menu_uncomment_line1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="menu_toggle_line_commentation2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Toggle Line Commentation</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_menu_toggle_line_commentation1_activate" last_modification_time="Tue, 12 Sep 2006 08:07:58 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="menu_duplicate_line2"> - <property name="visible">True</property> - <property name="label" translatable="yes">Du_plicate Line or Selection</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_menu_duplicate_line1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator31"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="menu_increase_indent2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Increase Indent</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image2589"> - <property name="visible">True</property> - <property name="stock">gtk-indent</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="menu_decrease_indent2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Decrease Indent</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image2590"> - <property name="visible">True</property> - <property name="stock">gtk-unindent</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator38"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="send_selection_to1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Send Selection to</property> - <property name="use_underline">True</property> - - <child> - <widget class="GtkMenu" id="send_selection_to1_menu"> - - <child> - <widget class="GtkMenuItem" id="invisible12"> - <property name="label" translatable="yes">invisible</property> - <property name="use_underline">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator17"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="comments"> - <property name="visible">True</property> - <property name="label" translatable="yes">I_nsert Comments</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image2591"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - - <child> - <widget class="GtkMenu" id="comments_menu"> - - <child> - <widget class="GtkMenuItem" id="add_changelog_entry2"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inserts a typical ChangeLog entry in the current file</property> - <property name="label" translatable="yes">Insert _ChangeLog Entry</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_comments_changelog_activate" last_modification_time="Sun, 02 Oct 2005 17:30:10 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="insert_file_header2"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inserts a file header at the beginning of the file</property> - <property name="label" translatable="yes">Insert File _Header</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_comments_fileheader_activate" last_modification_time="Mon, 03 Oct 2005 17:33:08 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="insert_function_description1"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inserts a description before the current function</property> - <property name="label" translatable="yes">Insert _Function Description</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_comments_function_activate" last_modification_time="Sat, 01 Oct 2005 17:28:26 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="insert_multiline_comment1"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inserts a multiline comment</property> - <property name="label" translatable="yes">Insert _Multiline Comment</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_comments_multiline_activate" last_modification_time="Sat, 01 Oct 2005 17:28:26 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="insert_gpl_notice1"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inserts a GPL notice (should be done at the beginning of the file)</property> - <property name="label" translatable="yes">Insert _GPL Notice</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_comments_gpl_activate" last_modification_time="Sun, 02 Oct 2005 17:37:31 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="insert_bsd_license_notice1"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inserts a BSD license notice (should be done at the beginning of the file)</property> - <property name="label" translatable="yes">Insert _BSD License Notice</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_comments_bsd_activate" last_modification_time="Fri, 05 Jan 2007 13:32:16 GMT"/> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="insert_date2"> - <property name="visible">True</property> - <property name="label" translatable="yes">Insert Dat_e</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image2592"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - - <child> - <widget class="GtkMenu" id="insert_date2_menu"> - - <child> - <widget class="GtkMenuItem" id="invisible10"> - <property name="label" translatable="yes">invisible</property> - <property name="use_underline">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="insert_include1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Insert "include <...>"</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image2593"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - - <child> - <widget class="GtkMenu" id="insert_include1_menu"> - - <child> - <widget class="GtkMenuItem" id="invisible3"> - <property name="label" translatable="yes">invisible</property> - <property name="use_underline">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator7"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="current_word1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Current _Word</property> - <property name="use_underline">True</property> - - <child> - <widget class="GtkMenu" id="current_word1_menu"> - - <child> - <widget class="GtkImageMenuItem" id="find_usage1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Find _Usage</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image2594"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="find_document_usage1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Find _Document Usage</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_find_document_usage1_activate" last_modification_time="Thu, 17 Jul 2008 13:42:25 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image2595"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator47"> - <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> - <property name="use_underline">True</property> - <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="goto_tag_declaration1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Go to T_ag Declaration</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator48"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="context_action1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Conte_xt Action</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_context_action1_activate" last_modification_time="Fri, 13 Apr 2007 18:37:55 GMT"/> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator15"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="go_to_line"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Go to the entered line</property> - <property name="label" translatable="yes">_Go to Line</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image2596"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> -</widget> - <widget class="GtkDialog" id="prefs_dialog"> <property name="visible">True</property> <property name="title" translatable="yes">Preferences</property> Modified: branches/dynamic-editor-menu/src/Makefile.am =================================================================== --- branches/dynamic-editor-menu/src/Makefile.am 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/Makefile.am 2008-07-22 16:54:02 UTC (rev 2802) @@ -40,6 +40,7 @@ tools.c tools.h \ treeviews.c treeviews.h \ ui_utils.c ui_utils.h \ + ui_manager.c ui_manager.h \ utils.c utils.h Modified: branches/dynamic-editor-menu/src/callbacks.c =================================================================== --- branches/dynamic-editor-menu/src/callbacks.c 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/callbacks.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -270,7 +270,7 @@ { GeanyDocument *doc = document_get_current(); ui_update_menu_copy_items(doc); - ui_update_insert_include_item(doc, 1); + ui_update_insert_include_item(doc, UI_INSERT_INCLUDE_ITEM_MENU); } @@ -1047,21 +1047,32 @@ void -on_goto_tag_activate (GtkMenuItem *menuitem, +on_goto_tag_definition_activate (GtkMenuItem *menuitem, gpointer user_data) { - gboolean definition = (menuitem == - GTK_MENU_ITEM(lookup_widget(main_widgets.editor_menu, "goto_tag_definition1"))); GeanyDocument *doc = document_get_current(); g_return_if_fail(doc != NULL); sci_set_current_position(doc->editor->sci, editor_info.click_pos, FALSE); - symbols_goto_tag(editor_info.current_word, definition); + symbols_goto_tag(editor_info.current_word, TRUE); } void +on_goto_tag_declaration_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + g_return_if_fail(doc != NULL); + + sci_set_current_position(doc->editor->sci, editor_info.click_pos, FALSE); + symbols_goto_tag(editor_info.current_word, FALSE); +} + + +void on_count_words1_activate (GtkMenuItem *menuitem, gpointer user_data) { Modified: branches/dynamic-editor-menu/src/callbacks.h =================================================================== --- branches/dynamic-editor-menu/src/callbacks.h 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/callbacks.h 2008-07-22 16:54:02 UTC (rev 2802) @@ -236,10 +236,14 @@ gpointer user_data); void -on_goto_tag_activate (GtkMenuItem *menuitem, +on_goto_tag_definition_activate (GtkMenuItem *menuitem, gpointer user_data); void +on_goto_tag_declaration_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void on_construct_completion1_activate (GtkMenuItem *menuitem, gpointer user_data); Modified: branches/dynamic-editor-menu/src/dialogs.c =================================================================== --- branches/dynamic-editor-menu/src/dialogs.c 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/dialogs.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -196,6 +196,7 @@ gtk_window_set_type_hint(GTK_WINDOW(ui_widgets.open_filesel), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.open_filesel), GTK_WINDOW(main_widgets.window)); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(ui_widgets.open_filesel), TRUE); + gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(ui_widgets.open_filesel), FALSE); /* add checkboxes and filename entry */ gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(ui_widgets.open_filesel), Modified: branches/dynamic-editor-menu/src/editor.c =================================================================== --- branches/dynamic-editor-menu/src/editor.c 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/editor.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -199,7 +199,7 @@ ui_update_popup_goto_items((current_word[0] != '\0') ? TRUE : FALSE); ui_update_popup_copy_items(doc); - ui_update_insert_include_item(doc, 0); + ui_update_insert_include_item(doc, UI_INSERT_INCLUDE_ITEM_POPUP); if (geany_object) { Modified: branches/dynamic-editor-menu/src/interface.c =================================================================== --- branches/dynamic-editor-menu/src/interface.c 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/interface.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -2077,492 +2077,6 @@ } GtkWidget* -create_edit_menu1 (void) -{ - GtkWidget *edit_menu1; - GtkWidget *undo1; - GtkWidget *redo1; - GtkWidget *separator2; - GtkWidget *cut1; - GtkWidget *copy1; - GtkWidget *paste1; - GtkWidget *delete1; - GtkWidget *separator3; - GtkWidget *menu_select_all2; - GtkWidget *separator26; - GtkWidget *menu_open_selected_file2; - GtkWidget *separator36; - GtkWidget *menu_format2; - GtkWidget *menu_format2_menu; - GtkWidget *toggle_case1; - GtkWidget *separator30; - GtkWidget *menu_comment_line2; - GtkWidget *menu_uncomment_line2; - GtkWidget *menu_toggle_line_commentation2; - GtkWidget *menu_duplicate_line2; - GtkWidget *separator31; - GtkWidget *menu_increase_indent2; - GtkWidget *image2589; - GtkWidget *menu_decrease_indent2; - GtkWidget *image2590; - GtkWidget *separator38; - GtkWidget *send_selection_to1; - GtkWidget *send_selection_to1_menu; - GtkWidget *invisible12; - GtkWidget *separator17; - GtkWidget *comments; - GtkWidget *image2591; - GtkWidget *comments_menu; - GtkWidget *add_changelog_entry2; - GtkWidget *insert_file_header2; - GtkWidget *insert_function_description1; - GtkWidget *insert_multiline_comment1; - GtkWidget *insert_gpl_notice1; - GtkWidget *insert_bsd_license_notice1; - GtkWidget *insert_date2; - GtkWidget *image2592; - GtkWidget *insert_date2_menu; - GtkWidget *invisible10; - GtkWidget *insert_include1; - GtkWidget *image2593; - GtkWidget *insert_include1_menu; - GtkWidget *invisible3; - GtkWidget *separator7; - GtkWidget *current_word1; - GtkWidget *current_word1_menu; - GtkWidget *find_usage1; - GtkWidget *image2594; - GtkWidget *find_document_usage1; - GtkWidget *image2595; - GtkWidget *separator47; - GtkWidget *goto_tag_definition1; - GtkWidget *goto_tag_declaration1; - GtkWidget *separator48; - GtkWidget *context_action1; - GtkWidget *separator15; - GtkWidget *go_to_line; - GtkWidget *image2596; - GtkAccelGroup *accel_group; - GtkTooltips *tooltips; - - tooltips = gtk_tooltips_new (); - - accel_group = gtk_accel_group_new (); - - edit_menu1 = gtk_menu_new (); - - undo1 = gtk_image_menu_item_new_from_stock ("gtk-undo", accel_group); - gtk_widget_show (undo1); - gtk_container_add (GTK_CONTAINER (edit_menu1), undo1); - - redo1 = gtk_image_menu_item_new_from_stock ("gtk-redo", accel_group); - gtk_widget_show (redo1); - gtk_container_add (GTK_CONTAINER (edit_menu1), redo1); - - separator2 = gtk_separator_menu_item_new (); - gtk_widget_show (separator2); - gtk_container_add (GTK_CONTAINER (edit_menu1), separator2); - gtk_widget_set_sensitive (separator2, FALSE); - - cut1 = gtk_image_menu_item_new_from_stock ("gtk-cut", accel_group); - gtk_widget_show (cut1); - gtk_container_add (GTK_CONTAINER (edit_menu1), cut1); - - copy1 = gtk_image_menu_item_new_from_stock ("gtk-copy", accel_group); - gtk_widget_show (copy1); - gtk_container_add (GTK_CONTAINER (edit_menu1), copy1); - - paste1 = gtk_image_menu_item_new_from_stock ("gtk-paste", accel_group); - gtk_widget_show (paste1); - gtk_container_add (GTK_CONTAINER (edit_menu1), paste1); - - delete1 = gtk_image_menu_item_new_from_stock ("gtk-delete", accel_group); - gtk_widget_show (delete1); - gtk_container_add (GTK_CONTAINER (edit_menu1), delete1); - - separator3 = gtk_separator_menu_item_new (); - gtk_widget_show (separator3); - gtk_container_add (GTK_CONTAINER (edit_menu1), separator3); - gtk_widget_set_sensitive (separator3, FALSE); - - menu_select_all2 = gtk_menu_item_new_with_mnemonic (_("Select _All")); - gtk_widget_show (menu_select_all2); - gtk_container_add (GTK_CONTAINER (edit_menu1), menu_select_all2); - - separator26 = gtk_separator_menu_item_new (); - gtk_widget_show (separator26); - gtk_container_add (GTK_CONTAINER (edit_menu1), separator26); - gtk_widget_set_sensitive (separator26, FALSE); - - menu_open_selected_file2 = gtk_menu_item_new_with_mnemonic (_("Open Selected F_ile")); - gtk_widget_show (menu_open_selected_file2); - gtk_container_add (GTK_CONTAINER (edit_menu1), menu_open_selected_file2); - - separator36 = gtk_separator_menu_item_new (); - gtk_widget_show (separator36); - gtk_container_add (GTK_CONTAINER (edit_menu1), separator36); - gtk_widget_set_sensitive (separator36, FALSE); - - menu_format2 = gtk_menu_item_new_with_mnemonic (_("_Format")); - gtk_widget_show (menu_format2); - gtk_container_add (GTK_CONTAINER (edit_menu1), menu_format2); - - menu_format2_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_format2), menu_format2_menu); - - toggle_case1 = gtk_menu_item_new_with_mnemonic (_("T_oggle Case of Selection")); - gtk_widget_show (toggle_case1); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), toggle_case1); - - separator30 = gtk_separator_menu_item_new (); - gtk_widget_show (separator30); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), separator30); - gtk_widget_set_sensitive (separator30, FALSE); - - menu_comment_line2 = gtk_menu_item_new_with_mnemonic (_("_Comment Line(s)")); - gtk_widget_show (menu_comment_line2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_comment_line2); - - menu_uncomment_line2 = gtk_menu_item_new_with_mnemonic (_("U_ncomment Line(s)")); - gtk_widget_show (menu_uncomment_line2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_uncomment_line2); - - menu_toggle_line_commentation2 = gtk_menu_item_new_with_mnemonic (_("_Toggle Line Commentation")); - gtk_widget_show (menu_toggle_line_commentation2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_toggle_line_commentation2); - - menu_duplicate_line2 = gtk_menu_item_new_with_mnemonic (_("Du_plicate Line or Selection")); - gtk_widget_show (menu_duplicate_line2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_duplicate_line2); - - separator31 = gtk_separator_menu_item_new (); - gtk_widget_show (separator31); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), separator31); - gtk_widget_set_sensitive (separator31, FALSE); - - menu_increase_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Increase Indent")); - gtk_widget_show (menu_increase_indent2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2); - - image2589 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2589); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image2589); - - menu_decrease_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); - gtk_widget_show (menu_decrease_indent2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_decrease_indent2); - - image2590 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2590); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image2590); - - separator38 = gtk_separator_menu_item_new (); - gtk_widget_show (separator38); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), separator38); - gtk_widget_set_sensitive (separator38, FALSE); - - send_selection_to1 = gtk_menu_item_new_with_mnemonic (_("_Send Selection to")); - gtk_widget_show (send_selection_to1); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), send_selection_to1); - - send_selection_to1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (send_selection_to1), send_selection_to1_menu); - - invisible12 = gtk_menu_item_new_with_mnemonic (_("invisible")); - gtk_container_add (GTK_CONTAINER (send_selection_to1_menu), invisible12); - - separator17 = gtk_separator_menu_item_new (); - gtk_widget_show (separator17); - gtk_container_add (GTK_CONTAINER (edit_menu1), separator17); - gtk_widget_set_sensitive (separator17, FALSE); - - comments = gtk_image_menu_item_new_with_mnemonic (_("I_nsert Comments")); - gtk_widget_show (comments); - gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - - image2591 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2591); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image2591); - - comments_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); - - add_changelog_entry2 = gtk_menu_item_new_with_mnemonic (_("Insert _ChangeLog Entry")); - gtk_widget_show (add_changelog_entry2); - gtk_container_add (GTK_CONTAINER (comments_menu), add_changelog_entry2); - gtk_tooltips_set_tip (tooltips, add_changelog_entry2, _("Inserts a typical ChangeLog entry in the current file"), NULL); - - insert_file_header2 = gtk_menu_item_new_with_mnemonic (_("Insert File _Header")); - gtk_widget_show (insert_file_header2); - gtk_container_add (GTK_CONTAINER (comments_menu), insert_file_header2); - gtk_tooltips_set_tip (tooltips, insert_file_header2, _("Inserts a file header at the beginning of the file"), NULL); - - insert_function_description1 = gtk_menu_item_new_with_mnemonic (_("Insert _Function Description")); - gtk_widget_show (insert_function_description1); - gtk_container_add (GTK_CONTAINER (comments_menu), insert_function_description1); - gtk_tooltips_set_tip (tooltips, insert_function_description1, _("Inserts a description before the current function"), NULL); - - insert_multiline_comment1 = gtk_menu_item_new_with_mnemonic (_("Insert _Multiline Comment")); - gtk_widget_show (insert_multiline_comment1); - gtk_container_add (GTK_CONTAINER (comments_menu), insert_multiline_comment1); - gtk_tooltips_set_tip (tooltips, insert_multiline_comment1, _("Inserts a multiline comment"), NULL); - - insert_gpl_notice1 = gtk_menu_item_new_with_mnemonic (_("Insert _GPL Notice")); - gtk_widget_show (insert_gpl_notice1); - gtk_container_add (GTK_CONTAINER (comments_menu), insert_gpl_notice1); - gtk_tooltips_set_tip (tooltips, insert_gpl_notice1, _("Inserts a GPL notice (should be done at the beginning of the file)"), NULL); - - insert_bsd_license_notice1 = gtk_menu_item_new_with_mnemonic (_("Insert _BSD License Notice")); - gtk_widget_show (insert_bsd_license_notice1); - gtk_container_add (GTK_CONTAINER (comments_menu), insert_bsd_license_notice1); - gtk_tooltips_set_tip (tooltips, insert_bsd_license_notice1, _("Inserts a BSD license notice (should be done at the beginning of the file)"), NULL); - - insert_date2 = gtk_image_menu_item_new_with_mnemonic (_("Insert Dat_e")); - gtk_widget_show (insert_date2); - gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2); - - image2592 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2592); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image2592); - - insert_date2_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu); - - invisible10 = gtk_menu_item_new_with_mnemonic (_("invisible")); - gtk_container_add (GTK_CONTAINER (insert_date2_menu), invisible10); - - insert_include1 = gtk_image_menu_item_new_with_mnemonic (_("_Insert \"include <...>\"")); - gtk_widget_show (insert_include1); - gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - - image2593 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2593); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image2593); - - insert_include1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); - - invisible3 = gtk_menu_item_new_with_mnemonic (_("invisible")); - gtk_container_add (GTK_CONTAINER (insert_include1_menu), invisible3); - - separator7 = gtk_separator_menu_item_new (); - gtk_widget_show (separator7); - gtk_container_add (GTK_CONTAINER (edit_menu1), separator7); - gtk_widget_set_sensitive (separator7, FALSE); - - current_word1 = gtk_menu_item_new_with_mnemonic (_("Current _Word")); - gtk_widget_show (current_word1); - gtk_container_add (GTK_CONTAINER (edit_menu1), current_word1); - - current_word1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (current_word1), current_word1_menu); - - find_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Usage")); - gtk_widget_show (find_usage1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), find_usage1); - - image2594 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2594); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image2594); - - find_document_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Document Usage")); - gtk_widget_show (find_document_usage1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), find_document_usage1); - - image2595 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2595); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image2595); - - separator47 = gtk_separator_menu_item_new (); - gtk_widget_show (separator47); - gtk_container_add (GTK_CONTAINER (current_word1_menu), separator47); - gtk_widget_set_sensitive (separator47, 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 (current_word1_menu), goto_tag_definition1); - - goto_tag_declaration1 = gtk_menu_item_new_with_mnemonic (_("Go to T_ag Declaration")); - gtk_widget_show (goto_tag_declaration1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), goto_tag_declaration1); - - separator48 = gtk_separator_menu_item_new (); - gtk_widget_show (separator48); - gtk_container_add (GTK_CONTAINER (current_word1_menu), separator48); - gtk_widget_set_sensitive (separator48, FALSE); - - context_action1 = gtk_menu_item_new_with_mnemonic (_("Conte_xt Action")); - gtk_widget_show (context_action1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), context_action1); - - separator15 = gtk_separator_menu_item_new (); - gtk_widget_show (separator15); - gtk_container_add (GTK_CONTAINER (edit_menu1), separator15); - gtk_widget_set_sensitive (separator15, FALSE); - - go_to_line = gtk_image_menu_item_new_with_mnemonic (_("_Go to Line")); - gtk_widget_show (go_to_line); - gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); - gtk_tooltips_set_tip (tooltips, go_to_line, _("Go to the entered line"), NULL); - - image2596 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2596); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image2596); - - g_signal_connect ((gpointer) undo1, "activate", - G_CALLBACK (on_undo1_activate), - NULL); - g_signal_connect ((gpointer) redo1, "activate", - G_CALLBACK (on_redo1_activate), - NULL); - g_signal_connect ((gpointer) cut1, "activate", - G_CALLBACK (on_cut1_activate), - NULL); - g_signal_connect ((gpointer) copy1, "activate", - G_CALLBACK (on_copy1_activate), - NULL); - g_signal_connect ((gpointer) paste1, "activate", - G_CALLBACK (on_paste1_activate), - NULL); - g_signal_connect ((gpointer) delete1, "activate", - G_CALLBACK (on_delete1_activate), - NULL); - g_signal_connect ((gpointer) menu_select_all2, "activate", - G_CALLBACK (on_menu_select_all1_activate), - NULL); - g_signal_connect ((gpointer) menu_open_selected_file2, "activate", - G_CALLBACK (on_menu_open_selected_file1_activate), - NULL); - g_signal_connect ((gpointer) toggle_case1, "activate", - G_CALLBACK (on_toggle_case1_activate), - NULL); - g_signal_connect ((gpointer) menu_comment_line2, "activate", - G_CALLBACK (on_menu_comment_line1_activate), - NULL); - g_signal_connect ((gpointer) menu_uncomment_line2, "activate", - G_CALLBACK (on_menu_uncomment_line1_activate), - NULL); - g_signal_connect ((gpointer) menu_toggle_line_commentation2, "activate", - G_CALLBACK (on_menu_toggle_line_commentation1_activate), - NULL); - g_signal_connect ((gpointer) menu_duplicate_line2, "activate", - G_CALLBACK (on_menu_duplicate_line1_activate), - NULL); - g_signal_connect ((gpointer) menu_increase_indent2, "activate", - G_CALLBACK (on_menu_increase_indent1_activate), - NULL); - g_signal_connect ((gpointer) menu_decrease_indent2, "activate", - G_CALLBACK (on_menu_decrease_indent1_activate), - NULL); - g_signal_connect ((gpointer) add_changelog_entry2, "activate", - G_CALLBACK (on_comments_changelog_activate), - NULL); - g_signal_connect ((gpointer) insert_file_header2, "activate", - G_CALLBACK (on_comments_fileheader_activate), - NULL); - g_signal_connect ((gpointer) insert_function_description1, "activate", - G_CALLBACK (on_comments_function_activate), - NULL); - g_signal_connect ((gpointer) insert_multiline_comment1, "activate", - G_CALLBACK (on_comments_multiline_activate), - NULL); - g_signal_connect ((gpointer) insert_gpl_notice1, "activate", - G_CALLBACK (on_comments_gpl_activate), - NULL); - g_signal_connect ((gpointer) insert_bsd_license_notice1, "activate", - G_CALLBACK (on_comments_bsd_activate), - NULL); - g_signal_connect ((gpointer) find_usage1, "activate", - G_CALLBACK (on_find_usage1_activate), - NULL); - g_signal_connect ((gpointer) find_document_usage1, "activate", - G_CALLBACK (on_find_document_usage1_activate), - NULL); - g_signal_connect ((gpointer) goto_tag_definition1, "activate", - G_CALLBACK (on_goto_tag_activate), - NULL); - g_signal_connect ((gpointer) goto_tag_declaration1, "activate", - G_CALLBACK (on_goto_tag_activate), - NULL); - g_signal_connect ((gpointer) context_action1, "activate", - G_CALLBACK (on_context_action1_activate), - NULL); - g_signal_connect ((gpointer) go_to_line, "activate", - G_CALLBACK (on_go_to_line_activate), - NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, edit_menu1, "edit_menu1"); - GLADE_HOOKUP_OBJECT (edit_menu1, undo1, "undo1"); - GLADE_HOOKUP_OBJECT (edit_menu1, redo1, "redo1"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator2, "separator2"); - GLADE_HOOKUP_OBJECT (edit_menu1, cut1, "cut1"); - GLADE_HOOKUP_OBJECT (edit_menu1, copy1, "copy1"); - GLADE_HOOKUP_OBJECT (edit_menu1, paste1, "paste1"); - GLADE_HOOKUP_OBJECT (edit_menu1, delete1, "delete1"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator3, "separator3"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_select_all2, "menu_select_all2"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator26, "separator26"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_open_selected_file2, "menu_open_selected_file2"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator36, "separator36"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2, "menu_format2"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2_menu, "menu_format2_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, toggle_case1, "toggle_case1"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator30, "separator30"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_comment_line2, "menu_comment_line2"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_uncomment_line2, "menu_uncomment_line2"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_toggle_line_commentation2, "menu_toggle_line_commentation2"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2589, "image2589"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2590, "image2590"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator38, "separator38"); - GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1, "send_selection_to1"); - GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1_menu, "send_selection_to1_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, invisible12, "invisible12"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); - GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2591, "image2591"); - GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_function_description1, "insert_function_description1"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_multiline_comment1, "insert_multiline_comment1"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_bsd_license_notice1, "insert_bsd_license_notice1"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2592, "image2592"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2593, "image2593"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); - GLADE_HOOKUP_OBJECT (edit_menu1, current_word1, "current_word1"); - GLADE_HOOKUP_OBJECT (edit_menu1, current_word1_menu, "current_word1_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2594, "image2594"); - GLADE_HOOKUP_OBJECT (edit_menu1, find_document_usage1, "find_document_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2595, "image2595"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator47, "separator47"); - GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); - GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator48, "separator48"); - GLADE_HOOKUP_OBJECT (edit_menu1, context_action1, "context_action1"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); - GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2596, "image2596"); - GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips"); - - gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); - - return edit_menu1; -} - -GtkWidget* create_prefs_dialog (void) { GtkWidget *prefs_dialog; Modified: branches/dynamic-editor-menu/src/interface.h =================================================================== --- branches/dynamic-editor-menu/src/interface.h 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/interface.h 2008-07-22 16:54:02 UTC (rev 2802) @@ -4,5 +4,4 @@ GtkWidget* create_window1 (void); GtkWidget* create_toolbar_popup_menu1 (void); -GtkWidget* create_edit_menu1 (void); GtkWidget* create_prefs_dialog (void); Modified: branches/dynamic-editor-menu/src/keybindings.c =================================================================== --- branches/dynamic-editor-menu/src/keybindings.c 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/keybindings.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -90,7 +90,6 @@ static void cb_func_move_tab(guint key_id); static void cb_func_toggle_sidebar(guint key_id); -static void add_popup_menu_accels(void); static void apply_kb_accel(KeyBindingGroup *group, KeyBinding *kb, gpointer user_data); @@ -161,8 +160,7 @@ GEANY_KEYS_ ## group_id ## _COUNT, group_id ## _keys) /* Init all fields of keys with default values. - * The menu_item field is always the main menu item, popup menu accelerators are - * set in add_popup_menu_accels(). */ + * The menu_item field is always the main menu item. */ static void init_default_kb(void) { static KeyBindingGroup groups[GEANY_KEY_GROUP_COUNT]; @@ -557,7 +555,6 @@ void keybindings_load_keyfile(void) { load_user_kb(); - add_popup_menu_accels(); /* set menu accels now, after user keybindings have been read and processed * if we would set it before, user keybindings could not override menu item's default @@ -566,64 +563,6 @@ } -static void add_menu_accel(KeyBindingGroup *group, guint kb_id, - GtkAccelGroup *accel_group, GtkWidget *menuitem) -{ - KeyBinding *kb = &group->keys[kb_id]; - - if (kb->key != 0) - gtk_widget_add_accelerator(menuitem, "activate", accel_group, - kb->key, kb->mods, GTK_ACCEL_VISIBLE); -} - - -#define GEANY_ADD_POPUP_ACCEL(kb_id, wid) \ - add_menu_accel(group, kb_id, accel_group, lookup_widget(main_widgets.editor_menu, G_STRINGIFY(wid))) - -/* set the menu item accelerator shortcuts (just for visibility, they are handled anyway) */ -static void add_popup_menu_accels(void) -{ - GtkAccelGroup *accel_group = gtk_accel_group_new(); - KeyBindingGroup *group; - - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_EDITOR); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_UNDO, undo1); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_REDO, redo1); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_DUPLICATELINE, menu_duplicate_line2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_CONTEXTACTION, context_action1); - - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_SELECT); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SELECT_ALL, menu_select_all2); - - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_INSERT); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_INSERT_DATE, insert_date_custom2); - - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FILE); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FILE_OPENSELECTED, menu_open_selected_file2); - - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_SEARCH); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDUSAGE, find_usage1); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, find_document_usage1); - - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_GOTO); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_LINE, go_to_line); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDEFINITION, goto_tag_definition1); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDECLARATION, goto_tag_declaration1); - - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FORMAT); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_TOGGLECASE, toggle_case1); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_COMMENTLINE, menu_comment_line2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_UNCOMMENTLINE, menu_uncomment_line2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, menu_toggle_line_commentation2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_INCREASEINDENT, menu_increase_indent2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_DECREASEINDENT, menu_decrease_indent2); - - /* the build menu items are set if the build menus are created */ - - gtk_window_add_accel_group(GTK_WINDOW(main_widgets.window), accel_group); -} - - static void set_keyfile_kb(KeyBindingGroup *group, KeyBinding *kb, gpointer user_data) { GKeyFile *config = user_data; Modified: branches/dynamic-editor-menu/src/main.c =================================================================== --- branches/dynamic-editor-menu/src/main.c 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/main.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -47,6 +47,7 @@ #include "callbacks.h" #include "ui_utils.h" +#include "ui_manager.h" #include "utils.h" #include "document.h" #include "filetypes.h" @@ -305,7 +306,7 @@ main_widgets.toolbar = lookup_widget(main_widgets.window, "toolbar1"); main_widgets.sidebar_notebook = lookup_widget(main_widgets.window, "notebook3"); main_widgets.notebook = lookup_widget(main_widgets.window, "notebook1"); - main_widgets.editor_menu = create_edit_menu1(); + main_widgets.editor_menu = ui_manager_get_edit_menu(); main_widgets.tools_menu = lookup_widget(main_widgets.window, "tools1_menu"); ui_widgets.toolbar_menu = create_toolbar_popup_menu1(); @@ -790,6 +791,7 @@ glib_major_version, glib_minor_version, glib_micro_version); /* inits */ + ui_manager_init(); main_init(); gtk_widget_set_size_request(main_widgets.window, GEANY_WINDOW_MINIMAL_WIDTH, GEANY_WINDOW_MINIMAL_HEIGHT); gtk_window_set_default_size(GTK_WINDOW(main_widgets.window), GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT); @@ -987,6 +989,7 @@ g_free(vte_info.dir); #endif gtk_widget_destroy(main_widgets.window); + ui_manager_finalize(); /* destroy popup menus */ if (main_widgets.editor_menu && GTK_IS_WIDGET(main_widgets.editor_menu)) Modified: branches/dynamic-editor-menu/src/tools.c =================================================================== --- branches/dynamic-editor-menu/src/tools.c 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/tools.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -46,6 +46,7 @@ #include "sciwrappers.h" #include "utils.h" #include "ui_utils.h" +#include "ui_manager.h" #include "msgwindow.h" #include "keybindings.h" #include "templates.h" @@ -482,7 +483,8 @@ void tools_create_insert_custom_command_menu_items(void) { GtkMenu *menu_edit = GTK_MENU(lookup_widget(main_widgets.window, "send_selection_to2_menu")); - GtkMenu *menu_popup = GTK_MENU(lookup_widget(main_widgets.editor_menu, "send_selection_to1_menu")); + GtkMenu *menu_popup = GTK_MENU(gtk_menu_item_get_submenu( + GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager.uim, "/EditorMenu/Format/SendSelectionTo")))); GtkWidget *item; GList *me_children; GList *mp_children; @@ -538,12 +540,14 @@ if (! signal_set) { - g_signal_connect(lookup_widget(main_widgets.editor_menu, "send_selection_to1"), + g_signal_connect(gtk_ui_manager_get_widget(ui_manager.uim, "/EditorMenu/Format/SendSelectionTo"), "activate", G_CALLBACK(cc_on_custom_command_menu_activate), menu_popup); g_signal_connect(lookup_widget(main_widgets.window, "send_selection_to2"), "activate", G_CALLBACK(cc_on_custom_command_menu_activate), menu_edit); signal_set = TRUE; } + + gtk_widget_hide(gtk_ui_manager_get_widget(ui_manager.uim, "/EditorMenu/Format/SendSelectionTo/DummySST")); } Added: branches/dynamic-editor-menu/src/ui_manager.c =================================================================== --- branches/dynamic-editor-menu/src/ui_manager.c (rev 0) +++ branches/dynamic-editor-menu/src/ui_manager.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -0,0 +1,141 @@ +/* + * ui_manager.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)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$ + */ + +/* + * UI Manager code for creating the editor menu (popup menu). + */ + +#include "geany.h" + +#include "ui_manager.h" +#include "ui_utils.h" +#include "support.h" +#include "callbacks.h" +#include "utils.h" + + + +UIManager ui_manager; + + +/* Global list of available actions, might be shared with toolbar actions. + * Fields: name, stock_id, label, acceletator, tooltip, callback */ +const GtkActionEntry ui_entries[] = { + { "DummySST", NULL, "Dummy", NULL, NULL, NULL }, + { "DummyDate", NULL, "Dummy", NULL, NULL, NULL }, + { "DummyInclude", NULL, "Dummy", NULL, NULL, NULL }, + + { "Undo", GTK_STOCK_UNDO, NULL, NULL, NULL, G_CALLBACK(on_undo1_activate) }, + { "Redo", GTK_STOCK_REDO, NULL, NULL, NULL, G_CALLBACK(on_redo1_activate) }, + { "Cut", GTK_STOCK_CUT, NULL, NULL, NULL, G_CALLBACK(on_cut1_activate) }, + { "Copy", GTK_STOCK_COPY, NULL, NULL, NULL, G_CALLBACK(on_copy1_activate) }, + { "Paste", GTK_STOCK_PASTE, NULL, NULL, NULL, G_CALLBACK(on_paste1_activate) }, + { "Delete", GTK_STOCK_DELETE, NULL, NULL, NULL, G_CALLBACK(on_delete1_activate) }, + { "SelectAll", NULL, N_("Select _All"), NULL, NULL, G_CALLBACK(on_menu_select_all1_activate) }, + { "OpenSelectedFile", NULL, N_("Open Selected F_ile"), NULL, NULL, G_CALLBACK(on_menu_open_selected_file1_activate) }, + /* Format submenu */ + { "Format", NULL, N_("_Format"), NULL, NULL, NULL }, + { "ToggleCase", NULL, N_("T_oggle Case of Selection"), NULL, NULL, G_CALLBACK(on_toggle_case1_activate) }, + { "CommentLines", NULL, N_("_Comment Line(s)"), NULL, NULL, G_CALLBACK(on_menu_comment_line1_activate) }, + { "UnCommentLines", NULL, N_("U_ncomment Line(s)"), NULL, NULL, G_CALLBACK(on_menu_uncomment_line1_activate) }, + { "ToggleLineCommentation", NULL, N_("_Toggle Line Commentation"), NULL, NULL, G_CALLBACK(on_menu_toggle_line_commentation1_activate) }, + { "DuplicateLine", NULL, N_("Du_plicate Line or Selection"), NULL, NULL, G_CALLBACK(on_menu_duplicate_line1_activate) }, + { "IncreaseIndent", GTK_STOCK_INDENT, N_("_Increase Indent"), NULL, NULL, G_CALLBACK(on_menu_increase_indent1_activate) }, + { "DecreaseIndent", GTK_STOCK_UNINDENT, N_("_Decrease Indent"), NULL, NULL, G_CALLBACK(on_menu_decrease_indent1_activate) }, + /* Format submenu */ + { "SendSelectionTo", NULL, N_("_Send Selection to"), NULL, NULL, NULL }, + /* SendSelectionTo submenu */ + { "InsertComments", GTK_STOCK_ADD, N_("I_nsert Comments"), NULL, NULL, NULL }, + { "InsertChangeLog", NULL, N_("Insert _ChangeLog Entry"), NULL, N_("Inserts a typical ChangeLog entry in the current file"), G_CALLBACK(on_comments_changelog_activate) }, + { "InsertFileHeader", NULL, N_("Insert File _Header"), NULL, N_("Inserts a file header at the beginning of the file"), G_CALLBACK(on_comments_fileheader_activate) }, + { "InsertFunctionDescription", NULL, N_("Insert _Function Description"), NULL, N_("Inserts a description before the current function"), G_CALLBACK(on_comments_function_activate) }, + { "InsertMultilineComment", NULL, N_("Insert _Multiline Comment"), NULL, N_("Inserts a multiline comment"), G_CALLBACK(on_comments_multiline_activate) }, + { "InsertGPLNotice", NULL, N_("Insert _GPL Notice"), NULL, N_("Inserts a GPL notice (should be done at the beginning of the file)"), G_CALLBACK(on_comments_gpl_activate) }, + { "InsertBSDNotice", NULL, N_("Insert _BSD License Notice"), NULL, N_("Inserts a BSD license notice (should be done at the beginning of the file)"), G_CALLBACK(on_comments_bsd_activate) }, + /* InsertDate submenu */ + { "InsertDate", GTK_STOCK_ADD, N_("Insert Dat_e"), NULL, NULL, NULL }, + /* InsertIncludes submenu */ + { "InsertIncludes", GTK_STOCK_ADD, N_("_Insert \"include <...>\""), NULL, NULL, NULL }, + /* CurrentWord submenu */ + { "CurrentWord", NULL, N_("Current _Word"), NULL, NULL, NULL }, + { "FindUsage", NULL, N_("Find _Usage"), NULL, NULL, G_CALLBACK(on_find_usage1_activate) }, + { "FindDocumentUsage", GTK_STOCK_FIND, N_("Find _Document Usage"), NULL, NULL, G_CALLBACK(on_find_document_usage1_activate) }, + { "GotoTagDefinition", GTK_STOCK_FIND, N_("Go to _Tag Definition"), NULL, NULL, G_CALLBACK(on_goto_tag_definition_activate) }, + { "GotoTagDeclaration", GTK_STOCK_FIND, N_("Go to _Tag Declaration"), NULL, NULL, G_CALLBACK(on_goto_tag_declaration_activate) }, + { "ContextAction", NULL, N_("Conte_xt Action"), NULL, NULL, G_CALLBACK(on_context_action1_activate) }, + { "GotoLine", GTK_STOCK_JUMP_TO, N_("_Go to Line"), NULL, NULL, G_CALLBACK(on_go_to_line_activate) } +}; +const guint ui_entries_n = G_N_ELEMENTS(ui_entries); + + + +GtkWidget *ui_manager_get_edit_menu(void) +{ + return gtk_ui_manager_get_widget(ui_manager.uim, "/EditorMenu"); +} + + +GtkAction *ui_manager_get_action(const gchar *name) +{ + return gtk_action_group_get_action(ui_manager.group, name); +} + + +void ui_manager_init(void) +{ + GtkUIManager *uim; + GtkAction *action; + gchar *filename; + + ui_manager.uim = uim = gtk_ui_manager_new(); + ui_manager.group = gtk_action_group_new("GeanyUI"); + + gtk_action_group_set_translation_domain(ui_manager.group, GETTEXT_PACKAGE); + gtk_action_group_add_actions(ui_manager.group, ui_entries, ui_entries_n, NULL); + + gtk_ui_manager_insert_action_group(uim, ui_manager.group, 0); + + /* load UI XML file(s) from disk */ + filename = g_build_filename(app->configdir, "ui_editor_menu.xml", NULL); + if (! gtk_ui_manager_add_ui_from_file(uim, filename, NULL)) + { + GError *error= NULL; + + setptr(filename, g_build_filename(app->datadir, "ui_editor_menu.xml", NULL)); + if (! gtk_ui_manager_add_ui_from_file(uim, filename, &error)) + { + geany_debug("UI creation failed: %s", error->message); + g_error_free(error); + /** TODO at this point Geany crashes because of troubles in + * tools_create_insert_custom_command_menu_items() */ + } + } + g_free(filename); +} + + +void ui_manager_finalize(void) +{ + g_object_unref(ui_manager.uim); + g_object_unref(ui_manager.group); +} Property changes on: branches/dynamic-editor-menu/src/ui_manager.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/dynamic-editor-menu/src/ui_manager.h =================================================================== --- branches/dynamic-editor-menu/src/ui_manager.h (rev 0) +++ branches/dynamic-editor-menu/src/ui_manager.h 2008-07-22 16:54:02 UTC (rev 2802) @@ -0,0 +1,46 @@ +/* + * ui_manager.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)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$ + */ + +#ifndef GEANY_UI_MANAGER_H +#define GEANY_UI_MANAGER_H 1 + +typedef struct UIManager +{ + GtkUIManager *uim; + GtkActionGroup *group; +} +UIManager; + +extern UIManager ui_manager; + + + +void ui_manager_init(void); + +void ui_manager_finalize(void); + +GtkWidget *ui_manager_get_edit_menu(void); + +GtkAction *ui_manager_get_action(const gchar *name); + +#endif Property changes on: branches/dynamic-editor-menu/src/ui_manager.h ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/dynamic-editor-menu/src/ui_utils.c =================================================================== --- branches/dynamic-editor-menu/src/ui_utils.c 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/ui_utils.c 2008-07-22 16:54:02 UTC (rev 2802) @@ -30,6 +30,7 @@ #include <string.h> #include "ui_utils.h" +#include "ui_manager.h" #include "prefs.h" #include "sciwrappers.h" #include "document.h" @@ -60,12 +61,13 @@ { /* pointers to widgets only sensitive when there is at least one document */ GPtrArray *document_buttons; - GtkWidget *menu_insert_include_items[2]; - GtkWidget *current_word_item; - GtkWidget *popup_copy_items[3]; + gpointer menu_insert_include_items[2]; /* contains GtkWidgets and GtkActions */ + GtkAction *current_word_items[5]; + GtkAction *popup_copy_items[3]; GtkWidget *menu_copy_items[3]; - GtkWidget *redo_items[3]; - GtkWidget *undo_items[3]; + GtkWidget *redo_items[2]; + GtkWidget *undo_items[2]; + GtkAction *popup_undo_items[2]; GtkWidget *save_buttons[4]; } widgets; @@ -73,9 +75,7 @@ static void update_recent_menu(void); static void recent_file_loaded(const gchar *utf8_filename); -static void -recent_file_activate_cb (GtkMenuItem *menuitem, - gpointer user_data); +static void recent_file_activate_cb(GtkMenuItem *menuitem, gpointer user_data); /* allow_override is TRUE if text can be ignored when another message has been set @@ -309,14 +309,15 @@ enable_redo = document_can_redo(doc); } - /* index 0 is the popup menu, 1 is the menubar, 2 is the toolbar */ + /* index 0 is the menubar, 1 is the toolbar */ gtk_widget_set_sensitive(widgets.undo_items[0], enable_undo); gtk_widget_set_sensitive(widgets.undo_items[1], enable_undo); - gtk_widget_set_sensitive(widgets.undo_items[2], enable_undo); gtk_widget_set_sensitive(widgets.redo_items[0], enable_redo); gtk_widget_set_sensitive(widgets.redo_items[1], enable_redo); - gtk_widget_set_sensitive(widgets.redo_items[2], enable_redo); + + gtk_action_set_sensitive(widgets.popup_undo_items[0], enable_undo); + gtk_action_set_sensitive(widgets.popup_undo_items[1], enable_redo); } @@ -331,13 +332,16 @@ enable = sci_can_copy(doc->editor->sci); for (i = 0; i < G_N_ELEMENTS(widgets.popup_copy_items); i++) - gtk_widget_set_sensitive(widgets.popup_copy_items[i], enable); + gtk_action_set_sensitive(widgets.popup_copy_items[i], enable); } void ui_update_popup_goto_items(gboolean enable) { - gtk_widget_set_sensitive(widgets.current_word_item, enable); + guint i; + + for (i = 0; i < G_N_ELEMENTS(widgets.current_word_items); i++) + gtk_action_set_sensitive(widgets.current_word_items[i], enable); } @@ -376,7 +380,10 @@ { enable = TRUE; } - gtk_widget_set_sensitive(widgets.menu_insert_include_items[item], enable); + if (item == UI_INSERT_INCLUDE_ITEM_POPUP) + gtk_action_set_sensitive(GTK_ACTION(widgets.menu_insert_include_items[item]), enable); + else + gtk_widget_set_sensitive(GTK_WIDGET(widgets.menu_insert_include_items[item]), enable); } @@ -425,7 +432,8 @@ void ui_create_insert_menu_items(void) { GtkMenu *menu_edit = GTK_MENU(lookup_widget(main_widgets.window, "insert_include2_menu")); - GtkMenu *menu_popup = GTK_MENU(lookup_widget(main_widgets.editor_menu, "insert_include1_menu")); + GtkMenu *menu_popup = GTK_MENU(gtk_menu_item_get_submenu( + GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager.uim, "/EditorMenu/InsertIncludes")))); GtkWidget *blank; const gchar *c_includes_stdlib[] = { "assert.h", "ctype.h", "errno.h", "float.h", "limits.h", "locale.h", "math.h", "setjmp.h", @@ -470,6 +478,8 @@ insert_include_items(menu_edit, menu_popup, (gchar**) c_includes_cpp, _("C++ (C Standard Library)")); insert_include_items(menu_edit, menu_popup, (gchar**) c_includes_cppstdlib, _("C++ Standard Library")); insert_include_items(menu_edit, menu_popup, (gchar**) c_includes_stl, _("C++ STL")); + + gtk_widget_hide(gtk_ui_manager_get_widget(ui_manager.uim, "/EditorMenu/InsertIncludes/DummyInclude")); } @@ -492,7 +502,8 @@ void ui_create_insert_date_menu_items(void) { GtkMenu *menu_edit = GTK_MENU(lookup_widget(main_widgets.window, "insert_date1_menu")); - GtkMenu *menu_popup = GTK_MENU(lookup_widget(main_widgets.editor_menu, "insert_date2_menu")); + GtkMenu *menu_popup = GTK_MENU(gtk_menu_item_get_submenu( + GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager.uim, "/EditorMenu/InsertDate")))); GtkWidget *item; gchar *str; @@ -534,6 +545,8 @@ "insert_date_custom2", gtk_widget_ref(item), (GDestroyNotify)gtk_widget_unref); insert_date_items(menu_edit, menu_popup, _("_Set Custom Date Format")); + + gtk_widget_hide(gtk_ui_manager_get_widget(ui_manager.uim, "/EditorMenu/InsertDate/DummyDate")); } @@ -1460,25 +1473,29 @@ ui_widgets.statusbar = lookup_widget(main_widgets.window, "statusbar"); ui_widgets.print_page_setup = lookup_widget(main_widgets.window, "page_setup1"); - widgets.current_word_item = lookup_widget(main_widgets.editor_menu, "current_word1"); - widgets.popup_copy_items[0] = lookup_widget(main_widgets.editor_menu, "cut1"); - widgets.popup_copy_items[1] = lookup_widget(main_widgets.editor_menu, "copy1"); - widgets.popup_copy_items[2] = lookup_widget(main_widgets.editor_menu, "delete1"); + widgets.current_word_items[0] = ui_manager_get_action("FindUsage"); + widgets.current_word_items[1] = ui_manager_get_action("FindDocumentUsage"); + widgets.current_word_items[2] = ui_manager_get_action("GotoTagDefinition"); + widgets.current_word_items[3] = ui_manager_get_action("GotoTagDeclaration"); + widgets.current_word_items[4] = ui_manager_get_action("ContextAction"); + widgets.popup_copy_items[0] = ui_manager_get_action("Copy"); + widgets.popup_copy_items[1] = ui_manager_get_action("Cut"); + widgets.popup_copy_items[2] = ui_manager_get_action("Delete"); widgets.menu_copy_items[0] = lookup_widget(main_widgets.window, "menu_cut1"); widgets.menu_copy_items[1] = lookup_widget(main_widgets.window, "menu_copy1"); widgets.menu_copy_items[2] = lookup_widget(main_widgets.window, "menu_delete1"); - widgets.menu_insert_include_items[0] = lookup_widget(main_widgets.editor_menu, "insert_include1"); + widgets.menu_insert_include_items[0] = ui_manager_get_action("InsertIncludes"); widgets.menu_insert_include_items[1] = lookup_widget(main_widgets.window, "insert_include2"); widgets.save_buttons[0] = lookup_widget(main_widgets.window, "menu_save1"); widgets.save_buttons[1] = lookup_widget(main_widgets.window, "toolbutton10"); widgets.save_buttons[2] = lookup_widget(main_widgets.window, "menu_save_all1"); widgets.save_buttons[3] = lookup_widget(main_widgets.window, "toolbutton22"); - widgets.redo_items[0] = lookup_widget(main_widgets.editor_menu, "redo1"); - widgets.redo_items[1] = lookup_widget(main_widgets.window, "menu_redo2"); - widgets.redo_items[2] = lookup_widget(main_widgets.window, "toolbutton_redo"); - widgets.undo_items[0] = lookup_widget(main_widgets.editor_menu, "undo1"); - widgets.undo_items[1] = lookup_widget(main_widgets.window, "menu_undo2"); - widgets.undo_items[2] = lookup_widget(main_widgets.window, "toolbutton_undo"); + widgets.redo_items[0] = lookup_widget(main_widgets.window, "menu_redo2"); + widgets.redo_items[1] = lookup_widget(main_widgets.window, "toolbutton_redo"); + widgets.undo_items[0] = lookup_widget(main_widgets.window, "menu_undo2"); + widgets.undo_items[1] = lookup_widget(main_widgets.window, "toolbutton_undo"); + widgets.popup_undo_items[0] = ui_manager_get_action("Undo"); + widgets.popup_undo_items[1] = ui_manager_get_action("Redo"); init_document_widgets(); } Modified: branches/dynamic-editor-menu/src/ui_utils.h =================================================================== --- branches/dynamic-editor-menu/src/ui_utils.h 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/src/ui_utils.h 2008-07-22 16:54:02 UTC (rev 2802) @@ -124,6 +124,11 @@ extern UIWidgets ui_widgets; +enum +{ + UI_INSERT_INCLUDE_ITEM_POPUP = 0, + UI_INSERT_INCLUDE_ITEM_MENU +}; /* The following block of functions are more generic functions and closely related to * certain GTK+ widgets. */ Modified: branches/dynamic-editor-menu/wscript =================================================================== --- branches/dynamic-editor-menu/wscript 2008-07-22 16:38:45 UTC (rev 2801) +++ branches/dynamic-editor-menu/wscript 2008-07-22 16:54:02 UTC (rev 2802) @@ -89,7 +89,8 @@ 'src/keyfile.c', 'src/main.c', 'src/msgwindow.c', 'src/navqueue.c', 'src/notebook.c', 'src/plugins.c', 'src/prefix.c', 'src/prefs.c', 'src/printing.c', 'src/project.c', 'src/sciwrappers.c', 'src/search.c', 'src/socket.c', 'src/support.c', 'src/symbols.c', - 'src/templates.c', 'src/tools.c', 'src/treeviews.c', 'src/ui_utils.c', 'src/utils.c' ] + 'src/templates.c', 'src/tools.c', 'src/treeviews.c', 'src/ui_utils.c', 'src/ui_manager.c', + 'src/utils.c' ] @@ -386,6 +387,7 @@ bld.install_files('DATADIR', 'geany', 'data/filetype*') bld.install_files('DATADIR', 'geany', 'data/*.tags') bld.install_files('DATADIR', 'geany', 'data/snippets.conf') + bld.install_files('DATADIR', 'geany', 'data/ui_editor_menu.xml') bld.install_as('DATADIR', 'geany/GPL-2', 'COPYING') # Icons bld.install_files('DATADIR', 'pixmaps', 'pixmaps/geany.png') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2801] branches/dynamic-editor-menu/
by eht16＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 2801 http://geany.svn.sourceforge.net/geany/?rev=2801&view=rev Author: eht16 Date: 2008-07-22 16:38:45 +0000 (Tue, 22 Jul 2008) Log Message: ----------- Create temporary branch for a configurable editor popup menu. Added Paths: ----------- branches/dynamic-editor-menu/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2800] trunk
by eht16＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 2800 http://geany.svn.sourceforge.net/geany/?rev=2800&view=rev Author: eht16 Date: 2008-07-22 13:42:23 +0000 (Tue, 22 Jul 2008) Log Message: ----------- Fix space-only indentation when auto-generating HTML tables (patch by Colomban Wendling, thanks, closes #2023160). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-22 13:06:11 UTC (rev 2799) +++ trunk/ChangeLog 2008-07-22 13:42:23 UTC (rev 2800) @@ -2,6 +2,9 @@ * scintilla/LexHTML.cxx: Backport latest HTML/PHP lexer fixes from Scintilla CVS (#2024387). + * src/editor.c: + Fix space-only indentation when auto-generating HTML tables + (patch by Colomban Wendling, thanks, closes #2023160). 2008-07-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-07-22 13:06:11 UTC (rev 2799) +++ trunk/src/editor.c 2008-07-22 13:42:23 UTC (rev 2800) @@ -1791,6 +1791,7 @@ ScintillaObject *sci = editor->sci; gchar *table; gint indent_pos; + gchar *indent_str; if (SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_HTML) return; @@ -1812,9 +1813,19 @@ indent[x] = '\0'; } - table = g_strconcat("\n", indent, " <tr>\n", indent, " <td>\n", indent, " </td>\n", - indent, " </tr>\n", indent, NULL); + /* get indent string for generated code */ + if (editor_prefs.indent_mode == INDENT_NONE) + indent_str = g_strdup(""); + else + indent_str = get_whitespace(editor_prefs.tab_width, editor->use_tabs); + + table = g_strconcat("\n", indent, indent_str, "<tr>\n", + indent, indent_str, indent_str, "<td>\n", + indent, indent_str, indent_str, "</td>\n", + indent, indent_str, "</tr>\n", + indent, NULL); sci_insert_text(sci, pos, table); + g_free(indent_str); g_free(table); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2799] trunk
by eht16＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 2799 http://geany.svn.sourceforge.net/geany/?rev=2799&view=rev Author: eht16 Date: 2008-07-22 13:06:11 +0000 (Tue, 22 Jul 2008) Log Message: ----------- Backport latest HTML/PHP lexer fixes from Scintilla CVS (#2024387). Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/LexHTML.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-21 17:25:18 UTC (rev 2798) +++ trunk/ChangeLog 2008-07-22 13:06:11 UTC (rev 2799) @@ -1,3 +1,9 @@ +2008-07-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * scintilla/LexHTML.cxx: + Backport latest HTML/PHP lexer fixes from Scintilla CVS (#2024387). + + 2008-07-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/main.c, src/socket.c, src/main.h: @@ -21,6 +27,7 @@ Move code to reload configuration files into utils_reload_configuration() and add it to the plugin API. + 2008-07-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/classbuilder.c, plugins/demoplugin.c, plugins/export.c, Modified: trunk/scintilla/LexHTML.cxx =================================================================== --- trunk/scintilla/LexHTML.cxx 2008-07-21 17:25:18 UTC (rev 2798) +++ trunk/scintilla/LexHTML.cxx 2008-07-22 13:06:11 UTC (rev 2799) @@ -29,7 +29,7 @@ #define SCE_HA_VBS (SCE_HBA_START - SCE_HB_START) #define SCE_HA_PYTHON (SCE_HPA_START - SCE_HP_START) -enum script_type { eScriptNone = 0, eScriptJS, eScriptVBS, eScriptPython, eScriptPHP, eScriptXML, eScriptSGML, eScriptSGMLblock }; +enum script_type { eScriptNone = 0, eScriptJS, eScriptVBS, eScriptPython, eScriptPHP, eScriptXML, eScriptSGML, eScriptSGMLblock, eScriptComment }; enum script_mode { eHtml = 0, eNonHtmlScript, eNonHtmlPreProc, eNonHtmlScriptPreProc }; static inline bool IsAWordChar(const int ch) { @@ -249,7 +249,7 @@ static int classifyTagHTML(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, bool &tagDontFold, - bool caseSensitive, bool isXml) { + bool caseSensitive, bool isXml, bool allowScripts) { char s[30 + 2]; // Copy after the '<' unsigned int i = 0; @@ -268,31 +268,28 @@ // if the current language is XML, I can fold any tag // if the current language is HTML, I don't want to fold certain tags (input, meta, etc.) //...to find it in the list of no-container-tags - tagDontFold = (!isXml) && (NULL != strstr("meta link img area br hr input ",s)); + tagDontFold = (!isXml) && (NULL != strstr("meta link img area br hr input ", s)); //now we can remove the trailing space s[i] = '\0'; - bool isScript = false; + // No keywords -> all are known + // Name of a closing tag starts at s + 1 char chAttr = SCE_H_TAGUNKNOWN; if (s[0] == '!') { chAttr = SCE_H_SGML_DEFAULT; - } else if (s[0] == '/') { // Closing tag - if (keywords.InList(s + 1)) - chAttr = SCE_H_TAG; - } else { - if (keywords.InList(s)) { - chAttr = SCE_H_TAG; - isScript = 0 == strcmp(s, "script"); - } - } - if ((chAttr == SCE_H_TAGUNKNOWN) && !keywords) { - // No keywords -> all are known + } else if (!keywords || keywords.InList(s[0] == '/' ? s + 1 : s)) { chAttr = SCE_H_TAG; - isScript = 0 == strcmp(s, "script"); } styler.ColourTo(end, chAttr); - return isScript ? SCE_H_SCRIPT : chAttr; + if (chAttr == SCE_H_TAG) { + if (allowScripts && 0 == strcmp(s, "script")) { + chAttr = SCE_H_SCRIPT; + } else if (!isXml && 0 == strcmp(s, "comment")) { + chAttr = SCE_H_COMMENT; + } + } + return chAttr; } static void classifyWordHTJS(unsigned int start, unsigned int end, @@ -411,6 +408,9 @@ case eScriptSGML: Result = SCE_H_SGML_DEFAULT; break; + case eScriptComment: + Result = SCE_H_COMMENT; + break; default : Result = SCE_HJ_START; break; @@ -469,19 +469,51 @@ (state == SCE_HPHP_COMPLEX_VARIABLE); } -static int FindPhpStringDelimiter(char *phpStringDelimiter, const int phpStringDelimiterSize, int i, const int lengthDoc, Accessor &styler) { +static int FindPhpStringDelimiter(char *phpStringDelimiter, const int phpStringDelimiterSize, int i, const int lengthDoc, Accessor &styler, bool &isSimpleString) { int j; + const int beginning = i - 1; + bool isValidSimpleString = false; + while (i < lengthDoc && (styler[i] == ' ' || styler[i] == '\t')) i++; - phpStringDelimiter[0] = '\n'; - for (j = i; j < lengthDoc && styler[j] != '\n' && styler[j] != '\r'; j++) { + + char ch = styler.SafeGetCharAt(i); + const char chNext = styler.SafeGetCharAt(i + 1); + if (!IsPhpWordStart(ch)) { + if (ch == '\'' && IsPhpWordStart(chNext)) { + i++; + ch = chNext; + isSimpleString = true; + } else { + phpStringDelimiter[0] = '\0'; + return beginning; + } + } + phpStringDelimiter[0] = ch; + i++; + + for (j = i; j < lengthDoc && !isLineEnd(styler[j]); j++) { + if (!IsPhpWordChar(styler[j])) { + if (isSimpleString && (styler[j] == '\'') && isLineEnd(styler.SafeGetCharAt(j + 1))) { + isValidSimpleString = true; + j++; + break; + } else { + phpStringDelimiter[0] = '\0'; + return beginning; + } + } if (j - i < phpStringDelimiterSize - 2) phpStringDelimiter[j-i+1] = styler[j]; else i++; } - phpStringDelimiter[j-i+1] = '\0'; - return j; + if (isSimpleString && !isValidSimpleString) { + phpStringDelimiter[0] = '\0'; + return beginning; + } + phpStringDelimiter[j-i+1 - (isSimpleString ? 1 : 0)] = '\0'; + return j - 1; } static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], @@ -510,11 +542,15 @@ } state = SCE_H_DEFAULT; } - // String can be heredoc, must find a delimiter first - while (startPos > 0 && isPHPStringState(state) && state != SCE_HPHP_SIMPLESTRING) { - startPos--; - length++; - state = styler.StyleAt(startPos); + // String can be heredoc, must find a delimiter first. Reread from beginning of line containing the string, to get the correct lineState + if (isPHPStringState(state)) { + while (startPos > 0 && (isPHPStringState(state) || !isLineEnd(styler[startPos - 1]))) { + startPos--; + length++; + state = styler.StyleAt(startPos); + } + if (startPos == 0) + state = SCE_H_DEFAULT; } styler.StartAt(startPos, static_cast<char>(STYLE_MAX)); @@ -536,12 +572,17 @@ int beforePreProc = (lineState >> 12) & 0xFF; // 8 bits of state script_type scriptLanguage = ScriptOfState(state); + // If eNonHtmlScript coincides with SCE_H_COMMENT, assume eScriptComment + if (inScriptType == eNonHtmlScript && state == SCE_H_COMMENT) { + scriptLanguage = eScriptComment; + } const bool foldHTML = styler.GetPropertyInt("fold.html", 0) != 0; const bool fold = foldHTML && styler.GetPropertyInt("fold", 0); const bool foldHTMLPreprocessor = foldHTML && styler.GetPropertyInt("fold.html.preprocessor", 1); const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; const bool caseSensitive = styler.GetPropertyInt("html.tags.case.sensitive", 0) != 0; + const bool allowScripts = styler.GetPropertyInt("lexer.xml.allow.scripts", 1) != 0; const CharacterSet setHTMLWord(CharacterSet::setAlphaNum, ".-_:!#", 0x80, true); const CharacterSet setTagContinue(CharacterSet::setAlphaNum, ".-_:!#[", 0x80, true); @@ -686,19 +727,22 @@ case SCE_HP_STRING: case SCE_HP_TRIPLE: case SCE_HP_TRIPLEDOUBLE: + case SCE_HPHP_HSTRING: + case SCE_HPHP_SIMPLESTRING: + case SCE_HPHP_COMMENT: + case SCE_HPHP_COMMENTLINE: break; default : // check if the closing tag is a script tag - if (state == SCE_HJ_COMMENTLINE || isXml) { - char tag[7]; // room for the <script> tag - int j = 0; - char chr = styler.SafeGetCharAt(i+2); - while (j < 6 && !IsASpace(chr)) { - tag[j++] = static_cast<char>(MakeLowerCase(chr)); - chr = styler.SafeGetCharAt(i+2+j); - } - tag[j] = '\0'; - if (strcmp(tag, "script") != 0) break; + if (const char *tag = + state == SCE_HJ_COMMENTLINE || isXml ? "script" : + state == SCE_H_COMMENT ? "comment" : 0) { + int j = i + 2; + int chr; + do { + chr = static_cast<int>(*tag++); + } while (chr != 0 && chr == MakeLowerCase(styler.SafeGetCharAt(j++))); + if (chr != 0) break; } // closing tag of the script (it's a closing HTML tag anyway) styler.ColourTo(i - 1, StateToPrint); @@ -721,7 +765,7 @@ (ch == '<') && (chNext == '?') && !IsScriptCommentState(state) ) { - scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 10, eScriptPHP); + scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, eScriptPHP); if (scriptLanguage != eScriptPHP && isStringState(state)) continue; styler.ColourTo(i - 1, StateToPrint); beforePreProc = state; @@ -1005,7 +1049,7 @@ } break; case SCE_H_COMMENT: - if ((chPrev2 == '-') && (chPrev == '-') && (ch == '>')) { + if ((scriptLanguage != eScriptComment) && (chPrev2 == '-') && (chPrev == '-') && (ch == '>')) { styler.ColourTo(i, StateToPrint); state = SCE_H_DEFAULT; levelCurrent--; @@ -1050,16 +1094,15 @@ case SCE_H_TAGUNKNOWN: if (!setTagContinue.Contains(ch) && !((ch == '/') && (chPrev == '<'))) { int eClass = classifyTagHTML(styler.GetStartSegment(), - i - 1, keywords, styler, tagDontFold, caseSensitive, isXml); - if (eClass == SCE_H_SCRIPT) { + i - 1, keywords, styler, tagDontFold, caseSensitive, isXml, allowScripts); + if (eClass == SCE_H_SCRIPT || eClass == SCE_H_COMMENT) { if (!tagClosing) { inScriptType = eNonHtmlScript; - scriptLanguage = clientScript; - eClass = SCE_H_TAG; + scriptLanguage = eClass == SCE_H_SCRIPT ? clientScript : eScriptComment; } else { scriptLanguage = eScriptNone; - eClass = SCE_H_TAG; } + eClass = SCE_H_TAG; } if (ch == '>') { styler.ColourTo(i, eClass); @@ -1069,7 +1112,7 @@ state = SCE_H_DEFAULT; } tagOpened = false; - if (!tagDontFold){ + if (!tagDontFold) { if (tagClosing) { levelCurrent--; } else { @@ -1117,8 +1160,8 @@ state = SCE_H_DEFAULT; } tagOpened = false; - if (!tagDontFold){ - if (tagClosing){ + if (!tagDontFold) { + if (tagClosing) { levelCurrent--; } else { levelCurrent++; @@ -1143,8 +1186,8 @@ state = SCE_H_DEFAULT; } tagOpened = false; - if (!tagDontFold){ - if (tagClosing){ + if (!tagDontFold) { + if (tagClosing) { levelCurrent--; } else { levelCurrent++; @@ -1217,8 +1260,8 @@ state = SCE_H_DEFAULT; } tagOpened = false; - if (!tagDontFold){ - if (tagClosing){ + if (!tagDontFold) { + if (tagClosing) { levelCurrent--; } else { levelCurrent++; @@ -1577,10 +1620,12 @@ state = SCE_HPHP_HSTRING; strcpy(phpStringDelimiter, "\""); } else if (styler.Match(i, "<<<")) { - state = SCE_HPHP_HSTRING; - i = FindPhpStringDelimiter(phpStringDelimiter, sizeof(phpStringDelimiter), i + 3, lengthDoc, styler); + bool isSimpleString = false; + i = FindPhpStringDelimiter(phpStringDelimiter, sizeof(phpStringDelimiter), i + 3, lengthDoc, styler, isSimpleString); + if (strlen(phpStringDelimiter)) state = (isSimpleString ? SCE_HPHP_SIMPLESTRING : SCE_HPHP_HSTRING); } else if (ch == '\'') { state = SCE_HPHP_SIMPLESTRING; + strcpy(phpStringDelimiter, "\'"); } else if (ch == '$' && IsPhpWordStart(chNext)) { state = SCE_HPHP_VARIABLE; } else if (IsOperator(ch)) { @@ -1603,12 +1648,9 @@ } break; case SCE_HPHP_VARIABLE: - if (!IsPhpWordChar(ch)) { - styler.ColourTo(i - 1, SCE_HPHP_VARIABLE); - if (IsOperator(ch)) - state = SCE_HPHP_OPERATOR; - else - state = SCE_HPHP_DEFAULT; + if (!IsPhpWordChar(chNext)) { + styler.ColourTo(i, SCE_HPHP_VARIABLE); + state = SCE_HPHP_DEFAULT; } break; case SCE_HPHP_COMMENT: @@ -1635,26 +1677,46 @@ styler.ColourTo(i - 1, StateToPrint); state = SCE_HPHP_HSTRING_VARIABLE; } else if (styler.Match(i, phpStringDelimiter)) { + if (phpStringDelimiter[0] == '\"') { + styler.ColourTo(i, StateToPrint); + state = SCE_HPHP_DEFAULT; + } else if (isLineEnd(chPrev)) { const int psdLength = strlen(phpStringDelimiter); - if ((psdLength > 1) && ((i + psdLength) < lengthDoc)) - i += psdLength - 1; - styler.ColourTo(i, StateToPrint); - state = SCE_HPHP_DEFAULT; + const char chAfterPsd = styler.SafeGetCharAt(i + psdLength); + const char chAfterPsd2 = styler.SafeGetCharAt(i + psdLength + 1); + if (isLineEnd(chAfterPsd) || + (chAfterPsd == ';' && isLineEnd(chAfterPsd2))) { + i += (((i + psdLength) < lengthDoc) ? psdLength : lengthDoc) - 1; + styler.ColourTo(i, StateToPrint); + state = SCE_HPHP_DEFAULT; + } + } } break; case SCE_HPHP_SIMPLESTRING: - if (ch == '\\') { - // skip the next char - i++; - } else if (ch == '\'') { - styler.ColourTo(i, StateToPrint); - state = SCE_HPHP_DEFAULT; + if (phpStringDelimiter[0] == '\'') { + if (ch == '\\') { + // skip the next char + i++; + } else if (ch == '\'') { + styler.ColourTo(i, StateToPrint); + state = SCE_HPHP_DEFAULT; + } + } else if (isLineEnd(chPrev) && styler.Match(i, phpStringDelimiter)) { + const int psdLength = strlen(phpStringDelimiter); + const char chAfterPsd = styler.SafeGetCharAt(i + psdLength); + const char chAfterPsd2 = styler.SafeGetCharAt(i + psdLength + 1); + if (isLineEnd(chAfterPsd) || + (chAfterPsd == ';' && isLineEnd(chAfterPsd2))) { + i += (((i + psdLength) < lengthDoc) ? psdLength : lengthDoc) - 1; + styler.ColourTo(i, StateToPrint); + state = SCE_HPHP_DEFAULT; + } } break; case SCE_HPHP_HSTRING_VARIABLE: - if (!IsPhpWordChar(ch)) { - styler.ColourTo(i - 1, StateToPrint); - i--; // strange but it works + if (!IsPhpWordChar(chNext)) { + styler.ColourTo(i, StateToPrint); state = SCE_HPHP_HSTRING; } break; @@ -1683,10 +1745,12 @@ state = SCE_HPHP_HSTRING; strcpy(phpStringDelimiter, "\""); } else if (styler.Match(i, "<<<")) { - state = SCE_HPHP_HSTRING; - i = FindPhpStringDelimiter(phpStringDelimiter, sizeof(phpStringDelimiter), i + 3, lengthDoc, styler); + bool isSimpleString = false; + i = FindPhpStringDelimiter(phpStringDelimiter, sizeof(phpStringDelimiter), i + 3, lengthDoc, styler, isSimpleString); + if (strlen(phpStringDelimiter)) state = (isSimpleString ? SCE_HPHP_SIMPLESTRING : SCE_HPHP_HSTRING); } else if (ch == '\'') { state = SCE_HPHP_SIMPLESTRING; + strcpy(phpStringDelimiter, "\'"); } else if (ch == '$' && IsPhpWordStart(chNext)) { state = SCE_HPHP_VARIABLE; } else if (IsOperator(ch)) { @@ -1742,8 +1806,24 @@ } } - StateToPrint = statePrintForState(state, inScriptType); + switch (state) { + case SCE_HJ_WORD: + classifyWordHTJS(styler.GetStartSegment(), lengthDoc - 1, keywords2, styler, inScriptType); + break; + case SCE_HB_WORD: + classifyWordHTVB(styler.GetStartSegment(), lengthDoc - 1, keywords3, styler, inScriptType); + break; + case SCE_HP_WORD: + classifyWordHTPy(styler.GetStartSegment(), lengthDoc - 1, keywords4, styler, prevWord, inScriptType); + break; + case SCE_HPHP_WORD: + classifyWordHTPHP(styler.GetStartSegment(), lengthDoc - 1, keywords5, styler); + break; + default: + StateToPrint = statePrintForState(state, inScriptType); styler.ColourTo(lengthDoc - 1, StateToPrint); + break; + } // Fill in the real level of the next line, keeping the current flags as they will be filled in later if (fold) { @@ -1755,13 +1835,13 @@ static void ColouriseXMLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { // Passing in true because we're lexing XML - ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists,styler, true); + ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists, styler, true); } static void ColouriseHTMLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { // Passing in false because we're notlexing XML - ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists,styler, false); + ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists, styler, false); } static bool isASPScript(int state) { @@ -2058,9 +2138,10 @@ } static void ColourisePHPScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], - Accessor &styler) { - if(startPos == 0) initStyle = SCE_HPHP_DEFAULT; - ColouriseHTMLDoc(startPos,length,initStyle,keywordlists,styler); + Accessor &styler) { + if (startPos == 0) + initStyle = SCE_HPHP_DEFAULT; + ColouriseHTMLDoc(startPos, length, initStyle, keywordlists, styler); } static const char * const htmlWordListDesc[] = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2798] trunk
by ntrel＠users.sourceforge.net 21 Jul '08

21 Jul '08

Revision: 2798 http://geany.svn.sourceforge.net/geany/?rev=2798&view=rev Author: ntrel Date: 2008-07-21 17:25:18 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Rename above pref 'Open new documents...'. Group encodings prefs together in the Files tab. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-21 14:39:47 UTC (rev 2797) +++ trunk/ChangeLog 2008-07-21 17:25:18 UTC (rev 2798) @@ -6,6 +6,9 @@ * src/interface.c, src/prefs.c, src/keyfile.c, src/document.h, src/main.c, geany.glade: Add new Files pref 'Allow new documents from the command-line'. + * src/interface.c, geany.glade: + Rename above pref 'Open new documents...'. + Group encodings prefs together in the Files tab. 2008-07-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-07-21 14:39:47 UTC (rev 2797) +++ trunk/geany.glade 2008-07-21 17:25:18 UTC (rev 2798) @@ -6707,7 +6707,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Start a new file for each command-line filename that doesn't exist</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Allow new documents from the command-line</property> + <property name="label" translatable="yes">Open new documents from the command-line</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -6723,28 +6723,19 @@ </child> <child> - <widget class="GtkTable" id="table5"> + <widget class="GtkTable" id="table15"> <property name="visible">True</property> - <property name="n_rows">4</property> + <property name="n_rows">1</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> - <property name="column_spacing">0</property> + <property name="column_spacing">24</property> <child> - <widget class="GtkEventBox" id="eventbox1"> + <widget class="GtkComboBox" id="combo_eol"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - - <child> - <widget class="GtkComboBox" id="combo_new_encoding"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - </child> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -6757,9 +6748,9 @@ </child> <child> - <widget class="GtkLabel" id="label153"> + <widget class="GtkLabel" id="label210"> <property name="visible">True</property> - <property name="label" translatable="yes">Default encoding (new files):</property> + <property name="label" translatable="yes">Default end of line characters:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6783,125 +6774,6 @@ <property name="y_options"></property> </packing> </child> - - <child> - <widget class="GtkLabel" id="label_open_encoding"> - <property name="visible">True</property> - <property name="label" translatable="yes">Default encoding (existing files):</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEventBox" id="eventbox3"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the default encoding for opening existing files.</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - - <child> - <widget class="GtkComboBox" id="combo_open_encoding"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="check_open_encoding"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed).</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use fixed encoding when opening files</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label210"> - <property name="visible">True</property> - <property name="label" translatable="yes">Default end of line characters:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="combo_eol"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> </widget> <packing> <property name="padding">0</property> @@ -6952,6 +6824,196 @@ </child> <child> + <widget class="GtkFrame" id="frame37"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment40"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkTable" id="table5"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">24</property> + + <child> + <widget class="GtkEventBox" id="eventbox1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property> + <property name="visible_window">True</property> + <property name="above_child">False</property> + + <child> + <widget class="GtkComboBox" id="combo_new_encoding"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label153"> + <property name="visible">True</property> + <property name="label" translatable="yes">Default encoding (new files):</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_open_encoding"> + <property name="visible">True</property> + <property name="label" translatable="yes">Default encoding (existing files):</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEventBox" id="eventbox3"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the default encoding for opening existing files.</property> + <property name="visible_window">True</property> + <property name="above_child">False</property> + + <child> + <widget class="GtkComboBox" id="combo_open_encoding"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_open_encoding"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed).</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Use fixed encoding when opening files</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label219"> + <property name="visible">True</property> + <property name="label" translatable="yes">Encodings</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> <widget class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="label_xalign">0</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-07-21 14:39:47 UTC (rev 2797) +++ trunk/src/interface.c 2008-07-21 17:25:18 UTC (rev 2798) @@ -2768,6 +2768,12 @@ GtkWidget *vbox8; GtkWidget *vbox38; GtkWidget *check_cmdline_new_files; + GtkWidget *table15; + GtkWidget *combo_eol; + GtkWidget *label210; + GtkWidget *label109; + GtkWidget *frame37; + GtkWidget *alignment40; GtkWidget *table5; GtkWidget *eventbox1; GtkWidget *combo_new_encoding; @@ -2776,9 +2782,7 @@ GtkWidget *eventbox3; GtkWidget *combo_open_encoding; GtkWidget *check_open_encoding; - GtkWidget *label210; - GtkWidget *combo_eol; - GtkWidget *label109; + GtkWidget *label219; GtkWidget *frame2; GtkWidget *alignment3; GtkWidget *vbox6; @@ -4012,15 +4016,50 @@ gtk_widget_show (vbox38); gtk_box_pack_start (GTK_BOX (vbox8), vbox38, FALSE, TRUE, 0); - check_cmdline_new_files = gtk_check_button_new_with_mnemonic (_("Allow new documents from the command-line")); + check_cmdline_new_files = gtk_check_button_new_with_mnemonic (_("Open new documents from the command-line")); gtk_widget_show (check_cmdline_new_files); gtk_box_pack_start (GTK_BOX (vbox38), check_cmdline_new_files, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_cmdline_new_files, _("Start a new file for each command-line filename that doesn't exist"), NULL); - table5 = gtk_table_new (4, 2, FALSE); + table15 = gtk_table_new (1, 2, FALSE); + gtk_widget_show (table15); + gtk_box_pack_start (GTK_BOX (vbox38), table15, TRUE, TRUE, 0); + gtk_table_set_row_spacings (GTK_TABLE (table15), 3); + gtk_table_set_col_spacings (GTK_TABLE (table15), 24); + + combo_eol = gtk_combo_box_new_text (); + gtk_widget_show (combo_eol); + gtk_table_attach (GTK_TABLE (table15), combo_eol, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + + label210 = gtk_label_new (_("Default end of line characters:")); + gtk_widget_show (label210); + gtk_table_attach (GTK_TABLE (table15), label210, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label210), 0, 0.5); + + label109 = gtk_label_new (_("New files")); + gtk_widget_show (label109); + gtk_frame_set_label_widget (GTK_FRAME (frame6), label109); + gtk_label_set_use_markup (GTK_LABEL (label109), TRUE); + + frame37 = gtk_frame_new (NULL); + gtk_widget_show (frame37); + gtk_box_pack_start (GTK_BOX (vbox18), frame37, FALSE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame37), GTK_SHADOW_NONE); + + alignment40 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment40); + gtk_container_add (GTK_CONTAINER (frame37), alignment40); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment40), 0, 0, 12, 0); + + table5 = gtk_table_new (3, 2, FALSE); gtk_widget_show (table5); - gtk_box_pack_start (GTK_BOX (vbox38), table5, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (alignment40), table5); gtk_table_set_row_spacings (GTK_TABLE (table5), 3); + gtk_table_set_col_spacings (GTK_TABLE (table5), 24); eventbox1 = gtk_event_box_new (); gtk_widget_show (eventbox1); @@ -4066,24 +4105,11 @@ gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed)."), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_open_encoding), FALSE); - label210 = gtk_label_new (_("Default end of line characters:")); - gtk_widget_show (label210); - gtk_table_attach (GTK_TABLE (table5), label210, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label210), 0, 0.5); + label219 = gtk_label_new (_("Encodings")); + gtk_widget_show (label219); + gtk_frame_set_label_widget (GTK_FRAME (frame37), label219); + gtk_label_set_use_markup (GTK_LABEL (label219), TRUE); - combo_eol = gtk_combo_box_new_text (); - gtk_widget_show (combo_eol); - gtk_table_attach (GTK_TABLE (table5), combo_eol, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - - label109 = gtk_label_new (_("New files")); - gtk_widget_show (label109); - gtk_frame_set_label_widget (GTK_FRAME (frame6), label109); - gtk_label_set_use_markup (GTK_LABEL (label109), TRUE); - frame2 = gtk_frame_new (NULL); gtk_widget_show (frame2); gtk_box_pack_start (GTK_BOX (vbox18), frame2, FALSE, TRUE, 0); @@ -4931,6 +4957,12 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, vbox8, "vbox8"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox38, "vbox38"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_cmdline_new_files, "check_cmdline_new_files"); + GLADE_HOOKUP_OBJECT (prefs_dialog, table15, "table15"); + GLADE_HOOKUP_OBJECT (prefs_dialog, combo_eol, "combo_eol"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label210, "label210"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label109, "label109"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame37, "frame37"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment40, "alignment40"); GLADE_HOOKUP_OBJECT (prefs_dialog, table5, "table5"); GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox1, "eventbox1"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_new_encoding, "combo_new_encoding"); @@ -4939,9 +4971,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox3, "eventbox3"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_open_encoding, "combo_open_encoding"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_open_encoding, "check_open_encoding"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label210, "label210"); - GLADE_HOOKUP_OBJECT (prefs_dialog, combo_eol, "combo_eol"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label109, "label109"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label219, "label219"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame2, "frame2"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment3, "alignment3"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox6, "vbox6"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2797] trunk/src/keybindings.c
by ntrel＠users.sourceforge.net 21 Jul '08

21 Jul '08

Revision: 2797 http://geany.svn.sourceforge.net/geany/?rev=2797&view=rev Author: ntrel Date: 2008-07-21 14:39:47 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Fix compilation with -ansi. Modified Paths: -------------- trunk/src/keybindings.c Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2008-07-21 14:28:46 UTC (rev 2796) +++ trunk/src/keybindings.c 2008-07-21 14:39:47 UTC (rev 2797) @@ -533,7 +533,7 @@ kb->key = key; kb->mods = mods; - //~ apply_kb_accel(kb); + /* apply_kb_accel(kb); */ } g_free(val); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2796] trunk
by ntrel＠users.sourceforge.net 21 Jul '08

21 Jul '08

Revision: 2796 http://geany.svn.sourceforge.net/geany/?rev=2796&view=rev Author: ntrel Date: 2008-07-21 14:28:46 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Add new Files pref 'Allow new documents from the command-line'. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/document.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/main.c trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-21 14:12:15 UTC (rev 2795) +++ trunk/ChangeLog 2008-07-21 14:28:46 UTC (rev 2796) @@ -3,6 +3,9 @@ * src/main.c, src/socket.c, src/main.h: Fix filename encoding for new files at startup from the command-line. Make socket open command support filename:line:column syntax. + * src/interface.c, src/prefs.c, src/keyfile.c, src/document.h, + src/main.c, geany.glade: + Add new Files pref 'Allow new documents from the command-line'. 2008-07-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-07-21 14:12:15 UTC (rev 2795) +++ trunk/geany.glade 2008-07-21 14:28:46 UTC (rev 2796) @@ -6697,183 +6697,216 @@ <property name="spacing">3</property> <child> - <widget class="GtkTable" id="table5"> + <widget class="GtkVBox" id="vbox38"> <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">0</property> + <property name="spacing">0</property> <child> - <widget class="GtkEventBox" id="eventbox1"> + <widget class="GtkCheckButton" id="check_cmdline_new_files"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - - <child> - <widget class="GtkComboBox" id="combo_new_encoding"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - </child> + <property name="tooltip" translatable="yes">Start a new file for each command-line filename that doesn't exist</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Allow new documents from the command-line</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="label153"> + <widget class="GtkTable" id="table5"> <property name="visible">True</property> - <property name="label" translatable="yes">Default encoding (new files):</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <property name="n_rows">4</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">0</property> - <child> - <widget class="GtkLabel" id="label_open_encoding"> - <property name="visible">True</property> - <property name="label" translatable="yes">Default encoding (existing files):</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkEventBox" id="eventbox1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property> + <property name="visible_window">True</property> + <property name="above_child">False</property> - <child> - <widget class="GtkEventBox" id="eventbox3"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the default encoding for opening existing files.</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> + <child> + <widget class="GtkComboBox" id="combo_new_encoding"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> <child> - <widget class="GtkComboBox" id="combo_open_encoding"> + <widget class="GtkLabel" id="label153"> <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="label" translatable="yes">Default encoding (new files):</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - <child> - <widget class="GtkCheckButton" id="check_open_encoding"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed).</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use fixed encoding when opening files</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label_open_encoding"> + <property name="visible">True</property> + <property name="label" translatable="yes">Default encoding (existing files):</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> - <child> - <widget class="GtkLabel" id="label210"> - <property name="visible">True</property> - <property name="label" translatable="yes">Default end of line characters:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkEventBox" id="eventbox3"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the default encoding for opening existing files.</property> + <property name="visible_window">True</property> + <property name="above_child">False</property> - <child> - <widget class="GtkComboBox" id="combo_eol"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <child> + <widget class="GtkComboBox" id="combo_open_encoding"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_open_encoding"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed).</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Use fixed encoding when opening files</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label210"> + <property name="visible">True</property> + <property name="label" translatable="yes">Default end of line characters:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combo_eol"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -7054,113 +7087,126 @@ <property name="right_padding">0</property> <child> - <widget class="GtkTable" id="table10"> + <widget class="GtkVBox" id="vbox37"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">24</property> + <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="label147"> + <widget class="GtkTable" id="table10"> <property name="visible">True</property> - <property name="label" translatable="yes">Recent files list length:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">7</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">24</property> - <child> - <widget class="GtkSpinButton" id="spin_mru"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Specifies the number of files which are stored in the Recent files list.</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">4 1 50 1 10 10</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label147"> + <property name="visible">True</property> + <property name="label" translatable="yes">Recent files list length:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">7</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> - <child> - <widget class="GtkLabel" id="label208"> - <property name="visible">True</property> - <property name="label" translatable="yes">Disk check timeout:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkSpinButton" id="spin_mru"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Specifies the number of files which are stored in the Recent files list.</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">4 1 50 1 10 10</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> - <child> - <widget class="GtkSpinButton" id="spin_disk_check"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">How often to check for changes to document files on disk, in seconds. Zero disables checking.</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">30 0 10000 1 10 10</property> + <child> + <widget class="GtkLabel" id="label208"> + <property name="visible">True</property> + <property name="label" translatable="yes">Disk check timeout:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="spin_disk_check"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">How often to check for changes to document files on disk, in seconds. Zero disables checking.</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">30 0 10000 1 10 10</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-07-21 14:12:15 UTC (rev 2795) +++ trunk/src/document.h 2008-07-21 14:28:46 UTC (rev 2796) @@ -55,6 +55,7 @@ guint mru_length; gint default_eol_character; gint disk_check_timeout; + gboolean cmdline_new_files; /* New file if command-line filename doesn't exist */ } GeanyFilePrefs; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-07-21 14:12:15 UTC (rev 2795) +++ trunk/src/interface.c 2008-07-21 14:28:46 UTC (rev 2796) @@ -2766,6 +2766,8 @@ GtkWidget *frame6; GtkWidget *alignment7; GtkWidget *vbox8; + GtkWidget *vbox38; + GtkWidget *check_cmdline_new_files; GtkWidget *table5; GtkWidget *eventbox1; GtkWidget *combo_new_encoding; @@ -2786,6 +2788,7 @@ GtkWidget *label19; GtkWidget *frame17; GtkWidget *alignment20; + GtkWidget *vbox37; GtkWidget *table10; GtkWidget *label147; GtkObject *spin_mru_adj; @@ -4005,9 +4008,18 @@ gtk_widget_show (vbox8); gtk_container_add (GTK_CONTAINER (alignment7), vbox8); + vbox38 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox38); + gtk_box_pack_start (GTK_BOX (vbox8), vbox38, FALSE, TRUE, 0); + + check_cmdline_new_files = gtk_check_button_new_with_mnemonic (_("Allow new documents from the command-line")); + gtk_widget_show (check_cmdline_new_files); + gtk_box_pack_start (GTK_BOX (vbox38), check_cmdline_new_files, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_cmdline_new_files, _("Start a new file for each command-line filename that doesn't exist"), NULL); + table5 = gtk_table_new (4, 2, FALSE); gtk_widget_show (table5); - gtk_box_pack_start (GTK_BOX (vbox8), table5, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox38), table5, TRUE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table5), 3); eventbox1 = gtk_event_box_new (); @@ -4122,9 +4134,13 @@ gtk_container_add (GTK_CONTAINER (frame17), alignment20); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment20), 0, 0, 12, 0); + vbox37 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox37); + gtk_container_add (GTK_CONTAINER (alignment20), vbox37); + table10 = gtk_table_new (2, 2, FALSE); gtk_widget_show (table10); - gtk_container_add (GTK_CONTAINER (alignment20), table10); + gtk_box_pack_start (GTK_BOX (vbox37), table10, TRUE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table10), 3); gtk_table_set_col_spacings (GTK_TABLE (table10), 24); @@ -4913,6 +4929,8 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, frame6, "frame6"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment7, "alignment7"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox8, "vbox8"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox38, "vbox38"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_cmdline_new_files, "check_cmdline_new_files"); GLADE_HOOKUP_OBJECT (prefs_dialog, table5, "table5"); GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox1, "eventbox1"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_new_encoding, "combo_new_encoding"); @@ -4933,6 +4951,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, label19, "label19"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame17, "frame17"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment20, "alignment20"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox37, "vbox37"); GLADE_HOOKUP_OBJECT (prefs_dialog, table10, "table10"); GLADE_HOOKUP_OBJECT (prefs_dialog, label147, "label147"); GLADE_HOOKUP_OBJECT (prefs_dialog, spin_mru, "spin_mru"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-07-21 14:12:15 UTC (rev 2795) +++ trunk/src/keyfile.c 2008-07-21 14:28:46 UTC (rev 2796) @@ -101,6 +101,8 @@ static SettingEntry bool_prefs[] = { + {PACKAGE, "cmdline_new_files", &file_prefs.cmdline_new_files, GINT_TO_POINTER(TRUE)}, + {PACKAGE, "pref_main_suppress_search_dialogs", &search_prefs.suppress_dialogs, GINT_TO_POINTER(FALSE)}, {PACKAGE, "pref_main_search_use_current_word", &search_prefs.use_current_word, GINT_TO_POINTER(TRUE)}, {"search", "pref_search_current_file_dir", &search_prefs.use_current_file_dir, GINT_TO_POINTER(TRUE)}, Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-07-21 14:12:15 UTC (rev 2795) +++ trunk/src/main.c 2008-07-21 14:28:46 UTC (rev 2796) @@ -657,7 +657,7 @@ ui_add_recent_file(doc->file_name); return TRUE; } - else + else if (file_prefs.cmdline_new_files) { /* create new file with the given filename */ gchar *utf8_filename = utils_get_utf8_from_locale(locale_filename); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-07-21 14:12:15 UTC (rev 2795) +++ trunk/src/prefs.c 2008-07-21 14:28:46 UTC (rev 2796) @@ -99,6 +99,8 @@ static PrefEntry toggle_prefs[] = { + {"check_cmdline_new_files", &file_prefs.cmdline_new_files}, + {"check_ask_suppress_search_dialogs", &search_prefs.suppress_dialogs}, {"check_search_use_current_word", &search_prefs.use_current_word}, {"check_fif_current_dir", &search_prefs.use_current_file_dir}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2795] trunk
by ntrel＠users.sourceforge.net 21 Jul '08

21 Jul '08

Revision: 2795 http://geany.svn.sourceforge.net/geany/?rev=2795&view=rev Author: ntrel Date: 2008-07-21 14:12:15 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Fix filename encoding for new files at startup from the command-line. Make socket open command support filename:line:column syntax. Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c trunk/src/main.h trunk/src/socket.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-20 18:07:53 UTC (rev 2794) +++ trunk/ChangeLog 2008-07-21 14:12:15 UTC (rev 2795) @@ -1,3 +1,10 @@ +2008-07-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/main.c, src/socket.c, src/main.h: + Fix filename encoding for new files at startup from the command-line. + Make socket open command support filename:line:column syntax. + + 2008-07-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/keybindings.c: Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-07-20 18:07:53 UTC (rev 2794) +++ trunk/src/main.c 2008-07-21 14:12:15 UTC (rev 2795) @@ -634,45 +634,40 @@ } -static void handle_cl_filename(gchar *const filename) +/* Used for command-line arguments at startup or from socket. + * this will strip any :line:col filename suffix from locale_filename */ +gboolean main_handle_filename(gchar *locale_filename) { GeanyDocument *doc; + gint line = -1, column = -1; - if (filename != NULL) - { - gint line = -1, column = -1; + g_return_val_if_fail(locale_filename, FALSE); - get_line_and_column_from_filename(filename, &line, &column); - if (line >= 0) - cl_options.goto_line = line; - if (column >= 0) - cl_options.goto_column = column; - } + get_line_and_column_from_filename(locale_filename, &line, &column); + if (line >= 0) + cl_options.goto_line = line; + if (column >= 0) + cl_options.goto_column = column; - if (filename != NULL && - g_file_test(filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) { - doc = document_open_file(filename, FALSE, NULL, NULL); - /* add recent file manually because opening_session_files is set */ - if (doc != NULL) + doc = document_open_file(locale_filename, FALSE, NULL, NULL); + /* add recent file manually if opening_session_files is set */ + if (doc != NULL && main_status.opening_session_files) ui_add_recent_file(doc->file_name); + return TRUE; } - else if (filename != NULL) - { /* create new file if it doesn't exist */ - doc = document_new_file(filename, NULL, NULL); + else + { /* create new file with the given filename */ + gchar *utf8_filename = utils_get_utf8_from_locale(locale_filename); + + doc = document_new_file(utf8_filename, NULL, NULL); if (doc != NULL) - { ui_add_recent_file(doc->file_name); - } + g_free(utf8_filename); + return TRUE; } - else - { - const gchar *msg = _("Could not find file '%s'."); - - g_printerr(msg, filename); /* also print to the terminal */ - g_printerr("\n"); - ui_set_statusbar(TRUE, msg, filename); - } + return FALSE; } @@ -687,7 +682,14 @@ { gchar *filename = get_argv_filename(argv[i]); - handle_cl_filename(filename); + if (filename && !main_handle_filename(filename)) + { + const gchar *msg = _("Could not find file '%s'."); + + g_printerr(msg, filename); /* also print to the terminal */ + g_printerr("\n"); + ui_set_statusbar(TRUE, msg, filename); + } g_free(filename); } return TRUE; Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2008-07-20 18:07:53 UTC (rev 2794) +++ trunk/src/main.h 2008-07-21 14:12:15 UTC (rev 2795) @@ -53,4 +53,6 @@ void main_quit(void); +gboolean main_handle_filename(gchar *locale_filename); + #endif Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2008-07-20 18:07:53 UTC (rev 2794) +++ trunk/src/socket.c 2008-07-21 14:12:15 UTC (rev 2795) @@ -142,7 +142,7 @@ socket_fd_write_all(sock, "open\n", 5); - for(i = 1; i < argc && argv[i] != NULL; i++) + for (i = 1; i < argc && argv[i] != NULL; i++) { filename = get_argv_filename(argv[i]); @@ -484,20 +484,9 @@ utf8_filename = g_strdup(buf); locale_filename = utils_get_locale_from_utf8(utf8_filename); - - if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) - document_open_file(locale_filename, FALSE, NULL, NULL); - else - { /* create new file if it doesn't exist */ - GeanyDocument *doc; - - doc = document_new_file(utf8_filename, NULL, NULL); - if (doc != NULL) - ui_add_recent_file(doc->file_name); - else - geany_debug("got data from socket, but it does not look like a filename"); - } g_free(utf8_filename); + if (locale_filename) + main_handle_filename(locale_filename); g_free(locale_filename); } 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
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2008