Merge pull request #150 from jmlich/master

Add Nemo because of missing Theme

src/plugins/about/about.qml

@@ -18,6 +18,7 @@
  */
 import QtQuick 2.6
 
+import Nemo
 import Nemo.Controls
 
 import Nemo.Dialogs 1.0

src/plugins/bluez/bluez.qml

@@ -19,6 +19,7 @@
 import QtQuick
 import QtQuick.Window
 
+import Nemo
 import Nemo.Controls
 import org.nemomobile.models
 

src/plugins/datetime/SetupDate.qml

@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 import QtQuick 2.6
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/datetime/SetupTime.qml

@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 import QtQuick 2.6
-
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/datetime/SetupTimezone.qml

@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 import QtQuick 2.6
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/datetime/datetime.qml

@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 import QtQuick 2.6
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/devicelock/DeviceLockPad.qml

@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 import QtQuick 2.6
+import Nemo
 import Nemo.Controls
 
 import Nemo.Dialogs 1.0

src/plugins/devicelock/devicelock.qml

@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 import QtQuick 2.6
+import Nemo
 import Nemo.Controls
 import org.nemomobile.systemsettings 1.0
 import org.nemomobile.devicelock 1.0

src/plugins/display/display.qml

@@ -18,6 +18,7 @@
  */
 import QtQuick 2.6
 import QtQuick.Window 2.1
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0
@@ -244,7 +245,7 @@ Page {
 
             Slider {
                 id: scaleSlider
-                value: dpScaleFactor.value == 0 ? size.dpScaleFactor : dpScaleFactor.value
+                value: dpScaleFactor.value == 0 ? Theme.dpScaleFactor : dpScaleFactor.value
                 from: 0.5
                 to: 2
                 stepSize: 0.1

src/plugins/example/example.qml

@@ -19,6 +19,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 Page {

src/plugins/language/language.qml

@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
+import Nemo
 import Nemo.Controls
-
 import Nemo.Dialogs 1.0
 
 import org.nemomobile.systemsettings 1.0

src/plugins/location/location.qml

@@ -20,6 +20,7 @@ import QtQuick 2.6
 import QtQuick.Window 2.1
 import QtPositioning 5.2
 
+import Nemo
 import Nemo.Controls
 
 import Nemo.Configuration 1.0

src/plugins/mobile/mobile.qml

@@ -18,6 +18,7 @@
  */
 import QtQuick 2.6
 
+import Nemo
 import Nemo.Controls
 import QOfono 0.2
 

src/plugins/nfc/nfc.qml

@@ -18,6 +18,7 @@
  */
 import QtQuick 2.6
 
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/powersave/BatteryHealth.qml

@@ -19,6 +19,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/powersave/powersave.qml

@@ -19,6 +19,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import Nemo.Configuration 1.0

src/plugins/sounds/SoundLabel.qml

@@ -22,6 +22,7 @@ import QtQuick 2.6
 import QtQuick.Window 2.1
 
 import QtMultimedia
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/sounds/sounds.qml

@@ -22,6 +22,7 @@ import QtQuick 2.6
 
 import QtMultimedia
 
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/storage/storage.qml

@@ -19,6 +19,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/plugins/usb/usb.qml

@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 import QtQuick 2.6
+import Nemo
 import Nemo.Controls
 import org.nemomobile.systemsettings 1.0
 import Glacier.Controls.Settings 1.0

src/plugins/wifi/NetworkDelegate.qml

@@ -19,6 +19,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.1
+import Nemo
 import Nemo.Controls
 import Connman 0.2
 

src/plugins/wifi/SavedServices.qml

@@ -20,6 +20,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import Connman 0.2
@@ -49,7 +50,7 @@ Page {
         height: parent.height - header.height
         model: savedModel
         delegate: ListViewItemWithActions{
-            height: size.dp(80)
+            height: Theme.dp(80)
             label: networkService.name
             width: savedPage.width
 

src/plugins/wifi/SavedStatus.qml

@@ -20,6 +20,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import Connman 0.2

src/plugins/wifi/WifiSettings.qml

@@ -19,6 +19,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import Connman 0.2

src/plugins/wifi/WifiStatus.qml

@@ -19,6 +19,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import Connman 0.2

src/plugins/wifi/wifi.qml

@@ -20,6 +20,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import Connman 0.2
@@ -79,7 +80,7 @@ Page {
             width: parent.width
             height: parent.height-wifiEnable.height
 
-            contentHeight: networks.height+size.dp(50)
+            contentHeight: networks.height+Theme.dp(50)
 
             clip: true
 

src/plugins/wifi/wifisettingsplugin.cpp

@@ -38,7 +38,7 @@ WiFiSettingsPlugin::WiFiSettingsPlugin(QObject* parent)
         connect(m_wifiTech, &NetworkTechnology::poweredChanged, this, &WiFiSettingsPlugin::onPoweredChanded);
         connect(m_wifiTech, &NetworkTechnology::connectedChanged, this, &WiFiSettingsPlugin::onConnectedChanged);
     } else {
-        qCWarning(lcGlacierSettingsCoreLog) << "WiFi not found";
+        qWarning() << "WiFi not found";
     }
 }
 

src/qml/components/AiroplaneButton.qml

@@ -20,6 +20,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import Connman 0.2

src/qml/components/RightCheckBox.qml

@@ -18,6 +18,7 @@
  */
 import QtQuick 2.6
 
+import Nemo
 import Nemo.Controls
 
 Item {

src/qml/components/SettingsColumn.qml

@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 import QtQuick 2.6
+import Nemo
 import Nemo.Controls
 
 Column{

src/qml/components/VolumeButton.qml

@@ -20,6 +20,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.systemsettings 1.0

src/qml/components/WifiButton.qml

@@ -20,6 +20,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 
+import Nemo
 import Nemo.Controls
 
 import Connman 0.2

src/qml/glacier-settings.qml

@@ -20,6 +20,7 @@
 import QtQuick
 import QtQuick.Window
 
+import Nemo
 import Nemo.Controls
 
 import org.nemomobile.glacier.settings 1.0
@@ -59,12 +60,12 @@ ApplicationWindow{
                 Row {
                     id: brightnessRow
                     width: mainPage.width
-                    spacing: size.dp(40)
-                    padding: size.dp(40)
+                    spacing: Theme.dp(40)
+                    padding: Theme.dp(40)
 
                     Slider{
                         id: brightnessSlider
-                        width: parent.width-brightnessIcon.width-size.dp(120)
+                        width: parent.width-brightnessIcon.width-Theme.dp(120)
 
                         from: 0
                         to: displaySettings.maximumBrightness
@@ -105,7 +106,7 @@ ApplicationWindow{
             Column {
                 id: content
                 width: parent.width
-                spacing: size.dp(20)
+                spacing: Theme.dp(20)
 
                 Repeater {
                     id: view
@@ -139,7 +140,7 @@ ApplicationWindow{
 
                             Rectangle{
                                 id: line
-                                height: size.dp(1)
+                                height: Theme.dp(1)
                                 color: Theme.textColor
                                 width: content.width-sectionText.width-Theme.itemHeightExtraSmall
                                 anchors{