Merge lp:~ken-vandine/ubuntu-system-settings/launcher_reset into lp:ubuntu-system-settings

Proposed by Ken VanDine on 2017-03-30
Status: Merged
Approved by: Jonas G. Drange on 2017-03-30
Approved revision: 1776
Merged at revision: 1778
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/launcher_reset
Merge into: lp:ubuntu-system-settings
Diff against target: 782 lines (+39/-606)
16 files modified
plugins/CMakeLists.txt (+0/-1)
plugins/launcher/CMakeLists.txt (+1/-1)
plugins/launcher/PageComponent.qml (+34/-0)
plugins/launcher/ResetLauncherHome.qml (+4/-3)
plugins/reset/CMakeLists.txt (+0/-24)
plugins/reset/EntryComponent.qml (+0/-40)
plugins/reset/EraseEverything.qml (+0/-58)
plugins/reset/PageComponent.qml (+0/-147)
plugins/reset/ResetAllSettings.qml (+0/-42)
plugins/reset/plugin.cpp (+0/-34)
plugins/reset/plugin.h (+0/-33)
plugins/reset/qmldir (+0/-2)
plugins/reset/reset.cpp (+0/-56)
plugins/reset/reset.h (+0/-36)
plugins/reset/reset.settings (+0/-19)
plugins/reset/settings-reset.svg (+0/-110)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/launcher_reset
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve on 2017-03-30
Jonas G. Drange (community) 2017-03-30 Approve on 2017-03-30
Review via email: mp+321457@code.launchpad.net

Commit message

Add reset launcher to the launcher panel

Description of the change

Add reset launcher to the launcher panel

To post a comment you must log in.
Jonas G. Drange (jonas-drange) wrote :

LGTM! Thank you.

review: Approve
1777. By Ken VanDine on 2017-03-30

destroy popup after reset

