[shotwell] More consistent HeaderBar handling

[Jens Georg <jensgeorg src gnome org>]

commit b3a2f41ddf3bb3d12a17f2420d98ef13da0269e0
Author: Jens Georg <mail jensge org>
Date:   Tue Dec 19 21:36:40 2017 +0100

    More consistent HeaderBar handling

 src/Properties.vala                     |    6 ++----
 src/Resources.vala                      |   11 +++++++++++
 src/data_imports/DataImportsUI.vala     |    5 ++---
 src/dialogs/AdjustDateTimeDialog.vala   |    4 +---
 src/dialogs/ExportDialog.vala           |    4 +---
 src/dialogs/MultiTextEntryDialog.vala   |    6 ++----
 src/dialogs/Preferences.vala            |    4 +---
 src/dialogs/SetBackground.vala          |    4 +---
 src/dialogs/SetBackgroundSlideshow.vala |    4 +---
 src/dialogs/TextEntry.vala              |    4 +---
 src/dialogs/WelcomeDialog.vala          |    7 ++++---
 src/publishing/PublishingUI.vala        |    5 ++---
 src/searches/SavedSearchDialog.vala     |    5 +++++
 13 files changed, 34 insertions(+), 35 deletions(-)
---
diff --git a/src/Properties.vala b/src/Properties.vala
index 1f59040..3cbd5af 100644
--- a/src/Properties.vala
+++ b/src/Properties.vala
@@ -633,10 +633,8 @@ private class ExtendedPropertiesWindow : Gtk.Dialog {
     }
 
     public ExtendedPropertiesWindow(Gtk.Window owner) {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
-        
+        Object(use_header_bar: Resources.use_header_bar());
+
         add_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.KEY_PRESS_MASK);
         focus_on_map = true;
         set_accept_focus(true);
diff --git a/src/Resources.vala b/src/Resources.vala
index e26448a..03a7b9b 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -1040,6 +1040,17 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         providers.set(widget, styler);
     }
 
