Merge lp:~christriant/switchboard/fix-1101263 into lp:~elementary-pantheon/switchboard/switchboard

[Chris Triantafillis]

Remember window size to fix bug #1101263

[Corentin Noël (tintou)]

Hmm, please remember to never hardcode destination strings, string like "/usr/share/glib-2.0/schemas/" should never exists on CMake.
Please refer to CMakeLists.txt from other projects where it is done properly.
I'll correct this in trunk.

[Chris Triantafillis (christriant)]

Thanks! I'm not very good with cmake :)

[Corentin Noël (tintou)]

This branch introduced a bug, fixed in trunk, for your information here is why:
when connecting for the window_state_event (Switchboard.vala, line 175) you did return true to the connect function. As specified in the documentation, returning true does not send the signal to other connect function, that's why the window was not good maximizing, to fix this, you need to return false.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-23 19:51:27 +0000
+++ CMakeLists.txt	2014-03-13 22:31:56 +0000
@@ -7,6 +7,7 @@
 
 include (GNUInstallDirs)
 set (DATADIR ${CMAKE_INSTALL_FULL_DATAROOTDIR})
+set (GSETTINGSDIR "/usr/share/glib-2.0/schemas/")
 set (PKGDATADIR "${DATADIR}/${CMAKE_PROJECT_NAME}")
 set (GETTEXT_PACKAGE "${CMAKE_PROJECT_NAME}")
 set (RELEASE_NAME "Preferences with piazzaz.")
@@ -137,3 +138,6 @@
 if (BUILD_SAMPLE)
   add_subdirectory (sample)
 endif ()
+
+add_subdirectory (schemas)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/schemas/org.pantheon.switchboard.gschema.xml DESTINATION ${GSETTINGSDIR})
\ No newline at end of file

=== added directory 'schemas'
=== added file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ schemas/CMakeLists.txt	2014-03-13 22:31:56 +0000
@@ -0,0 +1,2 @@
+include(GSettings)
+add_schema("org.pantheon.switchboard.gschema.xml")
\ No newline at end of file

=== added file 'schemas/org.pantheon.switchboard.gschema.xml'
--- schemas/org.pantheon.switchboard.gschema.xml	1970-01-01 00:00:00 +0000
+++ schemas/org.pantheon.switchboard.gschema.xml	2014-03-13 22:31:56 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+	<enum id="switchboard-window-states">
+		<value nick="Normal" value="0" />
+		<value nick="Maximized" value="1" />
+	</enum>
+	<schema path="/org/pantheon/switchboard/saved-state/" id="org.pantheon.switchboard.saved-state" gettext-domain="switchboard">
+		<key name="window-state" enum="switchboard-window-states">
+			<default>"Normal"</default>
+			<summary>The saved state of the window.</summary>
+			<description>The saved state of the window.</description>
+		</key>
+		<key name="window-width" type="i">
+			<default>842</default>
+			<summary>The saved width of the window.</summary>
+			<description>The saved width of the window. Must be greater than 700, or it will not take effect.</description>
+		</key>
+		<key name="window-height" type="i">
+			<default>475</default>
+			<summary>The saved height of the window.</summary>
+			<description>The saved height of the window. Must be greater than 400, or it will not take effect.</description>
+		</key>
+		<key name="position" type="as">
+			<default>['']</default>
+			<summary>The position of the window.</summary>
+			<description>The position of the window.</description>
+		</key>
+	</schema>
+</schemalist>

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-01-31 18:21:51 +0000
+++ src/Switchboard.vala	2014-03-13 22:31:56 +0000
@@ -22,6 +22,11 @@
             { null }
     };
 
+    public enum WindowState {
+        NORMAL = 0,
+        MAXIMIZED = 1
+    }
+
     private static string? plug_to_open = null;
     
     public static int main (string[] args) {
@@ -55,6 +60,10 @@
         public Switchboard.Plug current_plug;
         public Gtk.SearchEntry search_box { public get; private set; }
 
+        private GLib.Settings settings;
+        private int default_width = 0;
+        private int default_height = 0;
+
         construct {
             application_id = "org.elementary.Switchboard";
             program_name = "Switchboard";
@@ -87,6 +96,7 @@
 
             loaded_plugs = new Gee.LinkedList <string> ();
             Switchboard.PlugsManager.get_default ();
+            settings = new GLib.Settings ("org.pantheon.switchboard.saved-state");
             build ();
             category_view.load_default_plugs ();
             if (current_plug != null)
@@ -154,10 +164,22 @@
             main_window.icon_name = app_icon;
 
             // Set up window
-            main_window.set_default_size (842, 475);
+            restore_saved_state ();
+            main_window.set_default_size (default_width, default_height);
             main_window.set_size_request (500, 300);
-            main_window.window_position = Gtk.WindowPosition.CENTER;
             main_window.destroy.connect (shut_down);
+            main_window.delete_event.connect (() => {
+                update_saved_state ();
+                return false;
+            });
+            main_window.window_state_event.connect ((event) => {
+                if (event.new_window_state == Gdk.WindowState.MAXIMIZED)
+                    settings.set_enum ("window-state", WindowState.MAXIMIZED);
+                else
+                    settings.set_enum ("window-state", WindowState.NORMAL);
+
+                return true;
+            });
             setup_toolbar ();
 
             // Set up accelerators (hotkeys)
@@ -216,6 +238,35 @@
             Gtk.main_quit ();
         }
 
+        private void restore_saved_state () {
+            // Restore window's state
+            default_width = settings.get_int ("window-width");
+            default_height = settings.get_int ("window-height");
+            var position = settings.get_strv ("position");
+
+            if (settings.get_enum ("window-state") == WindowState.MAXIMIZED) {
+                main_window.maximize ();
+            } else {
+                if (position.length != 2)
+                    main_window.window_position = Gtk.WindowPosition.CENTER;
+                else
+                    main_window.move (int.parse (position[0]), int.parse (position[1]));
+            }
+        }
+
+        private void update_saved_state () {
+            // Update saved state of window
+            if (settings.get_enum ("window-state") == WindowState.NORMAL) {
+                int width, height, x, y;
+                main_window.get_size (out width, out height);
+                main_window.get_position (out x, out y);
+                settings.set_int ("window-width", width);
+                settings.set_int ("window-height", height);
+                string[] position = {x.to_string (), y.to_string ()};
+                settings.set_strv ("position", position);
+            }
+        }
+
         // Change Switchboard title back to "Switchboard"
         private void reset_title () {
             headerbar.subtitle = null;