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

[Ken VanDine]

Add reset launcher to the launcher panel

Add reset launcher to the launcher panel

[Jonas G. Drange (jonas-drange)]

LGTM! Thank you.

review: Approve

[lp:~ken-vandine/ubuntu-system-settings/launcher_reset]

1777. By Ken VanDine on 2017-03-30

destroy popup after reset

[system-apps-ci-bot (system-apps-ci-bot)]

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)

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2017-03-24 10:30:22 +0000
+++ plugins/CMakeLists.txt	2017-03-30 14:32:08 +0000
@@ -17,7 +17,6 @@
 add_subdirectory(orientation-lock)
 add_subdirectory(phone)
 add_subdirectory(printing)
-#add_subdirectory(reset)
 add_subdirectory(security-privacy)
 add_subdirectory(sound)
 add_subdirectory(time-date)

=== modified file 'plugins/launcher/CMakeLists.txt'
--- plugins/launcher/CMakeLists.txt	2016-11-21 13:29:51 +0000
+++ plugins/launcher/CMakeLists.txt	2017-03-30 14:32:08 +0000
@@ -1,6 +1,6 @@
 add_subdirectory(plugin)
 
-set(QML_SOURCES PageComponent.qml)
+set(QML_SOURCES PageComponent.qml ResetLauncherHome.qml)
 set(PANEL_SOURCES
     launcher.h
     launcher_impl.cpp

=== modified file 'plugins/launcher/PageComponent.qml'
--- plugins/launcher/PageComponent.qml	2016-12-14 13:37:49 +0000
+++ plugins/launcher/PageComponent.qml	2017-03-30 14:32:08 +0000
@@ -24,6 +24,8 @@
 import Ubuntu.Settings.Components 0.1 as USC
 import Ubuntu.Settings.Menus 0.1 as Menus
 import Ubuntu.SystemSettings.Launcher 1.0
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
 
 ItemPage {
     id: root
@@ -46,6 +48,12 @@
         return true; // No large screens were the current one.
     }
 
+    // destroy popup after reset
+    property var popup
+    function done () {
+        popup.destroy();
+    }
+
     Flickable {
         id: flick
         anchors.fill: parent
@@ -103,12 +111,38 @@
                     onSyncTriggered: unity8Settings.launcherWidth = value
                 }
             }
+
+            ListItems.ThinDivider {}
+            SettingsListItems.Standard {
+                text: i18n.tr("Reset Launcher")
+                layout.subtitle.text: i18n.tr("Reset the Launcher to its original contents.")
+
+                Button {
+                    id: resetLauncherHomeButton
+                    objectName: "resetLauncher"
+                    text: i18n.tr("Reset Launcher")
+                    onClicked: {
+                        buttonActions.source = "ResetLauncherHome.qml";
+                        root.popup = PopupUtils.open(buttonActions.item);
+                    }
+                }
+            }
         }
     }
 
+    Loader {
+        id: buttonActions
+        asynchronous: false
+    }
+
     GSettings {
         id: unity8Settings
         objectName: "unity8Settings"
         schema.id: "com.canonical.Unity8"
     }
+
+    GSettings {
+        id: launcherSettings
+        schema.id: "com.canonical.Unity.Launcher"
+    }
 }

=== renamed file 'plugins/reset/ResetLauncherHome.qml' => 'plugins/launcher/ResetLauncherHome.qml'
--- plugins/reset/ResetLauncherHome.qml	2015-08-10 13:31:45 +0000
+++ plugins/launcher/ResetLauncherHome.qml	2017-03-30 14:32:08 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of system-settings
  *
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2017 Canonical Ltd.
  *
  * Contact: Iain Lane <[e-mail]>
  *
