From d64e8d1ebb74abf8527de683c3bde64ebf071bf5 Mon Sep 17 00:00:00 2001
From: Mentalflow <312902918@qq.com>
Date: Mon, 19 May 2025 17:13:34 +0800
Subject: [PATCH] include and i18n: Remove duplicate registrations and update
translation.
---
lib_source/i18n/RibbonUI_en_US.ts | 28 ++++++++++++++++---------
lib_source/i18n/RibbonUI_zh_CN.ts | 28 ++++++++++++++++---------
lib_source/include/platformsupport.h | 1 -
lib_source/include/ribbonlocalization.h | 1 -
lib_source/include/ribbontheme.h | 1 -
lib_source/include/ribbonui.h | 2 +-
6 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/lib_source/i18n/RibbonUI_en_US.ts b/lib_source/i18n/RibbonUI_en_US.ts
index 3bea03c..f39d297 100644
--- a/lib_source/i18n/RibbonUI_en_US.ts
+++ b/lib_source/i18n/RibbonUI_en_US.ts
@@ -29,25 +29,25 @@
-
+
Close
-
+
Minimize
-
+
Restore
-
+
Maximize
@@ -114,6 +114,14 @@
RibbonMessageBarGroup
+
+
+
+
+
+ 's
+
+
@@ -194,7 +202,7 @@
-
+
RibbonTabBar: Error loading component:
@@ -344,31 +352,31 @@
RibbonWindow
-
+
Quit
-
+
Minimize
-
+
Cancel
-
+
Do you want to close this window?
-
+
Please note
diff --git a/lib_source/i18n/RibbonUI_zh_CN.ts b/lib_source/i18n/RibbonUI_zh_CN.ts
index 5b14fc2..2b922b2 100644
--- a/lib_source/i18n/RibbonUI_zh_CN.ts
+++ b/lib_source/i18n/RibbonUI_zh_CN.ts
@@ -29,25 +29,25 @@
-
+
Close
关闭
-
+
Minimize
最小化
-
+
Restore
还原
-
+
Maximize
最大化
@@ -114,6 +114,14 @@
RibbonMessageBarGroup
+
+
+
+
+
+ 's
+ 的
+
@@ -194,7 +202,7 @@
-
+
RibbonTabBar: Error loading component:
RibbonTabBar：加载组件失败：
@@ -345,31 +353,31 @@
RibbonWindow
-
+
Quit
退出
-
+
Minimize
最小化
-
+
Cancel
取消
-
+
Do you want to close this window?
需要关闭窗口吗？
-
+
Please note
请注意
diff --git a/lib_source/include/platformsupport.h b/lib_source/include/platformsupport.h
index c86e940..cf8c22e 100644
--- a/lib_source/include/platformsupport.h
+++ b/lib_source/include/platformsupport.h
@@ -9,7 +9,6 @@ class PlatformSupport : public QObject
Q_OBJECT
QML_ELEMENT
QML_SINGLETON
- QML_NAMED_ELEMENT(PlatformSupport)
public:
static PlatformSupport* create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return instance();}
static PlatformSupport* instance(){
diff --git a/lib_source/include/ribbonlocalization.h b/lib_source/include/ribbonlocalization.h
index 94e0025..2e34d90 100644
--- a/lib_source/include/ribbonlocalization.h
+++ b/lib_source/include/ribbonlocalization.h
@@ -10,7 +10,6 @@ class RibbonLocalization : public QQuickItem
Q_OBJECT
QML_ELEMENT
QML_SINGLETON
- QML_NAMED_ELEMENT(RibbonLocalization)
Q_PROPERTY(QString currentLanguage READ currentLanguage WRITE setCurrentLanguage NOTIFY currentLanguageChanged FINAL)
public:
typedef QPair LangItem; // example: <"zh_CN", "qrc://i18n/xxx_zh_CN.qm">
diff --git a/lib_source/include/ribbontheme.h b/lib_source/include/ribbontheme.h
index 6bdae6b..98328f4 100644
--- a/lib_source/include/ribbontheme.h
+++ b/lib_source/include/ribbontheme.h
@@ -9,7 +9,6 @@ class RibbonTheme : public QQuickItem
Q_OBJECT
QML_ELEMENT
QML_SINGLETON
- QML_NAMED_ELEMENT(RibbonTheme)
Q_PROPERTY(bool isDarkMode READ isDarkMode NOTIFY isDarkModeChanged FINAL)
Q_PROPERTY_RW(RibbonThemeType::ThemeMode,themeMode)
diff --git a/lib_source/include/ribbonui.h b/lib_source/include/ribbonui.h
index 099f039..ec123e3 100644
--- a/lib_source/include/ribbonui.h
+++ b/lib_source/include/ribbonui.h
@@ -10,7 +10,7 @@ class RibbonUI : public QQuickItem
Q_OBJECT
QML_ELEMENT
QML_SINGLETON
- QML_NAMED_ELEMENT(RibbonUI)
+
Q_PROPERTY_R(QString, version)
Q_PROPERTY_R(int, qtVersion)
Q_PROPERTY_R(int, isWin11)