cleanup

Kolcha · Sep 12, 2024 · 8216110 · 8216110
1 parent 702d863
commit 8216110
Show file tree

Hide file tree

Showing 24 changed files with 402 additions and 352 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,9 +12,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-find_package(Qt6 6.5 REQUIRED COMPONENTS Widgets Network Svg
-             OPTIONAL_COMPONENTS Multimedia)
-find_package(Qt6 6.7 REQUIRED COMPONENTS LinguistTools)
+find_package(Qt6 6.7 REQUIRED COMPONENTS Widgets Network Svg
+             OPTIONAL_COMPONENTS Multimedia LinguistTools)
 
 qt_standard_project_setup(I18N_TRANSLATED_LANGUAGES en ru zh_CN)
 

diff --git a/app/gui/settings_dialog.cpp b/app/gui/settings_dialog.cpp
@@ -67,6 +67,10 @@ SettingsDialog::SettingsDialog(Application* app, int idx, QWidget* parent)
 {
   ui->setupUi(this);
 
+  // import/export is not implemnted for now
+  ui->import_btn->hide();
+  ui->export_btn->hide();
+
   app->window(_curr_idx)->enableFrame();
 
   QSignalBlocker _(ui->windows_box);

diff --git a/app/i18n/digital_clock_en.ts b/app/i18n/digital_clock_en.ts
diff --git a/app/i18n/digital_clock_ru.ts b/app/i18n/digital_clock_ru.ts
diff --git a/app/i18n/digital_clock_zh_CN.ts b/app/i18n/digital_clock_zh_CN.ts
diff --git a/plugin_core/i18n/plugin_core_en.ts b/plugin_core/i18n/plugin_core_en.ts
@@ -89,7 +89,7 @@
     <message>
         <location filename="../impl/appearance_settings_widget.ui" line="206"/>
         <location filename="../impl/appearance_settings_widget.ui" line="265"/>
-        <source>apply per cha&amp;racter</source>
+        <source>apply per &amp;element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/plugin_core/i18n/plugin_core_ru.ts b/plugin_core/i18n/plugin_core_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru_RU" sourcelanguage="en_US">
+<TS version="2.1" language="ru" sourcelanguage="en_US">
 <context>
     <name>AppearanceSettingsWidget</name>
     <message>
@@ -89,7 +89,7 @@
     <message>
         <location filename="../impl/appearance_settings_widget.ui" line="206"/>
         <location filename="../impl/appearance_settings_widget.ui" line="265"/>
-        <source>apply per cha&amp;racter</source>
+        <source>apply per &amp;element</source>
         <translation>для каждого символа</translation>
     </message>
     <message>

diff --git a/plugin_core/i18n/plugin_core_zh_CN.ts b/plugin_core/i18n/plugin_core_zh_CN.ts
@@ -89,7 +89,7 @@
     <message>
         <location filename="../impl/appearance_settings_widget.ui" line="206"/>
         <location filename="../impl/appearance_settings_widget.ui" line="265"/>
-        <source>apply per cha&amp;racter</source>
+        <source>apply per &amp;element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/plugin_core/impl/appearance_settings_widget.ui b/plugin_core/impl/appearance_settings_widget.ui
@@ -203,7 +203,7 @@
       <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="tx_per_char">
         <property name="text">
-         <string>apply per cha&amp;racter</string>
+         <string>apply per &amp;element</string>
         </property>
        </widget>
       </item>
@@ -262,7 +262,7 @@
       <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="bg_per_char">
         <property name="text">
-         <string>apply per cha&amp;racter</string>
+         <string>apply per &amp;element</string>
         </property>
        </widget>
       </item>

diff --git a/plugins/any_zoom/i18n/any_zoom_zh_CN.ts b/plugins/any_zoom/i18n/any_zoom_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>AnyZoomPluginFactory</name>
     <message>

diff --git a/plugins/chime/CMakeLists.txt b/plugins/chime/CMakeLists.txt
@@ -4,6 +4,8 @@
 
 project(chime VERSION 2.0.1 LANGUAGES CXX)
 
+set(CMAKE_AUTORCC ON)
+
 qt_add_plugin(${PROJECT_NAME} CLASS_NAME ChimePluginFactory
     gui/settings_widget.cpp
     gui/settings_widget.hpp

diff --git a/plugins/chime/i18n/chime_zh_CN.ts b/plugins/chime/i18n/chime_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>ChimePluginFactory</name>
     <message>

diff --git a/plugins/countdown_timer/i18n/countdown_timer_zh_CN.ts b/plugins/countdown_timer/i18n/countdown_timer_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>CountdownTimerPlugin</name>
     <message>

diff --git a/plugins/date/i18n/date_zh_CN.ts b/plugins/date/i18n/date_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>DatePluginFactory</name>
     <message>

diff --git a/plugins/quick_note/i18n/quick_note_en.ts b/plugins/quick_note/i18n/quick_note_en.ts
@@ -4,36 +4,36 @@
 <context>
     <name>QuickNotePlugin</name>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="49"/>
+        <location filename="../quick_note_plugin.cpp" line="55"/>
         <source>double click me!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="56"/>
+        <location filename="../quick_note_plugin.cpp" line="62"/>
         <source>Nothing is here!
 Double click the widget to change the text.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="78"/>
+        <location filename="../quick_note_plugin.cpp" line="84"/>
         <source>Quick note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="79"/>
+        <location filename="../quick_note_plugin.cpp" line="85"/>
         <source>Enter the desired note</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QuickNotePluginFactory</name>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="95"/>
+        <location filename="../quick_note_plugin.cpp" line="102"/>
         <source>Allows to display any short message under the clock.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.hpp" line="43"/>
+        <location filename="../quick_note_plugin.hpp" line="45"/>
         <source>Quick note</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/plugins/quick_note/i18n/quick_note_ru.ts b/plugins/quick_note/i18n/quick_note_ru.ts
@@ -4,37 +4,37 @@
 <context>
     <name>QuickNotePlugin</name>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="49"/>
+        <location filename="../quick_note_plugin.cpp" line="55"/>
         <source>double click me!</source>
         <translation>двойной щелчок здесь!</translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="56"/>
+        <location filename="../quick_note_plugin.cpp" line="62"/>
         <source>Nothing is here!
 Double click the widget to change the text.</source>
         <translation>Здесь ничего нет!
 Сделайте двойной щелчок по виджету чтобы изменить текст.</translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="78"/>
+        <location filename="../quick_note_plugin.cpp" line="84"/>
         <source>Quick note</source>
         <translation>Быстрая заметка</translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="79"/>
+        <location filename="../quick_note_plugin.cpp" line="85"/>
         <source>Enter the desired note</source>
         <translation>Введите желаемый текст</translation>
     </message>
 </context>
 <context>
     <name>QuickNotePluginFactory</name>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="95"/>
+        <location filename="../quick_note_plugin.cpp" line="102"/>
         <source>Allows to display any short message under the clock.</source>
         <translation>Отображает короткое сообщение под часами.</translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.hpp" line="43"/>
+        <location filename="../quick_note_plugin.hpp" line="45"/>
         <source>Quick note</source>
         <translation>Быстрая заметка</translation>
     </message>

diff --git a/plugins/quick_note/i18n/quick_note_zh_CN.ts b/plugins/quick_note/i18n/quick_note_zh_CN.ts
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>QuickNotePlugin</name>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="49"/>
+        <location filename="../quick_note_plugin.cpp" line="55"/>
         <source>double click me!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="56"/>
+        <location filename="../quick_note_plugin.cpp" line="62"/>
         <source>Nothing is here!
 Double click the widget to change the text.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="78"/>
+        <location filename="../quick_note_plugin.cpp" line="84"/>
         <source>Quick note</source>
         <translation>便捷笔记</translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="79"/>
+        <location filename="../quick_note_plugin.cpp" line="85"/>
         <source>Enter the desired note</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QuickNotePluginFactory</name>
     <message>
-        <location filename="../quick_note_plugin.cpp" line="95"/>
+        <location filename="../quick_note_plugin.cpp" line="102"/>
         <source>Allows to display any short message under the clock.</source>
         <translation>在时钟下显示一段简短的自定义内容。</translation>
     </message>
     <message>
-        <location filename="../quick_note_plugin.hpp" line="43"/>
+        <location filename="../quick_note_plugin.hpp" line="45"/>
         <source>Quick note</source>
         <translation>便捷笔记</translation>
     </message>

diff --git a/plugins/random_position/i18n/random_position_ru.ts b/plugins/random_position/i18n/random_position_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru_RU" sourcelanguage="en_US">
+<TS version="2.1" language="ru" sourcelanguage="en_US">
 <context>
     <name>RandomPositionPluginFactory</name>
     <message>

diff --git a/plugins/random_position/i18n/random_position_zh_CN.ts b/plugins/random_position/i18n/random_position_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>RandomPositionPluginFactory</name>
     <message>

diff --git a/plugins/sample/i18n/sample_ru.ts b/plugins/sample/i18n/sample_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="ru" sourcelanguage="en_US">
 <context>
     <name>SamplePluginFactory</name>
     <message>

diff --git a/plugins/sample/i18n/sample_zh_CN.ts b/plugins/sample/i18n/sample_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>SamplePluginFactory</name>
     <message>

diff --git a/plugins/spectrum_clock/i18n/spectrum_clock_zh_CN.ts b/plugins/spectrum_clock/i18n/spectrum_clock_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>SpectrumClockPluginFactory</name>
     <message>

diff --git a/plugins/var_translucency/i18n/var_translucency_ru.ts b/plugins/var_translucency/i18n/var_translucency_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru_RU" sourcelanguage="en_US">
+<TS version="2.1" language="ru" sourcelanguage="en_US">
 <context>
     <name>VarTranslucencyPluginFactory</name>
     <message>

diff --git a/plugins/var_translucency/i18n/var_translucency_zh_CN.ts b/plugins/var_translucency/i18n/var_translucency_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.1" language="zh_CN" sourcelanguage="en_US">
 <context>
     <name>VarTranslucencyPluginFactory</name>
     <message>