@@ -24,6 +24,7 @@
 
 Component {
     id: resetLauncherHome
+
     Dialog {
         id: dialog
         states: State {
@@ -45,8 +46,8 @@
             objectName: "resetLauncherAction"
             onClicked: {
                 dialog.state = "clicked";
-                unitySettings.schema.reset("favorites");
-                unitySettings.schema.reset("items");
+                launcherSettings.schema.reset("favorites");
+                launcherSettings.schema.reset("items");
                 root.done();
             }
         }

=== removed directory 'plugins/reset'
=== removed file 'plugins/reset/CMakeLists.txt'
--- plugins/reset/CMakeLists.txt	2016-09-23 13:07:28 +0000
+++ plugins/reset/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-set(QML_SOURCES EntryComponent.qml
-    EraseEverything.qml
-    PageComponent.qml
-    ResetAllSettings.qml
-    ResetLauncherHome.qml
-)
-
-add_library(UbuntuResetPanel MODULE
-  plugin.cpp
-  reset.cpp
-  plugin.h
-  reset.h
-  ${QML_SOURCES}
-)
-qt5_use_modules(UbuntuResetPanel Qml Quick DBus)
-
-target_link_libraries(UbuntuResetPanel uss-accountsservice)
-
-set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Reset)
-install(TARGETS UbuntuResetPanel DESTINATION ${PLUG_DIR})
-install(FILES qmldir DESTINATION ${PLUG_DIR})
-install(FILES reset.settings DESTINATION ${PLUGIN_MANIFEST_DIR})
-install(FILES settings-reset.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
-install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/reset)

=== removed file 'plugins/reset/EntryComponent.qml'
--- plugins/reset/EntryComponent.qml	2016-07-14 13:51:56 +0000
+++ plugins/reset/EntryComponent.qml	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2013-2016 Canonical Ltd.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-ListItem {
-    id: root
-    objectName: "entryComponent-reset"
-    height: layout.height
-
-    ListItemLayout {
-        id: layout
-        title.text: i18n.tr(model.displayName)
-        Icon {
-            SlotsLayout.position: SlotsLayout.Leading;
-            SlotsLayout.padding { top: 0; bottom: 0 }
-            source: model.icon
-            height: units.gu(5)
-        }
-        ProgressionSlot {}
-    }
-}

=== removed file 'plugins/reset/EraseEverything.qml'
--- plugins/reset/EraseEverything.qml	2016-02-04 15:28:51 +0000
+++ plugins/reset/EraseEverything.qml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2013 Canonical Ltd.
- *
- * Contact: Iain Lane <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
-
-Component {
-    id: eraseEverything
-    Dialog {
-        id: dialog
-        states: State {
-            name: "clicked"
-            PropertyChanges {
-                target: action
-                enabled: false
-            }
-            PropertyChanges {
-                target: cancel
-                enabled: false
-            }
-        }
-        objectName: "factoryResetDialog"
-        text: i18n.tr("All documents, saved games, settings, and other items will be permanently deleted from this device.")
-        Button {
-            id: action
-            text: i18n.tr("Erase & Reset Everything")
-            objectName: "factoryResetAction"
-            onClicked: {
-                dialog.state = "clicked";
-                resetBackend.factoryReset();
-                root.done();
-            }
-        }
-        Button {
-            id: cancel
-            text: i18n.tr("Cancel")
-            onClicked: PopupUtils.close(dialog);
-        }
-    }
-}

=== removed file 'plugins/reset/PageComponent.qml'
--- plugins/reset/PageComponent.qml	2016-07-14 13:51:56 +0000
+++ plugins/reset/PageComponent.qml	1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2013-2016 Canonical Ltd.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
- */
-
-import GSettings 1.0
-import QtQuick 2.4
-import SystemSettings 1.0
-import SystemSettings.ListItems 1.0 as SettingsListItems
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
-import Ubuntu.SystemSettings.Reset 1.0
-
-ItemPage {
-    id: root
-
-    title: i18n.tr("Reset device")
-    objectName: "resetPage"
-    flickable: scrollWidget
-
-    // workaround for #1231729
-    // delay destroying popup until pageStack has been popped
-    property var popup
-    function done () {
-        popup.opacity = 0;
-        pageStack.pop();
-        popup.destroy(1000);
-    }
-
-    Loader {
-        id: buttonActions
-        asynchronous: false
-    }
-
-    UbuntuResetPanel {
-        id: resetBackend
-    }
-
-    GSettings {
-        id: unitySettings
-        schema.id: "com.canonical.Unity.Launcher"
-    }
-
-    Flickable {
-        id: scrollWidget
-        anchors.fill: parent
-        contentHeight: contentItem.childrenRect.height
-        boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
-
-        Column {
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            Label {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                }
-                text: i18n.tr("Reset Launcher")
-                color: UbuntuColors.orange
-                height: units.gu(6)
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            SettingsListItems.Standard {
-
-                Button {
-                    id: resetLauncherHomeButton
-                    objectName: "resetLauncher"
-                    text: i18n.tr("Reset Launcher")
-                    onClicked: {
-                        buttonActions.source = "ResetLauncherHome.qml";
-                        root.popup = PopupUtils.open(buttonActions.item);
-                    }
-                }
-            }
-
-            Label {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                }
-                visible: showAllUI
-                text: i18n.tr("Reset all system settings…")
-                color: UbuntuColors.orange
-                height: units.gu(6)
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            SettingsListItems.Standard {
-                visible: showAllUI
-
-                Button {
-                    id: resetAllSettingsButton
-                    text: i18n.tr("Reset all system settings…")
-                    onClicked: {
-                        buttonActions.source = "ResetAllSettings.qml";
-                        root.popup = PopupUtils.open(buttonActions.item);
-                    }
-                }
-            }
-
-            Label {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                }
-                text: i18n.tr("Erase & Reset All")
-                color: UbuntuColors.orange
-                height: units.gu(6)
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            SettingsListItems.Standard {
-
-                Button {
-                    id: eraseEverythingButton
-                    objectName: "factoryReset"
-
-                    text: i18n.tr("Erase & Reset All")
-                    onClicked: {
-                        buttonActions.source = "EraseEverything.qml";
-                        root.popup = PopupUtils.open(buttonActions.item);
-                    }
-                }
-            }
-        }
-    }
-}

=== removed file 'plugins/reset/ResetAllSettings.qml'
--- plugins/reset/ResetAllSettings.qml	2015-08-10 13:31:45 +0000
+++ plugins/reset/ResetAllSettings.qml	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2013 Canonical Ltd.
- *
- * Contact: Iain Lane <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
-
-Component {
-    id: resetAllSettings
-    Dialog {
-        id: dialog
-        text: i18n.tr("The contents and layout of the launcher, and the filters in the home screen will be returned to their original settings.")
-        Button {
-            text: i18n.tr("Reset all system settings")
-            onClicked: {
-                pluginManager.resetPlugins()
-                PopupUtils.close(dialog)
-            }
-        }
-        Button {
-            text: i18n.tr("Cancel")
-            onClicked: PopupUtils.close(dialog)
-        }
-    }
-}

=== removed file 'plugins/reset/plugin.cpp'
--- plugins/reset/plugin.cpp	2014-07-23 13:53:48 +0000
+++ plugins/reset/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- *
-*/
-
-#include "plugin.h"
-
-#include <QtQml>
-#include <QtQml/QQmlContext>
-#include "reset.h"
-
-
-void BackendPlugin::registerTypes(const char *uri)
-{
-    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Reset"));
-    qmlRegisterType<Reset>(uri, 1, 0, "UbuntuResetPanel");
-}
-
-void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-{
-    QQmlExtensionPlugin::initializeEngine(engine, uri);
-}

=== removed file 'plugins/reset/plugin.h'
--- plugins/reset/plugin.h	2015-03-16 13:51:36 +0000
+++ plugins/reset/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- *
-*/
-
-#ifndef PLUGIN_H
-#define PLUGIN_H
-
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlExtensionPlugin>
-
-class BackendPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
-};
-#endif // PLUGIN_H

