diff options
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | src/ephy-header-bar.c | 11 | ||||
-rw-r--r-- | src/resources/epiphany.gresource.xml | 1 | ||||
-rw-r--r-- | src/resources/gtk/page-menu-popover-flatpak.ui | 172 |
4 files changed, 5 insertions, 180 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index d9a213822..22f5c0cd4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -65,7 +65,6 @@ src/resources/gtk/encoding-dialog.ui src/resources/gtk/history-dialog.ui src/resources/gtk/menus.ui src/resources/gtk/page-menu-popover.ui -src/resources/gtk/page-menu-popover-flatpak.ui src/resources/gtk/passwords-dialog.ui src/resources/gtk/prefs-dialog.ui src/resources/gtk/prefs-lang-dialog.ui diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c index 8a9d2b5bf..b17ef7a50 100644 --- a/src/ephy-header-bar.c +++ b/src/ephy-header-bar.c @@ -206,14 +206,13 @@ ephy_header_bar_constructed (GObject *object) gtk_image_new_from_icon_name ("open-menu-symbolic", GTK_ICON_SIZE_BUTTON)); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); g_type_ensure (G_TYPE_THEMED_ICON); - /* FIXME: This is horrible, but it doesn't seem possible to hide a single menu item of an existing menu. - * Calling gtk_widget_hide() on the child menu item somehow hides the entire menu! */ - if (ephy_is_running_inside_flatpak ()) - builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/gtk/page-menu-popover-flatpak.ui"); - else - builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/gtk/page-menu-popover.ui"); + builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/gtk/page-menu-popover.ui"); page_menu_popover = GTK_WIDGET (gtk_builder_get_object (builder, "page-menu-popover")); header_bar->zoom_level_button = GTK_WIDGET (gtk_builder_get_object (builder, "zoom-level")); + if (ephy_is_running_inside_flatpak ()) { + gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "save-as-application-separator"))); + gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "save-as-application-button"))); + } gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), page_menu_popover); g_object_unref (builder); diff --git a/src/resources/epiphany.gresource.xml b/src/resources/epiphany.gresource.xml index c797d2a53..380de489c 100644 --- a/src/resources/epiphany.gresource.xml +++ b/src/resources/epiphany.gresource.xml @@ -26,7 +26,6 @@ <file preprocess="xml-stripblanks" compressed="true">gtk/history-dialog.ui</file> <file preprocess="xml-stripblanks" compressed="true">gtk/menus.ui</file> <file preprocess="xml-stripblanks" compressed="true">gtk/page-menu-popover.ui</file> - <file preprocess="xml-stripblanks" compressed="true">gtk/page-menu-popover-flatpak.ui</file> <file preprocess="xml-stripblanks" compressed="true">gtk/passwords-dialog.ui</file> <file preprocess="xml-stripblanks" compressed="true">gtk/prefs-dialog.ui</file> <file preprocess="xml-stripblanks" compressed="true">gtk/prefs-lang-dialog.ui</file> diff --git a/src/resources/gtk/page-menu-popover-flatpak.ui b/src/resources/gtk/page-menu-popover-flatpak.ui deleted file mode 100644 index 486b7a9e1..000000000 --- a/src/resources/gtk/page-menu-popover-flatpak.ui +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<interface> - <object class="GtkPopoverMenu" id="page-menu-popover"> - <child> - <object class="GtkBox"> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="visible">True</property> - <child> - <object class="GtkBox" id="zoom-box"> - <property name="visible">True</property> - <property name="orientation">horizontal</property> - <property name="homogeneous">True</property> - <property name="margin-bottom">6</property> - <style> - <class name="linked"/> - </style> - <child> - <object class="GtkModelButton"> - <property name="text" translatable="yes">Zoom Out</property> - <property name="tooltip_text" translatable="yes">Zoom Out</property> - <property name="action-name">win.zoom-out</property> - <property name="iconic">True</property> - <property name="centered">True</property> - <property name="icon">zoom_out</property> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkModelButton" id="zoom-level"> - <property name="text">100%</property> - <property name="tooltip_text" translatable="yes">Restore Zoom</property> - <property name="action-name">win.zoom-normal</property> - <property name="iconic">True</property> - <property name="xalign">0.5</property> - <property name="centered">True</property> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkModelButton"> - <property name="text" translatable="yes">Zoom In</property> - <property name="action-name">win.zoom-in</property> - <property name="iconic">True</property> - <property name="centered">True</property> - <property name="icon">zoom_in</property> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="orientation">horizontal</property> - <property name="spacing">6</property> - <property name="homogeneous">True</property> - <property name="margin-bottom">6</property> - <child> - <object class="GtkModelButton"> - <property name="tooltip_text" translatable="yes">Print…</property> - <property name="action-name">win.print</property> - <property name="iconic">True</property> - <property name="centered">True</property> - <property name="icon">print</property> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkModelButton"> - <property name="tooltip_text" translatable="yes">Find…</property> - <property name="action-name">win.find</property> - <property name="iconic">True</property> - <property name="centered">True</property> - <property name="icon">find</property> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkModelButton"> - <property name="tooltip_text" translatable="yes">Fullscreen</property> - <property name="action-name">win.fullscreen</property> - <property name="iconic">True</property> - <property name="centered">True</property> - <property name="icon">fullscreen</property> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <child> - <object class="GtkSeparator"> - <property name="orientation">horizontal</property> - <property name="margin-top">6</property> - <property name="margin-bottom">6</property> - <property name="visible">True</property> - </object> - </child> - <child> - <object class="GtkModelButton"> - <property name="can_focus">True</property> - <property name="text" translatable="yes">_New Tab</property> - <property name="action-name">win.new-tab</property> - <property name="visible">True</property> - </object> - </child> - <child> - <object class="GtkSeparator"> - <property name="orientation">horizontal</property> - <property name="margin-top">6</property> - <property name="margin-bottom">6</property> - <property name="visible">True</property> - </object> - </child> - <child> - <object class="GtkModelButton"> - <property name="can_focus">True</property> - <property name="text" translatable="yes">Text _Encoding</property> - <property name="action-name">win.encoding</property> - <property name="visible">True</property> - </object> - </child> - </object> - </child> - </object> - <object class="GThemedIcon" id="zoom_out"> - <property name="name">zoom-out-symbolic</property> - </object> - <object class="GThemedIcon" id="zoom_in"> - <property name="name">zoom-in-symbolic</property> - </object> - <object class="GThemedIcon" id="print"> - <property name="name">document-print-symbolic</property> - </object> - <object class="GThemedIcon" id="find"> - <property name="name">system-search-symbolic</property> - </object> - <object class="GThemedIcon" id="fullscreen"> - <property name="name">view-fullscreen-symbolic</property> - </object> -</interface> |