Subject: [PATCH 1/2] Add a traditional menu bar (v3.28.2)
Bug: https://bugzilla.gnome.org/749976
Bug-Debian: https://bugs.debian.org/793445
---
data/eog-menubar.ui | 213 ++++++++++++++++++++++++++++++++++++++++++
data/meson.build | 1 +
po/POTFILES.in | 1 +
src/eog-application.c | 35 +++++++
src/eog.gresource.xml | 1 +
5 files changed, 251 insertions(+), 0 deletions(-)
create mode 100644 data/eog-menubar.ui
diff --git a/data/eog-menubar.ui b/data/eog-menubar.ui
new file mode 100644
index 0000000..5241c75
--- /dev/null
+++ b/data/eog-menubar.ui
@@ -0,0 +1,213 @@
+
+
+
+
diff --git a/data/meson.build b/data/meson.build
index 17c9140..7adcb40 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,6 +2,7 @@ subdir('icons')
resource_data = files(
'pixmaps/thumbnail-frame.png',
+ 'eog-menubar.ui',
'eog-details-dialog.ui',
'eog-gear-menu.ui',
'eog-multiple-save-as-dialog.ui',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 31cf8f1..8bc89b4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@
data/eog.appdata.xml.in
data/eog-gear-menu.ui
data/eog-details-dialog.ui
+data/eog-menubar.ui
data/eog-multiple-save-as-dialog.ui
data/eog-preferences-dialog.ui
data/eog-remote-presenter.ui
diff --git a/src/eog-application.c b/src/eog-application.c
index 69a5c06..ed2a82d 100644
--- a/src/eog-application.c
+++ b/src/eog-application.c
@@ -266,6 +266,29 @@ on_extension_removed (PeasExtensionSet *set,
eog_application_activatable_deactivate (EOG_APPLICATION_ACTIVATABLE (exten));
}
+static 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
eog_application_startup (GApplication *application)
{
@@ -327,6 +350,18 @@ eog_application_startup (GApplication *application)
G_CALLBACK (on_extension_removed), app);
peas_extension_set_call (app->priv->extensions, "activate");
+
+ if (!in_desktop("GNOME"))
+ {
+ GtkBuilder *builder;
+ builder = gtk_builder_new_from_resource ("/org/gnome/eog/gtk/menu/menus-traditional.ui");
+
+ 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")));
+
+ g_object_unref (builder);
+ }
}
static void
diff --git a/src/eog.gresource.xml b/src/eog.gresource.xml
index 472408a..0305a13 100644
--- a/src/eog.gresource.xml
+++ b/src/eog.gresource.xml
@@ -13,6 +13,7 @@
popup-menus.ui
+ eog-menubar.ui
help-overlay.ui
--
2.26.2