=== removed file 'plugins/reset/qmldir'
--- plugins/reset/qmldir	2013-09-06 13:12:46 +0000
+++ plugins/reset/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module Ubuntu.SystemSettings.Reset
-plugin UbuntuResetPanel

=== removed file 'plugins/reset/reset.cpp'
--- plugins/reset/reset.cpp	2015-03-16 13:51:36 +0000
+++ plugins/reset/reset.cpp	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Sebastien Bacher <[e-mail]>
- *
-*/
-
-#include "reset.h"
-
-#include <QDBusInterface>
-#include <QDBusReply>
-#include <QDebug>
-
-Reset::Reset(QObject *parent)
-    : QObject(parent)
-{
-}
-
-bool Reset::factoryReset()
-{
-    QDBusInterface iface (
-                "com.canonical.SystemImage",
-                "/Service",
-                "com.canonical.SystemImage",
-                QDBusConnection::systemBus(),
-                this);
-
-    // FIXME: temporary warning so we know we've reproduced bug #1370815
-    if (!iface.isValid())
-        qWarning() << iface.interface() << "Isn't valid";
-
-
-    QDBusReply<QString> reply = iface.call("FactoryReset");
-    if (!reply.isValid()) {
-         qWarning() << reply.error().message();
-        return false;
-    }
-
-    return true;
-}
-
-Reset::~Reset() {
-}

