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. https://bugzilla.gnome.org/show_bug.cgi?id=736419 --- po/POTFILES.in | 1 + shell/ev-application.c | 42 +++++++ shell/ev-application.h | 2 + shell/ev-window-title.c | 26 +++++ shell/ev-window.c | 3 +- shell/evince.gresource.xml | 1 + shell/meson.build | 1 + shell/traditional-menus.ui | 230 +++++++++++++++++++++++++++++++++++++ 8 files changed, 305 insertions(+), 1 deletion(-) create mode 100644 shell/traditional-menus.ui diff --git a/po/POTFILES.in b/po/POTFILES.in index ebfc72b..72797d3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -65,3 +65,4 @@ shell/ev-window-title.c shell/ev-zoom-action.c shell/help-overlay.ui shell/main.c +shell/traditional-menus.ui diff --git a/shell/ev-application.c b/shell/ev-application.c index 23871d9..946627f 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -45,12 +45,15 @@ #include "ev-media-player-keys.h" #endif /* ENABLE_DBUS */ +extern gboolean in_desktop (const gchar *name); + struct _EvApplication { GtkApplication base_instance; gchar *uri; gchar *dot_dir; + GMenu *bookmarks_menu; #ifdef ENABLE_DBUS EvEvinceApplication *skeleton; @@ -939,6 +942,26 @@ ev_application_migrate_config_dir (EvApplication *application) g_free (old_accels); } +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) { @@ -998,6 +1021,25 @@ ev_application_startup (GApplication *gapplication) hdy_init (); + if (!in_desktop ("GNOME")) { + GtkBuilder *builder; + GError *error = NULL; + + builder = gtk_builder_new (); + gtk_builder_add_from_resource (builder, "/org/gnome/evince/gtk/traditional-menus.ui", &error); + g_assert_no_error (error); + + gtk_application_set_app_menu (GTK_APPLICATION (application), NULL); + 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); + g_object_unref (builder); + } + for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1) gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]); } diff --git a/shell/ev-application.h b/shell/ev-application.h index 00a7a18..b2664a4 100644 --- a/shell/ev-application.h +++ b/shell/ev-application.h @@ -74,6 +74,8 @@ void ev_application_new_window (EvApplication *application GdkScreen *screen, guint32 timestamp); +gboolean ev_application_has_traditional_menus (EvApplication *application); + G_END_DECLS #endif /* !EV_APPLICATION_H */ diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c index 87fbd1f..dd4f152 100644 --- a/shell/ev-window-title.c +++ b/shell/ev-window-title.c @@ -32,6 +32,8 @@ #define EV_BACKEND_PS "PSDocument" #define EV_BACKEND_PDF "PdfDocument" +gboolean in_desktop (const gchar *name); + typedef struct { const gchar *backend; @@ -93,6 +95,30 @@ ev_window_title_sanitize_title (EvWindowTitle *window_title, char **title) { } } +gboolean +in_desktop (const gchar *name) +{ + const gchar *desktop_name_list; + gchar **names; + gboolean in_list = FALSE; + gint i; + + desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP"); + if (!desktop_name_list) + return FALSE; + + names = g_strsplit (desktop_name_list, ":", -1); + for (i = 0; names[i] && !in_list; i++) + if (strcmp (names[i], name) == 0) { + in_list = TRUE; + break; + } + g_strfreev (names); + + return in_list; +} + + static void ev_window_title_update (EvWindowTitle *window_title) { diff --git a/shell/ev-window.c b/shell/ev-window.c index 077d577..bf5122f 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -674,6 +674,8 @@ update_chrome_visibility (EvWindow *window) set_widget_visibility (priv->toolbar, toolbar); set_widget_visibility (priv->sidebar, sidebar); + + gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (window), !presentation); } static void @@ -7840,7 +7842,6 @@ ev_window_new (void) 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 --git a/shell/evince.gresource.xml b/shell/evince.gresource.xml index c7dcc17..865ba3f 100644 --- a/shell/evince.gresource.xml +++ b/shell/evince.gresource.xml @@ -21,6 +21,7 @@ evince.css thumbnail-frame.png evince-menus.ui + traditional-menus.ui evince-message-area.ui evince-password-view.ui evince-progress-message-area.ui diff --git a/shell/traditional-menus.ui b/shell/traditional-menus.ui new file mode 100644 index 0000000..aa2dc96 --- /dev/null +++ b/shell/traditional-menus.ui @@ -0,0 +1,230 @@ + + + + + + _File +
+ + _Open… + win.open + <Ctrl>O + + + Op_en a Copy + win.open-copy + <Ctrl>N + +
+
+ + _Save a Copy… + win.save-as + <Ctrl>S + + + 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 +
+ + _Keyboard Shortcuts + win.show-help-overlay + + + _Help + win.help + F1 + + + _About + win.about + +
+ + + -- 2.26.3