|
 |
ecdf9b |
From ac1d5ac64b9c8371bfabb144a77e053b38ff63c5 Mon Sep 17 00:00:00 2001
|
|
|
ecdf9b |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
Date: Thu, 13 Jun 2013 09:48:11 +0200
|
|
|
ecdf9b |
Subject: [PATCH 30/35] cheese: Move reading of widemode setting to cheese-main
|
|
|
ecdf9b |
|
|
|
ecdf9b |
So that the actiontoggle's state always properly reflects the actual
|
|
|
ecdf9b |
wide-mode setting.
|
|
|
ecdf9b |
|
|
|
ecdf9b |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
---
|
|
|
ecdf9b |
src/cheese-main.vala | 4 ++++
|
|
|
ecdf9b |
src/cheese-window.vala | 4 ++--
|
|
|
ecdf9b |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
ecdf9b |
|
|
|
ecdf9b |
diff --git a/src/cheese-main.vala b/src/cheese-main.vala
|
|
|
ecdf9b |
index 2adfdc0..d0f9b41 100644
|
|
|
ecdf9b |
--- a/src/cheese-main.vala
|
|
|
ecdf9b |
+++ b/src/cheese-main.vala
|
|
|
ecdf9b |
@@ -129,6 +129,10 @@ public class Cheese.Main : Gtk.Application
|
|
|
ecdf9b |
main_window.setup_ui ();
|
|
|
ecdf9b |
main_window.start_thumbview_monitors ();
|
|
|
ecdf9b |
|
|
|
ecdf9b |
+ /* If not set from the cmdline, get the settings from config file */
|
|
|
ecdf9b |
+ if (!wide)
|
|
|
ecdf9b |
+ wide = main_window.settings.get_boolean ("wide-mode");
|
|
|
ecdf9b |
+
|
|
|
ecdf9b |
if (wide)
|
|
|
ecdf9b |
change_action_state("widemode", true);
|
|
|
ecdf9b |
if (fullscreen)
|
|
|
ecdf9b |
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
|
|
|
ecdf9b |
index 7a3db6b..c75c5f0 100644
|
|
|
ecdf9b |
--- a/src/cheese-window.vala
|
|
|
ecdf9b |
+++ b/src/cheese-window.vala
|
|
|
ecdf9b |
@@ -44,7 +44,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
|
ecdf9b |
private Gtk.Builder gtk_builder;
|
|
|
ecdf9b |
private Clutter.Script clutter_builder;
|
|
|
ecdf9b |
|
|
|
ecdf9b |
- private GLib.Settings settings;
|
|
|
ecdf9b |
+ public GLib.Settings settings;
|
|
|
ecdf9b |
|
|
|
ecdf9b |
private Gtk.Widget thumbnails;
|
|
|
ecdf9b |
private GtkClutter.Embed viewport_widget;
|
|
|
ecdf9b |
@@ -1440,7 +1440,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
|
ecdf9b |
* if the widget is not realized */
|
|
|
ecdf9b |
viewport_widget.realize ();
|
|
|
ecdf9b |
|
|
|
ecdf9b |
- set_wide_mode (settings.get_boolean ("wide-mode"));
|
|
|
ecdf9b |
+ set_wide_mode (false);
|
|
|
ecdf9b |
|
|
|
ecdf9b |
set_mode (MediaMode.PHOTO);
|
|
|
ecdf9b |
setup_effects_selector ();
|
|
|
ecdf9b |
--
|
|
|
ecdf9b |
1.8.2.1
|
|
|
ecdf9b |
|