r47566 - in /desktop/experimental/eog/debian: changelog patches/0001-Add-a-traditional-menu-bar.patch patches/0002-Show-traditional-title-bar-in-unity.patch patches/Put-Exit-Fullscreen-button-into-toolbar.patch patches/series
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Wed Mar 16 15:06:12 UTC 2016
Author: laney
Date: Wed Mar 16 15:06:11 2016
New Revision: 47566
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47566
Log:
debian/patches/0001-Add-a-traditional-menu-bar.patch,
debian/patches/0002-Show-traditional-title-bar-in-unity.patch: Fix to
apply, and make smaller while achieving the same result (thanks, GTK!).
Removed:
desktop/experimental/eog/debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch
Modified:
desktop/experimental/eog/debian/changelog
desktop/experimental/eog/debian/patches/0001-Add-a-traditional-menu-bar.patch
desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch
desktop/experimental/eog/debian/patches/series
Modified: desktop/experimental/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/changelog?rev=47566&op=diff
==============================================================================
--- desktop/experimental/eog/debian/changelog [utf-8] (original)
+++ desktop/experimental/eog/debian/changelog [utf-8] Wed Mar 16 15:06:11 2016
@@ -1,6 +1,9 @@
eog (3.19.92-2) UNRELEASED; urgency=medium
* debian/watch: Find unstable versions too.
+ * debian/patches/0001-Add-a-traditional-menu-bar.patch,
+ debian/patches/0002-Show-traditional-title-bar-in-unity.patch: Fix to
+ apply, and make smaller while achieving the same result (thanks, GTK!).
-- Iain Lane <laney at debian.org> Wed, 16 Mar 2016 15:04:39 +0000
Modified: desktop/experimental/eog/debian/patches/0001-Add-a-traditional-menu-bar.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/patches/0001-Add-a-traditional-menu-bar.patch?rev=47566&op=diff
==============================================================================
--- desktop/experimental/eog/debian/patches/0001-Add-a-traditional-menu-bar.patch [utf-8] (original)
+++ desktop/experimental/eog/debian/patches/0001-Add-a-traditional-menu-bar.patch [utf-8] Wed Mar 16 15:06:11 2016
@@ -11,11 +11,11 @@
4 files changed, 259 insertions(+), 30 deletions(-)
create mode 100644 data/eog-menubar.xml
-Index: eog-3.18.0/data/eog-menubar.xml
+Index: b/data/eog-menubar.xml
===================================================================
--- /dev/null
-+++ eog-3.18.0/data/eog-menubar.xml
-@@ -0,0 +1,205 @@
++++ b/data/eog-menubar.xml
+@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<interface>
+ <menu id="menubar">
@@ -214,6 +214,10 @@
+ <attribute name="accel">F1</attribute>
+ </item>
+ <item>
++ <attribute name="action">win.show-help-overlay</attribute>
++ <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
++ </item>
++ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">app.about</attribute>
+ </item>
@@ -221,60 +225,11 @@
+ </submenu>
+ </menu>
+</interface>
-Index: eog-3.18.0/src/eog-application.c
+Index: b/src/eog-window.c
===================================================================
---- eog-3.18.0.orig/src/eog-application.c
-+++ eog-3.18.0/src/eog-application.c
-@@ -169,17 +169,34 @@ eog_application_init_app_menu (EogApplic
- application);
-
- builder = gtk_builder_new ();
-- gtk_builder_add_from_resource (builder,
-- "/org/gnome/eog/ui/eog-app-menu.xml",
-- &error);
-
-- if (error == NULL) {
-- gtk_application_set_app_menu (GTK_APPLICATION (application),
-- G_MENU_MODEL (gtk_builder_get_object (builder,
-- "app-menu")));
-- } else {
-- g_critical ("Unable to add the application menu: %s\n", error->message);
-- g_error_free (error);
-+ if (gtk_application_prefers_app_menu (GTK_APPLICATION (application))) {
-+ gtk_builder_add_from_resource (builder,
-+ "/org/gnome/eog/ui/eog-app-menu.xml",
-+ &error);
-+
-+ if (error == NULL) {
-+ gtk_application_set_app_menu (GTK_APPLICATION (application),
-+ G_MENU_MODEL (gtk_builder_get_object (builder,
-+ "app-menu")));
-+ } else {
-+ g_critical ("Unable to add the application menu: %s\n", error->message);
-+ g_error_free (error);
-+ }
-+ }
-+ else {
-+ gtk_builder_add_from_resource (builder,
-+ "/org/gnome/eog/ui/eog-menubar.xml",
-+ &error);
-+
-+ if (error == NULL) {
-+ gtk_application_set_menubar (GTK_APPLICATION (application),
-+ G_MENU_MODEL (gtk_builder_get_object (builder,
-+ "menubar")));
-+ } else {
-+ g_critical ("Unable to add the application menu: %s\n", error->message);
-+ g_error_free (error);
-+ }
- }
-
- action = g_action_map_lookup_action (G_ACTION_MAP (application),
-Index: eog-3.18.0/src/eog-window.c
-===================================================================
---- eog-3.18.0.orig/src/eog-window.c
-+++ eog-3.18.0/src/eog-window.c
-@@ -4330,18 +4330,30 @@ eog_window_construct_ui (EogWindow *wind
+--- a/src/eog-window.c
++++ b/src/eog-window.c
+@@ -4332,23 +4332,36 @@
priv->zoom_scale);
gtk_widget_show (priv->zoom_scale);
@@ -287,6 +242,14 @@
- builder_object = gtk_builder_get_object (builder, "gear-menu");
- gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
- G_MENU_MODEL (builder_object));
+-
+- gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
+- gtk_widget_show (menu_button);
+-
+- action = G_ACTION (g_property_action_new ("toggle-gear-menu",
+- menu_button, "active"));
+- g_action_map_add_action (G_ACTION_MAP (window), action);
+- g_object_unref (action);
+ priv->open_with_menu = g_menu_new ();
+ priv->appinfo = g_ptr_array_new_with_free_func (g_object_unref);
+
@@ -295,9 +258,7 @@
+ menu_image = gtk_image_new_from_icon_name ("open-menu-symbolic",
+ GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (menu_button), menu_image);
-
-- gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
-- gtk_widget_show (menu_button);
++
+ builder = gtk_builder_new_from_resource ("/org/gnome/eog/ui/eog-gear-menu.ui");
+ builder_object = gtk_builder_get_object (builder, "gear-menu");
+ gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
@@ -312,11 +273,17 @@
+ G_MENU_MODEL (priv->open_with_menu));
+ priv->gear_menu_builder = builder;
+ builder = NULL;
++
++ action = G_ACTION (g_property_action_new ("toggle-gear-menu",
++ menu_button, "active"));
++ g_action_map_add_action (G_ACTION_MAP (window), action);
++ g_object_unref (action);
++
+ }
fullscreen_button = gtk_button_new_from_icon_name ("view-fullscreen-symbolic",
GTK_ICON_SIZE_BUTTON);
-@@ -4352,15 +4364,6 @@ eog_window_construct_ui (EogWindow *wind
+@@ -4359,15 +4372,6 @@
gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), fullscreen_button);
gtk_widget_show (fullscreen_button);
@@ -332,7 +299,7 @@
priv->cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start (GTK_BOX (priv->box), priv->cbox, TRUE, TRUE, 0);
gtk_widget_show (priv->cbox);
-@@ -5300,6 +5303,9 @@ eog_window_get_gear_menu_section (EogWin
+@@ -5307,6 +5311,9 @@
GObject *object;
g_return_val_if_fail (EOG_IS_WINDOW (window), NULL);
@@ -342,22 +309,22 @@
object = gtk_builder_get_object (window->priv->gear_menu_builder, id);
if (object == NULL || !G_IS_MENU (object))
return NULL;
-Index: eog-3.18.0/src/eog.gresource.xml
+Index: b/src/eog.gresource.xml
===================================================================
---- eog-3.18.0.orig/src/eog.gresource.xml
-+++ eog-3.18.0/src/eog.gresource.xml
-@@ -3,6 +3,7 @@
- <gresource prefix="/org/gnome/eog/ui">
- <file>eog.css</file>
- <file compressed="true" preprocess="xml-stripblanks">eog-app-menu.xml</file>
-+ <file compressed="true" preprocess="xml-stripblanks">eog-menubar.xml</file>
- <file compressed="true" preprocess="xml-stripblanks">eog-gear-menu.ui</file>
- <file compressed="true" preprocess="xml-stripblanks">eog-image-properties-dialog.ui</file>
- <file compressed="true" preprocess="xml-stripblanks">eog-multiple-save-as-dialog.ui</file>
-Index: eog-3.18.0/po/POTFILES.in
+--- a/src/eog.gresource.xml
++++ b/src/eog.gresource.xml
+@@ -13,6 +13,7 @@
+ </gresource>
+ <gresource prefix="/org/gnome/eog/gtk">
+ <file alias="menus.ui" compressed="true" preprocess="xml-stripblanks">eog-app-menu.xml</file>
++ <file alias="menus-traditional.ui" compressed="true" preprocess="xml-stripblanks">eog-menubar.xml</file>
+ <file compressed="true" preprocess="xml-stripblanks">help-overlay.ui</file>
+ </gresource>
+ </gresources>
+Index: b/po/POTFILES.in
===================================================================
---- eog-3.18.0.orig/po/POTFILES.in
-+++ eog-3.18.0/po/POTFILES.in
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
Modified: desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch?rev=47566&op=diff
==============================================================================
--- desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch [utf-8] (original)
+++ desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch [utf-8] Wed Mar 16 15:06:11 2016
@@ -8,6 +8,8 @@
src/eog-window.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 55 insertions(+), 11 deletions(-)
+Index: b/src/eog-window.c
+===================================================================
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -134,6 +134,7 @@
@@ -18,34 +20,10 @@
GMenu *open_with_menu;
GPtrArray *appinfo;
-@@ -4259,6 +4260,43 @@
- gtk_button_set_image (GTK_BUTTON (button), zoom_image);
+@@ -4260,6 +4261,20 @@
}
-+/*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
+ static void
+on_action_state_changed (GActionGroup *action_group,
+ gchar *name,
+ GVariant *value,
@@ -59,10 +37,11 @@
+ priv->mode != EOG_WINDOW_MODE_SLIDESHOW);
+}
+
- static void
++static void
eog_window_construct_ui (EogWindow *window)
{
-@@ -4270,7 +4308,6 @@
+ EogWindowPrivate *priv;
+@@ -4270,7 +4285,6 @@
GtkWidget *popup_menu;
GtkWidget *hpaned;
@@ -70,7 +49,7 @@
GtkWidget *zoom_button;
GtkWidget *zoom_image;
GtkWidget *menu_button;
-@@ -4285,12 +4322,19 @@
+@@ -4285,12 +4299,19 @@
gtk_container_add (GTK_CONTAINER (window), priv->box);
gtk_widget_show (priv->box);
@@ -96,7 +75,7 @@
zoom_button = gtk_toggle_button_new ();
zoom_image = gtk_image_new_from_icon_name ("zoom-in-symbolic",
-@@ -4301,7 +4345,7 @@
+@@ -4301,7 +4322,7 @@
g_signal_connect (zoom_button, "toggled",
G_CALLBACK (eog_window_zoom_button_toggled_cb),
window);
@@ -105,7 +84,7 @@
/* disable zoom button if no image is loaded */
g_object_bind_property (g_action_map_lookup_action (G_ACTION_MAP(window),
"zoom-normal"),
-@@ -4312,7 +4356,7 @@
+@@ -4312,7 +4333,7 @@
priv->zoom_revealer = gtk_revealer_new ();
gtk_revealer_set_transition_type (GTK_REVEALER (priv->zoom_revealer),
GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT);
@@ -114,16 +93,16 @@
priv->zoom_revealer);
gtk_widget_show (priv->zoom_revealer);
-@@ -4342,7 +4386,7 @@
- gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
- G_MENU_MODEL (builder_object));
+@@ -4346,7 +4367,7 @@
+ gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
+ G_MENU_MODEL (builder_object));
-- gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
-+ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), menu_button);
- gtk_widget_show (menu_button);
+- gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
++ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), menu_button);
+ gtk_widget_show (menu_button);
- action = G_ACTION (g_property_action_new ("toggle-gear-menu",
-@@ -4356,7 +4400,7 @@
+ builder_object = gtk_builder_get_object (builder, "open-with-menu");
+@@ -4369,7 +4390,7 @@
"win.view-fullscreen");
gtk_widget_set_tooltip_text(fullscreen_button,
_("Show the current image in fullscreen mode"));
@@ -131,4 +110,4 @@
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), fullscreen_button);
gtk_widget_show (fullscreen_button);
- priv->open_with_menu = g_menu_new ();
+ priv->cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
Modified: desktop/experimental/eog/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/patches/series?rev=47566&op=diff
==============================================================================
--- desktop/experimental/eog/debian/patches/series [utf-8] (original)
+++ desktop/experimental/eog/debian/patches/series [utf-8] Wed Mar 16 15:06:11 2016
@@ -1,3 +1,2 @@
-#0001-Add-a-traditional-menu-bar.patch
+0001-Add-a-traditional-menu-bar.patch
0002-Show-traditional-title-bar-in-unity.patch
-#Put-Exit-Fullscreen-button-into-toolbar.patch
More information about the pkg-gnome-commits
mailing list