[epiphany] Move import & export functions into a sub menu
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Move import & export functions into a sub menu
- Date: Mon, 11 May 2020 18:33:09 +0000 (UTC)
commit 68eca81fd4e9361544d247fc5e62dfa05ba1fb2f
Author: Jan-Michael Brummer <jan brummer tabos org>
Date: Mon May 11 18:14:11 2020 +0200
Move import & export functions into a sub menu
src/ephy-header-bar.c | 6 +--
src/resources/gtk/page-menu-popover.ui | 95 +++++++++++++++++++++++-----------
2 files changed, 66 insertions(+), 35 deletions(-)
---
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index 1012310d4..71b1f9364 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -265,9 +265,6 @@ ephy_header_bar_constructed (GObject *object)
gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "new-window-button")));
gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "new-incognito-window-button")));
gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "reopen-closed-tab-button")));
- gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "bookmarks-separator")));
- gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "import-bookmarks-button")));
- gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "export-bookmarks-button")));
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_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "application-manager-button")));
@@ -276,7 +273,8 @@ ephy_header_bar_constructed (GObject *object)
gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard-shortcuts-button")));
gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "help-button")));
gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "passwords-separator")));
- gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "import-passwords-button")));
+ gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "import-export-separator")));
+ gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "import-export-menu")));
} else 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")));
diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
index e6293f1bc..b0b35b9d2 100644
--- a/src/resources/gtk/page-menu-popover.ui
+++ b/src/resources/gtk/page-menu-popover.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <object class="GtkPopover" id="page-menu-popover">
+ <object class="GtkPopoverMenu" id="page-menu-popover">
<child>
<object class="GtkBox">
<property name="can_focus">False</property>
@@ -209,7 +209,7 @@
</child>
<!-- FRAGILE: These buttons are manually removed for app mode in ephy-header-bar.c. -->
<child>
- <object class="GtkSeparator" id="bookmarks-separator">
+ <object class="GtkSeparator" id="import-export-separator">
<property name="orientation">horizontal</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
@@ -217,36 +217,10 @@
</object>
</child>
<child>
- <object class="GtkModelButton" id="import-bookmarks-button">
- <property name="can_focus">True</property>
- <property name="text" translatable="yes">I_mport Bookmarks…</property>
- <property name="action-name">app.import-bookmarks</property>
- <property name="visible">True</property>
- </object>
- </child>
- <child>
- <object class="GtkModelButton" id="export-bookmarks-button">
- <property name="can_focus">True</property>
- <property name="text" translatable="yes">E_xport Bookmarks…</property>
- <property name="action-name">app.export-bookmarks</property>
- <property name="visible">True</property>
- </object>
- </child>
- <!-- FRAGILE: These buttons are manually removed for app mode in ephy-header-bar.c. -->
- <child>
- <object class="GtkSeparator" id="passwords-separator">
- <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" id="import-passwords-button">
- <property name="can_focus">True</property>
- <property name="text" translatable="yes">I_mport Passwords…</property>
- <property name="action-name">app.import-passwords</property>
+ <object class="GtkModelButton" id="import-export-menu">
+ <property name="text" translatable="yes">I_mport & Export</property>
<property name="visible">True</property>
+ <property name="menu-name">import_export</property>
</object>
</child>
<!-- FRAGILE: These buttons are manually removed for app mode in ephy-header-bar.c. -->
@@ -338,6 +312,65 @@
</object>
</child>
</object>
+ <packing>
+ <property name="submenu">main</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="can_focus">False</property>
+ <property name="margin-top">12</property>
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <style>
+ <class name="page-menu-contents"/>
+ </style>
+ <child>
+ <object class="GtkModelButton">
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">Import & Export</property>
+ <property name="visible">True</property>
+ <property name="menu-name">main</property>
+ <property name="inverted">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkModelButton">
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">I_mport Bookmarks…</property>
+ <property name="action-name">app.import-bookmarks</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkModelButton">
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">E_xport Bookmarks…</property>
+ <property name="action-name">app.export-bookmarks</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">I_mport Passwords…</property>
+ <property name="action-name">app.import-passwords</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="submenu">import_export</property>
+ </packing>
</child>
</object>
<object class="GThemedIcon" id="zoom_out">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]