Fix tray menu quick action lack translate

mhtvsSFrpHdE · Jan 20, 2023 · 4e29d1b · 4e29d1b
1 parent 950c19c
commit 4e29d1b
Show file tree

Hide file tree

Showing 12 changed files with 120 additions and 30 deletions.
diff --git a/qpp/prefetch/Source/Core/const_core.cpp b/qpp/prefetch/Source/Core/const_core.cpp
@@ -20,7 +20,6 @@ QString Const_Core::Message::RunStartupItems = DEFINE_RunStartupItems;
 
 void Const_Core::Message::init()
 {
-
     ScanFolder = trr(tscope, DEFINE_ScanFolder);
     CacheFound = Tab + trr(tscope, DEFINE_CacheFound);
     Prefetching = trr(tscope, DEFINE_Prefetching);

diff --git a/qpp/prefetch/Source/Core/const_core_tdummy.cpp b/qpp/prefetch/Source/Core/const_core_tdummy.cpp
@@ -5,7 +5,6 @@
 
 void Const_Core::Message::tdummy()
 {
-
 #define DEFINE_ScanFolder "Scan folder..."
     ScanFolder = tr("Scan folder...");
 #define DEFINE_CacheFound "Cache found, restore file list"

diff --git a/qpp/prefetch/Source/Interface/MainWindow/mainwindow.cpp b/qpp/prefetch/Source/Interface/MainWindow/mainwindow.cpp
@@ -270,6 +270,8 @@ void MainWindow::changeEvent(QEvent *changeEventAddress)
 
         ui->sendCommand_pushButton->setText(SendCommand_PushButton);
 
+        Global::trayIconInstanceAddress->reloadTranslate();
+
         TranslateTool::unlock();
         LAST_KNOWN_POSITION(4)
     }

diff --git a/qpp/prefetch/Source/Interface/TrayIcon/const_tray_icon.cpp b/qpp/prefetch/Source/Interface/TrayIcon/const_tray_icon.cpp
@@ -0,0 +1,12 @@
+#include "const_tray_icon_tdummy.cpp"
+
+QString Const_TrayIcon::MenuText::Pause = DEFINE_Pause;
+QString Const_TrayIcon::MenuText::Resume = DEFINE_Resume;
+QString Const_TrayIcon::MenuText::Exit = DEFINE_Exit;
+
+void Const_TrayIcon::MenuText::init()
+{
+    Pause = trr(tscope, DEFINE_Pause);
+    Resume = trr(tscope, DEFINE_Resume);
+    Exit = trr(tscope, DEFINE_Exit);
+}
diff --git a/qpp/prefetch/Source/Interface/TrayIcon/const_tray_icon.h b/qpp/prefetch/Source/Interface/TrayIcon/const_tray_icon.h
@@ -1,3 +1,6 @@
+#ifndef Const_Tray_Icon_h
+#define Const_Tray_Icon_h
+
 #include <QString>
 
 namespace Const_TrayIcon
@@ -8,9 +11,20 @@ namespace Const_TrayIcon
     }
     namespace MenuText
     {
-        const QString Pause = "Pause";
-        const QString Resume = "Resume";
-        const QString Exit = "Exit";
+        extern QString Pause;
+        extern QString Resume;
+        extern QString Exit;
+
+        // Test code entry
+#if TEST_TRAY_MENU_ENABLED
         const QString Test = "Test";
+#endif
+
+        extern void init();
+
+        // See translate_define.h for more information
+        extern void tdummy();
     }
 }
+
+#endif
diff --git a/qpp/prefetch/Source/Interface/TrayIcon/const_tray_icon_tdummy.cpp b/qpp/prefetch/Source/Interface/TrayIcon/const_tray_icon_tdummy.cpp
@@ -0,0 +1,14 @@
+#include "const_tray_icon.h"
+#include "..\..\Translate\translate_tool.h"
+
+#define tscope "Const_TrayIcon::MenuText"
+
+void Const_TrayIcon::MenuText::tdummy()
+{
+#define DEFINE_Pause "Pause"
+    Pause = tr("Pause");
+#define DEFINE_Resume "Resume"
+    Resume = tr("Resume");
+#define DEFINE_Exit "Exit"
+    Exit = tr("Exit");
+}
diff --git a/qpp/prefetch/Source/Interface/TrayIcon/tray_icon.cpp b/qpp/prefetch/Source/Interface/TrayIcon/tray_icon.cpp
@@ -40,7 +40,6 @@ namespace TrayIconObject
 
 void TrayIcon::init()
 {
-
     using namespace Const_Setting::ConfigGroupName;
     using namespace Const_Setting::Instance_ConfigKeyName;
     using namespace TrayIconObject;
@@ -115,16 +114,16 @@ void TrayIcon::init()
     connect(exitMenu, SIGNAL(triggered()), this, SLOT(action_exit()));
     qMenu->addAction(exitMenu);
 
-    // Menu style
-    qMenu->setFixedWidth(Dpi::multiply(trayMenuMinimalWidth));
-
     // Test code entry
 #if TEST_TRAY_MENU_ENABLED
     testMenu = new QAction(MenuText::Test, qMenu);
     connect(testMenu, SIGNAL(triggered()), this, SLOT(action_test()));
     qMenu->addAction(testMenu);
 #endif
 
+    // Menu style
+    qMenu->setFixedWidth(Dpi::multiply(trayMenuMinimalWidth));
+
     systemTrayIcon->setContextMenu(qMenu);
 
     // Event
@@ -135,6 +134,15 @@ void TrayIcon::init()
     connect(systemTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(action_traydc(QSystemTrayIcon::ActivationReason)));
 }
 
