From 8b2440b23466b2b9e30a92122b4ed9496484ae54 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 30 Jan 2014 15:13:38 +0100 Subject: Add traditional menu bar This menu bar will only be shown when the desktop requests this through the gtk-shell-shows-app-menu and gtk-shell-shows-menubar settings. The view and action menus are hidden when the menubar is shown. diff -Nur evince-3.13.91.orig/shell/ev-application.c evince-3.13.91/shell/ev-application.c --- evince-3.13.91.orig/shell/ev-application.c 2014-09-09 19:29:27.708284422 +0200 +++ evince-3.13.91/shell/ev-application.c 2014-09-09 21:29:56.376525156 +0200 @@ -50,7 +50,8 @@ gchar *uri; gchar *dot_dir; - + GMenu *bookmarks_menu; + #ifdef ENABLE_DBUS EvEvinceApplication *skeleton; EvMediaPlayerKeys *keys; @@ -1055,6 +1056,26 @@ } static void +ev_application_update_bookmarks_menu (EvApplication *application) +{ + GtkWindow *window; + + /* The bookmarks menu has two sections: the first one contains + * the "Add Bookmark" menu item and the second one is filled + * with the active window's bookmarks. + */ + + if (g_menu_model_get_n_items (G_MENU_MODEL (application->bookmarks_menu)) == 2) + g_menu_remove (application->bookmarks_menu, 1); + + window = gtk_application_get_active_window (GTK_APPLICATION (application)); + if (window) { + g_menu_append_section (application->bookmarks_menu, NULL, + ev_window_get_bookmarks_menu (EV_WINDOW (window))); + } +} + +static void ev_application_startup (GApplication *gapplication) { const GActionEntry app_menu_actions[] = { @@ -1112,11 +1133,29 @@ application); builder = gtk_builder_new (); - gtk_builder_add_from_resource (builder, "/org/gnome/evince/shell/ui/menus.ui", &error); - g_assert_no_error (error); - gtk_application_set_app_menu (GTK_APPLICATION (application), + if (ev_application_has_traditional_menus (application)) + { + gtk_builder_add_from_resource (builder, "/org/gnome/evince/shell/ui/traditional-menus.ui", &error); + g_assert_no_error (error); + + gtk_application_set_menubar (GTK_APPLICATION (application), + G_MENU_MODEL (gtk_builder_get_object (builder, "menubar"))); + + application->bookmarks_menu = G_MENU (gtk_builder_get_object (builder, "bookmarks")); + g_signal_connect_swapped (application, "notify::active-window", + G_CALLBACK (ev_application_update_bookmarks_menu), application); + ev_application_update_bookmarks_menu (application); + } + else + { + gtk_builder_add_from_resource (builder, "/org/gnome/evince/shell/ui/menus.ui", &error); + g_assert_no_error (error); + + gtk_application_set_app_menu (GTK_APPLICATION (application), G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"))); + } + g_object_unref (builder); for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1) @@ -1342,3 +1381,25 @@ gtk_show_uri (screen, uri, gtk_get_current_event_time (), NULL); g_free (uri); } + +gboolean +ev_application_has_traditional_menus (EvApplication *application) +{ + GdkDisplay *display; + GdkScreen *screen; + GtkSettings *settings; + gboolean show_app_menu; + gboolean show_menubar; + + g_return_val_if_fail (EV_IS_APPLICATION (application), FALSE); + + display = gdk_display_get_default (); + screen = gdk_display_get_default_screen (display); + settings = gtk_settings_get_for_screen (screen); + g_object_get (G_OBJECT (settings), + "gtk-shell-shows-app-menu", &show_app_menu, + "gtk-shell-shows-menubar", &show_menubar, + NULL); + + return !show_app_menu || show_menubar; +} diff -Nur evince-3.13.91.orig/shell/ev-application.h evince-3.13.91/shell/ev-application.h --- evince-3.13.91.orig/shell/ev-application.h 2014-09-09 19:29:27.708284422 +0200 +++ evince-3.13.91/shell/ev-application.h 2014-09-09 19:50:20.304326137 +0200 @@ -80,6 +80,8 @@ GdkScreen *screen, const char *topic); +gboolean ev_application_has_traditional_menus (EvApplication *application); + G_END_DECLS #endif /* !EV_APPLICATION_H */ diff -Nur evince-3.13.91.orig/shell/evince.gresource.xml evince-3.13.91/shell/evince.gresource.xml --- evince-3.13.91.orig/shell/evince.gresource.xml 2014-09-09 19:29:27.704284422 +0200 +++ evince-3.13.91/shell/evince.gresource.xml 2014-09-09 19:44:19.232314112 +0200 @@ -20,5 +20,6 @@ evince.css thumbnail-frame.png evince-menus.ui + traditional-menus.ui diff -Nur evince-3.13.91.orig/shell/ev-toolbar.c evince-3.13.91/shell/ev-toolbar.c --- evince-3.13.91.orig/shell/ev-toolbar.c 2014-09-09 19:29:27.704284422 +0200 +++ evince-3.13.91/shell/ev-toolbar.c 2014-09-09 21:31:11.592527661 +0200 @@ -190,8 +190,6 @@ GtkWidget *hbox, *vbox; GtkWidget *button; gboolean rtl; - GMenuModel *menu; - GMenuModel *bookmarks_submenu_model; G_OBJECT_CLASS (ev_toolbar_parent_class)->constructed (object); @@ -240,25 +238,36 @@ gtk_widget_set_margin_right (button, 6); gtk_header_bar_pack_start (GTK_HEADER_BAR (ev_toolbar), button); - /* Action Menu */ - menu = G_MENU_MODEL (gtk_builder_get_object (builder, "action-menu")); - button = ev_toolbar_create_menu_button (ev_toolbar, "open-menu-symbolic", - menu, GTK_ALIGN_END); - gtk_widget_set_tooltip_text (button, _("File options")); - atk_object_set_name (gtk_widget_get_accessible (button), _("File options")); - - ev_toolbar->priv->action_menu_button = button; - gtk_header_bar_pack_end (GTK_HEADER_BAR (ev_toolbar), button); - - /* View Menu */ - menu = G_MENU_MODEL (gtk_builder_get_object (builder, "view-menu")); - button = ev_toolbar_create_menu_button (ev_toolbar, "document-properties-symbolic", - menu, GTK_ALIGN_END); - gtk_widget_set_tooltip_text (button, _("View options")); - atk_object_set_name (gtk_widget_get_accessible (button), _("View options")); - ev_toolbar->priv->view_menu_button = button; - gtk_header_bar_pack_end (GTK_HEADER_BAR (ev_toolbar), button); - + if (!ev_application_has_traditional_menus (EV_APP)) { + GMenuModel *bookmarks_submenu_model; + GMenuModel *menu; + + /* Action Menu */ + menu = G_MENU_MODEL (gtk_builder_get_object (builder, "action-menu")); + button = ev_toolbar_create_menu_button (ev_toolbar, "open-menu-symbolic", + menu, GTK_ALIGN_END); + gtk_widget_set_tooltip_text (button, _("File options")); + atk_object_set_name (gtk_widget_get_accessible (button), _("File options")); + + ev_toolbar->priv->action_menu_button = button; + gtk_header_bar_pack_end (GTK_HEADER_BAR (ev_toolbar), button); + + /* View Menu */ + menu = G_MENU_MODEL (gtk_builder_get_object (builder, "view-menu")); + button = ev_toolbar_create_menu_button (ev_toolbar, "document-properties-symbolic", + menu, GTK_ALIGN_END); + gtk_widget_set_tooltip_text (button, _("View options")); + atk_object_set_name (gtk_widget_get_accessible (button), _("View options")); + ev_toolbar->priv->view_menu_button = button; + gtk_header_bar_pack_end (GTK_HEADER_BAR (ev_toolbar), button); + + ev_toolbar->priv->bookmarks_section = G_MENU (gtk_builder_get_object (builder, "bookmarks")); + bookmarks_submenu_model = ev_window_get_bookmarks_menu (ev_toolbar->priv->window); + g_signal_connect (bookmarks_submenu_model, "items-changed", + G_CALLBACK (ev_toolbar_bookmarks_menu_model_changed), + ev_toolbar); + ev_toolbar_setup_bookmarks_menu (ev_toolbar, bookmarks_submenu_model); + } /* Zoom selector */ vbox = ev_zoom_action_new (ev_window_get_document_model (ev_toolbar->priv->window), G_MENU (gtk_builder_get_object (builder, "zoom-menu"))); @@ -272,13 +281,6 @@ gtk_widget_set_margin_right (vbox, 6); gtk_header_bar_pack_end (GTK_HEADER_BAR (ev_toolbar), vbox); - ev_toolbar->priv->bookmarks_section = G_MENU (gtk_builder_get_object (builder, "bookmarks")); - bookmarks_submenu_model = ev_window_get_bookmarks_menu (ev_toolbar->priv->window); - g_signal_connect (bookmarks_submenu_model, "items-changed", - G_CALLBACK (ev_toolbar_bookmarks_menu_model_changed), - ev_toolbar); - ev_toolbar_setup_bookmarks_menu (ev_toolbar, bookmarks_submenu_model); - g_object_unref (builder); } diff -Nur evince-3.13.91.orig/shell/ev-window.c evince-3.13.91/shell/ev-window.c --- evince-3.13.91.orig/shell/ev-window.c 2014-09-09 19:29:27.708284422 +0200 +++ evince-3.13.91/shell/ev-window.c 2014-09-10 10:54:05.849241430 +0200 @@ -637,6 +637,8 @@ set_widget_visibility (priv->toolbar, toolbar); set_widget_visibility (priv->find_bar, findbar); set_widget_visibility (priv->sidebar, sidebar); + + gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (window), !presentation); } static void @@ -7242,7 +7244,6 @@ ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW, "type", GTK_WINDOW_TOPLEVEL, "application", g_application_get_default (), - "show-menubar", FALSE, NULL)); return ev_window; diff -Nur evince-3.13.91.orig/shell/Makefile.am evince-3.13.91/shell/Makefile.am --- evince-3.13.91.orig/shell/Makefile.am 2014-09-09 19:29:27.700284422 +0200 +++ evince-3.13.91/shell/Makefile.am 2014-09-09 19:45:03.944315601 +0200 @@ -172,7 +172,8 @@ evince-icon.rc \ evince.gresource.xml \ ev-gdbus.xml \ - ev-daemon-gdbus.xml + ev-daemon-gdbus.xml \ + traditional-menus.ui ev-resources.c: evince.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) --sourcedir=$(top_srcdir)/data $(srcdir)/evince.gresource.xml) $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir=$(srcdir) --sourcedir=$(top_srcdir)/data --generate-source --c-name ev $< diff -Nur evince-3.13.91.orig/shell/traditional-menus.ui evince-3.13.91/shell/traditional-menus.ui --- evince-3.13.91.orig/shell/traditional-menus.ui 1970-01-01 01:00:00.000000000 +0100 +++ evince-3.13.91/shell/traditional-menus.ui 2014-09-09 19:43:59.112313442 +0200 @@ -0,0 +1,229 @@ + + + + + + _File +
+ + _Open… + win.open + <Ctrl>O + + + Op_en a Copy + win.open-copy + <Ctrl>N + +
+
+ + _Save a Copy… + win.save-copy + <Ctrl>S + + + Send _To… + win.send-to + + + Open Containing _Folder + win.open-containing-folder + + + _Print… + win.print + <Ctrl>P + +
+
+ + P_roperties… + win.show-properties + <Alt>Return + +
+ + + + +
+ + _Close + win.close + <Ctrl>W + +
+ + + _Edit +
+ + _Copy + win.copy + <Ctrl>C + + + Select _All + win.select-all + <Ctrl>A + +
+
+ + _Find + win.find + <Ctrl>F + +
+
+ + Rotate _Left + win.rotate-left + <Ctrl>Left + + + Rotate _Right + win.rotate-right + <Ctrl>Right + +
+
+ + Save Current Settings as _Default + win.save-settings + <Ctrl>T + +
+ + + _View +
+ + _Continuous + win.continuous + + + _Dual + win.dual-page + +
+
+ + Side _Pane + win.show-side-pane + F9 + +
+
+ + _Fullscreen + win.fullscreen + F11 + + + Pre_sentation + win.presentation + F5 + +
+
+ + Zoom _In + win.zoom-in + <Ctrl>plus + + + Zoom _Out + win.zoom-out + <Ctrl>minus + +
+
+ + _Odd Pages Left + win.dual-odd-left + + + _Inverted Colors + win.inverted-colors + <Ctrl>I + +
+
+ + _Reload + win.reload + <Ctrl>R + +
+ + + _Go +
+ + _Previous Page + win.go-previous-page + p + + + _Next Page + win.go-next-page + n + +
+
+ + _First Page + win.go-first-page + <Ctrl>Home + + + _Last Page + win.go-last-page + <Ctrl>End + +
+ + + _Bookmarks +
+ + _Add Bookmark + win.add-bookmark + +
+ + + _Help +
+ + _Help + app.help + + + _About + app.about + +
+ + +