Merge remote-tracking branch 'upsteam/develop' into develop

Author: oOIssaMOo

src/components/ThinDivider.qml

@@ -9,6 +9,7 @@
  */
 
 import QtQuick 2.4
+import Material 0.3
 
 /*!
    \qmltype ThinDivider
@@ -22,6 +23,8 @@ Rectangle {
         right: parent.right
     }
 
-    color: Qt.rgba(0,0,0,0.1)
+    property bool darkBackground
+
+    color: darkBackground ? Theme.dark.hintColor : Theme.light.hintColor
     height: 1
 }

src/core/Icon.qml

@@ -63,10 +63,14 @@ Item {
             } else if (icon.source.indexOf('icon://') === 0) {
                 var name = icon.source.substring(7)
 
-                if (name)
-                    return "qrc:/icons/" + name + '.svg'
-                else
+                if (name) {
+                    if (Theme.iconsRoot.indexOf('qrc') != -1)
+                        return Theme.iconsRoot + '/' + name + '.svg'
+                    else
+                        return Theme.iconsRoot + '/' + name.replace('/', '_') + '.svg'
+                } else {
                     return ""
+                }
             } else {
                 return icon.source
             }

src/core/Theme.qml

@@ -79,6 +79,8 @@ Object {
         light: false
     }
 
+    property string iconsRoot: "qrc:/icons"
+
     /*!
        A utility method for changing the alpha on colors. Returns a new object, and does not modify
        the original color at all.

src/core/ThemePalette.qml

@@ -28,7 +28,8 @@ QtObject {
     readonly property color textColor: light ? shade(0.7) : shade(1)
     readonly property color subTextColor: light ? shade(0.54) : shade(0.70)
     readonly property color iconColor: light ? subTextColor : textColor
-    readonly property color hintColor: light ? shade(0.26) : shade(0.30)
+    readonly property color disabledColor: light ? shade(0.38) : shade(0.50)
+    readonly property color hintColor: disabledColor
     readonly property color dividerColor: shade(0.12)
 
     /*!

src/core/device.cpp

@@ -83,6 +83,7 @@ QString Device::iconName() const
         case TV:
             return "hardware/tv";
         case Unknown:
+        default:
             return "hardware/computer";
     }
 }

src/core/units.cpp

@@ -20,7 +20,7 @@
 #define DEFAULT_DPI 72
 
 UnitsAttached::UnitsAttached(QObject *attachee)
-        : QObject(attachee), m_screen(nullptr), m_window(nullptr), m_multiplier(1), m_dpi(0)
+        : QObject(attachee), m_screen(nullptr), m_window(nullptr), m_dpi(0), m_multiplier(1)
 {
     m_attachee = qobject_cast<QQuickItem *>(attachee);
 

src/extras/CircleImage.qml

@@ -34,18 +34,8 @@ Item {
         mipmap: true
     }
 
-    Extras.Image {
-        id: mask
-        source: Qt.resolvedUrl("images/circle.png")
-        anchors.fill: image
-        smooth: true
-        visible: false
-        mipmap: true
-    }
-
-    OpacityMask {
+    CircleMask {
         anchors.fill: image
         source: image
-        maskSource: mask
     }
 }

src/extras/circle.png

@@ -26,6 +26,7 @@ View {
         right: parent ? parent.right : undefined
     }
 
+    property bool darkBackground
     property int margins: 16 * Units.dp
 
     property bool selected
@@ -44,6 +45,7 @@ View {
         anchors.leftMargin: dividerInset
 
         visible: showDivider
+        darkBackground: listItem.darkBackground
     }
 
     Ink {

src/listitems/BaseListItem.qml

@@ -25,9 +25,12 @@ Item {
 		right: parent.right
 	}
 
+    property bool darkBackground
+
 	height: 16 * Units.dp
 
 	ThinDivider {
         anchors.verticalCenter: parent.verticalCenter
+        darkBackground: divider.darkBackground
     }
 }