git.iko.soy/maciek134/podphoenix
on main help sign in
Tweak Colors
commitc17b67a3f502009a9b4d7d95bec9633bf2a3305d authorJoan CiberSheep <cibersheep@gmail.com> dateFri 18 Oct 2019, 13:56 (7 years ago) parent94fb920
6 files changed+49−30
compare with main
unifiedsplit
app/components/Walkthrough.qml+5−6 app/themes/Dark.qml+1−1 app/themes/Light.qml+1−1 app/ui/EpisodesPage.qml−1 app/welcomewizard/Slide1.qml+21−11 app/welcomewizard/Slide7.qml+21−10
app/components/Walkthrough.qml+5−6
@@ -32,13 +32,13 @@ Page {
3232 property list<Component> model
3333
3434 // Property to set the color of bottom cirle to indicate the user's progress
35− property color completeColor: "green"
35+ property color completeColor: "#299ABF"
3636
3737 // Property to set the color of the bottom circle to indicate the slide still left to cover
38− property color inCompleteColor: "lightgrey"
38+ property color inCompleteColor: theme.palette.normal.base
3939
4040 // Property to set the color of the skip welcome wizard text
41− property color skipTextColor: "grey"
41+ property color skipTextColor: theme.palette.normal.baseText
4242
4343 // Property to signal walkthrough completion
4444 signal finished
@@ -145,7 +145,7 @@ Page {
145145 right: parent.right
146146 }
147147
148− iconName: "chevron"
148+ iconName: "go-next"
149149 visible: enabled
150150 enabled: listView.currentIndex !== listView.count-1
151151 onClicked: listView.currentIndex++
@@ -162,8 +162,7 @@ Page {
162162 left: parent.left
163163 }
164164
165− iconName: "chevron"
166− rotation: 180
165+ iconName: "go-previous"
167166 visible: enabled
168167 enabled: listView.currentIndex !== 0
169168 onClicked: listView.currentIndex--
app/themes/Dark.qml+1−1
@@ -26,7 +26,7 @@ QtObject {
2626 // Main Text Colors
2727 property color baseText: "White"
2828 property color baseSubText: "#999999"
29− property color focusText: "#35AF44"
29+ property color focusText: UbuntuColors.blue
3030 property color linkText: "Cyan"
3131
3232 // Icon Colors
app/themes/Light.qml+1−1
@@ -26,7 +26,7 @@ QtObject {
2626 // Main Text Colors
2727 property color baseText: UbuntuColors.darkGrey
2828 property color baseSubText: "#999999"
29− property color focusText: "#35AF44"
29+ property color focusText: UbuntuColors.blue
3030 property color linkText: "Blue"
3131
3232 // Icon Colors
app/ui/EpisodesPage.qml−1
@@ -721,7 +721,6 @@ Page {
721721 Scrollbar {
722722 flickableItem: episodeList
723723 align: Qt.AlignTrailing
724− StyleHints { sliderColor: podbird.appTheme.focusText }
725724 }
726725 }
727726
app/welcomewizard/Slide1.qml+21−11
@@ -41,31 +41,41 @@ Component {
4141 id: introductionText
4242 text: i18n.tr("Welcome to Podbird")
4343 textSize: Label.XLarge
44+ width: parent.width
4445 height: contentHeight
4546 anchors.centerIn: parent
47+ wrapMode: Text.WordWrap
48+ horizontalAlignment: Text.AlignHCenter
4649 }
4750
4851 Label {
4952 id: bodyText
5053 text: i18n.tr("Enjoy your favourite shows with Podbird, the chirpiest podcast \
5154manager for Ubuntu.\n\nChirp Chirp...")
52− anchors.left: parent.left
53− anchors.right: parent.right
54− anchors.margins: units.gu(1)
55− anchors.top: introductionText.bottom
56− anchors.topMargin: units.gu(4)
57− anchors.bottom: swipeText.top
55+
56+ anchors {
57+ left: parent.left
58+ right: parent.right
59+ margins: units.gu(1)
60+ top: introductionText.bottom
61+ topMargin: units.gu(4)
62+ bottom: swipeText.top
63+ }
64+
5865 wrapMode: Text.WordWrap
5966 horizontalAlignment: Text.AlignHCenter
6067 }
6168
6269 Label {
6370 id: swipeText
64− anchors.left: parent.left
65− anchors.right: parent.right
66− anchors.margins: units.gu(1)
67− anchors.bottom: parent.bottom
68− color: "grey"
71+ anchors {
72+ left: parent.left
73+ right: parent.right
74+ margins: units.gu(1)
75+ bottom: parent.bottom
76+ }
77+
78+ color: theme.palette.normal.baseText
6979 textSize: Label.Small
7080 wrapMode: Text.WordWrap
7181 horizontalAlignment: Text.AlignHCenter
app/welcomewizard/Slide7.qml+21−10
@@ -19,9 +19,9 @@
1919import QtQuick 2.4
2020import Ubuntu.Components 1.3
2121
22−// Slide 5
22+// Slide 6
2323Component {
24− id: slide5
24+ id: slide6
2525 Item {
2626 id: slide1Container
2727
@@ -33,7 +33,7 @@ Component {
3333 horizontalCenter: parent.horizontalCenter
3434 }
3535 fillMode: Image.PreserveAspectFit
36− source: Qt.resolvedUrl("../graphics/support.png")
36+ source: Qt.resolvedUrl("../graphics/gift.png")
3737 }
3838
3939 Label {
@@ -42,7 +42,7 @@ Component {
4242 elide: Text.ElideRight
4343 textSize: Label.XLarge
4444 maximumLineCount: 2
45− text: i18n.tr("Support")
45+ text: i18n.tr("Enjoy")
4646 horizontalAlignment: Text.AlignHCenter
4747 width: parent.width
4848 wrapMode: Text.WordWrap
@@ -52,18 +52,29 @@ Component {
5252 id: finalMessage
5353 anchors {
5454 top: introductionText.bottom
55− bottom: parent.bottom
55+ bottom: continueButton.top
5656 left: parent.left
5757 right: parent.right
5858 margins: units.gu(1)
5959 topMargin: units.gu(4)
6060 }
61− wrapMode: Text.WordWrap
6261 horizontalAlignment: Text.AlignHCenter
63− linkColor: podbird.appTheme.linkText
64− // TRANSLATORS: The %1 points to a url defined in html format <a href=\link\>Link</a>.
65− text: i18n.tr("If you find any bugs or have any feature requests, let us know on our project page at %1").arg("<a href=\"https://launchpad.net/podbird\">launchpad.net</a>")
66− onLinkActivated: Qt.openUrlExternally(link)
62+ text: i18n.tr("We hope you enjoy using Podbird!")
63+ wrapMode: Text.WordWrap
64+ }
65+
66+ Button {
67+ id: continueButton
68+ anchors {
69+ bottom: parent.bottom
70+ bottomMargin: units.gu(3)
71+ horizontalCenter: parent.horizontalCenter
72+ }
73+ //height: units.gu(6)
74+ width: Math.min(parent.width/1.3, units.gu(40))
75+ color: theme.palette.normal.positive
76+ text: i18n.tr("Finish")
77+ onClicked: finished()
6778 }
6879 }
6980}