git.iko.soy/unity8
on xenial help sign in
Merge lp:~lukas-kde/unity8/newWindowDecosAndPanel again
a2eb4f8Daniel d'Andrada
qml/Components/ModeSwitchWarningDialog.qml+1−1
compare with xenial
unifiedsplit
@@ -75,7 +75,7 @@ ShellDialog {
75 property string notClickedText: i18n.tr("OK, I will reconnect")
75 property string notClickedText: i18n.tr("OK, I will reconnect")
76 property string clickedText: i18n.tr("Reconnect now!")
76 property string clickedText: i18n.tr("Reconnect now!")
77 text: clicked ? clickedText : notClickedText
77 text: clicked ? clickedText : notClickedText
78− color: "#333333"
78+ color: "#292929"
79
79
80 MouseArea {
80 MouseArea {
81 anchors.fill: parent
81 anchors.fill: parent
qml/Panel/Handle.qml+1−1
@@ -35,7 +35,7 @@ Rectangle {
35 id: dot
35 id: dot
36 width: units.dp(3)
36 width: units.dp(3)
37 height: width
37 height: width
38− color: handle.active ? UbuntuColors.orange : "#717171"
38+ color: handle.active ? UbuntuColors.orange : "#888888"
39 radius: units.dp(1)
39 radius: units.dp(1)
40 }
40 }
41 }
41 }
qml/Panel/IndicatorItem.qml+3
@@ -66,6 +66,7 @@ IndicatorDelegate {
66 opacity: 1.0
66 opacity: 1.0
67 font.family: "Ubuntu"
67 font.family: "Ubuntu"
68 fontSize: "medium"
68 fontSize: "medium"
69+ font.weight: Font.Light
69 color: root.color
70 color: root.color
70 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
71 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
71 }
72 }
@@ -126,6 +127,7 @@ IndicatorDelegate {
126 opacity: 1.0
127 opacity: 1.0
127 font.family: "Ubuntu"
128 font.family: "Ubuntu"
128 fontSize: "medium"
129 fontSize: "medium"
130+ font.weight: Font.Light
129 color: root.color
131 color: root.color
130 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
132 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
131 }
133 }
@@ -142,6 +144,7 @@ IndicatorDelegate {
142
144
143 text: title !== "" ? title : identifier
145 text: title !== "" ? title : identifier
144 fontSize: "x-small"
146 fontSize: "x-small"
147+ font.weight: Font.Light
145 horizontalAlignment: Text.AlignHCenter
148 horizontalAlignment: Text.AlignHCenter
146 opacity: 0
149 opacity: 0
147 color: root.color
150 color: root.color
qml/Panel/Indicators/client/IndicatorsClient.qml+1−1
@@ -22,7 +22,7 @@ import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.3 as ListItem
22import Ubuntu.Components.ListItems 1.3 as ListItem
23
23
24Rectangle {
24Rectangle {
25− color: "#333333"
25+ color: "#292929"
26 id: root
26 id: root
27
27
28 Component.onCompleted: {
28 Component.onCompleted: {
qml/Panel/IndicatorsMenu.qml+2−11
@@ -38,7 +38,7 @@ Showable {
38 property bool enableHint: true
38 property bool enableHint: true
39 property bool contentEnabled: true
39 property bool contentEnabled: true
40 property bool showOnClick: true
40 property bool showOnClick: true
41− property color panelColor: "#333333"
41+ property color panelColor: "#292929"
42
42
43 signal showTapped(point position)
43 signal showTapped(point position)
44
44
@@ -110,21 +110,12 @@ Showable {
110 height: units.gu(0.5)
110 height: units.gu(0.5)
111 gradient: Gradient {
111 gradient: Gradient {
112 GradientStop { position: 0.0; color: "transparent" }
112 GradientStop { position: 0.0; color: "transparent" }
113− GradientStop { position: 1.0; color: "#333333" }
113+ GradientStop { position: 1.0; color: "#292929" }
114 }
114 }
115 opacity: 0.3
115 opacity: 0.3
116 }
116 }
117 }
117 }
118
118
119− PanelSeparatorLine {
120− id: indicatorOrangeLine
121− anchors {
122− bottom: handle.top
123− left: handle.left
124− right: handle.right
125− }
126− }
127−
128 Rectangle {
119 Rectangle {
129 anchors.fill: bar
120 anchors.fill: bar
130 color: panelColor
121 color: panelColor
qml/Panel/MenuContent.qml+1−1
@@ -27,7 +27,7 @@ Rectangle {
27
27
28 property QtObject indicatorsModel: null
28 property QtObject indicatorsModel: null
29 property int currentMenuIndex: -1
29 property int currentMenuIndex: -1
30− color: "#333333" // FIXME not in palette yet
30+ color: "#292929" // FIXME not in palette yet
31
31
32 width: units.gu(40)
32 width: units.gu(40)
33 height: units.gu(42)
33 height: units.gu(42)
qml/Panel/Panel.qml+1−1
@@ -89,7 +89,7 @@ Item {
89
89
90 Rectangle {
90 Rectangle {
91 id: indicatorAreaBackground
91 id: indicatorAreaBackground
92− color: callHint.visible ? "green" : "#333333"
92+ color: callHint.visible ? "green" : "#292929"
93 anchors {
93 anchors {
94 top: parent.top
94 top: parent.top
95 left: parent.left
95 left: parent.left
qml/Panel/PanelSeparatorLine.qmldeleted−25
@@ -1,25 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−
19−Rectangle {
20− property real saturation: 1.0
21−
22− // orange in HSL
23− color: Qt.hsla(16.0/360.0, saturation * 0.83, 0.47, 1.0)
24− height: units.dp(2)
25−}
qml/Shell.qml+1−1
@@ -269,7 +269,7 @@ Item {
269 target: applicationsDisplayLoader.item
269 target: applicationsDisplayLoader.item
270 property: "maximizedAppTopMargin"
270 property: "maximizedAppTopMargin"
271 // Not just using panel.panelHeight as that changes depending on the focused app.
271 // Not just using panel.panelHeight as that changes depending on the focused app.
272− value: panel.indicators.minimizedPanelHeight + units.dp(2) // dp(2) for orange line
272+ value: panel.indicators.minimizedPanelHeight
273 }
273 }
274 Binding {
274 Binding {
275 target: applicationsDisplayLoader.item
275 target: applicationsDisplayLoader.item
qml/Stages/WindowDecoration.qml+1−1
@@ -67,7 +67,7 @@ MouseArea {
67 anchors.fill: parent
67 anchors.fill: parent
68 anchors.bottomMargin: -radius
68 anchors.bottomMargin: -radius
69 radius: units.gu(.5)
69 radius: units.gu(.5)
70− color: "#333333"
70+ color: "#292929"
71 }
71 }
72
72
73 Row {
73 Row {
tests/qmltests/Stages/tst_PhoneStage.qml+1−1
@@ -34,7 +34,7 @@ Item {
34 anchors { fill: parent; rightMargin: units.gu(30) }
34 anchors { fill: parent; rightMargin: units.gu(30) }
35 focus: true
35 focus: true
36 dragAreaWidth: units.gu(2)
36 dragAreaWidth: units.gu(2)
37− maximizedAppTopMargin: units.gu(3) + units.dp(2)
37+ maximizedAppTopMargin: units.gu(3)
38 interactive: true
38 interactive: true
39 shellOrientation: Qt.PortraitOrientation
39 shellOrientation: Qt.PortraitOrientation
40 orientations: Orientations {}
40 orientations: Orientations {}
tests/qmltests/Stages/tst_SurfaceContainer.qml+1−1
@@ -39,7 +39,7 @@ Rectangle {
39 id: surfaceContainerLoader
39 id: surfaceContainerLoader
40 anchors {
40 anchors {
41 top: parent.top
41 top: parent.top
42− topMargin: fullscreenCheckbox.checked ? 0 : units.gu(3) + units.dp(2)
42+ topMargin: fullscreenCheckbox.checked ? 0 : units.gu(3)
43 bottom: parent.bottom
43 bottom: parent.bottom
44 left: parent.left
44 left: parent.left
45 }
45 }
tests/qmltests/Stages/tst_TabletStage.qml+1−1
@@ -50,7 +50,7 @@ Rectangle {
50 tabletStageLoader.itemDestroyed = true;
50 tabletStageLoader.itemDestroyed = true;
51 }
51 }
52 dragAreaWidth: units.gu(2)
52 dragAreaWidth: units.gu(2)
53− maximizedAppTopMargin: units.gu(3) + units.dp(2)
53+ maximizedAppTopMargin: units.gu(3)
54 interactive: true
54 interactive: true
55 shellOrientation: Qt.LandscapeOrientation
55 shellOrientation: Qt.LandscapeOrientation
56 nativeWidth: width
56 nativeWidth: width