[glade] Set proper names for menubar item and updated mac integration
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Set proper names for menubar item and updated mac integration
- Date: Fri, 27 Apr 2012 22:39:02 +0000 (UTC)
commit b6f3d968f661781e5cc9df7bc499810de4f168f9
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Fri Apr 27 19:31:24 2012 -0300
Set proper names for menubar item and updated mac integration
src/glade-window.c | 14 +++------
src/glade.glade | 74 ++++++++++++++++++++++++++--------------------------
2 files changed, 42 insertions(+), 46 deletions(-)
---
diff --git a/src/glade-window.c b/src/glade-window.c
index 0c0fc9f..dca459a 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -3098,31 +3098,27 @@ glade_window_constructed (GObject *object)
#ifdef MAC_INTEGRATION
{
/* Fix up the menubar for MacOSX Quartz builds */
- GtkWidget *menubar =GTK_WIDGET (gtk_builder_get_object (builder, "menubar"));
+ GtkWidget *menubar = GET_OBJECT (builder, GTK_WIDGET, "menubar");
GtkWidget *sep;
GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
gtk_widget_hide (menubar);
gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
- widget =
- gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit");
+ widget = GET_OBJECT (builder, GTK_WIDGET, "quit_menuitem");
gtk_widget_hide (widget);
- widget =
- gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu/About");
+ widget = GET_OBJECT (builder, GTK_WIDGET, "about_menuitem");
gtk_osxapplication_insert_app_menu_item (theApp, widget, 0);
sep = gtk_separator_menu_item_new();
g_object_ref(sep);
gtk_osxapplication_insert_app_menu_item (theApp, sep, 1);
- widget =
- gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Properties");
+ widget = GET_OBJECT (builder, GTK_WIDGET, "properties_menuitem");
gtk_osxapplication_insert_app_menu_item (theApp, widget, 2);
sep = gtk_separator_menu_item_new();
g_object_ref(sep);
gtk_osxapplication_insert_app_menu_item (theApp, sep, 3);
- widget =
- gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu");
+ widget = GET_OBJECT (builder, GTK_WIDGET, "help_menuitem");
gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget));
g_signal_connect(theApp, "NSApplicationWillTerminate",
diff --git a/src/glade.glade b/src/glade.glade
index bc9d51b..f8af740 100644
--- a/src/glade.glade
+++ b/src/glade.glade
@@ -391,19 +391,19 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="menuitem1">
+ <object class="GtkMenuItem" id="file_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu1">
+ <object class="GtkMenu" id="file_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="accel_group">accelgroup</property>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem1">
+ <object class="GtkImageMenuItem" id="new_menuitem">
<property name="related_action">new_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -412,7 +412,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem2">
+ <object class="GtkImageMenuItem" id="open_menuitem">
<property name="related_action">open_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -449,7 +449,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem3">
+ <object class="GtkImageMenuItem" id="save_menuitem">
<property name="related_action">save_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -458,7 +458,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem4">
+ <object class="GtkImageMenuItem" id="save_as_menuitem">
<property name="related_action">save_as_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -474,7 +474,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem13">
+ <object class="GtkImageMenuItem" id="properties_menuitem">
<property name="related_action">properties_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -490,7 +490,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem15">
+ <object class="GtkImageMenuItem" id="close_menuitem">
<property name="related_action">close_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -499,7 +499,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem5">
+ <object class="GtkImageMenuItem" id="quit_menuitem">
<property name="related_action">quit_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -512,19 +512,19 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="menuitem2">
+ <object class="GtkMenuItem" id="edit_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu2">
+ <object class="GtkMenu" id="edit_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="accel_group">accelgroup</property>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem11">
+ <object class="GtkImageMenuItem" id="undo_menuitem">
<property name="related_action">undo_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -533,7 +533,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem12">
+ <object class="GtkImageMenuItem" id="redo_menuitem">
<property name="related_action">redo_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -549,7 +549,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem6">
+ <object class="GtkImageMenuItem" id="cut_menuitem">
<property name="related_action">cut_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -558,7 +558,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem7">
+ <object class="GtkImageMenuItem" id="copy_menuitem">
<property name="related_action">copy_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -567,7 +567,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem8">
+ <object class="GtkImageMenuItem" id="paste_menuitem">
<property name="related_action">paste_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -576,7 +576,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem9">
+ <object class="GtkImageMenuItem" id="delete_menuitem">
<property name="related_action">delete_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -592,7 +592,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem29">
+ <object class="GtkImageMenuItem" id="preferences_menuitem">
<property name="related_action">preferences_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -605,19 +605,19 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="menuitem3">
+ <object class="GtkMenuItem" id="view_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu5">
+ <object class="GtkMenu" id="view_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="accel_group">accelgroup</property>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem19">
+ <object class="GtkImageMenuItem" id="toolbar_visible_menuitem">
<property name="related_action">toolbar_visible_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -626,7 +626,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem20">
+ <object class="GtkImageMenuItem" id="statusbar_visible_menuitem">
<property name="related_action">statusbar_visible_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -635,7 +635,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem21">
+ <object class="GtkImageMenuItem" id="project_tabs_visible_menuitem">
<property name="related_action">project_tabs_visible_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -655,21 +655,21 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkCheckMenuItem" id="checkmenuitem1">
+ <object class="GtkCheckMenuItem" id="icons_and_labels_checkmenuitem">
<property name="related_action">icons_and_labels_radioaction</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
- <object class="GtkCheckMenuItem" id="checkmenuitem2">
+ <object class="GtkCheckMenuItem" id="icons_only_checkmenuitem">
<property name="related_action">icons_only_radioaction</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
- <object class="GtkCheckMenuItem" id="checkmenuitem3">
+ <object class="GtkCheckMenuItem" id="labels_only_checkmenuitem">
<property name="related_action">labels_only_radioaction</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -683,7 +683,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem28">
+ <object class="GtkImageMenuItem" id="use_small_icons_menuitem">
<property name="related_action">use_small_icons_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -703,7 +703,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem22">
+ <object class="GtkImageMenuItem" id="dock_palette_menuitem">
<property name="related_action">dock_palette_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -712,7 +712,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem25">
+ <object class="GtkImageMenuItem" id="dock_inspector_menuitem">
<property name="related_action">dock_inspector_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -721,7 +721,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem26">
+ <object class="GtkImageMenuItem" id="dock_editor_menuitem">
<property name="related_action">dock_editor_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -734,7 +734,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="menuitem5">
+ <object class="GtkMenuItem" id="projects_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -746,7 +746,7 @@ Andreas Nilsson <andreas andreasn se></property>
<property name="can_focus">False</property>
<property name="accel_group">accelgroup</property>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem17">
+ <object class="GtkImageMenuItem" id="previous_project_menuitem">
<property name="related_action">previous_project_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -755,7 +755,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem18">
+ <object class="GtkImageMenuItem" id="next_project_menuitem">
<property name="related_action">next_project_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -775,19 +775,19 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="menuitem4">
+ <object class="GtkMenuItem" id="help_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu3">
+ <object class="GtkMenu" id="help_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="accel_group">accelgroup</property>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem16">
+ <object class="GtkImageMenuItem" id="reference_menuitem">
<property name="related_action">reference_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -803,7 +803,7 @@ Andreas Nilsson <andreas andreasn se></property>
</object>
</child>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem10">
+ <object class="GtkImageMenuItem" id="about_menuitem">
<property name="related_action">about_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
