diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2021-04-05 09:40:23 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2021-04-05 09:40:23 -0500 |
| commit | eb1aa52ff40fe274df2ae87a888de09d97c3f382 (patch) | |
| tree | 4346e395b5936275defda967a4383405db11a78f | |
| parent | 995188511b31de4af1c813bf3b4b01de276d10fc (diff) | |
| download | epiphany-mcatanzaro/unhide-firefox-sync.tar.gz | |
Move Firefox Sync to toplevel window menumcatanzaro/unhide-firefox-sync
It's buried under Import and Export currently, and at least one user has
reported a bug suspecting that the feature was lost entirely. Let's make
it more visible.
Fixes #1470
| -rw-r--r-- | src/ephy-header-bar.c | 3 | ||||
| -rw-r--r-- | src/resources/gtk/page-menu-popover.ui | 26 |
2 files changed, 11 insertions, 18 deletions
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c index 057f4c696..c51a6fe81 100644 --- a/src/ephy-header-bar.c +++ b/src/ephy-header-bar.c @@ -297,7 +297,8 @@ ephy_header_bar_constructed (GObject *object) gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "override-text-encoding-button"))); 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, "import-export-separator"))); + gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "firefox-sync-separator"))); + gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (builder, "firefox-sync-button"))); 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, "run-in-background-separator"))); diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui index 25df01a8b..830a54393 100644 --- a/src/resources/gtk/page-menu-popover.ui +++ b/src/resources/gtk/page-menu-popover.ui @@ -232,7 +232,7 @@ </child> <!-- FRAGILE: These buttons are manually removed for app mode in ephy-header-bar.c. --> <child> - <object class="GtkSeparator" id="import-export-separator"> + <object class="GtkSeparator" id="firefox-sync-separator"> <property name="orientation">horizontal</property> <property name="margin-top">6</property> <property name="margin-bottom">6</property> @@ -240,6 +240,14 @@ </object> </child> <child> + <object class="GtkModelButton" id="firefox-sync-button"> + <property name="can_focus">True</property> + <property name="text" translatable="yes">Firefox _Sync</property> + <property name="action-name">app.firefox-sync-dialog</property> + <property name="visible">True</property> + </object> + </child> + <child> <object class="GtkModelButton" id="import-export-menu"> <property name="text" translatable="yes">I_mport and Export</property> <property name="visible">True</property> @@ -399,22 +407,6 @@ <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">Firefox _Sync</property> - <property name="action-name">app.firefox-sync-dialog</property> - <property name="visible">True</property> - </object> - </child> </object> <packing> <property name="submenu">import_export</property> |