[geany/geany] 28f7c1: Merge pull request #652 from b4n/kb/file-properties

Colomban Wendling git-noreply at xxxxx
Sat Jan 9 19:07:23 UTC 2016


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 09 Jan 2016 19:07:23 UTC
Commit:      28f7c169fcad406fc12a5363d768bbe98789c07e
             https://github.com/geany/geany/commit/28f7c169fcad406fc12a5363d768bbe98789c07e

Log Message:
-----------
Merge pull request #652 from b4n/kb/file-properties

Allow to set a keybinding for File->Properties


Modified Paths:
--------------
    data/geany.glade
    src/callbacks.c
    src/callbacks.h
    src/keybindings.c
    src/keybindings.h
    src/ui_utils.c

Modified: data/geany.glade
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -6407,7 +6407,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkImageMenuItem" id="preferences2">
+                          <object class="GtkImageMenuItem" id="properties1">
                             <property name="label">gtk-properties</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>


Modified: src/callbacks.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1124,7 +1124,7 @@ static void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpointer user
 }
 
 
-static void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);


Modified: src/callbacks.h
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -117,6 +117,8 @@ void on_menu_remove_indicators1_activate(GtkMenuItem *menuitem, gpointer user_da
 
 void on_print1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
+void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data);
+
 void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
 void on_menu_show_sidebar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);


Modified: src/keybindings.c
5 lines changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -341,6 +341,8 @@ static void init_default_kb(void)
 	add_kb(group, GEANY_KEYS_FILE_SAVEALL, NULL,
 		GDK_s, GDK_SHIFT_MASK | GEANY_PRIMARY_MOD_MASK, "menu_saveall", _("Save all"),
 		"menu_save_all1");
+	add_kb(group, GEANY_KEYS_FILE_PROPERTIES, NULL,
+		0, 0, "file_properties", _("Properties"), "properties1");
 	add_kb(group, GEANY_KEYS_FILE_PRINT, NULL,
 		GDK_p, GEANY_PRIMARY_MOD_MASK, "menu_print", _("Print"), "print1");
 	add_kb(group, GEANY_KEYS_FILE_CLOSE, NULL,
@@ -1439,6 +1441,9 @@ static gboolean cb_func_file_action(guint key_id)
 		case GEANY_KEYS_FILE_PRINT:
 			on_print1_activate(NULL, NULL);
 			break;
+		case GEANY_KEYS_FILE_PROPERTIES:
+			on_file_properties_activate(NULL, NULL);
+			break;
 		case GEANY_KEYS_FILE_QUIT:
 			main_quit();
 			break;


Modified: src/keybindings.h
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -266,6 +266,7 @@ enum GeanyKeyBindingID
 	GEANY_KEYS_GOTO_LINESTARTVISUAL,			/**< Keybinding. */
 	GEANY_KEYS_DOCUMENT_CLONE,					/**< Keybinding. */
 	GEANY_KEYS_FILE_QUIT,						/**< Keybinding. */
+	GEANY_KEYS_FILE_PROPERTIES,					/**< Keybinding. */
 	GEANY_KEYS_COUNT	/* must not be used by plugins */
 };
 


Modified: src/ui_utils.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -875,7 +875,7 @@ static void init_document_widgets(void)
 	add_doc_widget("add_comments1");
 	add_doc_widget("menu_paste1");
 	add_doc_widget("menu_undo2");
-	add_doc_widget("preferences2");
+	add_doc_widget("properties1");
 	add_doc_widget("menu_reload1");
 	add_doc_widget("menu_document1");
 	add_doc_widget("menu_choose_color1");



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list