=== removed file 'plugins/reset/reset.h'
--- plugins/reset/reset.h	2014-09-30 11:38:35 +0000
+++ plugins/reset/reset.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Sebastien Bacher <[e-mail]>
- *
-*/
-
-#ifndef RESET_H
-#define RESET_H
-
-#include <QObject>
-
-class Reset : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit Reset(QObject *parent = 0);
-    ~Reset();
-    Q_INVOKABLE bool factoryReset(void);
-};
-
-#endif // RESET_H

=== removed file 'plugins/reset/reset.settings'
--- plugins/reset/reset.settings	2016-09-23 13:07:28 +0000
+++ plugins/reset/reset.settings	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-{
-    "icon": "reset",
-    "name": "Reset",
-    "translations": "ubuntu-system-settings",
-    "category": "uncategorized-bottom",
-    "priority": 1,
-    "keywords": [
-        "reset",
-        "erase",
-        "factory",
-        "clear",
-        "restore"
-    ],
-    "has-dynamic-keywords": false,
-    "has-dynamic-visibility": false,
-    "visible-if-file-exists": "/usr/share/dbus-1/system-services/com.canonical.SystemImage.service",
-    "entry-component": "EntryComponent.qml",
-    "page-component": "PageComponent.qml"
-}

=== removed file 'plugins/reset/settings-reset.svg'
--- plugins/reset/settings-reset.svg	2013-06-18 19:17:18 +0000
+++ plugins/reset/settings-reset.svg	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3390"
-   version="1.1"
-   inkscape:version="0.48+devel r12322"
-   sodipodi:docname="settings-reset.svg">
-  <defs
-     id="defs3392" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.6077032"
-     inkscape:cx="68.02921"
-     inkscape:cy="13.671034"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata3395">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(33.5714,-515.93361)">
-    <g
-       transform="translate(-1695.5714,-204.42851)"
-       id="g3359">
-      <rect
-         transform="matrix(0,-1,-1,0,0,0)"
-         y="-1752"
-         x="-810.36212"
-         height="90"
-         width="90"
-         id="rect3252"
-         style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="matrix(0,-1,-1,0,0,0)"
-         y="-1752"
-         x="-810.36212"
-         height="90"
-         width="90"
-         id="rect3254"
-         style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         inkscape:transform-center-x="-15.628909"
-         inkscape:transform-center-y="16.92955"
-         transform="matrix(1.8790952,-1.0848368,1.1274571,1.952706,1284.5287,528.84733)"
-         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"
-         inkscape:randomized="0"
-         inkscape:rounded="0.06"
-         inkscape:flatsided="true"
-         sodipodi:arg2="2.0943951"
-         sodipodi:arg1="1.0471976"
-         sodipodi:r2="2.9154758"
-         sodipodi:r1="5.8309517"
-         sodipodi:cy="174.09448"
-         sodipodi:cx="111"
-         sodipodi:sides="3"
-         id="path3262"
-         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"
-         sodipodi:type="star" />
-      <path
-         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"
-         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"
-         id="path3264"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:transform-center-y="-0.012708878"
-         inkscape:transform-center-x="0.38886507"
-         sodipodi:type="arc"
-         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"
-         id="path3275"
-         sodipodi:cx="1807"
-         sodipodi:cy="2350"
-         sodipodi:rx="24"
-         sodipodi:ry="24"
-         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"
-         transform="matrix(-0.08335105,0.311094,0.31107032,0.08335738,1126.8691,8.8719668)" />
-    </g>
-  </g>
-</svg>