Merge lp:~donadigo/capnet-assist/gsettings into lp:~elementary-apps/capnet-assist/trunk

[Adam Bieńkowski]

* Add GSetting to enable the assistant

This branch fixes bug #1651585: "Add GSetting to disable".

Adds a gsettings xml file and a "enabled" key to disable / enable the assistant. The settings are implemented in a separate file, to minimize work in case of adding another keys if needed.

[Corentin Noël (tintou)]

Tiny fix with the gettext-domain and then it's okay to merge

[lp:~donadigo/capnet-assist/gsettings]

127. By Adam Bieńkowski on 2016-12-23

Remove gettext-domain

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-09-02 17:26:17 +0000
+++ data/CMakeLists.txt	2016-12-23 13:16:37 +0000
@@ -1,3 +1,7 @@
 configure_file(org.pantheon.capnet-assist.desktop ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.capnet-assist.desktop)
 
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.capnet-assist.desktop DESTINATION share/applications)
+
+include (GSettings)
+
+add_schema (org.pantheon.capnet-assist.gschema.xml)

=== added file 'data/org.pantheon.capnet-assist.gschema.xml'
--- data/org.pantheon.capnet-assist.gschema.xml	1970-01-01 00:00:00 +0000
+++ data/org.pantheon.capnet-assist.gschema.xml	2016-12-23 13:16:37 +0000
@@ -0,0 +1,8 @@
+<schemalist>
+  <schema path="/org/pantheon/capnet-assist/" id="org.pantheon.capnet-assist">
+        <key name="enabled" type="b">
+            <default>true</default>
+            <summary>Whether the assistant should be enabled</summary>
+        </key>
+    </schema>
+</schemalist>

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-12-20 18:00:10 +0000
+++ src/Application.vala	2016-12-23 13:16:37 +0000
@@ -57,6 +57,12 @@
     }
 
     public override void activate () {
+        var settings = new Settings ();
+        if (!settings.enabled) {
+            quit ();
+            return;
+        }
+
         if (!is_busy) {
             mark_busy ();
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-12-05 04:41:39 +0000
+++ src/CMakeLists.txt	2016-12-23 13:16:37 +0000
@@ -42,6 +42,7 @@
     CaptiveLogin.vala
     CertButton.vala
     TabbedWebView.vala
+    Settings.vala
 PACKAGES
     ${CAPTIVE_LOGIN_PACKAGES}
 OPTIONS

=== added file 'src/Settings.vala'
--- src/Settings.vala	1970-01-01 00:00:00 +0000
+++ src/Settings.vala	2016-12-23 13:16:37 +0000
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2016 elementary LLC (https://launchpad.net/capnet-assist)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*/
+
+public class Captive.Settings : Granite.Services.Settings {
+	public bool enabled { get; set; }
+
+	public Settings () {
+		base ("org.pantheon.capnet-assist");
+	}
+}
\ No newline at end of file