Branch: refs/heads/master Author: Matthew Brush matt@geany.org Committer: Matthew Brush matt@geany.org Date: Mon, 27 Feb 2012 04:19:17 Commit: d7d5a6d7fb48c9b86218f1e826ffd1b05207a128 https://github.com/geany/geany/commit/d7d5a6d7fb48c9b86218f1e826ffd1b05207a1...
Log Message: ----------- Add some more key links to the Help menu (wiki, bug tracker, donate)
Modified Paths: -------------- data/geany.glade src/callbacks.c src/callbacks.h src/geany.h
Modified: data/geany.glade 199 files changed, 118 insertions(+), 81 deletions(-) =================================================================== @@ -452,232 +452,232 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkImage" id="image3192"> + <object class="GtkImage" id="image4060"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-preferences</property> + <property name="stock">gtk-close</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image3193"> + <object class="GtkImage" id="image4061"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-cancel</property> + <property name="stock">gtk-close</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image3761"> + <object class="GtkImage" id="image4062"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-cut</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image3762"> + <object class="GtkImage" id="image4063"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-copy</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image3763"> + <object class="GtkImage" id="image4064"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-indent</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image3764"> + <object class="GtkImage" id="image4065"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-open</property> + <property name="stock">gtk-unindent</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image3765"> + <object class="GtkImage" id="image4066"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-find</property> + <property name="stock">gtk-add</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image3766"> + <object class="GtkImage" id="image4067"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-find</property> + <property name="stock">gtk-add</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image3767"> + <object class="GtkImage" id="image4068"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-jump-to</property> + <property name="stock">gtk-add</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4055"> + <object class="GtkImage" id="image4069"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-preferences</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4056"> + <object class="GtkImage" id="image4070"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-new</property> + <property name="stock">gtk-preferences</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4057"> + <object class="GtkImage" id="image4071"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-save</property> + <property name="stock">gtk-find</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4058"> + <object class="GtkImage" id="image4072"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-revert-to-saved</property> + <property name="stock">gtk-find-and-replace</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4059"> + <object class="GtkImage" id="image4073"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-revert-to-saved</property> + <property name="stock">gtk-go-down</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4060"> + <object class="GtkImage" id="image4074"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-close</property> + <property name="stock">gtk-go-up</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4061"> + <object class="GtkImage" id="image4075"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-close</property> + <property name="stock">gtk-jump-to</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4062"> + <object class="GtkImage" id="image4076"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-cut</property> + <property name="stock">gtk-select-font</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4063"> + <object class="GtkImage" id="image4077"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-copy</property> + <property name="stock">gtk-new</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4064"> + <object class="GtkImage" id="image4078"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-indent</property> + <property name="stock">gtk-open</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4065"> + <object class="GtkImage" id="image4079"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-unindent</property> + <property name="stock">gtk-close</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4066"> + <object class="GtkImage" id="image4080"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-refresh</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4067"> + <object class="GtkImage" id="image4081"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-file</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4068"> + <object class="GtkImage" id="image4082"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-select-color</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4069"> + <object class="GtkImage" id="image4083"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-preferences</property> + <property name="stock">gtk-help</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4070"> + <object class="GtkImage" id="image3192"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-preferences</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4071"> + <object class="GtkImage" id="image3193"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-find</property> + <property name="stock">gtk-cancel</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4072"> + <object class="GtkImage" id="image3761"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-find-and-replace</property> + <property name="stock">gtk-add</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4073"> + <object class="GtkImage" id="image3762"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-go-down</property> + <property name="stock">gtk-add</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4074"> + <object class="GtkImage" id="image3763"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-go-up</property> + <property name="stock">gtk-add</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4075"> + <object class="GtkImage" id="image3764"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-jump-to</property> + <property name="stock">gtk-open</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4076"> + <object class="GtkImage" id="image3765"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-select-font</property> + <property name="stock">gtk-find</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4077"> + <object class="GtkImage" id="image3766"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-new</property> + <property name="stock">gtk-find</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4078"> + <object class="GtkImage" id="image3767"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-open</property> + <property name="stock">gtk-jump-to</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4079"> + <object class="GtkImage" id="image4055"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-close</property> + <property name="stock">gtk-add</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4080"> + <object class="GtkImage" id="image4056"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-refresh</property> + <property name="stock">gtk-new</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4081"> + <object class="GtkImage" id="image4057"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-file</property> + <property name="stock">gtk-save</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4082"> + <object class="GtkImage" id="image4058"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-select-color</property> + <property name="stock">gtk-revert-to-saved</property> <property name="icon-size">1</property> </object> - <object class="GtkImage" id="image4083"> + <object class="GtkImage" id="image4059"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-help</property> + <property name="stock">gtk-revert-to-saved</property> <property name="icon-size">1</property> </object> <object class="GtkListStore" id="indent_mode_list"> @@ -9047,6 +9047,33 @@ </object> </child> <child> + <object class="GtkMenuItem" id="keyboard_shortcuts1"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Keyboard Shortcuts</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_help_shortcuts1_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="debug_messages1"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Debug _Messages</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_debug_messages1_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="help_menu_sep1"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="website1"> <property name="use_action_appearance">False</property> <property name="visible">True</property> @@ -9057,23 +9084,33 @@ </object> </child> <child> - <object class="GtkMenuItem" id="keyboard_shortcuts1"> + <object class="GtkMenuItem" id="help_menu_item_wiki"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Keyboard Shortcuts</property> + <property name="label" translatable="yes">Wi_ki</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_help_shortcuts1_activate" swapped="no"/> + <signal name="activate" handler="on_help_menu_item_wiki_activate" swapped="no"/> </object> </child> <child> - <object class="GtkMenuItem" id="debug_messages1"> + <object class="GtkMenuItem" id="help_menu_item_bug_report"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Debug Messages</property> + <property name="label" translatable="yes">Report a _Bug</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_debug_messages1_activate" swapped="no"/> + <signal name="activate" handler="on_help_menu_item_bug_report_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="help_menu_item_donate"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Donate</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_help_menu_item_donate_activate" swapped="no"/> </object> </child> <child>
Modified: src/callbacks.c 18 files changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -1126,6 +1126,24 @@ G_MODULE_EXPORT void on_website1_activate(GtkMenuItem *menuitem, gpointer user_d }
+G_MODULE_EXPORT void on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data) +{ + utils_open_browser(GEANY_DONATE); +} + + +G_MODULE_EXPORT void on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data) +{ + utils_open_browser(GEANY_WIKI); +} + + +G_MODULE_EXPORT void on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data) +{ + utils_open_browser(GEANY_BUG_REPORT); +} + + G_MODULE_EXPORT void on_comments_function_activate(GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current();
Modified: src/callbacks.h 11 files changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -268,7 +268,16 @@ gpointer user_data);
G_MODULE_EXPORT void -on_line_wrapping1_toggled (GtkCheckMenuItem *checkmenuitem, +on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data); + +G_MODULE_EXPORT void +on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data); + +G_MODULE_EXPORT void +on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data); + +G_MODULE_EXPORT void +on_line_wrapping1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data);
G_MODULE_EXPORT void
Modified: src/geany.h 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -47,6 +47,9 @@ #define GEANY_TEMPLATES_SUBDIR "templates" #define GEANY_CODENAME "Tavira" #define GEANY_HOMEPAGE "http://www.geany.org/" +#define GEANY_WIKI "http://wiki.geany.org/" +#define GEANY_BUG_REPORT "http://www.geany.org/Support/Bugs" +#define GEANY_DONATE "https://sourceforge.net/donate/index.php?group_id=153444" #define GEANY_STRING_UNTITLED _("untitled") #define GEANY_DEFAULT_DIALOG_HEIGHT 350 #define GEANY_WINDOW_DEFAULT_WIDTH 900
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).