diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt index 5e64b8c..a1fe761 100644 --- 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 index 476e60a..acbd373 100644 --- 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 index d44fbc9..0b17ab9 100644 --- a/desktop/FlowLink.qrc +++ b/desktop/FlowLink.qrc @@ -14,5 +14,6 @@ asset/style/lumos/btnFolderOpenHover.svg asset/style/lumos/hideLocalHost.svg asset/style/lumos/showLocalHost.svg + asset/icon/FlowLink.png diff --git a/desktop/Main.cpp b/desktop/Main.cpp index c5c5459..59eeaf2 100644 --- 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 new file mode 100644 index 0000000..a2f4b58 Binary files /dev/null and b/desktop/asset/icon/FlowLink.ico differ diff --git a/desktop/asset/icon/FlowLink.png b/desktop/asset/icon/FlowLink.png new file mode 100644 index 0000000..ada3d8f Binary files /dev/null and b/desktop/asset/icon/FlowLink.png differ diff --git a/desktop/asset/icon/FlowLink.svg b/desktop/asset/icon/FlowLink.svg new file mode 100644 index 0000000..b3249e1 --- /dev/null +++ b/desktop/asset/icon/FlowLink.svg @@ -0,0 +1,57 @@ + + + + + + + + + + diff --git a/desktop/translate/de_DE.qph b/desktop/translate/de_DE.qph index 839ff0f..bb58ce0 100644 --- a/desktop/translate/de_DE.qph +++ b/desktop/translate/de_DE.qph @@ -1,5 +1,5 @@ - + File Datei @@ -29,11 +29,71 @@ Geräte - Save Perspective - Perspektive speichern + Save As Current Perspective + Als aktuelle Perspektive speichern Perspective Name: Name der Perspektive: + + New Perspective + Neue Perspektive + + + Progress + Fortschritt + + + Delete Current Perspective + Aktuelle Perspektive löschen + + + Can not delete last perspective! + Die letzte Perspektive lässt sich nicht löschen! + + + Connect to local network + Verbinden mit lokalem Netzwerk + + + Disconnect from local network + Vom lokalen Netzwerk abtrennen + + + Show/Hide local host + Lokalen Host anzeigen/verbergen + + + Common + Allgemein + + + <b>Download Directory</b> + <b>Herunterladen-Directory</b> + + + Select Directory + Directory auswählen + + + Appearance + Aussehen + + + <b>Language</b> + <b>Sprache</b> + + + <b>Style</b> + <b>Stil</b> + + + * The language will be changed after restarting the application. + * Die Sprache wird nach einem Neustart der Applikation geändert. + + + Exit + Beenden + diff --git a/desktop/translate/de_DE.ts b/desktop/translate/de_DE.ts index 3d5e058..de9fe7e 100644 --- a/desktop/translate/de_DE.ts +++ b/desktop/translate/de_DE.ts @@ -22,19 +22,19 @@ File - + Datei Edit - + Bearbeiten View - + Aussicht @@ -45,72 +45,72 @@ - + Exit - + Beenden - + Preferences - + Präferenzen - - - New Perspective - + + Connect to local network + Verbinden mit lokalem Netzwerk - - Save As Current Perspective - + + Disconnect from local network + Vom lokalen Netzwerk abtrennen - - Delete Current Perspective - + + Show/Hide local host + Lokalen Host anzeigen/verbergen - - Progress - + + + New Perspective + Neue Perspektive - - Can not delete last perspective! - + + Save As Current Perspective + Als aktuelle Perspektive speichern - - Set Default Perspective - + + Delete Current Perspective + Aktuelle Perspektive löschen - - Connect to local network - + + Set Default Perspective + Standardperspektive einstellen - - Disonnect from local network - + + Devices + Geräte - - Show/Hide local host - + + Progress + Fortschritt - - Devices - + + Perspective Name: + Name der Perspektive: - - Perspective Name: - + + Can not delete last perspective! + Die letzte Perspektive lässt sich nicht löschen! @@ -118,42 +118,42 @@ Common - + Allgemein <b>Download Directory</b> - + <b>Herunterladen-Directory</b> Select Directory - + Directory auswählen Appearance - + Aussehen <b>Language</b> - + <b>Sprache</b> * The language will be changed after restarting the application. - + * Die Sprache wird nach einem Neustart der Applikation geändert. <b>Style</b> - + <b>Stil</b> Preferences - + Präferenzen diff --git a/desktop/translate/en_US.ts b/desktop/translate/en_US.ts index 8871361..929906b 100644 --- a/desktop/translate/en_US.ts +++ b/desktop/translate/en_US.ts @@ -45,70 +45,70 @@ - + Exit - + Preferences - - + + New Perspective - + Save As Current Perspective - + Delete Current Perspective - + Progress - + Can not delete last perspective! - + Set Default Perspective - + Connect to local network - + Disonnect from local network - + Show/Hide local host - + Devices - + Perspective Name: diff --git a/desktop/translate/zh_CN.qph b/desktop/translate/zh_CN.qph index da1e987..c1955a0 100644 --- a/desktop/translate/zh_CN.qph +++ b/desktop/translate/zh_CN.qph @@ -36,4 +36,68 @@ Perspective Name: 视图布局名称： + + New Perspective + 新建视图布局 + + + Save As Current Perspective + 覆盖保存当前视图布局 + + + Delete Current Perspective + 删除当前视图 + + + Progress + 下载进度 + + + Can not delete last perspective! + 无法删除最后一个视图布局 + + + Connect to local network + 连接到本地网络 + + + Disconnect from local network + 从本地网络断开连接 + + + Show/Hide local host + 显示/隐藏本地主机 + + + Common + 常用 + + + <b>Download Directory</b> + <b>下载目录</b> + + + Select Directory + 选择目录 + + + Appearance + 外观 + + + <b>Language</b> + <b>语言</b> + + + * The language will be changed after restarting the application. + * 语言选项将在重启后生效 + + + <b>Style</b> + <b>风格</b> + + + Exit + 离开 + diff --git a/desktop/translate/zh_CN.ts b/desktop/translate/zh_CN.ts index 8871361..3cbfa5f 100644 --- a/desktop/translate/zh_CN.ts +++ b/desktop/translate/zh_CN.ts @@ -1,6 +1,6 @@ - + ChatWindow @@ -22,19 +22,19 @@ File - + 文件 Edit - + 编辑 View - + 视图 @@ -45,72 +45,72 @@ - + Exit - + 离开 - + Preferences - + 偏好设置 - - - New Perspective - + + Connect to local network + 连接到本地网络 - - Save As Current Perspective - + + Disconnect from local network + 从本地网络断开连接 - - Delete Current Perspective - + + Show/Hide local host + 显示/隐藏本地主机 - - Progress - + + + New Perspective + 新建视图布局 - - Can not delete last perspective! - + + Save As Current Perspective + 覆盖保存当前视图布局 - - Set Default Perspective - + + Delete Current Perspective + 删除当前视图 - - Connect to local network - + + Set Default Perspective + 设为默认视图布局 - - Disonnect from local network - + + Devices + 设备 - - Show/Hide local host - + + Progress + 下载进度 - - Devices - + + Perspective Name: + 视图布局名称： - - Perspective Name: - + + Can not delete last perspective! + 无法删除最后一个视图布局 @@ -118,42 +118,42 @@ Common - + 常用 <b>Download Directory</b> - + <b>下载目录</b> Select Directory - + 选择目录 Appearance - + 外观 <b>Language</b> - + <b>语言</b> * The language will be changed after restarting the application. - + * 语言选项将在重启后生效 <b>Style</b> - + <b>风格</b> Preferences - + 偏好设置