git.iko.soy/unity8
on xenial help sign in
Removed palettes copied over from toolkit.
f78c7f2Florian Boucault
qml/Stages/AmbiancePalette.qmldeleted−48
compare with xenial
unifiedsplit
@@ -1,48 +0,0 @@
1−/*
2− * Copyright 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 Lesser 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 Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.0
18−import Ubuntu.Components 1.1
19−import Ubuntu.Components.Themes 0.1
20−
21−// FIXME: copied without modifications from Ubuntu UI Toolkit's Ambiance's theme
22−Palette {
23− normal: PaletteValues {
24− background: "#EDEDED"
25− backgroundText: "#81888888"
26− base: Qt.rgba(0, 0, 0, 0.1)
27− baseText: UbuntuColors.lightGrey
28− foreground: UbuntuColors.lightGrey
29− foregroundText: "#F3F3E7"
30− overlay: "#FDFDFD"
31− overlayText: UbuntuColors.lightGrey
32− field: "#1A000000"
33− fieldText: UbuntuColors.darkGrey
34− }
35− selected: PaletteValues {
36− /* FIXME: 'background' does not come from design
37− it is used solely in the list items for the selection highlight
38− that will go away with the new design.
39− */
40− background: "#B2E6E6E6"
41− backgroundText: UbuntuColors.darkGrey
42− selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
43− foreground: UbuntuColors.orange
44− foregroundText: UbuntuColors.darkGrey
45− field: "#FFFFFF"
46− fieldText: UbuntuColors.darkGrey
47− }
48−}
qml/Stages/Splash.qml+1−6
@@ -33,12 +33,7 @@ StyledItem {
33 // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
33 // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
34 property var theme: QtObject {
34 property var theme: QtObject {
35 property string name: "Ambiance"
35 property string name: "Ambiance"
36− property Palette palette: paletteLoader.item
36+ property Palette palette: Qt.createQmlObject("import QtQuick 2.2; import Ubuntu.Components.Themes.%1 1.1; Palette {}".arg(theme.name), root, "dynamicPalette");
37− }
38−
39− Loader {
40− id: paletteLoader
41− source: "%1Palette.qml".arg(theme.name)
42 }
37 }
43
38
44 // FIXME: should instead use to be created API from toolkit
39 // FIXME: should instead use to be created API from toolkit
qml/Stages/SuruDarkPalette.qmldeleted−44
@@ -1,44 +0,0 @@
1−/*
2− * Copyright 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 Lesser 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 Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.0
18−import Ubuntu.Components 1.1
19−import Ubuntu.Components.Themes 0.1
20−
21−// FIXME: copied without modifications from Ubuntu UI Toolkit's SuruDark's theme
22−Palette {
23− normal: PaletteValues {
24− background: "#221E1C"
25− backgroundText: "#33F3F3E7"
26− base: "#19000000"
27− baseText: "#F3F3E7"
28− foreground: "#888888"
29− foregroundText: "#F3F3E7"
30− overlay: "#F2F2F2"
31− overlayText: "#888888"
32− field: "#19000000"
33− fieldText: "#7F7F7F7F"
34− }
35− selected: PaletteValues {
36− background: "#88D6D6D6" // FIXME: not from design
37− backgroundText: "#F3F3E7"
38− selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
39− foreground: UbuntuColors.orange
40− foregroundText: UbuntuColors.darkGrey
41− field: "#FFFFFF"
42− fieldText: "#888888"
43− }
44−}
qml/Stages/SuruGradientPalette.qmldeleted−42
@@ -1,42 +0,0 @@
1−/*
2− * Copyright 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 Lesser 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 Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.0
18−import Ubuntu.Components.Themes 0.1
19−
20−// FIXME: copied without modifications from Ubuntu UI Toolkit's SuruGradient's theme
21−Palette {
22− normal: PaletteValues {
23− background: "#5E2750"
24− backgroundText: "#33F3F3E7"
25− base: "#19000000"
26− baseText: "#F3F3E7"
27− foreground: "#888888"
28− foregroundText: "#F3F3E7"
29− overlay: "#F5F5F5"
30− overlayText: "#888888"
31− field: "#19000000"
32− fieldText: "#7F7F7F7F"
33− }
34− selected: PaletteValues {
35− background: "#88D6D6D6" // FIXME: not from design
36− backgroundText: "#F3F3E7"
37− foreground: "#DD4814"
38− foregroundText: "#F3F3E7"
39− field: "#FFFFFF"
40− fieldText: "#888888"
41− }
42−}