Resolve conflicts

CMakeLists.txt

@@ -12,7 +12,7 @@ set (PLUGCATEGORY "system")
 # Set the Title to use for the Plug in the Overview and in the Titlebar
 set (PLUGTITLE "Parental Control")
 # Set the version for the plug
-set (VERSION "0.1")
+set (VERSION "0.1.3")
 
 # Set the Name of the plug, should be an executable command, lowercase, no spaces 
 
@@ -52,4 +52,4 @@ add_definitions (-w)
 add_subdirectory (po)
 
 add_subdirectory (data)
-add_subdirectory (src)
+add_subdirectory (src)

data/CMakeLists.txt

@@ -1,10 +1,10 @@
 configure_file (org.pantheon.switchboard.parental-controls.policy.cmake ${CMAKE_CURRENT_BINARY_DIR}/data/org.pantheon.switchboard.parental-controls.policy)
-configure_file (pantheon-parental-controls.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-parental-controls.service)
 configure_file (org.pantheon.ParentalControls.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.ParentalControls.service)
+configure_file (pantheon-parental-controls.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/data/pantheon-parental-controls.service)
 
 install (FILES daemon.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pantheon-parental-controls)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/data/org.pantheon.switchboard.parental-controls.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.ParentalControls.service DESTINATION share/dbus-1/system-services)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-parental-controls.service DESTINATION /lib/systemd/system)
 install (FILES org.pantheon.ParentalControls.conf DESTINATION /etc/dbus-1/system.d)
-install (FILES pantheon-parental-controls-client.desktop DESTINATION share/applications)
+install (FILES pantheon-parental-controls-client.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/data/pantheon-parental-controls.service DESTINATION /lib/systemd/system)

data/pantheon-parental-controls-client.desktop

@@ -1,6 +1,10 @@
 [Desktop Entry]
 Name=Parental Controls Client
 Exec=pantheon-parental-controls-client
-Icon=preferences-system-parental-controls
 Comment=Show parental control restrictions
+Icon=preferences-system-parental-controls
+Terminal=false
+Type=Application
 NoDisplay=true
+X-GNOME-AutoRestart=true
+X-GNOME-Autostart-Phase=Applications

debian/changelog

@@ -1,3 +1,21 @@
+switchboard-plug-parental-controls (0.1.3) xenial; urgency=medium
+
+  * New upstream release.
+
+ -- Cody Garver <cody@elementary.io>  Sat, 11 Feb 2017 12:04:49 -0600
+
+switchboard-plug-parental-controls (0.1.2) xenial; urgency=medium
+
+  * New upstream release.
+
+ -- Cody Garver <cody@elementary.io>  Mon, 02 Jan 2017 19:53:33 -0600
+
+switchboard-plug-parental-controls (0.1.1) xenial; urgency=medium
+
+  * New upstream release.
+
+ -- Cody Garver <cody@elementary.io>  Wed, 21 Sep 2016 08:11:33 -0500
+
 switchboard-plug-parental-controls (0.1) xenial; urgency=medium
 
   * Initial Release.

debian/control

@@ -4,13 +4,14 @@ Priority: optional
 Maintainer: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
 Build-Depends: cmake,
                debhelper (>= 9),
+               dh-systemd (>= 1.5),
                libaccountsservice-dev,
                libgranite-dev,
                libglib2.0-dev,
                libgtk-3-dev,
                libpolkit-gobject-1-dev,
                libswitchboard-2.0-dev,
-               valac
+               valac (>= 0.34.1)
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/pantheon-plugs
 

debian/install

@@ -1,5 +1,5 @@
 etc/
-lib/systemd/system
+lib/systemd
 usr/bin
 usr/lib
 usr/share

debian/rules

@@ -10,7 +10,13 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@ --with systemd
+
+override_dh_systemd_enable:
+	dh_systemd_enable -ppantheon-parental-controls
+
+override_dh_systemd_start:
+	dh_systemd_start -ppantheon-parental-controls
 
 override_dh_strip:
 	dh_strip --dbg-package=switchboard-plug-parental-controls-dbg

debian/switchboard-plug-parental-controls.links

@@ -0,0 +1 @@
+/usr/share/applications/pantheon-parental-controls-client.desktop /etc/xdg/autostart/pantheon-parental-controls-client.desktop

po/aa.po

