[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock.spec
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">http://git.monich.net/git/harbour-swissclock.git</param>
<param name="branch">master</param>
- <param name="revision">cd5ffdc</param>
+ <param name="revision">145a913</param>
</service>
</services>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/harbour-swissclock.pro
^
|
@@ -61,7 +61,7 @@
settings/*.qml \
settings/harbour-$${NAME}.json \
icons/harbour-$${NAME}.svg \
- harbour-$${NAME}.desktop \
+ *.desktop \
translations/*.ts \
rpm/*-$${NAME}.spec
@@ -92,12 +92,6 @@
INSTALLS += settings_qml settings_json
}
-# Desktop file
-equals(PREFIX, "openrepos") {
- desktop.extra = sed s/harbour/openrepos/g harbour-$${NAME}.desktop > $${TARGET}.desktop
- desktop.CONFIG += no_check_exist
-}
-
# Translations
TRANSLATION_IDBASED=-idbased
TRANSLATION_SOURCES = \
|
[-]
[+]
|
Added |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/openrepos-swissclock.desktop
^
|
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+X-Nemo-Application-Type=silica-qt5
+Name=Swiss Clock
+Icon=openrepos-swissclock
+Exec=openrepos-swissclock
+
+[X-Sailjail]
+Sandboxing=Disabled
+
+[X-HarbourBackup]
+BackupConfigList=/apps/openrepos-swissclock/
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/settings/settings.qml
^
|
@@ -1,6 +1,6 @@
/*
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
* Copyright (C) 2016-2019 Jolla Ltd.
- * Copyright (C) 2016-2019 Slava Monich <slava@monich.com>
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -68,9 +68,28 @@
width: parent.width
PageHeader {
- //: Settings page header
- //% "Swiss Clock"
- title: qsTrId("swissclock-settings-page_header")
+ id: pageHeader
+
+ rightMargin: Theme.horizontalPageMargin + (appIcon.visible ? (height - appIcon.padding) : 0)
+ title: applicationName ? applicationName : "Swiss Clock"
+ description: applicationName ?
+ //: Settings page header description (app version)
+ //% "Version %1"
+ qsTrId("swissclock-settings-version").arg("1.0.10") : ""
+
+ Image {
+ id: appIcon
+
+ readonly property int padding: Theme.paddingLarge
+ readonly property int size: pageHeader.height - 2 * padding
+ x: pageHeader.width - width - Theme.horizontalPageMargin
+ y: padding
+ width: size
+ height: size
+ sourceSize: Qt.size(size,size)
+ source: applicationIcon ? applicationIcon : ""
+ visible: appIcon.status === Image.Ready
+ }
}
ComboBox {
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/src/ClockRendererSwissRailroad.cpp
^
|
@@ -34,7 +34,7 @@
#include "ClockRenderer.h"
#include "ClockDebug.h"
-#include <math.h>
+#include <qmath.h>
const QString ClockRenderer::SWISS_RAILROAD("SwissRailroad");
@@ -114,6 +114,9 @@
} else {
return 0.0;
}
+ } else if (aType == NodeMin && aTime.second() == 0) {
+ const qreal x = aTime.msec()/222.0;
+ return 6*(aTime.minute() - qExp(-1.5 * x) * qCos(2 * M_PI * x));
} else {
return ClockRenderer::nodeAngle(aType, aTime);
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/translations/harbour-swissclock-hu.ts
^
|
@@ -18,10 +18,10 @@
<extracomment>Label for Deutsche Bahn clock style</extracomment>
<translation>Német vasút</translation>
</message>
- <message id="swissclock-settings-page_header">
- <source>Swiss Clock</source>
- <extracomment>Settings page header</extracomment>
- <translation>Svájci óra</translation>
+ <message id="swissclock-settings-version">
+ <source>Version %1</source>
+ <extracomment>Settings page header description (app version)</extracomment>
+ <translation type="unfinished">Verzió %1</translation>
</message>
<message id="swissclock-settings-dial_plate">
<source>Dial plate</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/translations/harbour-swissclock-nl.ts
^
|
@@ -18,10 +18,10 @@
<extracomment>Label for Deutsche Bahn clock style</extracomment>
<translation>Deutsche Bahn</translation>
</message>
- <message id="swissclock-settings-page_header">
- <source>Swiss Clock</source>
- <extracomment>Settings page header</extracomment>
- <translation>Zwitserse klok</translation>
+ <message id="swissclock-settings-version">
+ <source>Version %1</source>
+ <extracomment>Settings page header description (app version)</extracomment>
+ <translation type="unfinished">Versie 1</translation>
</message>
<message id="swissclock-settings-dial_plate">
<source>Dial plate</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/translations/harbour-swissclock-ru.ts
^
|
@@ -18,10 +18,10 @@
<extracomment>Label for Deutsche Bahn clock style</extracomment>
<translation>Германия</translation>
</message>
- <message id="swissclock-settings-page_header">
- <source>Swiss Clock</source>
- <extracomment>Settings page header</extracomment>
- <translation>Swiss Clock</translation>
+ <message id="swissclock-settings-version">
+ <source>Version %1</source>
+ <extracomment>Settings page header description (app version)</extracomment>
+ <translation>Версия %1</translation>
</message>
<message id="swissclock-settings-dial_plate">
<source>Dial plate</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/translations/harbour-swissclock-sv.ts
^
|
@@ -18,10 +18,10 @@
<extracomment>Label for Deutsche Bahn clock style</extracomment>
<translation>Deutsche Bahn</translation>
</message>
- <message id="swissclock-settings-page_header">
- <source>Swiss Clock</source>
- <extracomment>Settings page header</extracomment>
- <translation>Swiss Clock</translation>
+ <message id="swissclock-settings-version">
+ <source>Version %1</source>
+ <extracomment>Settings page header description (app version)</extracomment>
+ <translation>Version %1</translation>
</message>
<message id="swissclock-settings-dial_plate">
<source>Dial plate</source>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-swissclock-1.0.10.tar.bz2/translations/harbour-swissclock.ts
^
|
@@ -18,10 +18,10 @@
<extracomment>Label for Deutsche Bahn clock style</extracomment>
<translation>Deutsche Bahn</translation>
</message>
- <message id="swissclock-settings-page_header">
- <source>Swiss Clock</source>
- <extracomment>Settings page header</extracomment>
- <translation>Swiss Clock</translation>
+ <message id="swissclock-settings-version">
+ <source>Version %1</source>
+ <extracomment>Settings page header description (app version)</extracomment>
+ <translation>Version %1</translation>
</message>
<message id="swissclock-settings-dial_plate">
<source>Dial plate</source>
|