Merge branch 'refs/heads/blueprint'

.parlance.json

@@ -0,0 +1,17 @@
+{
+    "name": "theHeartbeat",
+    "subprojects": [
+        {
+            "name": "theHeartbeat Desktop",
+            "type": "qt",
+            "path": "/heartbeat/translations/{lang}.ts",
+            "baseLang": "en_US"
+        },
+        {
+            "name": "theHeartbeat Desktop File",
+            "type": "webext-json",
+            "path": "/heartbeat/translations/desktop/com.vicr123.theheartbeat/{lang}.json",
+            "baseLang": "en"
+        }
+    ]
+}

heartbeat/com.vicr123.theheartbeat.desktop

@@ -2,11 +2,9 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=theHeartbeat
-GenericName=System Monitor
-GenericName[vi]=Trình theo dõi hệ thống
-GenericName[nl]=Systeemmonitor
-GenericName[pl]=Monitor systemu
+Name[]=theHeartbeat
+GenericName[]=System Monitor
 Exec=theheartbeat
 Icon=theheartbeat
 Categories=Utility;
+StartupWMClass=theHeartbeat

heartbeat/heartbeat.pro

@@ -21,13 +21,10 @@ unix:!macx {
 
     target.path = /usr/bin
 
-    desktop.path = /usr/share/applications
-    desktop.files = com.vicr123.theheartbeat.desktop
-
     icon.path = /usr/share/icons/hicolor/scalable/apps/
     icon.files = theheartbeat.svg
 
-    INSTALLS += target desktop icon
+    INSTALLS += target icon
 }
 
 # The following define makes your compiler emit warnings if you use
@@ -81,6 +78,8 @@ FORMS += \
     panes/numberpane.ui \
     panes/mininumberpane.ui
 
+DESKTOP_FILE += com.vicr123.theheartbeat.desktop
+
 # Turn off stripping as this causes the install to fail :(
 QMAKE_STRIP = echo
 

heartbeat/main.cpp

@@ -28,8 +28,7 @@
 QMutex checkerMutex;
 int checkers = 0;
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char* argv[]) {
     tApplication a(argc, argv);
 
     if (QDir("/usr/share/theheartbeat").exists()) {
@@ -39,21 +38,25 @@ int main(int argc, char *argv[])
     }
     a.installTranslators();
 
+//    a.setLayoutDirection(QLocale().textDirection());
+
     a.setOrganizationName("theSuite");
     a.setOrganizationDomain("vicr123.com");
     a.setDesktopFileName("com.vicr123.theheartbeat");
     a.setApplicationIcon(QIcon::fromTheme("theheartbeat", QIcon::fromTheme("utilities-system-monitor")));
-    a.setApplicationVersion("1.0");
+    a.setApplicationVersion("1.1");
     a.setGenericName(QApplication::translate("main", "System Monitor"));
     a.setAboutDialogSplashGraphic(a.aboutDialogSplashGraphicFromSvg(":/icons/aboutsplash.svg"));
     a.setApplicationLicense(tApplication::Gpl3OrLater);
     a.setCopyrightHolder("Victor Tran");
-    a.setCopyrightYear("2019");
-    #ifdef T_BLUEPRINT_BUILD
-        a.setApplicationName("theHeartbeat Blueprint");
-    #else
-        a.setApplicationName("theHeartbeat");
-    #endif
+    a.setCopyrightYear("2021");
+    a.setApplicationUrl(tApplication::Sources, QUrl("https://github.com/vicr123/theheartbeat"));
+    a.setApplicationUrl(tApplication::FileBug, QUrl("https://github.com/vicr123/theheartbeat/issues"));
+#ifdef T_BLUEPRINT_BUILD
+    a.setApplicationName("theHeartbeat Blueprint");
+#else
+    a.setApplicationName("theHeartbeat");
+#endif
 
     MainWindow w;
     w.show();