@@ -0,0 +1,210 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-04 11:47+0100\n"
+"PO-Revision-Date: 2017-02-11 20:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2017-02-12 06:27+0000\n"
+"X-Generator: Launchpad (build 18326)\n"
+
+#: ../src/Widgets/AppsBox.vala:90
+msgid "Prevent %s from using these apps:"
+msgstr ""
+
+#: ../src/Widgets/AppsBox.vala:101
+msgid "Add Prevented Apps…"
+msgstr ""
+
+#: ../src/Widgets/AppsBox.vala:105
+msgid "Remove Selected App"
+msgstr ""
+
+#: ../src/Widgets/AppsBox.vala:110
+msgid "Clear All"
+msgstr ""
+
+#: ../src/Widgets/AppsBox.vala:133
+msgid "Allow access to these apps with admin permission:"
+msgstr ""
+
+#: ../src/Widgets/ControlPage.vala:53
+msgid "General"
+msgstr ""
+
+#: ../src/Widgets/ControlPage.vala:54
+msgid "Internet"
+msgstr ""
+
+#: ../src/Widgets/ControlPage.vala:55
+msgid "Applications"
+msgstr ""
+
+#: ../src/Widgets/UserList.vala:42
+msgid "My Account"
+msgstr ""
+
+#: ../src/Widgets/UserList.vala:46
+msgid "Other Accounts"
+msgstr ""
+
+#: ../src/Widgets/WeekSpinBox.vala:45
+msgid "From:"
+msgstr ""
+
+#: ../src/Widgets/WeekSpinBox.vala:47
+msgid "To:"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:62
+msgid "Allow this user to:"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:65
+msgid "Modify the dock"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:68
+msgid "Configure printing"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:84
+msgid "Limit computer use:"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:92
+msgid "On weekdays and weekends"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:93
+msgid "Only on weekdays"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:94
+msgid "Only on weekends"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:104
+msgid "Weekdays"
+msgstr ""
+
+#: ../src/Widgets/GeneralBox.vala:108
+msgid "Weekends"
+msgstr ""
+
+#: ../src/Widgets/AppChooser.vala:71
+msgid "Search Applications"
+msgstr ""
+
+#: ../src/Widgets/InternetBox.vala:77
+msgid "Prevent %s from visiting these websites:"
+msgstr ""
+
+#: ../src/Widgets/InternetBox.vala:90
+msgid "Add URL"
+msgstr ""
+
+#: ../src/Widgets/InternetBox.vala:99
+msgid "Add a new URL, for example: google.com"
+msgstr ""
+
+#: ../src/Widgets/InternetBox.vala:100
+msgid "Invalid URL"
+msgstr ""
+
+#. //launchpad.net/switchboard-plug-parental-controls)
+#. *
+#. * This library is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Library General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 3 of the License, or (at your option) any later version.
+#. *
+#. * This library 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
+#. * Library General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Library General Public
+#. * License along with this library; if not, write to the
+#. * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+#. * Boston, MA 02111-1307, USA.
+#. *
+#. * Authored by: Adam Bieńkowski <donadigos159@gmail.com>
+#. 
+#: ../src/Translation.vala:23
+msgid "Manage parental control settings"
+msgstr ""
+
+#: ../src/Translation.vala:24
+msgid "Authentication is required to change parental control settings"
+msgstr ""
+
+#: ../src/Plug.vala:71
+msgid "Some settings require administrator rights to be changed"
+msgstr ""
+
+#: ../src/Plug.vala:80
+msgid "No users to edit"
+msgstr ""
+
+#: ../src/Plug.vala:80
+msgid ""
+"Parental Controls can only be applied to user accounts that don't have "
+"administrative permissions.\n"
+"You can change a user's account type from \"Administrator\" to \"Standard\" "
+"in the User Accounts pane."
+msgstr ""
+
+#: ../src/Plug.vala:83
+msgid "Configure User Accounts"
+msgstr ""
+
+#: ../src/Plug.vala:86
+msgid "Open Users settings"
+msgstr ""
+
+#: ../src/Plug.vala:163
+msgid "Parental Control"
+msgstr ""
+
+#: ../src/Plug.vala:164
+msgid "Configure time limits and restrict application usage"
+msgstr ""
+
+#: ../src/client/AppUnavailableDialog.vala:27
+msgid "You cannot run this application"
+msgstr ""
+
+#: ../src/client/AppUnavailableDialog.vala:28
+msgid "You are not permitted to run this application."
+msgstr ""
+
+#: ../src/client/Client.vala:95
+msgid ""
+"Make sure to close all applications before your computer will be locked."
+msgstr ""
+
+#: ../src/client/Client.vala:99
+msgid "%lu hour"
+msgid_plural "%lu hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/Client.vala:103
+msgid "%lu minute"
+msgid_plural "%lu minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/Client.vala:106
+msgid "This computer will lock after %s %s. %s"
+msgstr ""
+
+#: ../src/client/Client.vala:108
+msgid "Time left"
+msgstr ""