Merge lp:~artem-anufrij/webby-browser/save-main-window-settings into lp:webby-browser

[Artem Anufrij]

Store size and state of main window.

New pot-file.

Store size and state of main window.

New pot-file.

[Erasmo Marín (erasmo-marin)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-13 20:25:00 +0000
+++ CMakeLists.txt	2015-10-16 21:44:55 +0000
@@ -115,12 +115,18 @@
             src/DesktopFile.vala
             src/InfoDialog.vala
             src/Launcher.vala
+            src/Settings.vala
             src/UrlEntry.vala
             src/WebApp.vala
             src/WebBar.vala
             src/Webby.vala
             src/WebAppWindow.vala)
 
+#
+# schema
+#
+add_subdirectory (schemas)
+
 
 include(ValaPrecompile)
 vala_precompile(VALA_C ${SRC_FILES} PACKAGES ${PKG_DEPS}
@@ -139,9 +145,3 @@
 add_executable(webby ${VALA_C})
 target_link_libraries(webby ${SQLITE_LIBRARIES} ${CLUTTERGTK_LIBRARIES} -lm)
 install(TARGETS webby RUNTIME DESTINATION bin)
-
-#
-# GSettings Schema
-#
-include(GSettings)
-add_schema("org.pantheon.Webby.gschema.xml")

=== removed file 'org.pantheon.Webby.gschema.xml'
--- org.pantheon.Webby.gschema.xml	2015-02-24 05:12:05 +0000
+++ org.pantheon.Webby.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<schemalist>
-	<enum id="org.pantheon.webby.SavedState.window-state">
-		<value nick="Normal" value="0" />
-		<value nick="Maximized" value="1" />
-		<value nick="Fullscreen" value="2" />
-	</enum>
-	<schema path="/org/pantheon/webby/saved-state/" id="org.pantheon.webby.SavedState" gettext-domain="webby">
-		<key name="window-width" type="i">
-			<default>800</default>
-			<summary>The saved width of the window.</summary>
-			<description>The saved width of the window.</description>
-		</key>
-		<key name="window-height" type="i">
-			<default>650</default>
-			<summary>The saved height of the window.</summary>
-			<description>The saved height of the window.</description>
-		</key>
-		<key name="window-state" enum="org.pantheon.webby.SavedState.window-state">
-			<default>"Normal"</default>
-			<summary>The saved state of the window.</summary>
-			<description>The saved state of the window.</description>
-		</key>
-	</schema>
-</schemalist>

=== modified file 'po/webby.pot'
--- po/webby.pot	2015-03-24 00:20:49 +0000
+++ po/webby.pot	2015-10-16 21:44:55 +0000
@@ -1,72 +1,102 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-26 23:57-0300\n"
+"POT-Creation-Date: 2015-10-16 23:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 00:16+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
-"Language: \n"
-
-msgid "Remove Application"
-msgstr ""
-
+
+#: /home/artem/Launchpad/webby-browser/po/../src/InfoDialog.vala:16
 msgid "Accept"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/AppWindow.vala:70
+msgid "Applications"
+msgstr ""
+
+#: /home/artem/Launchpad/webby-browser/po/../src/AppWindow.vala:76
+msgid "Add a new Web App"
+msgstr ""
+
+#: /home/artem/Launchpad/webby-browser/po/../src/AppWindow.vala:79
+msgid "No Web Apps Availible"
+msgstr ""
+
+#: /home/artem/Launchpad/webby-browser/po/../src/AppWindow.vala:79
+msgid "Create a new Webby Web App."
+msgstr ""
+
+#: /home/artem/Launchpad/webby-browser/po/../src/AppWindow.vala:80
+msgid "Create App"
+msgstr ""
+
+#: /home/artem/Launchpad/webby-browser/po/../src/AppWindow.vala:80
+msgid "Create a new Webby web app."
+msgstr ""
+
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:45
 msgid "Create a new web app with webby"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:53
 msgid "Application name"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:56
 msgid "http://myapp.domain"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:66
 msgid "theme icon name"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:68
 msgid "or"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:69
 msgid "Set from file..."
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:85
 msgid "Save cookies"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:87
 msgid "Save login information"
 msgstr ""
 
-msgid "Create app"
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:110
+msgid "Save app"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:132
 msgid "url must start with http:// or https://"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:145
 msgid "App already exist"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:198
 msgid "Images"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:210
 msgid "Cancel"
 msgstr ""
 
+#: /home/artem/Launchpad/webby-browser/po/../src/Assistant.vala:211
 msgid "Open"
 msgstr ""
-
-msgid "App created"
-msgstr ""
-
-msgid "The application shortcut was successfully created"
-msgstr ""
-
-msgid "Applications"
-msgstr ""

=== added directory 'schemas'
=== added file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ schemas/CMakeLists.txt	2015-10-16 21:44:55 +0000
@@ -0,0 +1,5 @@
+#
+# GSettings Schema
+#
+include(GSettings)
+add_schema(org.pantheon.Webby.gschema.xml)

=== added file 'schemas/org.pantheon.Webby.gschema.xml'
--- schemas/org.pantheon.Webby.gschema.xml	1970-01-01 00:00:00 +0000
+++ schemas/org.pantheon.Webby.gschema.xml	2015-10-16 21:44:55 +0000
@@ -0,0 +1,24 @@
+<schemalist>
+	<enum id="org.pantheon.webby.SavedState.window-state">
+		<value nick="Normal" value="0" />
+		<value nick="Maximized" value="1" />
+		<value nick="Fullscreen" value="2" />
+	</enum>
+	<schema path="/org/pantheon/webby/saved-state/" id="org.pantheon.webby.SavedState" gettext-domain="webby">
+		<key name="window-width" type="i">
+			<default>800</default>
+			<summary>The saved width of the window.</summary>
+			<description>The saved width of the window.</description>
+		</key>
+		<key name="window-height" type="i">
+			<default>650</default>
+			<summary>The saved height of the window.</summary>
+			<description>The saved height of the window.</description>
+		</key>
+		<key name="window-state" enum="org.pantheon.webby.SavedState.window-state">
+			<default>"Normal"</default>
+			<summary>The saved state of the window.</summary>
+			<description>The saved state of the window.</description>
+		</key>
+	</schema>
+</schemalist>

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2015-10-16 13:27:38 +0000
+++ src/AppWindow.vala	2015-10-16 21:44:55 +0000
@@ -1,5 +1,7 @@
 public class AppWindow : Granite.Application {
 
+    private Settings settings;
+
     public Gtk.Window mainwindow;
 
     private Gtk.Stack stack;
@@ -52,6 +54,8 @@
             return;
         }
 
+        settings = Settings.get_default ();
+
         mainwindow = new Gtk.Window ();
 
         mainwindow.set_default_size (700, 500);
@@ -129,8 +133,14 @@
             show_assistant ();
         });
 
