Merge lp:~zsombi/ubuntu-ui-toolkit/focusedValueSet into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Introducing focused valueset.
-= IN PROGRESS =-

=== modified file 'components.api'
--- components.api	2016-02-24 13:18:49 +0000
+++ components.api	2016-02-29 17:24:05 +0000
@@ -862,6 +862,7 @@
     property PaletteValues selected
 Ubuntu.Components.Themes.Palette 1.3: QtObject
     property PaletteValues disabled
+    property PaletteValues focused
     property PaletteValues highlighted
     property PaletteValues normal
     property PaletteValues selected
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2016-02-25 15:03:52 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2016-02-29 17:24:05 +0000
@@ -29,7 +29,7 @@
         className: "Palette"
         documentation: "qml-palette.html"
 
-        property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted"]
+        property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted", "focused"]
         property var paletteValues: [["background", ["backgroundText", "backgroundSecondaryText", "backgroundTertiaryText"]],
             ["base", ["baseText"]],
             ["foreground", ["foregroundText"]],
 
=== modified file 'src/Ubuntu/Components/Themes/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/1.3/Palette.qml	2016-01-27 15:17:56 +0000
+++ src/Ubuntu/Components/Themes/1.3/Palette.qml	2016-02-29 17:24:05 +0000
@@ -66,6 +66,11 @@
     property PaletteValues selected: PaletteValues{}
 
     /*!
+      Color palette to use when the widget is in focused state.
+      */
+    property PaletteValues focused: PaletteValues{}
+
+    /*!
        Color palette to use when the widget is selected and disabled.
       \since Ubuntu.Components.Themes 1.3
     */
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml	2016-01-25 14:26:32 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml	2016-02-29 17:24:05 +0000
@@ -19,9 +19,7 @@
 
 AmbianceNormal {
     background: UbuntuColors.porcelain
-    backgroundText: UbuntuColors.blue
-    backgroundTertiaryText: UbuntuColors.blue
     base: UbuntuColors.ash
-    baseText: UbuntuColors.blue
     foreground: UbuntuColors.ash
+    overlay: UbuntuColors.porcelain
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-01-27 15:17:56 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-02-29 17:24:05 +0000
@@ -56,4 +56,8 @@
         base: UbuntuColors.jet
         foreground: UbuntuColors.silk
     }
+
+    focused: AmbianceNormal {
+        background: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
+    }
 }
 
=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2016-01-27 15:17:56 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2016-02-29 17:24:05 +0000
@@ -58,5 +58,9 @@
         base: UbuntuColors.graphite
         foreground: UbuntuColors.slate
     }
+
+    focused: SuruDarkNormal {
+        background: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.4)
+    }
 }
 //![0]
 
=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml	2016-01-25 14:26:32 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml	2016-02-29 17:24:05 +0000
@@ -20,10 +20,8 @@
 
 SuruDarkNormal {
     background: UbuntuColors.inkstone
-    backgroundText: UbuntuColors.blue
-    backgroundTertiaryText: UbuntuColors.blue
     base: UbuntuColors.ash
-    baseText:UbuntuColors.blue
     foreground: UbuntuColors.slate
+    overlay: UbuntuColors.slate
 }