refactor: change ui translation mechanism

arcan1s · Apr 22, 2024 · 9557236 · 9557236
1 parent ba60be9
commit 9557236
Show file tree

Hide file tree

Showing 47 changed files with 6,604 additions and 4,090 deletions.
diff --git a/create_archive.sh b/create_archive.sh
@@ -5,7 +5,7 @@ VERSION="$(git describe --tags --abbrev=0)"
 
 # build widget
 ARCHIVE="awesome-widgets"
-FILES="AUTHORS CHANGELOG COPYING packages patches sources"
+FILES="AUTHORS CHANGELOG COPYING packages patches"
 IGNORELIST="build usr .kdev4 *.kdev4 .idea packages/*src.tar.xz"
 # create archive
 [[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"

diff --git a/sources/awesome-widget/plugin/CMakeLists.txt b/sources/awesome-widget/plugin/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMA
 file(GLOB SUBPROJECT_UI *.ui)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
-qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
+qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI} OPTIONS --translate ui_i18n)
 add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER})
 target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
 

diff --git a/sources/awesomewidgets/CMakeLists.txt b/sources/awesomewidgets/CMakeLists.txt
@@ -28,7 +28,7 @@ file(RELATIVE_PATH SUBPROJECT_WEATHER_JSON ${CMAKE_SOURCE_DIR} ${SUBPROJECT_WEAT
 # prepare
 configure_file(${SUBPROJECT_WEATHER_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON})
 
-qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
+qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI} OPTIONS --translate ui_i18n)
 add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER})
 target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
 

diff --git a/sources/awesomewidgets/abstractextitem.h b/sources/awesomewidgets/abstractextitem.h
@@ -86,8 +86,6 @@ public slots:
     QCronScheduler *m_scheduler = nullptr;
     QString m_filePath = "";
     int m_times = 0;
-    // FIXME find a better way to do it
-    virtual void translate(void *_ui) = 0;
     // properties
     int m_apiVersion = 0;
     bool m_active = true;

diff --git a/sources/awesomewidgets/awdatetimeformatter.cpp b/sources/awesomewidgets/awdatetimeformatter.cpp
@@ -18,8 +18,6 @@
 #include "awdatetimeformatter.h"
 #include "ui_awdatetimeformatter.h"
 
-#include <KI18n/KLocalizedString>
-
 #include <QDateTime>
 #include <QSettings>
 
@@ -110,7 +108,6 @@ int AWDateTimeFormatter::showConfiguration(QWidget *_parent, const QVariant &_ar
     auto dialog = new QDialog(_parent);
     auto ui = new Ui::AWDateTimeFormatter();
     ui->setupUi(dialog);
-    translate(ui);
 
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
@@ -157,14 +154,3 @@ void AWDateTimeFormatter::initLocale()
 {
     m_locale = m_translate ? QLocale::system() : QLocale::c();
 }
-
-void AWDateTimeFormatter::translate(void *_ui)
-{
-    auto ui = reinterpret_cast<Ui::AWDateTimeFormatter *>(_ui);
-
-    ui->label_name->setText(i18n("Name"));
-    ui->label_comment->setText(i18n("Comment"));
-    ui->label_type->setText(i18n("Type"));
-    ui->label_format->setText(i18n("Format"));
-    ui->checkBox_translate->setText(i18n("Translate strings"));
-}
diff --git a/sources/awesomewidgets/awdatetimeformatter.h b/sources/awesomewidgets/awdatetimeformatter.h
@@ -20,6 +20,7 @@
 #include <QLocale>
 
 #include "awabstractformatter.h"
+#include "awtranslation.h"
 
 
 class AWDateTimeFormatter : public AWAbstractFormatter
@@ -45,7 +46,6 @@ public slots:
 
 private:
     void initLocale();
-    void translate(void *_ui) override;
     // properties
     QLocale m_locale;
     QString m_format = "";

diff --git a/sources/awesomewidgets/awfloatformatter.cpp b/sources/awesomewidgets/awfloatformatter.cpp
@@ -18,8 +18,6 @@
 #include "awfloatformatter.h"
 #include "ui_awfloatformatter.h"
 
-#include <KI18n/KLocalizedString>
-
 #include <QSettings>
 
 #include "awdebug.h"
@@ -198,7 +196,6 @@ int AWFloatFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
     auto dialog = new QDialog(_parent);
     auto ui = new Ui::AWFloatFormatter();
     ui->setupUi(dialog);
-    translate(ui);
 
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
@@ -254,20 +251,3 @@ void AWFloatFormatter::writeConfiguration() const
 
     settings.sync();
 }