+    public static int use_header_bar() {
+        if (Environment.get_variable("SHOTWELL_USE_HEADERBARS") != null) {
+            return 0;
+        }
+
+        bool use_header;
+        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
+
+        return use_header ? 1 : 0;
+    }
+
     public const string CUSTOM_CSS =
          """LibraryWindow .pane-separator {
                background-color: @borders;
diff --git a/src/data_imports/DataImportsUI.vala b/src/data_imports/DataImportsUI.vala
index 2c0cd40..29791a4 100644
--- a/src/data_imports/DataImportsUI.vala
+++ b/src/data_imports/DataImportsUI.vala
@@ -208,9 +208,8 @@ public class DataImportsDialog : Gtk.Dialog {
     private Spit.DataImports.ConcreteDataImportsHost host;
 
     protected DataImportsDialog() {
-        bool use_header = false;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
+        bool use_header = Resources.use_header_bar() == 1;
+        Object(use_header_bar: Resources.use_header_bar());
         if (use_header)
             ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
 
diff --git a/src/dialogs/AdjustDateTimeDialog.vala b/src/dialogs/AdjustDateTimeDialog.vala
index a55a084..cf2685b 100644
--- a/src/dialogs/AdjustDateTimeDialog.vala
+++ b/src/dialogs/AdjustDateTimeDialog.vala
@@ -38,9 +38,7 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
         bool contains_video = false, bool only_video = false) {
         assert(source != null);
 
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
+        Object(use_header_bar: Resources.use_header_bar());
 
         set_modal(true);
         set_resizable(false);
diff --git a/src/dialogs/ExportDialog.vala b/src/dialogs/ExportDialog.vala
index 2366ce9..5a61dc4 100644
--- a/src/dialogs/ExportDialog.vala
+++ b/src/dialogs/ExportDialog.vala
@@ -36,9 +36,7 @@ public class ExportDialog : Gtk.Dialog {
     private bool in_insert = false;
 
     public ExportDialog(string title) {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object (use_header_bar: use_header ? 1 : 0);
+        Object (use_header_bar: Resources.use_header_bar());
 
         this.title = title;
         resizable = false;
diff --git a/src/dialogs/MultiTextEntryDialog.vala b/src/dialogs/MultiTextEntryDialog.vala
index 8671d43..42e5318 100644
--- a/src/dialogs/MultiTextEntryDialog.vala
+++ b/src/dialogs/MultiTextEntryDialog.vala
@@ -11,12 +11,10 @@ public class MultiTextEntryDialog : Gtk.Dialog {
 
     private unowned OnModifyValidateType on_modify_validate;
     [GtkChild]
-        private Gtk.TextView entry;
+    private Gtk.TextView entry;
 
     public MultiTextEntryDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object (use_header_bar: use_header ? 1 : 0);
+        Object (use_header_bar: Resources.use_header_bar());
     }
 
     public void setup(OnModifyValidateType? modify_validate, string title, string label, string? 
initial_text) {
diff --git a/src/dialogs/Preferences.vala b/src/dialogs/Preferences.vala
index 3286cb2..0a18547 100644
--- a/src/dialogs/Preferences.vala
+++ b/src/dialogs/Preferences.vala
@@ -65,9 +65,7 @@ public class PreferencesDialog : Gtk.Dialog {
     private Gtk.RadioButton transparent_none_radio;
 
     private PreferencesDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object (use_header_bar: use_header ? 1 : 0);
+        Object (use_header_bar: Resources.use_header_bar());
 
         set_parent_window(AppWindow.get_instance().get_parent_window());
         set_transient_for(AppWindow.get_instance());
diff --git a/src/dialogs/SetBackground.vala b/src/dialogs/SetBackground.vala
index 3017f19..d9a77c4 100644
--- a/src/dialogs/SetBackground.vala
+++ b/src/dialogs/SetBackground.vala
@@ -13,9 +13,7 @@ public class SetBackgroundPhotoDialog : Gtk.Dialog {
     private Gtk.CheckButton screensaver_checkbox;
 
     public SetBackgroundPhotoDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
+        Object(use_header_bar: Resources.use_header_bar());
         this.set_transient_for (AppWindow.get_instance());
     }
 
diff --git a/src/dialogs/SetBackgroundSlideshow.vala b/src/dialogs/SetBackgroundSlideshow.vala
index 6aec31b..914af76 100644
--- a/src/dialogs/SetBackgroundSlideshow.vala
+++ b/src/dialogs/SetBackgroundSlideshow.vala
@@ -19,9 +19,7 @@ public class SetBackgroundSlideshowDialog : Gtk.Dialog {
     private int delay_value = 0;
 
     public SetBackgroundSlideshowDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
+        Object(use_header_bar: Resources.use_header_bar());
         this.set_transient_for (AppWindow.get_instance());
     }
 
diff --git a/src/dialogs/TextEntry.vala b/src/dialogs/TextEntry.vala
index a133b66..d82fdbd 100644
--- a/src/dialogs/TextEntry.vala
+++ b/src/dialogs/TextEntry.vala
@@ -18,9 +18,7 @@ public class TextEntryDialog : Gtk.Dialog {
     private Gtk.Label label;
 
     public TextEntryDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object (use_header_bar: use_header ? 1 : 0);
+        Object (use_header_bar: Resources.use_header_bar());
     }
 
     public void setup(OnModifyValidateType? modify_validate, string title, string label,
diff --git a/src/dialogs/WelcomeDialog.vala b/src/dialogs/WelcomeDialog.vala
index b2352f9..e40686d 100644
--- a/src/dialogs/WelcomeDialog.vala
+++ b/src/dialogs/WelcomeDialog.vala
@@ -26,10 +26,11 @@ public class WelcomeDialog : Gtk.Dialog {
     bool ok_clicked = false;
 
     public WelcomeDialog(Gtk.Window owner) {
+        Object(use_header_bar : Resources.use_header_bar());
         import_meta_host = new Spit.DataImports.WelcomeImportMetaHost(this);
         bool show_system_pictures_import = is_system_pictures_import_possible();
-        Gtk.Widget ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
-        set_default_response(Gtk.ResponseType.OK);
+        Gtk.Widget ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.CLOSE);
+        set_default_response(Gtk.ResponseType.CLOSE);
 
         set_title(_("Welcome!"));
         set_resizable(false);
@@ -144,7 +145,7 @@ public class WelcomeDialog : Gtk.Dialog {
      * images from a camera; please see #4997 for details.
      */
     private void on_dismiss(int resp) {
-        if (resp == Gtk.ResponseType.OK) {
+        if (resp == Gtk.ResponseType.CLOSE) {
             ok_clicked = true;
         }
         hide();
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index c975564..f385ec6 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -161,9 +161,8 @@ public class PublishingDialog : Gtk.Dialog {
     protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
         assert(to_publish.size > 0);
 
-        bool use_header = false;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
+        bool use_header = Resources.use_header_bar() == 1;
+        Object(use_header_bar: Resources.use_header_bar());
         if (use_header)
             ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
 
diff --git a/src/searches/SavedSearchDialog.vala b/src/searches/SavedSearchDialog.vala
index 5c9351f..e1b533f 100644
--- a/src/searches/SavedSearchDialog.vala
+++ b/src/searches/SavedSearchDialog.vala
@@ -649,6 +649,8 @@ public class SavedSearchDialog : Gtk.Dialog {
     private bool valid = false;
     
     public SavedSearchDialog() {
+        Object (use_header_bar : Resources.use_header_bar());
+
         setup_dialog();
         
         // Default name.
@@ -664,6 +666,9 @@ public class SavedSearchDialog : Gtk.Dialog {
     }
     
     public SavedSearchDialog.edit_existing(SavedSearch saved_search) {
+        Object (use_header_bar : Resources.use_header_bar());
+
+        previous_search = saved_search;
         edit_mode = true;
         setup_dialog();