Project: add app icon; update locale files; fix typo

ForSuhr · Sep 16, 2023 · 01d3f9f · 01d3f9f
1 parent 322ff31
commit 01d3f9f
Show file tree

Hide file tree

Showing 12 changed files with 330 additions and 126 deletions.
diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt
@@ -49,6 +49,7 @@ set(PROJECT_SOURCES
         utils/TabBar.h
         utils/TabBar.cpp
         FlowLink.qrc
+        asset/icon/FlowLink.rc
 )
 
 set(PROJECT_TRANSLATE
@@ -63,16 +64,36 @@ set(TS_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/translate/de_DE.ts
     )
 
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
-    qt_add_executable(FlowLink
-        MANUAL_FINALIZATION
-        ${PROJECT_SOURCES}
-        ${PROJECT_TRANSLATE}
-    )
-    qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+if (WIN32)
+    if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+        qt_add_executable(FlowLink WIN32
+            MANUAL_FINALIZATION
+            ${PROJECT_SOURCES}
+            ${PROJECT_TRANSLATE}
+        )
+        qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+    else()
+        add_executable(FlowLink WIN32
+            ${PROJECT_SOURCES}
+            ${PROJECT_TRANSLATE}
+        )
+        qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+    endif()
 else()
-    add_executable(FlowLink ${PROJECT_SOURCES} ${PROJECT_TRANSLATE})
-    qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+    if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+        qt_add_executable(FlowLink
+            MANUAL_FINALIZATION
+            ${PROJECT_SOURCES}
+            ${PROJECT_TRANSLATE}
+        )
+        qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+    else()
+        add_executable(FlowLink
+            ${PROJECT_SOURCES}
+            ${PROJECT_TRANSLATE}
+        )
+        qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+    endif()
 endif()
 
 target_include_directories(FlowLink PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/ads")

diff --git a/desktop/FlowLink.cpp b/desktop/FlowLink.cpp
@@ -92,7 +92,7 @@ void FlowLink::createConnectionUi()
   m_connectAction->setEnabled(true);
   m_disconnectAction = new QAction(this);
   m_disconnectAction->setIcon(QIcon(R"(:/asset/style/lumos/disconnectAction.svg)"));
-  m_disconnectAction->setToolTip(tr("Disonnect from local network"));
+  m_disconnectAction->setToolTip(tr("Disconnect from local network"));
   m_disconnectAction->setEnabled(false);
   m_toggleShowLocalHostAction = new QAction(this);
   m_toggleShowLocalHostAction->setIcon(QIcon(R"(:/asset/style/lumos/hideLocalHost.svg)"));

diff --git a/desktop/FlowLink.qrc b/desktop/FlowLink.qrc
@@ -14,5 +14,6 @@
         <file>asset/style/lumos/btnFolderOpenHover.svg</file>
         <file>asset/style/lumos/hideLocalHost.svg</file>
         <file>asset/style/lumos/showLocalHost.svg</file>
+        <file>asset/icon/FlowLink.png</file>
     </qresource>
 </RCC>
diff --git a/desktop/Main.cpp b/desktop/Main.cpp
@@ -17,6 +17,7 @@ int main(int argc, char *argv[])
     }
 
     FlowLink w;
+    w.setWindowIcon(QIcon(":/asset/icon/FlowLink.png"));
     w.show();
     return a.exec();
 }
diff --git a/desktop/asset/icon/FlowLink.ico b/desktop/asset/icon/FlowLink.ico
diff --git a/desktop/asset/icon/FlowLink.png b/desktop/asset/icon/FlowLink.png
diff --git a/desktop/asset/icon/FlowLink.svg b/desktop/asset/icon/FlowLink.svg
diff --git a/desktop/translate/de_DE.qph b/desktop/translate/de_DE.qph
@@ -1,5 +1,5 @@
 <!DOCTYPE QPH>
-<QPH sourcelanguage="en_US" language="zh_CN">
+<QPH sourcelanguage="en_US" language="de_DE">
 <phrase>
     <source>File</source>
     <target>Datei</target>
@@ -29,11 +29,71 @@
     <target>Geräte</target>
 </phrase>
 <phrase>
-    <source>Save Perspective</source>
-    <target>Perspektive speichern</target>
+    <source>Save As Current Perspective</source>
+    <target>Als aktuelle Perspektive speichern</target>
 </phrase>
 <phrase>
     <source>Perspective Name:</source>
     <target>Name der Perspektive:</target>
 </phrase>
+<phrase>
+    <source>New Perspective</source>
+    <target>Neue Perspektive</target>
+</phrase>
+<phrase>
+    <source>Progress</source>
+    <target>Fortschritt</target>
+</phrase>
+<phrase>
+    <source>Delete Current Perspective</source>
+    <target>Aktuelle Perspektive löschen</target>
+</phrase>
+<phrase>
+    <source>Can not delete last perspective!</source>
+    <target>Die letzte Perspektive lässt sich nicht löschen!</target>
+</phrase>
+<phrase>
+    <source>Connect to local network</source>
+    <target>Verbinden mit lokalem Netzwerk</target>
+</phrase>
+<phrase>
+    <source>Disconnect from local network</source>
+    <target>Vom lokalen Netzwerk abtrennen</target>
+</phrase>
+<phrase>
+    <source>Show/Hide local host</source>
+    <target>Lokalen Host anzeigen/verbergen</target>
+</phrase>
+<phrase>
+    <source>Common</source>
+    <target>Allgemein</target>
+</phrase>
+<phrase>
+    <source>&lt;b&gt;Download Directory&lt;/b&gt;</source>
+    <target>&lt;b&gt;Herunterladen-Directory&lt;/b&gt;</target>
+</phrase>
+<phrase>
+    <source>Select Directory</source>
+    <target>Directory auswählen</target>
+</phrase>
+<phrase>
+    <source>Appearance</source>
+    <target>Aussehen</target>
+</phrase>
+<phrase>
+    <source>&lt;b&gt;Language&lt;/b&gt;</source>
+    <target>&lt;b&gt;Sprache&lt;/b&gt;</target>
+</phrase>
+<phrase>
+    <source>&lt;b&gt;Style&lt;/b&gt;</source>
+    <target>&lt;b&gt;Stil&lt;/b&gt;</target>
+</phrase>
+<phrase>
+    <source>* The language will be changed after restarting the application.</source>
+    <target>* Die Sprache wird nach einem Neustart der Applikation geändert.</target>
+</phrase>
+<phrase>
+    <source>Exit</source>
+    <target>Beenden</target>
+</phrase>
 </QPH>