git.iko.soy/maciek134/podphoenix
on main help sign in
Tweak Colors
c17b67aJoan CiberSheep
app/components/Walkthrough.qml+5−6
compare with main
unifiedsplit
@@ -32,13 +32,13 @@ Page {
32 property list<Component> model
32 property list<Component> model
33
33
34 // Property to set the color of bottom cirle to indicate the user's progress
34 // Property to set the color of bottom cirle to indicate the user's progress
35− property color completeColor: "green"
35+ property color completeColor: "#299ABF"
36
36
37 // Property to set the color of the bottom circle to indicate the slide still left to cover
37 // 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
39
39
40 // Property to set the color of the skip welcome wizard text
40 // Property to set the color of the skip welcome wizard text
41− property color skipTextColor: "grey"
41+ property color skipTextColor: theme.palette.normal.baseText
42
42
43 // Property to signal walkthrough completion
43 // Property to signal walkthrough completion
44 signal finished
44 signal finished
@@ -145,7 +145,7 @@ Page {
145 right: parent.right
145 right: parent.right
146 }
146 }
147
147
148− iconName: "chevron"
148+ iconName: "go-next"
149 visible: enabled
149 visible: enabled
150 enabled: listView.currentIndex !== listView.count-1
150 enabled: listView.currentIndex !== listView.count-1
151 onClicked: listView.currentIndex++
151 onClicked: listView.currentIndex++
@@ -162,8 +162,7 @@ Page {
162 left: parent.left
162 left: parent.left
163 }
163 }
164
164
165− iconName: "chevron"
165+ iconName: "go-previous"
166− rotation: 180
167 visible: enabled
166 visible: enabled
168 enabled: listView.currentIndex !== 0
167 enabled: listView.currentIndex !== 0
169 onClicked: listView.currentIndex--
168 onClicked: listView.currentIndex--
app/themes/Dark.qml+1−1
@@ -26,7 +26,7 @@ QtObject {
26 // Main Text Colors
26 // Main Text Colors
27 property color baseText: "White"
27 property color baseText: "White"
28 property color baseSubText: "#999999"
28 property color baseSubText: "#999999"
29− property color focusText: "#35AF44"
29+ property color focusText: UbuntuColors.blue
30 property color linkText: "Cyan"
30 property color linkText: "Cyan"
31
31
32 // Icon Colors
32 // Icon Colors
app/themes/Light.qml+1−1
@@ -26,7 +26,7 @@ QtObject {
26 // Main Text Colors
26 // Main Text Colors
27 property color baseText: UbuntuColors.darkGrey
27 property color baseText: UbuntuColors.darkGrey
28 property color baseSubText: "#999999"
28 property color baseSubText: "#999999"
29− property color focusText: "#35AF44"
29+ property color focusText: UbuntuColors.blue
30 property color linkText: "Blue"
30 property color linkText: "Blue"
31
31
32 // Icon Colors
32 // Icon Colors
app/ui/EpisodesPage.qml−1
@@ -721,7 +721,6 @@ Page {
721 Scrollbar {
721 Scrollbar {
722 flickableItem: episodeList
722 flickableItem: episodeList
723 align: Qt.AlignTrailing
723 align: Qt.AlignTrailing
724− StyleHints { sliderColor: podbird.appTheme.focusText }
725 }
724 }
726 }
725 }
727
726
app/welcomewizard/Slide1.qml+21−11
@@ -41,31 +41,41 @@ Component {
41 id: introductionText
41 id: introductionText
42 text: i18n.tr("Welcome to Podbird")
42 text: i18n.tr("Welcome to Podbird")
43 textSize: Label.XLarge
43 textSize: Label.XLarge
44+ width: parent.width
44 height: contentHeight
45 height: contentHeight
45 anchors.centerIn: parent
46 anchors.centerIn: parent
47+ wrapMode: Text.WordWrap
48+ horizontalAlignment: Text.AlignHCenter
46 }
49 }
47
50
48 Label {
51 Label {
49 id: bodyText
52 id: bodyText
50 text: i18n.tr("Enjoy your favourite shows with Podbird, the chirpiest podcast \
53 text: i18n.tr("Enjoy your favourite shows with Podbird, the chirpiest podcast \
51manager for Ubuntu.\n\nChirp Chirp...")
54manager for Ubuntu.\n\nChirp Chirp...")
55+
56+ anchors {
52− anchors.left: parent.left
57+ left: parent.left
53− anchors.right: parent.right
58+ right: parent.right
54− anchors.margins: units.gu(1)
59+ margins: units.gu(1)
55− anchors.top: introductionText.bottom
60+ top: introductionText.bottom
56− anchors.topMargin: units.gu(4)
61+ topMargin: units.gu(4)
57− anchors.bottom: swipeText.top
62+ bottom: swipeText.top
63+ }
64+
58 wrapMode: Text.WordWrap
65 wrapMode: Text.WordWrap
59 horizontalAlignment: Text.AlignHCenter
66 horizontalAlignment: Text.AlignHCenter
60 }
67 }
61
68
62 Label {
69 Label {
63 id: swipeText
70 id: swipeText
71+ anchors {
64− anchors.left: parent.left
72+ left: parent.left
65− anchors.right: parent.right
73+ right: parent.right
66− anchors.margins: units.gu(1)
74+ margins: units.gu(1)
67− anchors.bottom: parent.bottom
75+ bottom: parent.bottom
68− color: "grey"
76+ }
77+
78+ color: theme.palette.normal.baseText
69 textSize: Label.Small
79 textSize: Label.Small
70 wrapMode: Text.WordWrap
80 wrapMode: Text.WordWrap
71 horizontalAlignment: Text.AlignHCenter
81 horizontalAlignment: Text.AlignHCenter
app/welcomewizard/Slide7.qml+21−10
@@ -19,9 +19,9 @@
19import QtQuick 2.4
19import QtQuick 2.4
20import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21
21
22−// Slide 5
22+// Slide 6
23Component {
23Component {
24− id: slide5
24+ id: slide6
25 Item {
25 Item {
26 id: slide1Container
26 id: slide1Container
27
27
@@ -33,7 +33,7 @@ Component {
33 horizontalCenter: parent.horizontalCenter
33 horizontalCenter: parent.horizontalCenter
34 }
34 }
35 fillMode: Image.PreserveAspectFit
35 fillMode: Image.PreserveAspectFit
36− source: Qt.resolvedUrl("../graphics/support.png")
36+ source: Qt.resolvedUrl("../graphics/gift.png")
37 }
37 }
38
38
39 Label {
39 Label {
@@ -42,7 +42,7 @@ Component {
42 elide: Text.ElideRight
42 elide: Text.ElideRight
43 textSize: Label.XLarge
43 textSize: Label.XLarge
44 maximumLineCount: 2
44 maximumLineCount: 2
45− text: i18n.tr("Support")
45+ text: i18n.tr("Enjoy")
46 horizontalAlignment: Text.AlignHCenter
46 horizontalAlignment: Text.AlignHCenter
47 width: parent.width
47 width: parent.width
48 wrapMode: Text.WordWrap
48 wrapMode: Text.WordWrap
@@ -52,18 +52,29 @@ Component {
52 id: finalMessage
52 id: finalMessage
53 anchors {
53 anchors {
54 top: introductionText.bottom
54 top: introductionText.bottom
55− bottom: parent.bottom
55+ bottom: continueButton.top
56 left: parent.left
56 left: parent.left
57 right: parent.right
57 right: parent.right
58 margins: units.gu(1)
58 margins: units.gu(1)
59 topMargin: units.gu(4)
59 topMargin: units.gu(4)
60 }
60 }
61− wrapMode: Text.WordWrap
62 horizontalAlignment: Text.AlignHCenter
61 horizontalAlignment: Text.AlignHCenter
63− linkColor: podbird.appTheme.linkText
62+ text: i18n.tr("We hope you enjoy using Podbird!")
64− // TRANSLATORS: The %1 points to a url defined in html format <a href=\link\>Link</a>.
63+ wrapMode: Text.WordWrap
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>")
64+ }
66− onLinkActivated: Qt.openUrlExternally(link)
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()
67 }
78 }
68 }
79 }
69}
80}