+void TrayIcon::reloadTranslate()
+{
+    using namespace Const_TrayIcon;
+
+    TrayIconObject::pauseMenu->setText(MenuText::Pause);
+    TrayIconObject::resumeMenu->setText(MenuText::Resume);
+    TrayIconObject::exitMenu->setText(MenuText::Exit);
+}
+
 void TrayIcon::start()
 {
     using namespace Const_TrayIcon::Resource;

diff --git a/qpp/prefetch/Source/Interface/TrayIcon/tray_icon.h b/qpp/prefetch/Source/Interface/TrayIcon/tray_icon.h
@@ -11,6 +11,8 @@ class TrayIcon : public QObject
 public:
     // Create system tray icon object
     void init();
+    // Update translate text
+    void reloadTranslate();
 
     // Show system tray icon
     static void start();
@@ -30,4 +32,4 @@ public slots:
 
 private:
     static QSystemTrayIcon *systemTrayIcon;
-};
+};
diff --git a/qpp/prefetch/Source/Translate/File/prefetch_en_US.ts b/qpp/prefetch/Source/Translate/File/prefetch_en_US.ts
@@ -4,53 +4,53 @@
 <context>
     <name>Const_Core::Message</name>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="10"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="9"/>
         <source>Scan folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="12"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="11"/>
         <source>Cache found, restore file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="14"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="13"/>
         <source>Prefetching...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="16"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="15"/>
         <source>Idle, Time: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="18"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="17"/>
         <source> Sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="20"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="19"/>
         <source>Scan complete, Time: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="22"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="21"/>
         <source>ss.zzz</source>
         <translatorcomment>Rarely necessary to modify these texts</translatorcomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="24"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="23"/>
         <source>Rescan interval reached.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="26"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="25"/>
         <source>Cache will expire on next run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="29"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="28"/>
         <source>Run startup items...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -132,6 +132,24 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Const_TrayIcon::MenuText</name>
+    <message>
+        <location filename="../../Interface/TrayIcon/const_tray_icon_tdummy.cpp" line="9"/>
+        <source>Pause</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Interface/TrayIcon/const_tray_icon_tdummy.cpp" line="11"/>
+        <source>Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Interface/TrayIcon/const_tray_icon_tdummy.cpp" line="13"/>
+        <source>Exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>

diff --git a/qpp/prefetch/Source/Translate/File/prefetch_zh_CN.ts b/qpp/prefetch/Source/Translate/File/prefetch_zh_CN.ts
@@ -4,52 +4,52 @@
 <context>
     <name>Const_Core::Message</name>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="10"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="9"/>
         <source>Scan folder...</source>
         <translation>清点可缓存文件列表...</translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="12"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="11"/>
         <source>Cache found, restore file list</source>
         <translation>从缓存恢复可缓存文件列表</translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="14"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="13"/>
         <source>Prefetching...</source>
         <translation>缓存文件...</translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="16"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="15"/>
         <source>Idle, Time: </source>
         <translation>空闲，消耗时间：</translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="18"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="17"/>
         <source> Sec</source>
         <translation>秒</translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="20"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="19"/>
         <source>Scan complete, Time: </source>
         <translation>清点完成，消耗时间：</translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="22"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="21"/>
         <source>ss.zzz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="24"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="23"/>
         <source>Rescan interval reached.</source>
         <translation>已符合重新清点条件</translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="26"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="25"/>
         <source>Cache will expire on next run.</source>
         <translation>可缓存文件列表将在下次运行前删除。</translation>
     </message>
     <message>
-        <location filename="../../Core/const_core_tdummy.cpp" line="29"/>
+        <location filename="../../Core/const_core_tdummy.cpp" line="28"/>
         <source>Run startup items...</source>
         <translation>运行开机启动项...</translation>
     </message>
@@ -130,6 +130,24 @@
         <translation>提交</translation>
     </message>
 </context>
+<context>
+    <name>Const_TrayIcon::MenuText</name>
+    <message>
+        <location filename="../../Interface/TrayIcon/const_tray_icon_tdummy.cpp" line="9"/>
+        <source>Pause</source>
+        <translation>暂停</translation>
+    </message>
+    <message>
+        <location filename="../../Interface/TrayIcon/const_tray_icon_tdummy.cpp" line="11"/>
+        <source>Resume</source>
+        <translation>继续</translation>
+    </message>
+    <message>
+        <location filename="../../Interface/TrayIcon/const_tray_icon_tdummy.cpp" line="13"/>
+        <source>Exit</source>
+        <translation>退出</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>

diff --git a/qpp/prefetch/Source/Translate/init_message.cpp b/qpp/prefetch/Source/Translate/init_message.cpp
@@ -5,10 +5,12 @@
 #include "..\Interface\MainWindow\const_mainwindow.h"
 #include "..\Output\const_log.h"
 #include "..\Setting\const_setting.h"
+#include "..\Interface\TrayIcon\const_tray_icon.h"
 
 void TranslatorLoader::initMessage()
 {
     Const_Core::Message::init();
     Const_Input::Message::init();
     Const_MainWindow::ButtonText::init();
+    Const_TrayIcon::MenuText::init();
 }
diff --git a/qpp/prefetch/prefetch.pro b/qpp/prefetch/prefetch.pro
@@ -74,6 +74,8 @@ SOURCES += \
     Source/Interface/MainWindow/const_mainwindow_tdummy.cpp \
     Source/Interface/MainWindow/mainwindow.cpp \
     Source/Interface/TrayIcon/Action/custom_action.cpp \
+    Source/Interface/TrayIcon/const_tray_icon.cpp \
+    Source/Interface/TrayIcon/const_tray_icon_tdummy.cpp \
     Source/Interface/TrayIcon/tray_icon.cpp \
     Source/Output/log.cpp \
     Source/Output/const_log.cpp \