move general singleton to shared part, update part of desktop-panel ui

sources/awesome-widget/package/contents/ui/about.qml

@@ -16,8 +16,6 @@
  ***************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Layouts 1.0 as QtLayouts
 
 import org.kde.plasma.private.awesomewidget 1.0
 
@@ -34,4 +32,8 @@ Item {
     AboutTab {
         textProvider: awActions
     }
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

sources/awesome-widget/package/contents/ui/general.qml

@@ -1,94 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets 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 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets 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 awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-pragma Singleton
-import QtQuick 2.0
-
-
-QtObject {
-    property variant fontWeight: {
-        "light": Font.Light,
-        "normal": Font.Normal,
-        "demibold": Font.DemiBold,
-        "bold": Font.Bold,
-        "black": Font.Black
-    }
-    property variant align: {
-        "left": Text.AlignLeft,
-        "center": Text.AlignHCenter,
-        "right": Text.AlignRight,
-        "justify": Text.AlignJustify
-    }
-    property variant textStyle: {
-        "normal": Text.Normal,
-        "outline": Text.Outline,
-        "raised": Text.Raised,
-        "sunken": Text.Sunken
-    }
-
-    // models
-    property variant fontStyleModel: [
-        {
-            'label': i18n("normal"),
-            'name': "normal"
-        },
-        {
-            'label': i18n("italic"),
-            'name': "italic"
-        }
-    ]
-    property variant fontWeightModel: [
-        {
-            'label': i18n("light"),
-            'name': "light"
-        },
-        {
-            'label': i18n("normal"),
-            'name': "normal"
-        },
-        {
-            'label': i18n("demi bold"),
-            'name': "demibold"
-        },
-        {
-            'label': i18n("bold"),
-            'name': "bold"
-        },
-        {
-            'label': i18n("black"),
-            'name': "black"
-        }
-    ]
-    property variant textStyleModel: [
-        {
-            'label': i18n("normal"),
-            'name': "normal"
-        },
-        {
-            'label': i18n("outline"),
-            'name': "outline"
-        },
-        {
-            'label': i18n("raised"),
-            'name': "raised"
-        },
-        {
-            'label': i18n("sunken"),
-            'name': "sunken"
-        }
-    ]
-}

sources/awesome-widget/package/contents/ui/qmldir

@@ -1,4 +1,4 @@
-singleton general 1.0 general.qml
+singleton general 1.0 file:///usr/share/awesomewidgets/qml/general.qml
 
 AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml
 BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml