Skip to content

Commit

Permalink
Version 0.4-0
Browse files Browse the repository at this point in the history
  • Loading branch information
@a-dekker
a-dekker committed Sep 14, 2015
1 parent 2571714 commit 7a8c94b
Show file tree
Hide file tree
Showing 21 changed files with 867 additions and 127 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*.so
*.dll
*.dylib
rpm/*.yaml

# Qt-es

Expand Down
4 changes: 3 additions & 1 deletion qml/cover/CoverPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ CoverBackground {
anchors.top: parent.top
horizontalAlignment: Text.Center
color: Theme.highlightColor
font.pixelSize: Theme.fontSizeSmall
}

Separator {
id: coverHeaderSeparator
color: Theme.primaryColor
Expand All @@ -190,7 +192,7 @@ CoverBackground {
Label {
id: timeLabel
x: Theme.paddingSmall
text: zoneTime.replace(" ", "")
text: zoneTime.replace(" ", "").substr(0, 7)
height: font.pixelSize + Theme.paddingSmall
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: Theme.fontSizeSmall
Expand Down
Binary file added qml/images/CocosIslands.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added qml/images/SaintPierreAndMiquelon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 12 additions & 17 deletions qml/pages/About.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ Page {
SectionHeader {
text: qsTr("Info")
}
Rectangle {
color: "#999999"
x: Theme.paddingLarge * 3
width: parent.width - Theme.paddingLarge * 3 * 2
height: 2
anchors.leftMargin: 20
anchors.topMargin: 30
Separator {
color: Theme.primaryColor
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Qt.AlignHCenter
}
Label {
text: "Worldclock"
Expand All @@ -39,15 +37,14 @@ Page {
height: width
radius: 100
anchors.horizontalCenter: parent.horizontalCenter
NumberAnimation on rotation
{
NumberAnimation on rotation {
from: 0
to: 360
duration: 5000
loops: 1
}
Image {
source: "/usr/share/icons/hicolor/86x86/apps/harbour-worldclock.png"
source: "/usr/share/icons/hicolor/86x86/apps/harbour-worldclock.png"
}
}
Label {
Expand All @@ -64,13 +61,11 @@ Page {
SectionHeader {
text: qsTr("Author")
}
Rectangle {
color: "#999999"
x: Theme.paddingLarge * 3
width: parent.width - Theme.paddingLarge * 3 * 2
height: 2
anchors.leftMargin: 20
anchors.topMargin: 30
Separator {
color: Theme.primaryColor
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Qt.AlignHCenter
}
Label {
text: "© Arno Dekker 2015"
Expand Down
26 changes: 20 additions & 6 deletions qml/pages/CityDetail.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ Page {
dstShiftTxt = data[14]
zoneNextTransition = data[10]
// now some translation stuff, as I can't get it to work in worldclock.cpp
if (zonePreviousTransition === "none" ) {
zonePreviousTransition = qsTr("none")
if (zonePreviousTransition === "None" ) {
zonePreviousTransition = qsTr("None")
}
if (zoneNextTransition === "none" ) {
zoneNextTransition = qsTr("none")
if (zoneNextTransition === "None" ) {
zoneNextTransition = qsTr("None")
}
switch (dstShiftTxtOld) {
case "txt_clock_back_old":
Expand Down Expand Up @@ -94,25 +94,27 @@ Page {
title: qsTr("Timezone details")
}
SectionHeader {
text: zoneCity.replace(/_/g, " ") + ", " + zoneCountry.replace(
/([a-z])([A-Z])/g, "$1 $2")
wrapMode: Text.Wrap
Image {
height: 55
width: 95
source: zoneCountry !== "" ? '../images/' + zoneCountry + '.png' : ""
anchors.leftMargin: Theme.paddingSmall
}
text: zoneCity.replace(/_/g, " ") + ", " + zoneCountry.replace(
/([a-z])([A-Z])/g, "$1 $2")
}
Label {
x: Theme.paddingLarge
text: qsTr("Timezone")
}
Label {
x: Theme.paddingLarge
width: parent.width - Theme.paddingLarge
font.pixelSize: Theme.fontSizeSmall
color: Theme.secondaryColor
text: zoneName
truncationMode: TruncationMode.Fade
}
Label {
x: Theme.paddingLarge
Expand All @@ -123,6 +125,8 @@ Page {
font.pixelSize: Theme.fontSizeSmall
color: Theme.secondaryColor
text: zoneDateTime
width: parent.width - Theme.paddingLarge
truncationMode: TruncationMode.Fade
}
Label {
x: Theme.paddingLarge
Expand All @@ -133,6 +137,8 @@ Page {
font.pixelSize: Theme.fontSizeSmall
color: Theme.secondaryColor
text: localDateTime
width: parent.width - Theme.paddingLarge
truncationMode: TruncationMode.Fade
}
Label {
x: Theme.paddingLarge
Expand All @@ -146,13 +152,17 @@ Page {
}
Label {
x: Theme.paddingLarge
width: parent.width - Theme.paddingLarge
truncationMode: TruncationMode.Fade
text: qsTr("Prev. daylight transition") + " " + abbrevFromPrev
}
Label {
x: Theme.paddingLarge
font.pixelSize: Theme.fontSizeSmall
color: Theme.secondaryColor
text: zonePreviousTransition
width: parent.width - Theme.paddingLarge
truncationMode: TruncationMode.Fade
}
Label {
x: Theme.paddingLarge
Expand All @@ -162,13 +172,17 @@ Page {
}
Label {
x: Theme.paddingLarge
width: parent.width - Theme.paddingLarge
truncationMode: TruncationMode.Fade
text: qsTr("Next daylight transition") + " " + abbrevToNext
}
Label {
x: Theme.paddingLarge
font.pixelSize: Theme.fontSizeSmall
color: Theme.secondaryColor
text: zoneNextTransition
width: parent.width - Theme.paddingLarge
truncationMode: TruncationMode.Fade
}
Label {
x: Theme.paddingLarge
Expand Down
Loading

0 comments on commit 7a8c94b

Please sign in to comment.