merge(代码合并):合并主线代码，更新upstream

ukui · Sep 20, 2023 · c051d72 · c051d72
2 parents 31a64fc + 520bd25
commit c051d72
Show file tree

Hide file tree

Showing 197 changed files with 11,439 additions and 4,326 deletions.
diff --git a/kylin-nm.pro b/kylin-nm.pro
@@ -2,24 +2,12 @@ TEMPLATE = subdirs
 
 CONFIG += \
         ordered \
-        qt
+        qt \
 
 SUBDIRS = \
         plugins/plugin.pro \
         src-vpn/src-vpn.pro \
-        src
+        src \
+        sys-dbus-register \
 
-TRANSLATIONS += \
-        translations/kylin-nm_zh_CN.ts \
-        translations/kylin-nm_tr.ts \
-        translations/kylin-nm_bo.ts \
-        translations/kylin-nm_bo_CN.ts
-
-CONFIG(release, debug|release) {
-    !system($$PWD/translate_generation.sh): error("Failed to generate translation")
-}
-
-qm_files.path = $${PREFIX}/share/kylin-nm/kylin-nm/
-qm_files.files = translations/*.qm
-
-INSTALLS += qm_files \
+QT += widgets
diff --git a/plugins/component/AddBtn/addnetbtn.cpp b/plugins/component/AddBtn/addnetbtn.cpp
@@ -79,17 +79,16 @@ void AddNetBtn::leaveEvent(QEvent *event){
 
 void AddNetBtn::paintEvent(QPaintEvent *event)
 {
-//    QPalette pal = qApp->palette();
-
     QPainter painter(this);
     painter.setRenderHint(QPainter:: Antialiasing, true);  //设置渲染,启动反锯齿
     painter.setPen(Qt::NoPen);
     painter.setBrush(this->palette().base().color());
 
-//    QColor color = pal.color(QPalette::Button);
-//    color.setAlphaF(0.5);
-//    pal.setColor(QPalette::Button, color);
-//    this->setPalette(pal);
+    QPalette pal = qApp->palette();
+    QColor color = pal.color(QPalette::Button);
+    color.setAlphaF(0.5);
+    pal.setColor(QPalette::Button, color);
+    this->setPalette(pal);
 
     QRect rect = this->rect();
     QPainterPath path;

diff --git a/plugins/component/InfoButton/infobutton.cpp b/plugins/component/InfoButton/infobutton.cpp
@@ -22,7 +22,6 @@
 #include <QPainter>
 #include <QApplication>
 #include <QDebug>
-#include <QPainterPath>
 
 #define BUTTON_SIZE 36,36
 #define ICON_SIZE 16,16

diff --git a/plugins/mobilehotspot/mobilehotspot.pro b/plugins/mobilehotspot/mobilehotspot.pro
@@ -4,6 +4,11 @@ CONFIG += plugin
 
 TARGET = $$qtLibraryTarget(mobilehotspot)
 DESTDIR = ../..
+
+CONFIG(release, debug|release) {
+    !system($$PWD/translate_generation.sh): error("Failed to generate translation")
+}
+
 target.path = $$[QT_INSTALL_LIBS]/ukui-control-center
 trans.files = translations/*
 trans.path = /usr/share/kylin-nm/mobilehotspot/
@@ -50,4 +55,5 @@ TRANSLATIONS += \
         translations/tr.ts \
         translations/bo.ts\
         translations/bo_CN.ts \
-        translations/en_US.ts
+        translations/en_US.ts \
+        translations/mn.ts