summaryrefslogtreecommitdiff
path: root/src/library/LibraryWindow.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
commitf39ea21098340bd99c48669f152c9068046c2c99 (patch)
treed1166fce1a4a8c470dfaf364816f767678c4729e /src/library/LibraryWindow.vala
parentbc48a4cff815ed156b603c92e684779c317417ba (diff)
parenta7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff)
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/library/LibraryWindow.vala')
-rw-r--r--src/library/LibraryWindow.vala16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 628bc36..0a39318 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -84,12 +84,14 @@ public class LibraryWindow : AppWindow {
base.switched_to();
}
+ public override void switching_from() {
+ }
+
protected override void init_collect_ui_filenames(Gee.List<string> ui_filenames) {
// We intentionally don't call the base class here since we don't want the
// top-level menu in photo.ui.
ui_filenames.add("photo_context.ui");
}
-
}
private string import_dir = Environment.get_home_dir();
@@ -209,7 +211,11 @@ public class LibraryWindow : AppWindow {
CameraTable.get_instance().camera_added.connect(on_camera_added);
background_progress_bar.set_show_text(true);
-
+
+ // Need to re-install F8 here as it will overwrite the binding created
+ // by the menu
+ const string[] accels = { "<Primary>f", "F8", null };
+ Application.set_accels_for_action("win.CommonDisplaySearchbar", accels);
}
~LibraryWindow() {
@@ -1187,9 +1193,6 @@ public class LibraryWindow : AppWindow {
add(layout);
- var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui");
- Application.set_appmenu (builder.get_object ("appmenu") as GLib.Menu);
-
switch_to_page(start_page);
start_page.grab_focus();
}
@@ -1272,6 +1275,9 @@ public class LibraryWindow : AppWindow {
Application.set_menubar (page.get_menubar ());
set_show_menubar (true);
+ var old = get_settings().gtk_shell_shows_menubar;
+ get_settings().gtk_shell_shows_menubar = !old;
+ get_settings().gtk_shell_shows_menubar = old;
Gtk.Toolbar toolbar = page.get_toolbar();
if (toolbar != null) {