PASSED: Continuous integration, rev:1776
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/29/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2367
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2367
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2183/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/29/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/CMakeLists.txt'
2--- plugins/CMakeLists.txt 2017-03-24 10:30:22 +0000
3+++ plugins/CMakeLists.txt 2017-03-30 14:32:08 +0000
4@@ -17,7 +17,6 @@
5 add_subdirectory(orientation-lock)
6 add_subdirectory(phone)
7 add_subdirectory(printing)
8-#add_subdirectory(reset)
9 add_subdirectory(security-privacy)
10 add_subdirectory(sound)
11 add_subdirectory(time-date)
12
13=== modified file 'plugins/launcher/CMakeLists.txt'
14--- plugins/launcher/CMakeLists.txt 2016-11-21 13:29:51 +0000
15+++ plugins/launcher/CMakeLists.txt 2017-03-30 14:32:08 +0000
16@@ -1,6 +1,6 @@
17 add_subdirectory(plugin)
18
19-set(QML_SOURCES PageComponent.qml)
20+set(QML_SOURCES PageComponent.qml ResetLauncherHome.qml)
21 set(PANEL_SOURCES
22 launcher.h
23 launcher_impl.cpp
24
25=== modified file 'plugins/launcher/PageComponent.qml'
26--- plugins/launcher/PageComponent.qml 2016-12-14 13:37:49 +0000
27+++ plugins/launcher/PageComponent.qml 2017-03-30 14:32:08 +0000
28@@ -24,6 +24,8 @@
29 import Ubuntu.Settings.Components 0.1 as USC
30 import Ubuntu.Settings.Menus 0.1 as Menus
31 import Ubuntu.SystemSettings.Launcher 1.0
32+import Ubuntu.Components.Popups 1.3
33+import Ubuntu.Components.ListItems 1.3 as ListItems
34
35 ItemPage {
36 id: root
37@@ -46,6 +48,12 @@
38 return true; // No large screens were the current one.
39 }
40
41+ // destroy popup after reset
42+ property var popup
43+ function done () {
44+ popup.destroy();
45+ }
46+
47 Flickable {
48 id: flick
49 anchors.fill: parent
50@@ -103,12 +111,38 @@
51 onSyncTriggered: unity8Settings.launcherWidth = value
52 }
53 }
54+
55+ ListItems.ThinDivider {}
56+ SettingsListItems.Standard {
57+ text: i18n.tr("Reset Launcher")
58+ layout.subtitle.text: i18n.tr("Reset the Launcher to its original contents.")
59+
60+ Button {
61+ id: resetLauncherHomeButton
62+ objectName: "resetLauncher"
63+ text: i18n.tr("Reset Launcher")
64+ onClicked: {
65+ buttonActions.source = "ResetLauncherHome.qml";
66+ root.popup = PopupUtils.open(buttonActions.item);
67+ }
68+ }
69+ }
70 }
71 }
72
73+ Loader {
74+ id: buttonActions
75+ asynchronous: false
76+ }
77+
78 GSettings {
79 id: unity8Settings
80 objectName: "unity8Settings"
81 schema.id: "com.canonical.Unity8"
82 }
83+
84+ GSettings {
85+ id: launcherSettings
86+ schema.id: "com.canonical.Unity.Launcher"
87+ }
88 }
89
90=== renamed file 'plugins/reset/ResetLauncherHome.qml' => 'plugins/launcher/ResetLauncherHome.qml'
91--- plugins/reset/ResetLauncherHome.qml 2015-08-10 13:31:45 +0000
92+++ plugins/launcher/ResetLauncherHome.qml 2017-03-30 14:32:08 +0000
93@@ -1,7 +1,7 @@
94 /*
95 * This file is part of system-settings
96 *
97- * Copyright (C) 2013 Canonical Ltd.
98+ * Copyright (C) 2013-2017 Canonical Ltd.
99 *
100 * Contact: Iain Lane <iain.lane@canonical.com>
101 *
102@@ -24,6 +24,7 @@
103
104 Component {
105 id: resetLauncherHome
106+
107 Dialog {
108 id: dialog
109 states: State {
110@@ -45,8 +46,8 @@
111 objectName: "resetLauncherAction"
112 onClicked: {
113 dialog.state = "clicked";
114- unitySettings.schema.reset("favorites");
115- unitySettings.schema.reset("items");
116+ launcherSettings.schema.reset("favorites");
117+ launcherSettings.schema.reset("items");
118 root.done();
119 }
120 }
121
122=== removed directory 'plugins/reset'
123=== removed file 'plugins/reset/CMakeLists.txt'
124--- plugins/reset/CMakeLists.txt 2016-09-23 13:07:28 +0000
125+++ plugins/reset/CMakeLists.txt 1970-01-01 00:00:00 +0000
126@@ -1,24 +0,0 @@
127-set(QML_SOURCES EntryComponent.qml
128- EraseEverything.qml
129- PageComponent.qml
130- ResetAllSettings.qml
131- ResetLauncherHome.qml
132-)
133-
134-add_library(UbuntuResetPanel MODULE
135- plugin.cpp
136- reset.cpp
137- plugin.h
138- reset.h
139- ${QML_SOURCES}
140-)
141-qt5_use_modules(UbuntuResetPanel Qml Quick DBus)
142-
143-target_link_libraries(UbuntuResetPanel uss-accountsservice)
144-
145-set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Reset)
146-install(TARGETS UbuntuResetPanel DESTINATION ${PLUG_DIR})
147-install(FILES qmldir DESTINATION ${PLUG_DIR})
148-install(FILES reset.settings DESTINATION ${PLUGIN_MANIFEST_DIR})
149-install(FILES settings-reset.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
150-install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/reset)
151
152=== removed file 'plugins/reset/EntryComponent.qml'
153--- plugins/reset/EntryComponent.qml 2016-07-14 13:51:56 +0000
154+++ plugins/reset/EntryComponent.qml 1970-01-01 00:00:00 +0000
155@@ -1,40 +0,0 @@
156-/*
157- * This file is part of system-settings
158- *
159- * Copyright (C) 2013-2016 Canonical Ltd.
160- *
161- * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
162- *
163- * This program is free software: you can redistribute it and/or modify it
164- * under the terms of the GNU General Public License version 3, as published
165- * by the Free Software Foundation.
166- *
167- * This program is distributed in the hope that it will be useful, but
168- * WITHOUT ANY WARRANTY; without even the implied warranties of
169- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
170- * PURPOSE. See the GNU General Public License for more details.
171- *
172- * You should have received a copy of the GNU General Public License along
173- * with this program. If not, see <http://www.gnu.org/licenses/>.
174- */
175-
176-import QtQuick 2.4
177-import Ubuntu.Components 1.3
178-
179-ListItem {
180- id: root
181- objectName: "entryComponent-reset"
182- height: layout.height
183-
184- ListItemLayout {
185- id: layout
186- title.text: i18n.tr(model.displayName)
187- Icon {
188- SlotsLayout.position: SlotsLayout.Leading;
189- SlotsLayout.padding { top: 0; bottom: 0 }
190- source: model.icon
191- height: units.gu(5)
192- }
193- ProgressionSlot {}
194- }
195-}
196
197=== removed file 'plugins/reset/EraseEverything.qml'
198--- plugins/reset/EraseEverything.qml 2016-02-04 15:28:51 +0000
199+++ plugins/reset/EraseEverything.qml 1970-01-01 00:00:00 +0000
200@@ -1,58 +0,0 @@
201-/*
202- * This file is part of system-settings
203- *
204- * Copyright (C) 2013 Canonical Ltd.
205- *
206- * Contact: Iain Lane <iain.lane@canonical.com>
207- *
208- * This program is free software: you can redistribute it and/or modify it
209- * under the terms of the GNU General Public License version 3, as published
210- * by the Free Software Foundation.
211- *
212- * This program is distributed in the hope that it will be useful, but
213- * WITHOUT ANY WARRANTY; without even the implied warranties of
214- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
215- * PURPOSE. See the GNU General Public License for more details.
216- *
217- * You should have received a copy of the GNU General Public License along
218- * with this program. If not, see <http://www.gnu.org/licenses/>.
219- */
220-
221-import QtQuick 2.4
222-import Ubuntu.Components 1.3
223-import Ubuntu.Components.Popups 1.3
224-
225-Component {
226- id: eraseEverything
227- Dialog {
228- id: dialog
229- states: State {
230- name: "clicked"
231- PropertyChanges {
232- target: action
233- enabled: false
234- }
235- PropertyChanges {
236- target: cancel
237- enabled: false
238- }
239- }
240- objectName: "factoryResetDialog"
241- text: i18n.tr("All documents, saved games, settings, and other items will be permanently deleted from this device.")
242- Button {
243- id: action
244- text: i18n.tr("Erase & Reset Everything")
245- objectName: "factoryResetAction"
246- onClicked: {
247- dialog.state = "clicked";
248- resetBackend.factoryReset();
249- root.done();
250- }
251- }
252- Button {
253- id: cancel
254- text: i18n.tr("Cancel")
255- onClicked: PopupUtils.close(dialog);
256- }
257- }
258-}
259
260=== removed file 'plugins/reset/PageComponent.qml'
261--- plugins/reset/PageComponent.qml 2016-07-14 13:51:56 +0000
262+++ plugins/reset/PageComponent.qml 1970-01-01 00:00:00 +0000
263@@ -1,147 +0,0 @@
264-/*
265- * This file is part of system-settings
266- *
267- * Copyright (C) 2013-2016 Canonical Ltd.
268- *
269- * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
270- *
271- * This program is free software: you can redistribute it and/or modify it
272- * under the terms of the GNU General Public License version 3, as published
273- * by the Free Software Foundation.
274- *
275- * This program is distributed in the hope that it will be useful, but
276- * WITHOUT ANY WARRANTY; without even the implied warranties of
277- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
278- * PURPOSE. See the GNU General Public License for more details.
279- *
280- * You should have received a copy of the GNU General Public License along
281- * with this program. If not, see <http://www.gnu.org/licenses/>.
282- */
283-
284-import GSettings 1.0
285-import QtQuick 2.4
286-import SystemSettings 1.0
287-import SystemSettings.ListItems 1.0 as SettingsListItems
288-import Ubuntu.Components 1.3
289-import Ubuntu.Components.Popups 1.3
290-import Ubuntu.SystemSettings.Reset 1.0
291-
292-ItemPage {
293- id: root
294-
295- title: i18n.tr("Reset device")
296- objectName: "resetPage"
297- flickable: scrollWidget
298-
299- // workaround for #1231729
300- // delay destroying popup until pageStack has been popped
301- property var popup
302- function done () {
303- popup.opacity = 0;
304- pageStack.pop();
305- popup.destroy(1000);
306- }
307-
308- Loader {
309- id: buttonActions
310- asynchronous: false
311- }
312-
313- UbuntuResetPanel {
314- id: resetBackend
315- }
316-
317- GSettings {
318- id: unitySettings
319- schema.id: "com.canonical.Unity.Launcher"
320- }
321-
322- Flickable {
323- id: scrollWidget
324- anchors.fill: parent
325- contentHeight: contentItem.childrenRect.height
326- boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
327-
328- Column {
329- anchors.left: parent.left
330- anchors.right: parent.right
331-
332- Label {
333- anchors {
334- left: parent.left
335- right: parent.right
336- margins: units.gu(2)
337- }
338- text: i18n.tr("Reset Launcher")
339- color: UbuntuColors.orange
340- height: units.gu(6)
341- verticalAlignment: Text.AlignVCenter
342- }
343-
344- SettingsListItems.Standard {
345-
346- Button {
347- id: resetLauncherHomeButton
348- objectName: "resetLauncher"
349- text: i18n.tr("Reset Launcher")
350- onClicked: {
351- buttonActions.source = "ResetLauncherHome.qml";
352- root.popup = PopupUtils.open(buttonActions.item);
353- }
354- }
355- }
356-
357- Label {
358- anchors {
359- left: parent.left
360- right: parent.right
361- margins: units.gu(2)
362- }
363- visible: showAllUI
364- text: i18n.tr("Reset all system settingsā€¦")
365- color: UbuntuColors.orange
366- height: units.gu(6)
367- verticalAlignment: Text.AlignVCenter
368- }
369-
370- SettingsListItems.Standard {
371- visible: showAllUI
372-
373- Button {
374- id: resetAllSettingsButton
375- text: i18n.tr("Reset all system settingsā€¦")
376- onClicked: {
377- buttonActions.source = "ResetAllSettings.qml";
378- root.popup = PopupUtils.open(buttonActions.item);
379- }
380- }
381- }
382-
383- Label {
384- anchors {
385- left: parent.left
386- right: parent.right
387- margins: units.gu(2)
388- }
389- text: i18n.tr("Erase & Reset All")
390- color: UbuntuColors.orange
391- height: units.gu(6)
392- verticalAlignment: Text.AlignVCenter
393- }
394-
395- SettingsListItems.Standard {
396-
397- Button {
398- id: eraseEverythingButton
399- objectName: "factoryReset"
400-
401- text: i18n.tr("Erase & Reset All")
402- onClicked: {
403- buttonActions.source = "EraseEverything.qml";
404- root.popup = PopupUtils.open(buttonActions.item);
405- }
406- }
407- }
408- }
409- }
410-}
411
412=== removed file 'plugins/reset/ResetAllSettings.qml'
413--- plugins/reset/ResetAllSettings.qml 2015-08-10 13:31:45 +0000
414+++ plugins/reset/ResetAllSettings.qml 1970-01-01 00:00:00 +0000
415@@ -1,42 +0,0 @@
416-/*
417- * This file is part of system-settings
418- *
419- * Copyright (C) 2013 Canonical Ltd.
420- *
421- * Contact: Iain Lane <iain.lane@canonical.com>
422- *
423- * This program is free software: you can redistribute it and/or modify it
424- * under the terms of the GNU General Public License version 3, as published
425- * by the Free Software Foundation.
426- *
427- * This program is distributed in the hope that it will be useful, but
428- * WITHOUT ANY WARRANTY; without even the implied warranties of
429- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
430- * PURPOSE. See the GNU General Public License for more details.
431- *
432- * You should have received a copy of the GNU General Public License along
433- * with this program. If not, see <http://www.gnu.org/licenses/>.
434- */
435-
436-import QtQuick 2.4
437-import Ubuntu.Components 1.3
438-import Ubuntu.Components.Popups 1.3
439-
440-Component {
441- id: resetAllSettings
442- Dialog {
443- id: dialog
444- text: i18n.tr("The contents and layout of the launcher, and the filters in the home screen will be returned to their original settings.")
445- Button {
446- text: i18n.tr("Reset all system settings")
447- onClicked: {
448- pluginManager.resetPlugins()
449- PopupUtils.close(dialog)
450- }
451- }
452- Button {
453- text: i18n.tr("Cancel")
454- onClicked: PopupUtils.close(dialog)
455- }
456- }
457-}
458
459=== removed file 'plugins/reset/plugin.cpp'
460--- plugins/reset/plugin.cpp 2014-07-23 13:53:48 +0000
461+++ plugins/reset/plugin.cpp 1970-01-01 00:00:00 +0000
462@@ -1,34 +0,0 @@
463-/*
464- * Copyright (C) 2013 Canonical Ltd
465- *
466- * This program is free software: you can redistribute it and/or modify
467- * it under the terms of the GNU General Public License version 3 as
468- * published by the Free Software Foundation.
469- *
470- * This program is distributed in the hope that it will be useful,
471- * but WITHOUT ANY WARRANTY; without even the implied warranty of
472- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
473- * GNU General Public License for more details.
474- *
475- * You should have received a copy of the GNU General Public License
476- * along with this program. If not, see <http://www.gnu.org/licenses/>.
477- *
478-*/
479-
480-#include "plugin.h"
481-
482-#include <QtQml>
483-#include <QtQml/QQmlContext>
484-#include "reset.h"
485-
486-
487-void BackendPlugin::registerTypes(const char *uri)
488-{
489- Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Reset"));
490- qmlRegisterType<Reset>(uri, 1, 0, "UbuntuResetPanel");
491-}
492-
493-void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
494-{
495- QQmlExtensionPlugin::initializeEngine(engine, uri);
496-}
497
498=== removed file 'plugins/reset/plugin.h'
499--- plugins/reset/plugin.h 2015-03-16 13:51:36 +0000
500+++ plugins/reset/plugin.h 1970-01-01 00:00:00 +0000
501@@ -1,33 +0,0 @@
502-/*
503- * Copyright (C) 2013 Canonical Ltd
504- *
505- * This program is free software: you can redistribute it and/or modify
506- * it under the terms of the GNU General Public License version 3 as
507- * published by the Free Software Foundation.
508- *
509- * This program is distributed in the hope that it will be useful,
510- * but WITHOUT ANY WARRANTY; without even the implied warranty of
511- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
512- * GNU General Public License for more details.
513- *
514- * You should have received a copy of the GNU General Public License
515- * along with this program. If not, see <http://www.gnu.org/licenses/>.
516- *
517-*/
518-
519-#ifndef PLUGIN_H
520-#define PLUGIN_H
521-
522-#include <QtQml/QQmlEngine>
523-#include <QtQml/QQmlExtensionPlugin>
524-
525-class BackendPlugin : public QQmlExtensionPlugin
526-{
527- Q_OBJECT
528- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
529-
530-public:
531- void registerTypes(const char *uri);
532- void initializeEngine(QQmlEngine *engine, const char *uri);
533-};
534-#endif // PLUGIN_H
535
536=== removed file 'plugins/reset/qmldir'
537--- plugins/reset/qmldir 2013-09-06 13:12:46 +0000
538+++ plugins/reset/qmldir 1970-01-01 00:00:00 +0000
539@@ -1,2 +0,0 @@
540-module Ubuntu.SystemSettings.Reset
541-plugin UbuntuResetPanel
542
543=== removed file 'plugins/reset/reset.cpp'
544--- plugins/reset/reset.cpp 2015-03-16 13:51:36 +0000
545+++ plugins/reset/reset.cpp 1970-01-01 00:00:00 +0000
546@@ -1,56 +0,0 @@
547-/*
548- * Copyright (C) 2013 Canonical Ltd
549- *
550- * This program is free software: you can redistribute it and/or modify
551- * it under the terms of the GNU General Public License version 3 as
552- * published by the Free Software Foundation.
553- *
554- * This program is distributed in the hope that it will be useful,
555- * but WITHOUT ANY WARRANTY; without even the implied warranty of
556- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
557- * GNU General Public License for more details.
558- *
559- * You should have received a copy of the GNU General Public License
560- * along with this program. If not, see <http://www.gnu.org/licenses/>.
561- *
562- * Authors:
563- * Sebastien Bacher <sebastien.bacher@canonical.com>
564- *
565-*/
566-
567-#include "reset.h"
568-
569-#include <QDBusInterface>
570-#include <QDBusReply>
571-#include <QDebug>
572-
573-Reset::Reset(QObject *parent)
574- : QObject(parent)
575-{
576-}
577-
578-bool Reset::factoryReset()
579-{
580- QDBusInterface iface (
581- "com.canonical.SystemImage",
582- "/Service",
583- "com.canonical.SystemImage",
584- QDBusConnection::systemBus(),
585- this);
586-
587- // FIXME: temporary warning so we know we've reproduced bug #1370815
588- if (!iface.isValid())
589- qWarning() << iface.interface() << "Isn't valid";
590-
591-
592- QDBusReply<QString> reply = iface.call("FactoryReset");
593- if (!reply.isValid()) {
594- qWarning() << reply.error().message();
595- return false;
596- }
597-
598- return true;
599-}
600-
601-Reset::~Reset() {
602-}
603
604=== removed file 'plugins/reset/reset.h'
605--- plugins/reset/reset.h 2014-09-30 11:38:35 +0000
606+++ plugins/reset/reset.h 1970-01-01 00:00:00 +0000
607@@ -1,36 +0,0 @@
608-/*
609- * Copyright (C) 2013 Canonical Ltd
610- *
611- * This program is free software: you can redistribute it and/or modify
612- * it under the terms of the GNU General Public License version 3 as
613- * published by the Free Software Foundation.
614- *
615- * This program is distributed in the hope that it will be useful,
616- * but WITHOUT ANY WARRANTY; without even the implied warranty of
617- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
618- * GNU General Public License for more details.
619- *
620- * You should have received a copy of the GNU General Public License
621- * along with this program. If not, see <http://www.gnu.org/licenses/>.
622- *
623- * Authors:
624- * Sebastien Bacher <sebastien.bacher@canonical.com>
625- *
626-*/
627-
628-#ifndef RESET_H
629-#define RESET_H
630-
631-#include <QObject>
632-
633-class Reset : public QObject
634-{
635- Q_OBJECT
636-
637-public:
638- explicit Reset(QObject *parent = 0);
639- ~Reset();
640- Q_INVOKABLE bool factoryReset(void);
641-};
642-
643-#endif // RESET_H
644
645=== removed file 'plugins/reset/reset.settings'
646--- plugins/reset/reset.settings 2016-09-23 13:07:28 +0000
647+++ plugins/reset/reset.settings 1970-01-01 00:00:00 +0000
648@@ -1,19 +0,0 @@
649-{
650- "icon": "reset",
651- "name": "Reset",
652- "translations": "ubuntu-system-settings",
653- "category": "uncategorized-bottom",
654- "priority": 1,
655- "keywords": [
656- "reset",
657- "erase",
658- "factory",
659- "clear",
660- "restore"
661- ],
662- "has-dynamic-keywords": false,
663- "has-dynamic-visibility": false,
664- "visible-if-file-exists": "/usr/share/dbus-1/system-services/com.canonical.SystemImage.service",
665- "entry-component": "EntryComponent.qml",
666- "page-component": "PageComponent.qml"
667-}
668
669=== removed file 'plugins/reset/settings-reset.svg'
670--- plugins/reset/settings-reset.svg 2013-06-18 19:17:18 +0000
671+++ plugins/reset/settings-reset.svg 1970-01-01 00:00:00 +0000
672@@ -1,110 +0,0 @@
673-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
674-<!-- Created with Inkscape (http://www.inkscape.org/) -->
675-
676-<svg
677- xmlns:dc="http://purl.org/dc/elements/1.1/"
678- xmlns:cc="http://creativecommons.org/ns#"
679- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
680- xmlns:svg="http://www.w3.org/2000/svg"
681- xmlns="http://www.w3.org/2000/svg"
682- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
683- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
684- width="90"
685- height="90"
686- id="svg3390"
687- version="1.1"
688- inkscape:version="0.48+devel r12322"
689- sodipodi:docname="settings-reset.svg">
690- <defs
691- id="defs3392" />
692- <sodipodi:namedview
693- id="base"
694- pagecolor="#ffffff"
695- bordercolor="#666666"
696- borderopacity="1.0"
697- inkscape:pageopacity="0.0"
698- inkscape:pageshadow="2"
699- inkscape:zoom="2.6077032"
700- inkscape:cx="68.02921"
701- inkscape:cy="13.671034"
702- inkscape:document-units="px"
703- inkscape:current-layer="layer1"
704- showgrid="false"
705- fit-margin-top="0"
706- fit-margin-left="0"
707- fit-margin-right="0"
708- fit-margin-bottom="0" />
709- <metadata
710- id="metadata3395">
711- <rdf:RDF>
712- <cc:Work
713- rdf:about="">
714- <dc:format>image/svg+xml</dc:format>
715- <dc:type
716- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
717- <dc:title></dc:title>
718- </cc:Work>
719- </rdf:RDF>
720- </metadata>
721- <g
722- inkscape:label="Layer 1"
723- inkscape:groupmode="layer"
724- id="layer1"
725- transform="translate(33.5714,-515.93361)">
726- <g
727- transform="translate(-1695.5714,-204.42851)"
728- id="g3359">
729- <rect
730- transform="matrix(0,-1,-1,0,0,0)"
731- y="-1752"
732- x="-810.36212"
733- height="90"
734- width="90"
735- id="rect3252"
736- style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
737- <rect
738- transform="matrix(0,-1,-1,0,0,0)"
739- y="-1752"
740- x="-810.36212"
741- height="90"
742- width="90"
743- id="rect3254"
744- style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
745- <path
746- inkscape:transform-center-x="-15.628909"
747- inkscape:transform-center-y="16.92955"
748- transform="matrix(1.8790952,-1.0848368,1.1274571,1.952706,1284.5287,528.84733)"
749- d="m 113.91548,179.14423 c -0.52479,0.30299 -8.74643,-4.44378 -8.74643,-5.04975 0,-0.60597 8.22164,-5.35273 8.74643,-5.04975 C 114.44026,169.34772 114.44026,178.84125 113.91548,179.14423 Z"
750- inkscape:randomized="0"
751- inkscape:rounded="0.06"
752- inkscape:flatsided="true"
753- sodipodi:arg2="2.0943951"
754- sodipodi:arg1="1.0471976"
755- sodipodi:r2="2.9154758"
756- sodipodi:r1="5.8309517"
757- sodipodi:cy="174.09448"
758- sodipodi:cx="111"
759- sodipodi:sides="3"
760- id="path3262"
761- style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
762- sodipodi:type="star" />
763- <path
764- style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;stroke:none;stroke-width:5.68486595;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
765- d="m 1687.224,747.01288 c 11.0389,-11.0383 29.0212,-11.06049 40.06,-0.0222 11.039,11.03829 11.0611,29.01962 0.022,40.05782 -11.0389,11.03831 -29.0212,11.06049 -40.06,0.0222 l 4.216,-4.26527 c 8.746,8.74543 22.8326,8.77264 31.5785,0.0272 8.7459,-8.7455 8.7731,-22.83135 0.027,-31.57675 l -0.032,-0.009 c -8.7475,-8.72388 -22.8079,-8.75694 -31.5466,-0.0187 L 1687.224,747.01288 Z"
766- id="path3264"
767- inkscape:connector-curvature="0" />
768- <path
769- inkscape:transform-center-y="-0.012708878"
770- inkscape:transform-center-x="0.38886507"
771- sodipodi:type="arc"
772- style="opacity:0.5;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:7.96446705;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
773- id="path3275"
774- sodipodi:cx="1807"
775- sodipodi:cy="2350"
776- sodipodi:rx="24"
777- sodipodi:ry="24"
778- d="m 1831,2350 c 0,13.2548 -10.7452,24 -24,24 -13.2548,0 -24,-10.7452 -24,-24 0,-13.2548 10.7452,-24 24,-24 C 1820.2548,2326 1831,2336.7452 1831,2350 Z"
779- transform="matrix(-0.08335105,0.311094,0.31107032,0.08335738,1126.8691,8.8719668)" />
780- </g>
781- </g>
782-</svg>

Subscribers

People subscribed via source and target branches