+        mainwindow.delete_event.connect (() => {
+            this.store_settings ();
+            return false;
+        });
+
         mainwindow.destroy.connect (Gtk.main_quit);
 
+        this.restore_settings ();
         mainwindow.show_all ();
 
         if (apps_view.has_items)
@@ -172,4 +182,19 @@
         //fix ugly border at the bottom of headerbar
         mainwindow.queue_draw ();
     }
+
+    private void restore_settings () {
+        this.mainwindow.set_default_size (settings.window_width, settings.window_height);
+
+        if (settings.window_state == Settings.WindowState.MAXIMIZED)
+            this.mainwindow.maximize ();
+    }
+
+    private void store_settings () {
+        settings.window_state = (this.mainwindow.is_maximized ? Settings.WindowState.MAXIMIZED: Settings.WindowState.NORMAL);
+        if (settings.window_state == Settings.WindowState.NORMAL) {
+            settings.window_height = this.mainwindow.get_allocated_height ();
+            settings.window_width = this.mainwindow.get_allocated_width ();
+        }
+    }
 }

=== added file 'src/Settings.vala'
--- src/Settings.vala	1970-01-01 00:00:00 +0000
+++ src/Settings.vala	2015-10-16 21:44:55 +0000
@@ -0,0 +1,23 @@
+public class Settings : Granite.Services.Settings {
+
+    private static Settings settings;
+    public static Settings get_default () {
+        if (settings == null)
+            settings = new Settings ();
+
+        return settings;
+    }
+    public int window_width { get; set; }
+    public int window_height { get; set; }
+    public WindowState window_state { get; set; }
+
+    private Settings () {
+        base ("org.pantheon.webby.SavedState");
+    }
+
+    public enum WindowState {
+        NORMAL,
+        MAXIMIZED,
+        FULLSCREEN
+    }
+}