-
-
-void AWFloatFormatter::translate(void *_ui)
-{
-    auto ui = reinterpret_cast<Ui::AWFloatFormatter *>(_ui);
-
-    ui->label_name->setText(i18n("Name"));
-    ui->label_comment->setText(i18n("Comment"));
-    ui->label_type->setText(i18n("Type"));
-    ui->label_format->setText(i18n("Format"));
-    ui->label_precision->setText(i18n("Precision"));
-    ui->label_width->setText(i18n("Width"));
-    ui->label_fill->setText(i18n("Fill char"));
-    ui->checkBox_forceWidth->setText(i18n("Force width"));
-    ui->label_multiplier->setText(i18n("Multiplier"));
-    ui->label_summand->setText(i18n("Summand"));
-}
diff --git a/sources/awesomewidgets/awfloatformatter.h b/sources/awesomewidgets/awfloatformatter.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "awabstractformatter.h"
+#include "awtranslation.h"
 
 
 class AWFloatFormatter : public AWAbstractFormatter
@@ -57,7 +58,6 @@ public slots:
     void writeConfiguration() const override;
 
 private:
-    void translate(void *_ui) override;
     // properties
     int m_count = 0;
     QChar m_fillChar = QChar();

diff --git a/sources/awesomewidgets/awjsonformatter.cpp b/sources/awesomewidgets/awjsonformatter.cpp
@@ -18,8 +18,6 @@
 #include "awjsonformatter.h"
 #include "ui_awjsonformatter.h"
 
-#include <KI18n/KLocalizedString>
-
 #include <QJsonDocument>
 #include <QSettings>
 
@@ -108,7 +106,6 @@ int AWJsonFormatter::showConfiguration(QWidget *_parent, const QVariant &args)
     auto dialog = new QDialog(_parent);
     auto ui = new Ui::AWJsonFormatter();
     ui->setupUi(dialog);
-    translate(ui);
 
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
@@ -177,14 +174,3 @@ QVariant AWJsonFormatter::getFromMap(const QVariant &_value, const QString &_key
 
     return _value.toMap()[_key];
 }
-
-
-void AWJsonFormatter::translate(void *_ui)
-{
-    auto ui = reinterpret_cast<Ui::AWJsonFormatter *>(_ui);
-
-    ui->label_name->setText(i18n("Name"));
-    ui->label_comment->setText(i18n("Comment"));
-    ui->label_type->setText(i18n("Type"));
-    ui->label_path->setText(i18n("Path"));
-}
diff --git a/sources/awesomewidgets/awjsonformatter.h b/sources/awesomewidgets/awjsonformatter.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "awabstractformatter.h"
+#include "awtranslation.h"
 
 
 class AWJsonFormatter : public AWAbstractFormatter
@@ -42,7 +43,6 @@ public slots:
     static QVariant getFromJson(const QVariant &_value, const QVariant &_element);
     static QVariant getFromList(const QVariant &_value, int _index);
     static QVariant getFromMap(const QVariant &_value, const QString &_key);
-    void translate(void *_ui) override;
     // properties
     QVariantList m_path;
 };
diff --git a/sources/awesomewidgets/awlistformatter.cpp b/sources/awesomewidgets/awlistformatter.cpp
@@ -18,8 +18,6 @@
 #include "awlistformatter.h"
 #include "ui_awlistformatter.h"
 
-#include <KI18n/KLocalizedString>
-
 #include <QSettings>
 
 #include "awdebug.h"
@@ -129,7 +127,6 @@ int AWListFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
     auto dialog = new QDialog(_parent);
     auto ui = new Ui::AWListFormatter();
     ui->setupUi(dialog);
-    translate(ui);
 
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
@@ -173,16 +170,3 @@ void AWListFormatter::writeConfiguration() const
 
     settings.sync();
 }
-
-
-void AWListFormatter::translate(void *_ui)
-{
-    auto ui = reinterpret_cast<Ui::AWListFormatter *>(_ui);
-
-    ui->label_name->setText(i18n("Name"));
-    ui->label_comment->setText(i18n("Comment"));
-    ui->label_type->setText(i18n("Type"));
-    ui->label_filter->setText(i18n("Filter"));
-    ui->label_separator->setText(i18n("Separator"));
-    ui->checkBox_sorted->setText(i18n("Sort"));
-}
diff --git a/sources/awesomewidgets/awlistformatter.h b/sources/awesomewidgets/awlistformatter.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "awabstractformatter.h"
+#include "awtranslation.h"
 
 
 class AWListFormatter : public AWAbstractFormatter
@@ -45,7 +46,6 @@ public slots:
     void writeConfiguration() const override;
 
 private:
-    void translate(void *_ui) override;
     // properties
     QString m_filter = "";
     QString m_separator = "";

diff --git a/sources/awesomewidgets/awnoformatter.cpp b/sources/awesomewidgets/awnoformatter.cpp
@@ -18,8 +18,6 @@
 #include "awnoformatter.h"
 #include "ui_awnoformatter.h"
 
-#include <KI18n/KLocalizedString>
-
 #include "awdebug.h"
 
 
@@ -61,7 +59,6 @@ int AWNoFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
     auto dialog = new QDialog(_parent);
     auto ui = new Ui::AWNoFormatter();
     ui->setupUi(dialog);
-    translate(ui);
 
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
@@ -82,13 +79,3 @@ int AWNoFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
 
     return ret;
 }
-
-
-void AWNoFormatter::translate(void *_ui)
-{
-    auto ui = reinterpret_cast<Ui::AWNoFormatter *>(_ui);
-
-    ui->label_name->setText(i18n("Name"));
-    ui->label_comment->setText(i18n("Comment"));
-    ui->label_type->setText(i18n("Type"));
-}
diff --git a/sources/awesomewidgets/awnoformatter.h b/sources/awesomewidgets/awnoformatter.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "awabstractformatter.h"
+#include "awtranslation.h"
 
 
 class AWNoFormatter : public AWAbstractFormatter
@@ -31,7 +32,4 @@ class AWNoFormatter : public AWAbstractFormatter
 
 public slots:
     int showConfiguration(QWidget *_parent, const QVariant &_args) override;
-
-private:
-    void translate(void *_ui) override;
 };
diff --git a/sources/awesomewidgets/awscriptformatter.cpp b/sources/awesomewidgets/awscriptformatter.cpp
@@ -18,8 +18,6 @@
 #include "awscriptformatter.h"
 #include "ui_awscriptformatter.h"
 
-#include <KI18n/KLocalizedString>
-
 #include <QJSEngine>
 #include <QSettings>
 
@@ -145,7 +143,6 @@ int AWScriptFormatter::showConfiguration(QWidget *_parent, const QVariant &_args
     auto dialog = new QDialog(_parent);
     auto ui = new Ui::AWScriptFormatter();
     ui->setupUi(dialog);
-    translate(ui);
 
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
@@ -154,7 +151,7 @@ int AWScriptFormatter::showConfiguration(QWidget *_parent, const QVariant &_args
     ui->checkBox_hasReturn->setCheckState(hasReturn() ? Qt::Checked : Qt::Unchecked);
     ui->textEdit_code->setPlainText(code());
 
-    int ret = dialog->exec();
+    auto ret = dialog->exec();
     if (ret == 1) {
         setName(ui->lineEdit_name->text());
         setComment(ui->lineEdit_comment->text());
@@ -202,16 +199,3 @@ void AWScriptFormatter::initProgram()
 
     qCInfo(LOG_LIB) << "Create JS engine with code" << m_program;
 }
-
-
-void AWScriptFormatter::translate(void *_ui)
-{
-    auto ui = reinterpret_cast<Ui::AWScriptFormatter *>(_ui);
-
-    ui->label_name->setText(i18n("Name"));
-    ui->label_comment->setText(i18n("Comment"));
-    ui->label_type->setText(i18n("Type"));
-    ui->checkBox_appendCode->setText(i18n("Append code"));
-    ui->checkBox_hasReturn->setText(i18n("Has return"));
-    ui->label_code->setText(i18n("Code"));
-}
diff --git a/sources/awesomewidgets/awscriptformatter.h b/sources/awesomewidgets/awscriptformatter.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "awabstractformatter.h"
+#include "awtranslation.h"
 
 
 class AWScriptFormatter : public AWAbstractFormatter
@@ -48,7 +49,6 @@ public slots:
 
 private:
     void initProgram();
-    void translate(void *_ui) override;
     // properties
     bool m_appendCode = true;
     QString m_code = "";

diff --git a/sources/awesomewidgets/awstringformatter.cpp b/sources/awesomewidgets/awstringformatter.cpp
@@ -18,8 +18,6 @@
 #include "awstringformatter.h"
 #include "ui_awstringformatter.h"
 
-#include <KI18n/KLocalizedString>
-
 #include <QSettings>
 
 #include "awdebug.h"
@@ -128,7 +126,6 @@ int AWStringFormatter::showConfiguration(QWidget *_parent, const QVariant &_args
     auto dialog = new QDialog(_parent);
     auto ui = new Ui::AWStringFormatter();
     ui->setupUi(dialog);
-    translate(ui);
 
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
@@ -172,16 +169,3 @@ void AWStringFormatter::writeConfiguration() const
 
     settings.sync();
 }
-
-
-void AWStringFormatter::translate(void *_ui)
-{
-    auto ui = reinterpret_cast<Ui::AWStringFormatter *>(_ui);
-
-    ui->label_name->setText(i18n("Name"));
-    ui->label_comment->setText(i18n("Comment"));
-    ui->label_type->setText(i18n("Type"));
-    ui->label_width->setText(i18n("Width"));
-    ui->label_fill->setText(i18n("Fill char"));
-    ui->checkBox_forceWidth->setText(i18n("Force width"));
-}
diff --git a/sources/awesomewidgets/awstringformatter.h b/sources/awesomewidgets/awstringformatter.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "awabstractformatter.h"
+#include "awtranslation.h"
 
 
 class AWStringFormatter : public AWAbstractFormatter
@@ -45,7 +46,6 @@ public slots:
     void writeConfiguration() const override;
 
 private:
-    void translate(void *_ui) override;
     // properties
     int m_count = 0;
     QChar m_fillChar = QChar();