chore: 同步tablet分支代码

data/org.ukui.control-center.gschema.xml

@@ -6,9 +6,30 @@
       <description>Control panel default font list</description>
     </key>
     <key name="autoapp-list" type="as">
-	    <default> ['kylin-weather.desktop', 'sogouImeService.desktop']</default>
+      <default> ['kylin-weather.desktop', 'sogouImeService.desktop']</default>
       <summary>Control panel autoapp list</summary>
       <description>Control panel autoapp list</description>
     </key>
+    <key name="enabled" type="b">
+      <default>false</default>
+      <summary>Whether open</summary>
+      <description>
+        This key is used to record whether to open service.
+      </description>
+    </key>
+    <key name="vino-enabled" type="b">
+      <default>false</default>
+      <summary>Whether vino service activice</summary>
+      <description>
+        This key is used to record whether open vino service.
+      </description>
+    </key>
+    <key name="xrdp-enabled" type="b">
+      <default>false</default>
+      <summary>Whether xrdp service activice</summary>
+      <description>
+        This key is used to record whether open xrdp service.
+      </description>
+    </key>
   </schema>
 </schemalist>

debian/changelog

@@ -1,3 +1,12 @@
+ukui-control-center (3.22.1.25-ok16) yangtze; urgency=medium
+
+  * bug#无
+  * 需求：无
+  * 任务：重新编译代码，解决编译问题
+  * 其他改动：无
+
+ -- zhoubin <zhoubin@kylinos.cn>  Sat, 13 May 2023 15:53:27 +0800
+
 ukui-control-center (3.22.1.25-ok15) yangtze; urgency=medium
 
   * bug#I6YPX8 【X】【控制面板】打印机界面点击添加无反应

libukcc/interface/common.cpp

@@ -294,25 +294,25 @@ bool Common::buriedSettings(QString pluginName, QString settingsName, QString ac
 #ifdef SP2
     // 埋点数据
     char appName[] = "ukui-control-center";
-    QString message;
+    QByteArray actiontr = action.toLocal8Bit();  // toLocal8Bit 支持中文
-    if (settingsName != nullptr) {
+    char *messageType = actiontr.data();
-        message = pluginName + "/" + settingsName;
-    } else {
-        message = pluginName;
-    }
-    QByteArray ba = message.toLatin1();
-    char *messageType = ba.data();
-    KBuriedPoint pt[2];
-    pt[0].key = "action";
-    std::string str = action.toStdString();
-    pt[0].value = str.c_str();
 
-    pt[1].key = "value";
+    KBuriedPoint pt[3];
+    pt[0].key = "pluginName";
+    std::string pluginStr = pluginName.toStdString();
+    pt[0].value = pluginStr.c_str();
+
+    pt[1].key = "settingsName";
+    std::string settingStr = settingsName.toStdString();
+    pt[1].value = settingStr.c_str();
+
+    pt[2].key = "value";
     std::string valueStr = value.toStdString();
-    pt[1].value = valueStr.c_str();
+    pt[2].value = valueStr.c_str();
 
-    if (kdk_buried_point(appName , messageType , pt , 2)) {
+    if (kdk_buried_point(appName , messageType , pt , 3) == -1) {
-        qDebug() << __FUNCTION__ << "messageType:" << message << "action:" << action << "value:" << value << "buried point fail !" << __LINE__;
+        qDebug() << __FUNCTION__ << "messageType:" << action << "pluginName:" << pluginName
+                 << "settingsName:" << settingsName << "value:" << value << "buried point fail !" << __LINE__;
         return false;
     }
 #endif

libukcc/widgets/SettingWidget/addbutton.cpp

@@ -16,6 +16,7 @@ AddButton::AddButton(QWidget *parent, UkccFrame::BorderRadiusStyle style, bool h
 {
     this->setObjectName("AddButton");
     this->setProperty("useButtonPalette", true);
+    this->setProperty("needTranslucent", true);
     this->setFlat(true);
 
     QHBoxLayout *addLyt = new QHBoxLayout;

plugins/account/userinfo/changeusergroup.cpp

@@ -366,6 +366,7 @@ void changeUserGroup::loadAllGroup()
     connect(allUserGroupTableView,&QTableView::clicked,this,[=](const QModelIndex &index){
         bool idSetEnable = true;
         currentRow = index.row();
+        Common::buriedSettings(QString("Userinfo"), this->windowTitle(), QString("clicked"), groupList->at(currentRow)->groupname);
 
         if (setTextDynamic(mUserGroupLineEdit, groupList->at(currentRow)->groupname)) {
             mUserGroupLineEdit->setToolTip(groupList->at(currentRow)->groupname);

plugins/account/userinfo/creategroupdialog.cpp

@@ -51,7 +51,7 @@ void CreateGroupDialog::initUI()
     this->setFixedSize(480, 214);
     setAttribute(Qt::WA_DeleteOnClose);
 
-    mGroupNameLabel = new QLabel(tr("Name"), this);
+    mGroupNameLabel = new FixLabel(tr("Name"), this);
     mGroupNameLabel->setFixedSize(62, 36);
     mGroupNameEdit = new QLineEdit(this);
     mGroupNameEdit->installEventFilter(this);
@@ -75,7 +75,7 @@ void CreateGroupDialog::initUI()
     mGroupNameTipHLayout->addStretch();
     mGroupNameTipHLayout->addWidget(mGroupNameTipLabel);
 
-    mGroupIdLabel = new QLabel(tr("Id"), this);
+    mGroupIdLabel = new FixLabel(tr("Id"), this);
     mGroupIdLabel->setFixedSize(62, 36);
     mGroupIdEdit = new QLineEdit(this);
     mGroupIdEdit->setFixedSize(370, 36);
@@ -90,7 +90,7 @@ void CreateGroupDialog::initUI()
     mCancelBtn->setFixedSize(96, 36);
     mCancelBtn->setFocusPolicy(Qt::FocusPolicy::NoFocus);
     mConfirmBtn = new QPushButton(tr("Confirm"), this);
-    mConfirmBtn->setFixedSize(96, 36);
+    mConfirmBtn->setMinimumSize(96, 36);
 
     mConfirmHLaout = new QHBoxLayout(this);
     mConfirmHLaout->setContentsMargins(0,0,0,0);

plugins/account/userinfo/userinfo.cpp

@@ -254,7 +254,7 @@ void UserInfo::initUI(){
     currentFrame->insertWidget(2, autoLoginFrame);
 
     //其他用户区域
-    addUserBtn = new AddBtn;
+    addUserBtn = new AddButton(pluginWidget2);
     addUserBtn->setObjectName("addUser");
 
     addUserHorLayout = new QHBoxLayout();
@@ -830,7 +830,7 @@ void UserInfo::setUserConnect(){
 
     });
 
-    connect(addUserBtn, &AddBtn::clicked, [=]{
+    connect(addUserBtn, &AddButton::clicked, [=]{
         Common::buriedSettings(name(), addUserBtn->objectName(), QString("settings"));
 
         showCreateUserNewDialog();
@@ -1112,11 +1112,6 @@ void UserInfo::_acquireAllUsersInfo(){
         ui->currentUserFrame->setVisible(false);
         ui->autoLoginFrame->setVisible(false);
     } else {
-        if (allUserInfoMap.size() > 1) {
-            addUserBtn->setBtnStyle(AddBtn::Bottom);
-        } else {
-            addUserBtn->setBtnStyle(AddBtn::Box);
-        }
         ui->currentUserFrame->setVisible(true);
         ui->autoLoginFrame->setVisible(true);
     }

plugins/account/userinfo/userinfo.h

@@ -44,6 +44,7 @@
 #include "settinggroup.h"
 #include "titlelabel.h"
 #include "addbtn.h"
+#include "addbutton.h"
 
 #include "qtdbus/systemdbusdispatcher.h"
 #include "qtdbus/userdispatcher.h"
@@ -130,7 +131,7 @@ public:
     bool isEnable() const Q_DECL_OVERRIDE;
 
 public:
-    AddBtn * addUserBtn;
+    AddButton *addUserBtn;
 
     TitleLabel * currentLabel;
     TitleLabel * othersLabel;

plugins/account/userinfo/userinfo.pro

@@ -26,9 +26,8 @@ target.path = $${PLUGIN_INSTALL_DIRS}
 INCLUDEPATH   +=  \
                  $$PROJECT_ROOTDIR \
 
-LIBS          += -L$$[QT_INSTALL_LIBS] -lcrypt -lpolkit-qt5-core-1 -lpam -lkysec   -lpwquality -lkylin_chkname
+LIBS          += -L$$[QT_INSTALL_LIBS] -lcrypt -lpolkit-qt5-core-1 -lpam -lpwquality -lkylin_chkname
 DEFINES += ENABLEPQ
-DEFINES += WITHKYSEC
 
 ##加载gio库和gio-unix库
 CONFIG        += link_pkgconfig \

plugins/application/autoboot/autoboot.cpp

@@ -195,7 +195,7 @@ void AutoBoot::initAutoUI()
     mAutoWidget->getAutobootWidget()->addWidget(mAutoWidget->getAddWidget());
     mAutobootDBus->call("setApplist", mAutoAppList);
     connect(checkSignalMapper, SIGNAL(mapped(QString)), this, SLOT(checkboxChangedSlot(QString)));
-    connect(mAutoWidget->getAddBtn(), &AddBtn::clicked, this, &AutoBoot::addAppSlot);
+    connect(mAutoWidget->getAddBtn(), &AddButton::clicked, this, &AutoBoot::addAppSlot);
 }
 
 void AutoBoot::initItem(AutoApp &it)

plugins/application/autoboot/autoboot.h

@@ -27,7 +27,6 @@
 #include "common.h"
 #include "titlelabel.h"
 #include "hoverwidget.h"
-#include "addbtn.h"
 #include "switchwidget.h"
 #include "settinggroup.h"
 #include "ukccframe.h"

plugins/application/autoboot/autobootui.cpp

@@ -13,7 +13,7 @@ void AutoBootUi::initUi()
     vLyt->setContentsMargins(0, 0, 0, 0);
 
     TitleLabel *mTitleLabel = new TitleLabel(this);
-    //~ contents_path /autoboot/Autoboot Settings
+    //~ contents_path /Autoboot/Autoboot Settings
     mTitleLabel->setText(tr("Autoboot Settings"));
 
     mAutobootWidget = new SettingGroup(this);
@@ -22,9 +22,8 @@ void AutoBootUi::initUi()
     mAddWidget->setLineWidth(0);
     QHBoxLayout *Lyt = new QHBoxLayout(mAddWidget);
     Lyt->setContentsMargins(0, 0, 0, 0);
-    mAddBtn = new AddBtn(mAddWidget);
+    mAddBtn = new AddButton(mAddWidget);
     //~ contents_path /autoboot/Add
-    mAddBtn->setBtnStyle(AddBtn::Bottom);
     Lyt->addWidget(mAddBtn);
 
     vLyt->addWidget(mTitleLabel);

plugins/application/autoboot/autobootui.h

@@ -6,7 +6,7 @@
 
 #include "titlelabel.h"
 #include "hoverwidget.h"
-#include "addbtn.h"
+#include "addbutton.h"
 #include "switchwidget.h"
 #include "settinggroup.h"
 #include "ukccframe.h"
@@ -29,7 +29,7 @@ public:
         return mAddWidget;
     }
 
-    AddBtn *getAddBtn()
+    AddButton *getAddBtn()
     {
         return mAddBtn;
     }
@@ -37,7 +37,7 @@ public:
 private:
     SettingGroup *mAutobootWidget = nullptr;
     UkccFrame *mAddWidget = nullptr;
-    AddBtn *mAddBtn = nullptr;
+    AddButton *mAddBtn = nullptr;
 
 };
 

plugins/devices/keyboard/keyboardui.cpp

@@ -55,6 +55,7 @@ void KeyboardUi::setDelayFrame()
     /* delay */
     //~ contents_path /Keyboard/Delay
     mDelayFrame = new SliderWidget(tr("Delay"), false, this);
+    mDelayFrame->slider()->setSliderType(KSliderType::StepSlider);
     mDelayFrame->setObjectName("Delay");
     mDelayFrame->setLeftText(tr("Short"));
     mDelayFrame->setRightText(tr("Long"));

plugins/devices/printer/printer.cpp

@@ -157,9 +157,9 @@ void Printer::initComponent()
     QHBoxLayout *hLyt = new QHBoxLayout(mAddWidget);
     hLyt->setContentsMargins(0, 0, 0, 0);
     //~ contents_path /Printer/Add
-    AddBtn *addBtn = new AddBtn(pluginWidget);
+    AddButton *addBtn = new AddButton(pluginWidget);
     hLyt->addWidget(addBtn);
-    connect(addBtn, &AddBtn::clicked, this, &Printer::runExternalApp);
+    connect(addBtn, &AddButton::clicked, this, &Printer::runExternalApp);
 
 }
 

plugins/devices/printer/printer.h

@@ -32,10 +32,10 @@
 #include "hoverbtn.h"
 #include "titlelabel.h"
 #include "fixlabel.h"
-#include "addbtn.h"
 #include "settinggroup.h"
 #include "ukccframe.h"
 #include "printerbtn.h"
+#include "addbutton.h"
 
 
 namespace Ui {

plugins/devices/shortcut/addshortcutdialog.ui

@@ -359,7 +359,7 @@
        </property>
        <property name="maximumSize">
         <size>
-         <width>96</width>
+         <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>

plugins/devices/shortcut/shortcut.cpp

@@ -178,7 +178,6 @@ void Shortcut::connectUiSignals()
         connect(addDialog, &AddShortcutDialog::shortcutInfoSignal,
                 [=](QString path, QString name, QString exec, QString key){
             createNewShortcut(path, name, exec, key, true, true);
-            Common::buriedSettings(this->name(), QString("createNewShortcut"), QString("settings"), key);
             shortcutInterface->call("updateShortcut");
         });
         Common::buriedSettings(this->name(), QString("AddBtn"), QString("clicked"));
@@ -234,6 +233,9 @@ void Shortcut::createNewShortcut(QString path, QString name, QString exec, QStri
     } else {
         availablepath = path; // 更新快捷键
 
+        if (convertFlag) {
+            Common::buriedSettings(name, exec, QString("settings"), key);
+        }
         // 更新数据
         for (int i = 0; i < customEntryList.count(); i++) {
             if (customEntryList[i].gsPath == availablepath) {

plugins/devices/shortcut/shortcutui.cpp

@@ -274,7 +274,8 @@ void ShortcutUi::addCustomShortcut(KeyEntry keyEntry, KeyEntryList *systemEntryL
     return;
 }
 
-QString ShortcutUi::getShowShortcutString(QString src) {
+QString ShortcutUi::getShowShortcutString(QString src)
+{
     src.replace("<","");
     src.replace(">","   ");
     src.replace(" or ",tr(" or "));
@@ -284,7 +285,7 @@ QString ShortcutUi::getShowShortcutString(QString src) {
         str += temp_list.at(i)
                     .left(1).toUpper() +
                     temp_list.at(i)
-                    .mid(1, temp_list.at(i).length() - 1).toLower();
+                    .mid(1, temp_list.at(i).length() - 1);
         str += " ";
     }
     str.replace("Or","or");

plugins/personalized/fonts/fonts.cpp

@@ -146,6 +146,7 @@ void Fonts::setupConnect(){
     connectToServer();
     connect(mSlider, &KSlider::valueChanged, [=](int value){
         float size = sliderConvertToSize(value);
+        Common::buriedSettings(name(), ui->fontSizeLabel->text(), QString("settings"), QString::number(size, 'f', 1));
         // 获取当前字体信息
         getCurrentFontInfo();
 
@@ -160,6 +161,7 @@ void Fonts::setupConnect(){
     connect(ui->fontSelectComBox, &QComboBox::currentTextChanged, [=](QString text){
         // 获取当前字体信息
         getCurrentFontInfo();
+        Common::buriedSettings(name(), ui->fontSelectLabel->text(), QString("select"), text);
         ifsettings->set(GTK_FONT_KEY, QVariant(QString("%1 %2").arg(text).arg(gtkfontStrList.at(1))));
         ifsettings->set(DOC_FONT_KEY, QVariant(QString("%1 %2").arg(text).arg(docfontStrList.at(1))));        
         stylesettings->set(SYSTEM_NAME_KEY, QVariant(QString("%1").arg(text)));
@@ -169,6 +171,7 @@ void Fonts::setupConnect(){
     connect(ui->monoSelectComBox, &QComboBox::currentTextChanged, [=](QString text){
         // 获取当前字体信息
         QVariant monoName = QVariant(QString("%1 %2").arg(text).arg(monospacefontStrList.at(1)));
+        Common::buriedSettings(name(), ui->monoSelectLabel->text(), QString("select"), monoName.toString());
         getCurrentFontInfo();
         ifsettings->set(MONOSPACE_FONT_KEY, monoName);
         mGnomeSettings->set(MONOSPACE_FONT_KEY, monoName);

plugins/personalized/fonts/fonts.h

@@ -33,6 +33,7 @@
 #include <kslider.h>
 
 #include "shell/interface.h"
+#include "common.h"
 
 using namespace kdk;
 

plugins/personalized/wallpaper/colordialog.cpp

@@ -86,8 +86,7 @@ void ColorDialog::paintEvent(QPaintEvent *event)
 void ColorDialog::setupInit()
 {
     qDebug() << "setup init";
-    ui->cancelBtn->setProperty("useButtonPalette", true);
+    ui->label->setText(tr("Choose a custom color"));
-    ui->okBtn->setProperty("useButtonPalette", true);
     // 窗口属性
     setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);//开启窗口无边框
     setAttribute(Qt::WA_TranslucentBackground);

plugins/personalized/wallpaper/colordialog.ui

@@ -83,7 +83,7 @@
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>选择自定义颜色</string>
+         <string>Choose a custom color</string>
         </property>
        </widget>
       </item>

plugins/system/about/aboutui.cpp

@@ -371,8 +371,10 @@ void AboutUi::initSearchText()
     mDesktopLabel_1->setText(tr("Desktop"));
     //~ contents_path /About/User
     mUsernameLabel_1->setText(tr("User"));
-     //~ contents_path /About/Status
+    //~ contents_path /About/Status
     mStatusLabel_1->setText(tr("Status"));
+    //~ contents_path /About/Active
+    mActivationBtn->setText(tr("Active"));
     mSequenceLabel_1->setText(tr("Serial"));
 }
 

plugins/system/display/brightnessFrame.cpp

@@ -103,7 +103,8 @@ void BrightnessFrame::setTextLabelName(QString text)
 
 void BrightnessFrame::setTextLabelValue(QString text)
 {
-    this->labelValue->setText(text);
+    qDebug() << Q_FUNC_INFO << text;
+    this->labelValue->setText(text + "%");
 }
 
 void BrightnessFrame::runConnectThread(const bool &openFlag)

plugins/system/display/controlpanel.cpp

@@ -58,8 +58,7 @@ void ControlPanel::addOutput(const KScreen::OutputPtr &output, bool connectChang
                     this, &ControlPanel::slotOutputConnectedChanged);
     }
 
-    if (!output->isConnected())
+    if (!output->isConnected() || (output->size() == QSize(-1, -1))) return;
-        return;
 
     OutputConfig *outputCfg = new OutputConfig(this);
     outputCfg->setVisible(false);

plugins/system/display/getBrightnessThread.cpp

@@ -39,8 +39,9 @@ void GetBrightnessThread::run()
         }
         reply = ukccIfc.call("getDisplayBrightness", this->edidHash, this->i2cBus);
         if (reply.isValid() && reply.value() >= 0 && reply.value() <= 100) {
-           Q_EMIT getBrightnessFinished(reply.value());
+            qDebug() << Q_FUNC_INFO << "the ddc brightness is: " << reply.value() << this->edidHash << this->i2cBus;
-           return;
+            Q_EMIT getBrightnessFinished(reply.value());
+            return;
         }
         times--;
         msleep(100);

plugins/system/display_hw/brightnessFrame.cpp

@@ -39,5 +39,5 @@ void BrightnessFrame::setTextLableName(QString text)
 
 void BrightnessFrame::setTextLableValue(QString text)
 {
-    this->labelValue->setText(text);
+    this->labelValue->setText(text + "%");
 }

plugins/system/vino/vino.cpp

@@ -47,6 +47,10 @@ QWidget *Vino::pluginUi()
     if (mFirstLoad) {
         mFirstLoad = false;
         mVinoWidget = new VinoUi;
+        mServiceDbus = new QDBusInterface("com.control.center.qt.systemdbus",
+                                         "/",
+                                         "com.control.center.interface",
+                                         QDBusConnection::systemBus(), this);
         mVinoDBus = new QDBusInterface("org.ukui.ukcc.session",
                                         "/Vino",
                                         "org.ukui.ukcc.session.Vino",
@@ -55,6 +59,7 @@ QWidget *Vino::pluginUi()
             qCritical() << "org.ukui.ukcc.session.Vino DBus error:" << mVinoDBus->lastError();
         } else {
             initStatus();
+            initServiceStatus();
             initConnection();
         }
     }
@@ -102,7 +107,51 @@ void Vino::setVinoService(bool status)
     }
 }
 
-void Vino::enableSlot(bool status)
+void Vino::enabledSlot(bool status)
+{
+    if (status) {
+        mVinoDBus->call("setVinoKey", kEnableKey, true);
+        if (isExsitXrdp) {
+            if (mServiceDbus->isValid()) {
+                mVinoWidget->getXrdpEnableWidget()->setChecked(mVinoDBus->property("isXrdp").toBool());
+                setXrdpService(mVinoDBus->property("isXrdp").toBool());
+            }
+            mVinoWidget->getXrdpEnableWidget()->setVisible(true);
+        }
+        mVinoWidget->getVinoEnableWidget()->setChecked(mVinoDBus->property("isVino").toBool());
+        vinoEnableSlot(mVinoDBus->property("isVino").toBool());
+        mVinoWidget->getVinoFrame()->setVisible(true);
+    } else {
+        mVinoDBus->call("setVinoKey", kEnableKey, false);
+        if (isExsitXrdp) {
+            mVinoDBus->call("setVinoKey", kXrdpEnableKey, mVinoWidget->getXrdpEnableWidget()->isChecked());
+            mVinoWidget->getXrdpEnableWidget()->hide();
+            if (mServiceDbus->isValid()) {
+                setXrdpService(false);
+            }
+            mVinoWidget->getXrdpEnableWidget()->blockSignals(true);
+            mVinoWidget->getXrdpEnableWidget()->setChecked(false);
+            mVinoWidget->getXrdpEnableWidget()->blockSignals(false);
+        }
+        mVinoDBus->call("setVinoKey", kVinoEnableKey, mVinoWidget->getVinoEnableWidget()->isChecked());
+        vinoEnableSlot(false);
+        mVinoWidget->getVinoFrame()->setVisible(false);
+    }
+}
+
+void Vino::xrdpEnabledSlot(bool status)
+{
+    mVinoDBus->call("setVinoKey", kXrdpEnableKey, status);
+    if (isExsitXrdp) {
+        if (mServiceDbus->isValid()) {
+            setXrdpService(status);
+        }
+    } else {
+        mVinoWidget->getXrdpEnableWidget()->setVisible(false);
+    }
+
+}
+void Vino::vinoEnableSlot(bool status)
 {
     mVinoWidget->setFrameVisible(status);
     setVinoService(status);
@@ -121,15 +170,22 @@ void Vino::accessSlot(bool status)
 void Vino::pwdEnableSlot(bool status)
 {
     if (status) {
-        mVinoWidget->getPwdinputBtn()->setVisible(mVinoDBus->property("password").toString() == "keyring" ? false:true);
+        mVinoWidget->getPwdLabel()->setVisible(secpwd == "keyring" ? false:true);
-        mVinoWidget->getPwdinputBtn()->setText(QByteArray::fromBase64(mVinoDBus->property("password").toString().toLatin1()));
+        if (mVinoWidget->getPwdLabel()->isVisible()) {
-        pwdInputSlot();
+            mVinoWidget->getPwdLabel()->setText(QByteArray::fromBase64(mVinoDBus->property("password").toString().toLatin1()));
-        mVinoWidget->getPwdinputBtn()->setVisible(status);
+            mVinoDBus->call("setVinoKey", kAuthenticationKey, "vnc");
-        if (mVinoDBus->property("method").toString() == "none") {
+        } else {
-            mVinoWidget->getSecurityPwdWidget()->setChecked(false);
+            pwdInputSlot();
+            if (mVinoDBus->property("method").toString() == "none") {
+                mVinoWidget->getSecurityPwdWidget()->setChecked(false);
+            }
         }
+
+        mVinoWidget->getPwdLabel()->setVisible(mVinoWidget->getSecurityPwdWidget()->isChecked());
+        mVinoWidget->getPwdinputBtn()->setVisible(secpwd == "keyring" ? false:true);
+
     } else {
-        mVinoWidget->getPwdinputBtn()->setVisible(false);
+        mVinoWidget->getPwdLabel()->setVisible(false);
         mVinoDBus->call("setVinoKey", kAuthenticationKey, "none");
     }
 }
@@ -138,14 +194,24 @@ void Vino::pwdInputSlot()
 {
     InputPwdDialog *dialog = new InputPwdDialog(mVinoWidget);
     dialog->exec();
-    mVinoWidget->getPwdinputBtn()->setText(QByteArray::fromBase64(mVinoDBus->property("password").toString().toLatin1()));
+    mVinoWidget->getPwdLabel()->setText(QByteArray::fromBase64(mVinoDBus->property("password").toString().toLatin1()));
 }
 
 void Vino::initConnection()
 {
     connect(mVinoWidget->getEnableWidget(), &SwitchWidget::stateChanged, this, [=](bool status) {
+        Common::buriedSettings(QStringLiteral("Vino"), mVinoWidget->getEnableWidget()->objectName(), QString("settings"), status ? "true" : "false");
+        enabledSlot(status);
+    });
+
+    connect(mVinoWidget->getXrdpEnableWidget(), &SwitchWidget::stateChanged, this, [=](bool status) {
+        Common::buriedSettings(QStringLiteral("Vino"), mVinoWidget->getXrdpEnableWidget()->objectName(), QString("settings"), status ? "true" : "false");
+        xrdpEnabledSlot(status);
+    });
+
+    connect(mVinoWidget->getVinoEnableWidget(), &SwitchWidget::stateChanged, this, [=](bool status) {
         Common::buriedSettings(QStringLiteral("Vino"), "whether allow others to connect to your desktop remotely", QString("settings"), status ? "true" : "false");
-        enableSlot(status);
+        vinoEnableSlot(status);
     });
     connect(mVinoWidget->getViewWidget(), &SwitchWidget::stateChanged, this, [=](bool status) {
         Common::buriedSettings(QStringLiteral("Vino"), "whether allow others to control your desktop remotely", QString("settings"), status ? "true" : "false");
@@ -171,24 +237,80 @@ void Vino::initStatus()
     bool isPrompt = mVinoDBus->property("isPrompt").toBool();
 
     QString pwd = mVinoDBus->property("method").toString();
-    QString secpwd = mVinoDBus->property("password").toString();
+    secpwd = mVinoDBus->property("password").toString();
+    mVinoWidget->getPwdinputBtn()->setVisible(secpwd == "keyring" ? false:true);
 
     mVinoWidget->getSecurityWidget()->setChecked(isPrompt);
     mVinoWidget->getViewWidget()->setChecked(!isShared);
     if (pwd == "vnc") {
         if (secpwd == "keyring") {
             mVinoWidget->getSecurityPwdWidget()->setChecked(false);
-            mVinoWidget->getPwdinputBtn()->hide();
+            mVinoWidget->getPwdLabel()->hide();
             mVinoDBus->call("setVinoKey", kAuthenticationKey, "none");
         } else {
             mVinoWidget->getSecurityPwdWidget()->setChecked(true);
-            mVinoWidget->getPwdinputBtn()->setText(QByteArray::fromBase64(secpwd.toLatin1()));
+            mVinoWidget->getPwdLabel()->setText(QByteArray::fromBase64(secpwd.toLatin1()));
         }
     } else {
         mVinoWidget->getSecurityPwdWidget()->setChecked(false);
-        mVinoWidget->getPwdinputBtn()->setVisible(false);
+        mVinoWidget->getPwdLabel()->setVisible(false);
     }
 
     mVinoWidget->setFrameVisible(mVinoDBus->property("isActive").toBool());
 }
 
+void Vino::initServiceStatus()
+{
+    bool isEnabled = mVinoDBus->property("isEnable").toBool();
+    if (isEnabled) {
+        mVinoWidget->getEnableWidget()->setChecked(true);
+        XrdpServiceStatus xrdpstatus = getXrdpServiceStatus();
+        switch (xrdpstatus) {
+        case NONE:
+            mVinoWidget->getXrdpEnableWidget()->hide();
+            isExsitXrdp = false;
+            break;
+        case RUNNING:
+            mVinoWidget->getXrdpEnableWidget()->setChecked(true);
+            break;
+        case INACTIVE:
+            mVinoWidget->getXrdpEnableWidget()->setChecked(false);
+            break;
+        }
+    } else {
+        mVinoWidget->getEnableWidget()->setChecked(false);
+        mVinoWidget->getXrdpEnableWidget()->hide();
+        mVinoWidget->getVinoFrame()->hide();
+    }
+}
+
+XrdpServiceStatus Vino::getXrdpServiceStatus()
+{
+    QProcess process;
+    QString cmd = "systemctl status xrdp.service | grep Active:";
+    process.start("bash", QStringList() <<"-c" << cmd);
+    process.waitForFinished();
+    QString strResult = process.readAllStandardOutput()+process.readAllStandardError();
+    if (strResult.isEmpty()) {
+        return NONE;
+    }
+    cmd = "systemctl is-failed xrdp.service";
+    process.start("bash", QStringList() <<"-c" << cmd);
+    process.waitForFinished();
+    strResult = process.readAllStandardOutput()+process.readAllStandardError();
+    if ((strResult.replace("\n", "") == "active"))
+        return RUNNING;
+    else
+        return INACTIVE;
+
+}
+
+void Vino::setXrdpService(bool status)
+{
+    QTimer::singleShot(1, this, [=]() {
+        QtConcurrent::run([=]() {
+            mServiceDbus->call("setXrdpService", status);
+        });
+
+    });
+}

plugins/system/vino/vino.h

@@ -23,9 +23,15 @@
 #include <QWidget>
 #include <QSharedPointer>
 #include <QStringLiteral>
+#include <QtConcurrent>
 #include "vinoui.h"
 #include "shell/interface.h"
 
+enum XrdpServiceStatus {
+    RUNNING,
+    INACTIVE,
+    NONE
+};
 class Vino : public QObject, CommonInterface
 {
     Q_OBJECT
@@ -46,6 +52,7 @@ public:
 
     void initConnection();
     void initStatus();
+    void initServiceStatus();
 
 private:
     VinoUi *mVinoWidget;
@@ -53,14 +60,21 @@ private:
     int pluginType;
     bool mFirstLoad;
 
+    bool isExsitXrdp = true;
+    QString secpwd;
     QDBusInterface *mVinoDBus;
+    QDBusInterface *mServiceDbus;
 
 private:
     bool isExistVino() const;
     void setVinoService(bool status);
+    XrdpServiceStatus getXrdpServiceStatus();
+    void setXrdpService(bool status);
 
 private slots:
-    void enableSlot(bool status);
+    void enabledSlot(bool status);
+    void xrdpEnabledSlot(bool status);
+    void vinoEnableSlot(bool status);
     void viewBoxSlot(bool status);
     void accessSlot(bool status);
     void pwdEnableSlot(bool status);

plugins/system/vino/vino.pro

@@ -3,7 +3,7 @@ include($$PROJECT_ROOTDIR/libukcc/widgets/Label/label.pri)
 include($$PROJECT_ROOTDIR/libukcc/widgets/SettingWidget/settingwidget.pri)
 include($$PROJECT_ROOTDIR/libukcc/interface.pri)
 
-QT       += widgets
+QT       += widgets concurrent
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets dbus
 

plugins/system/vino/vinoui.cpp

@@ -10,34 +10,44 @@ void VinoUi::initUi()
     QVBoxLayout *vLyt = new QVBoxLayout(this);
     vLyt->setContentsMargins(0, 0, 0, 0);
 
-    SettingGroup *mVinoFrame = new SettingGroup;
+    mVinoFrame = new SettingGroup;
     mVinoTitleLabel = new TitleLabel(this);
     mVinoTitleLabel->setText(tr("Remote Desktop"));
 
-    mEnableWidget = new SwitchWidget(tr("Allow others to view your desktop"));
+    mEnableWidget = new SwitchWidget(tr("Connect to your desktop remotely"),this);
+    mEnableWidget->setObjectName("Connect to your desktop remotely");
+    //~ contents_path /Vino/Allow others to connect to your desktop remotely using RDP
+    mXrdpEnableWidget = new SwitchWidget(tr("Allow others to connect to your desktop remotely using RDP"), this);
+    mXrdpEnableWidget->setObjectName("Allow others to connect to your desktop remotely using RDP");
+    //~ contents_path /Vino/Allow others to connect to your desktop remotely using VNC
+    mVinoEnableWidget = new SwitchWidget(tr("Allow others to connect to your desktop remotely using VNC"), this);
+    mVinoEnableWidget->setObjectName("Allow others to connect to your desktop remotely using VNC");
     //~ contents_path /Vino/Allow connection to control screen
     mViewWidget = new SwitchWidget(tr("Allow connection to control screen"));
     //~ contents_path /Vino/You must confirm every visit for this machine
     mSecurityWidget = new SwitchWidget(tr("You must confirm every visit for this machine"));
     //~ contents_path /Vino/Require user to enter this password:
     mSecurityPwdWidget = new SwitchWidget(tr("Require user to enter this password: "));
-    mPwdinputBtn = new QPushButton(this);
+    mPwdstrLabel = new QLabel(this);
-    mSecurityPwdWidget->insertWidget(1, mPwdinputBtn);
+    mPwdinputBtn = new QPushButton(tr("Edit"), this);
+    mSecurityPwdWidget->insertWidget(1, mPwdstrLabel);
+    mSecurityPwdWidget->insertWidget(3, mPwdinputBtn);
 
-
+    mVinoFrame->addWidget(mVinoEnableWidget);
-    mVinoFrame->addWidget(mEnableWidget);
     mVinoFrame->addWidget(mViewWidget);
     mVinoFrame->addWidget(mSecurityWidget);
     mVinoFrame->addWidget(mSecurityPwdWidget);
 
     vLyt->addWidget(mVinoTitleLabel);
+    vLyt->addWidget(mEnableWidget);
+    vLyt->addWidget(mXrdpEnableWidget);
     vLyt->addWidget(mVinoFrame);
     vLyt->addStretch();
 }
 
 void VinoUi::setFrameVisible(bool visible)
 {
-    mEnableWidget->setChecked(visible);
+    mVinoEnableWidget->setChecked(visible);
     mViewWidget->setVisible(visible);
     mSecurityWidget->setVisible(visible);
     mSecurityPwdWidget->setVisible(visible);

plugins/system/vino/vinoui.h

@@ -19,6 +19,9 @@
 #include "ukccframe.h"
 
 const QByteArray kVinoSchemas = "org.gnome.Vino";
+const QString kEnableKey =  "enabled";
+const QString kXrdpEnableKey = "xrdp-enabled";
+const QString kVinoEnableKey = "vino-enabled";
 const QString kVinoViewOnlyKey = "view-only";
 const QString kVinoPromptKey = "prompt-enabled";
 const QString kAuthenticationKey = "authentication-methods";
@@ -37,20 +40,28 @@ public:
     void setFrameVisible(bool visible);
 
     SwitchWidget *getEnableWidget() {return mEnableWidget;}
+    SwitchWidget *getXrdpEnableWidget() {return mXrdpEnableWidget;}
+    SettingGroup *getVinoFrame() {return mVinoFrame;}
+    SwitchWidget *getVinoEnableWidget() {return mVinoEnableWidget;}
     SwitchWidget *getViewWidget() {return mViewWidget;}
     SwitchWidget *getSecurityWidget() {return mSecurityWidget;}
     SwitchWidget *getSecurityPwdWidget() {return mSecurityPwdWidget;}
 
+    QLabel *getPwdLabel() {return mPwdstrLabel;}
     QPushButton *getPwdinputBtn() {return mPwdinputBtn;}
 
 private:
-    SwitchWidget *mEnableWidget;
+    SwitchWidget *mEnableWidget;     // 允许其他人查看桌面
-    SwitchWidget *mViewWidget;
+    SwitchWidget *mXrdpEnableWidget; // 允许其他人使用rdp远程连接
-    SwitchWidget *mSecurityWidget;
+    SettingGroup *mVinoFrame;
-    SwitchWidget *mSecurityPwdWidget;
+    SwitchWidget *mVinoEnableWidget; // 允许其他人使用vnc远程连接
+    SwitchWidget *mViewWidget;       // 允许连接控制屏幕
+    SwitchWidget *mSecurityWidget;   // 为本机确认每次访问
+    SwitchWidget *mSecurityPwdWidget;// 要求用户输入密码
 
     TitleLabel *mVinoTitleLabel;
 
+    QLabel *mPwdstrLabel;
     QPushButton *mPwdinputBtn;
 };
 

plugins/time-language/datetime/timelabel.cpp

@@ -64,7 +64,7 @@ void TimeLabel::setTimeText()
     if ("cn" == areaInterface->property("dateFormat").toString()) {
         dateString = datetime.toString("yyyy/MM/dd ddd").replace("周", "星期");
     } else {
-        dateString = datetime.toString("yyyy-MM-dd ddd");
+        dateString = datetime.toString("yyyy-MM-dd ddd").replace("周", "星期");
     }
     if (dateString != date) {
         date = dateString;

registeredQDbus/sysdbusregister.cpp

@@ -1143,3 +1143,12 @@ QString SysdbusRegister::getSysInstallTime(const QString &part)
     }
     return QString();
 }
+
+void SysdbusRegister::setXrdpService(bool status)
+{
+    QString cmd = QString("systemctl %1 xrdp.service").arg(status ? "start" : "stop");
+    system(cmd.toUtf8().data());
+    return;
+}
+
+

registeredQDbus/sysdbusregister.h

@@ -178,6 +178,8 @@ public slots:
     // 获取系统安装时间
     Q_SCRIPTABLE QString getSysInstallTime(const QString &part);
 
+    //设置xrdp服务
+    Q_SCRIPTABLE void setXrdpService(bool status);
 };
 
 #endif // SYSDBUSREGISTER_H

registeredSession/main.cpp

@@ -19,6 +19,7 @@
 #include "plugins/screenlock/screenlockinterface.h"
 #include "plugins/shortcut/shortcutinterface.h"
 #include "plugins/screensaver/screensaverinterface.h"
+#include "plugins/vino/vinointerface.h"
 
 void registerPlugins(const QString &path, QObject *object, QDBusConnection &connection) {
     if (!connection.registerObject(path, object, QDBusConnection::ExportAllSlots |
@@ -66,6 +67,7 @@ int main(int argc, char *argv[])
     plugins["/Screenlock"] = new ScreenlockInterface;
     plugins["/Shortcut"] = new ShortcutInterface;
     plugins["/Screensaver"] = new ScreensaverInterface;
+    plugins["/Vino"] = new VinoInterface;
 
     for (std::map<QString, QObject*>::value_type plugin : plugins)
         registerPlugins(plugin.first, plugin.second, sessionBus);

registeredSession/plugins/vino/vinointerface.cpp

@@ -5,11 +5,15 @@
 VinoInterface::VinoInterface()
 {
     mVinoGsettings = UniversalInterface::self()->gnomeVinoGsettings();
+    mUkuiVinoGsettings = UniversalInterface::self()->ukuiVinoGsettings();
 
     mGsettingMap[kVinoViewOnlyKey] = QString("viewOnly");
     mGsettingMap[kVinoPromptKey] = QString("promptEnabled");
     mGsettingMap[kAuthenticationKey] = QString("authenticationMethods");
     mGsettingMap[kVncPwdKey] = QString("vncPassword");
+    mGsettingMap[kVinoEnableKey] = QString("vinoEnabled");
+    mGsettingMap[kXrdpEnableKey] = QString("xrdpEnabled");
+    mGsettingMap[kEnableKey] = QString("enabled");
 }
 
 bool VinoInterface::getViewOnly()
@@ -59,7 +63,36 @@ bool VinoInterface::getVinoServerStatus()
     process.waitForFinished();
     bool isActive = process.readAllStandardOutput().replace("\n", "") == "active";
     return isActive;
+}
 
+bool VinoInterface::getVinoStatus()
+{
+    if (mUkuiVinoGsettings->keys().contains("vinoEnabled")) {
+        return mUkuiVinoGsettings->get(kVinoEnableKey).toBool();
+    } else {
+        qCritical() << "mUkuiVinoGsettings not contains the key: " << kVinoEnableKey;
+    }
+    return false;
+}
+
+bool VinoInterface::getXrdpStatus()
+{
+    if (mUkuiVinoGsettings->keys().contains("xrdpEnabled")) {
+        return mUkuiVinoGsettings->get(kXrdpEnableKey).toBool();
+    } else {
+        qCritical() << "mUkuiVinoGsettings not contains the key: " << kXrdpEnableKey;
+    }
+    return false;
+}
+
+bool VinoInterface::getEnableStatus()
+{
+    if (mUkuiVinoGsettings->keys().contains("enabled")) {
+        return mUkuiVinoGsettings->get(kEnableKey).toBool();
+    } else {
+        qCritical() << "mUkuiVinoGsettings not contains the key: " << kEnableKey;
+    }
+    return false;
 }
 
 void VinoInterface::setVinoKey(const QString &key, bool value)
@@ -67,7 +100,13 @@ void VinoInterface::setVinoKey(const QString &key, bool value)
     if (mVinoGsettings->keys().contains(mGsettingMap[key])) {
         return mVinoGsettings->set(key, value);
     } else {
-        qCritical() << "ukuiNoticeGsettings not contains the key: " << key;
+        qCritical() << "mVinoGsettings not contains the key: " << key;
+    }
+
+    if (mUkuiVinoGsettings->keys().contains(mGsettingMap[key])) {
+        return mUkuiVinoGsettings->set(key, value);
+    } else {
+        qCritical() << "mUkuiVinoGsettings not contains the key: " << key;
     }
 }
 

registeredSession/plugins/vino/vinointerface.h

@@ -17,6 +17,9 @@ class VinoInterface : public QObject
     Q_PROPERTY(QString method READ getMethod)
     Q_PROPERTY(QString password READ getPassword)
     Q_PROPERTY(bool isActive READ getVinoServerStatus)
+    Q_PROPERTY(bool isVino READ getVinoStatus)
+    Q_PROPERTY(bool isXrdp READ getXrdpStatus)
+    Q_PROPERTY(bool isEnable READ getEnableStatus)
 
 public:
     VinoInterface();
@@ -27,6 +30,9 @@ protected:
     QString getMethod();
     QString getPassword();
     bool getVinoServerStatus();
+    bool getVinoStatus();
+    bool getXrdpStatus();
+    bool getEnableStatus();
 
 public Q_SLOTS:
     void setVinoKey(const QString &key, bool value);
@@ -34,14 +40,17 @@ public Q_SLOTS:
     void setVinoKey(const QString &key, QByteArray value);
 
 private:
+    const QString kEnableKey =  "enabled";
+    const QString kXrdpEnableKey = "xrdp-enabled";
+    const QString kVinoEnableKey = "vino-enabled";
     const QString kVinoViewOnlyKey = "view-only";
     const QString kVinoPromptKey = "prompt-enabled";
     const QString kAuthenticationKey = "authentication-methods";
     const QString kVncPwdKey = "vnc-password";
 
-    QGSettings *mVinoGsettings = nullptr;
+    QGSettings *mVinoGsettings     = nullptr;
+    QGSettings *mUkuiVinoGsettings = nullptr;
     QMap <QString, QString> mGsettingMap;
-
 };
 
 #endif // VINOINTERFACE_H

registeredSession/universalinterface.cpp

@@ -164,6 +164,18 @@ QGSettings *UniversalInterface::gnomeVinoGsettings()
     return mGnomeVinoGsettings;
 }
 
+QGSettings *UniversalInterface::ukuiVinoGsettings()
+{
+    if (!mUkuiVinoGsettings) {
+        const QByteArray id(UKUI_VINO_ID);
+        if (QGSettings::isSchemaInstalled(id)) {
+            mUkuiVinoGsettings = new QGSettings(id, QByteArray());
+        }
+    }
+    return mUkuiVinoGsettings;
+}
+
+
 QGSettings *UniversalInterface::ukccNoticeGsettings()
 {
     if (!mUkccNoticeGsettings) {

registeredSession/universalinterface.h

@@ -99,6 +99,13 @@ public:
      * @return QGSettings
      */
     QGSettings *gnomeVinoGsettings();
+
+    /**
+     * @brief 获取org.ukui.control-center的gsetting
+     *
+     * @return QGSettings
+     */
+    QGSettings *ukuiVinoGsettings();
     /**
      * @brief 获取com.control.center.qt.systemdbus的dbus
      *
@@ -138,6 +145,7 @@ private:
     const QByteArray UKCC_NOTICE_ID    = QByteArray("org.ukui.control-center.notice");
     const QByteArray UKUI_NOTICE_ID    = QByteArray("org.ukui.notification.demo");
     const QByteArray GNOME_VINO_ID     = QByteArray("org.gnome.Vino");
+    const QByteArray UKUI_VINO_ID      = QByteArray("org.ukui.control-center");
 
 private:
     QGSettings         *mBackgroundGsettings         = nullptr;
@@ -153,6 +161,7 @@ private:
     QGSettings         *mUkccNoticeGsettings         = nullptr;
     QGSettings         *mUkuiNoticeGsettings         = nullptr;
     QGSettings         *mGnomeVinoGsettings          = nullptr;
+    QGSettings         *mUkuiVinoGsettings           = nullptr;
     QDBusInterface     *mUkccSystemDbus              = nullptr;
     QGSettings         *mScreensaverGsettings        = nullptr;
     QGSettings         *mScreensaverDefaultGsettings = nullptr;

shell/homepagewidget.cpp

@@ -279,7 +279,7 @@ void HomePageWidget::initUI() {
                 if (moduleMap.keys().contains(tmpStruct.namei18nString)) {
                     if (mModuleMap.isEmpty() || !mModuleMap.contains(tmpStruct.nameString.toLower()) || mModuleMap[tmpStruct.nameString.toLower()].toBool()) {
                         firstFunc = tmpStruct.namei18nString;
-                        Common::buriedSettings(tmpStruct.nameString, nullptr, "clicked");
+                        Common::buriedSettings(tmpStruct.nameString, nullptr, "home clicked");
                         //跳转
                         pmainWindow->functionBtnClicked(moduleMap.value(firstFunc));
                         break;

shell/mainwindow.cpp

@@ -360,7 +360,7 @@ void MainWindow::initUI() {
     //top left return button
     connect(backBtn, &QPushButton::clicked, this, [=]{
         ui->stackedWidget->setCurrentIndex(0);
-        Utils::buriedSettings(backBtn->objectName(), nullptr, QString("clicked"));
+        Common::buriedSettings(backBtn->objectName(), nullptr, QString("clicked"));
     });
 
     // 快捷参数
@@ -420,7 +420,7 @@ void MainWindow::initTileBar() {
     titleLayout = new QHBoxLayout(ui->titleWidget);
     ui->titleWidget->setLayout(titleLayout);
     ui->titleWidget->setObjectName("titleWidget");
-    titleLayout->setContentsMargins(8, 2, 5, 2);
+    titleLayout->setContentsMargins(8, 2, 4, 2);
     titleLayout->setSpacing(0);
     m_searchWidget = new SearchWidget(this);
     m_searchWidget->setContextMenuPolicy(Qt::NoContextMenu);
@@ -821,7 +821,7 @@ void MainWindow::initLeftsideBar()
             modulepageWidget->refreshPluginWidget(pluginInstance);
 
             // 埋点点击左侧导航插件
-            Common::buriedSettings(pluginInstance->name(), nullptr, QString("clicked"));
+            Common::buriedSettings(pluginInstance->name(), nullptr, QString("left clicked"));
         }
 
     });
@@ -1096,7 +1096,7 @@ QMap<QString, QObject *> MainWindow::exportModule(int type) {
 void MainWindow::pluginBtnClicked(QObject *plugin) {
 
     CommonInterface * pluginInstance = qobject_cast<CommonInterface *>(plugin);
-    Common::buriedSettings(pluginInstance->name(), nullptr, "clicked");
+    Common::buriedSettings(pluginInstance->name(), nullptr, "home clicked");
 
     functionBtnClicked(plugin);
 }

shell/res/i18n/bo_CN.ts

@@ -386,7 +386,13 @@
         <extra-contents_path>/About/Status</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/aboutui.cpp" line="376"/>
+        <location filename="../../../plugins/system/about/aboutui.cpp" line="377"/>
+        <source>Active</source>
+        <translation>འཁྲུག་ཆ་དོད་པོ་</translation>
+        <extra-contents_path>/About/Active</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/about/aboutui.cpp" line="378"/>
         <source>Serial</source>
         <translation>གོ་རིམ་ལྟར་ན།</translation>
     </message>
@@ -453,7 +459,7 @@
 <context>
     <name>AddButton</name>
     <message>
-        <location filename="../../../libukcc/widgets/SettingWidget/addbutton.cpp" line="24"/>
+        <location filename="../../../libukcc/widgets/SettingWidget/addbutton.cpp" line="25"/>
         <source>Add</source>
         <translation>ཁ་སྣོན་བརྒྱབ་པ།</translation>
     </message>
@@ -926,7 +932,7 @@
         <location filename="../../../plugins/application/autoboot/autobootui.cpp" line="17"/>
         <source>Autoboot Settings</source>
         <translation>རང་འགུལ་གྱིས་སྒྲིག་བཀོད་སྒྲིག་བྱེད་པ།</translation>
-        <extra-contents_path>/autoboot/Autoboot Settings</extra-contents_path>
+        <extra-contents_path>/Autoboot/Autoboot Settings</extra-contents_path>
     </message>
 </context>
 <context>
@@ -1745,9 +1751,14 @@ you can restore them to ensure the integrity of your system.</source>
         <translation>གླེང་མོལ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="86"/>
         <source>选择自定义颜色</source>
-        <translation>选择自定义颜色</translation>
+        <translation type="vanished">选择自定义颜色</translation>
+    </message>
+    <message>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="86"/>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="89"/>
+        <source>Choose a custom color</source>
+        <translation>བདམས་པའི་མཚན་ཉིད་ཁ་མདོག</translation>
     </message>
     <message>
         <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="254"/>
@@ -1770,7 +1781,7 @@ you can restore them to ensure the integrity of your system.</source>
         <translation>འགྲིགས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="95"/>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="94"/>
         <source>Custom color</source>
         <translation>གོམས་སྲོལ་གྱི་ཁ་དོག</translation>
     </message>
@@ -3117,45 +3128,45 @@ change system settings</source>
         <extra-contents_path>/Keyboard/Delay</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="59"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="60"/>
         <source>Short</source>
         <translation>མདོར་ན།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="60"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="61"/>
         <source>Long</source>
         <translation>རིང་བ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="72"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="73"/>
         <source>Speed</source>
         <translation>མྱུར་ཚད།</translation>
         <extra-contents_path>/Keyboard/Speed</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="74"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="75"/>
         <source>Slow</source>
         <translation>དལ་མོ།དལ་མོ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="75"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="76"/>
         <source>Fast</source>
         <translation>མགྱོགས་མྱུར།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="86"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="87"/>
         <source>Input test</source>
         <translation>ནང་འཇུག་ཚོད་ལྟ།</translation>
         <extra-contents_path>/Keyboard/Input test</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="94"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="95"/>
         <source>Key tips</source>
         <translation>འགག་རྩའི་མན་ངག</translation>
         <extra-contents_path>/Keyboard/Key tips</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="103"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="104"/>
         <source>Input settings</source>
         <translation>ནང་འཇུག་གི་སྒྲིག་བཀོད།</translation>
         <extra-contents_path>/Keyboard/Input settings</extra-contents_path>
@@ -3225,81 +3236,80 @@ change system settings</source>
         <translation type="vanished">རྒྱུན་ལྡན་གྱི་གནས་</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="217"/>
+        <location filename="../../mainwindow.cpp" line="203"/>
-        <location filename="../../mainwindow.cpp" line="533"/>
+        <location filename="../../mainwindow.cpp" line="460"/>
         <source>Maximize</source>
         <translation>ཚད་གཞི་མཐོ་ཤོས་ཀྱི་སྒོ་ནས</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="456"/>
+        <location filename="../../mainwindow.cpp" line="417"/>
-        <location filename="../../mainwindow.cpp" line="511"/>
+        <location filename="../../mainwindow.cpp" line="438"/>
-        <location filename="../../mainwindow.cpp" line="659"/>
+        <location filename="../../mainwindow.cpp" line="575"/>
-        <location filename="../../mainwindow.cpp" line="1107"/>
+        <location filename="../../mainwindow.cpp" line="1022"/>
         <source>Settings</source>
         <translation>སྒྲིག་བཀོད།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="491"/>
         <source>Search</source>
-        <translation>འཚོལ་ཞིབ།</translation>
+        <translation type="vanished">འཚོལ་ཞིབ།</translation>
     </message>
     <message>
         <source>Main menu</source>
         <translation type="vanished">ཟས་ཐོ་གཙོ་བོ།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="214"/>
+        <location filename="../../mainwindow.cpp" line="200"/>
         <source>Restore</source>
         <translation>སླར་གསོ་བྱེད་པ།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="531"/>
+        <location filename="../../mainwindow.cpp" line="458"/>
         <source>Option</source>
         <translation>འདེམས་ཚན་</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="532"/>
+        <location filename="../../mainwindow.cpp" line="459"/>
         <source>Minimize</source>
         <translation>ཉུང་དུ་གཏོང་གང་ཐུབ་བྱ་དགོས།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="534"/>
+        <location filename="../../mainwindow.cpp" line="461"/>
         <source>Close</source>
         <translation>སྒོ་རྒྱག་པ།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="647"/>
+        <location filename="../../mainwindow.cpp" line="563"/>
         <source>Help</source>
         <translation>རོགས་རམ་བྱེད་པ།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="649"/>
+        <location filename="../../mainwindow.cpp" line="565"/>
         <source>About</source>
         <translation>འབྲེལ་ཡོད་ཀྱི་སྐོར།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="651"/>
+        <location filename="../../mainwindow.cpp" line="567"/>
         <source>Exit</source>
         <translation>ཕྱིར་འཐེན་བྱེད་པ།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="660"/>
+        <location filename="../../mainwindow.cpp" line="576"/>
         <source>Version: </source>
         <translation>པར་གཞི་འདི་ལྟ་སྟེ།：</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="795"/>
+        <location filename="../../mainwindow.cpp" line="711"/>
         <source>Specified</source>
         <translation>གཏན་འབེབས་བྱས་པ།</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="1271"/>
+        <location filename="../../mainwindow.cpp" line="1166"/>
         <source>Warning</source>
         <translation>ཐ་ཚིག་སྒྲོག་པ།</translation>
     </message>
     <message>
         <location filename="../../mainwindow.cpp" line="182"/>
-        <location filename="../../mainwindow.cpp" line="1271"/>
+        <location filename="../../mainwindow.cpp" line="1166"/>
         <source>This function has been controlled</source>
         <translation>འགན་ནུས་འདི་ཚོད་འཛིན་བྱས་ཟིན།</translation>
     </message>
@@ -4524,7 +4534,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
         <translation type="vanished">ཟླ་བ་བཅུ་གཉིས་</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1212"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1207"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="320"/>
         <source>min length %1
 </source>
@@ -4532,7 +4542,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 </translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1222"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1217"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="330"/>
         <source>min digit num %1
 </source>
@@ -4540,7 +4550,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 </translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1231"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1226"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="339"/>
         <source>min upper num %1
 </source>
@@ -4548,7 +4558,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 </translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1240"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1235"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="348"/>
         <source>min lower num %1
 </source>
@@ -4556,7 +4566,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 </translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1249"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1244"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="357"/>
         <source>min other num %1
 </source>
@@ -4564,7 +4574,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 </translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1259"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1254"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="367"/>
         <source>min char class %1
 </source>
@@ -4572,7 +4582,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 </translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1268"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1263"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="376"/>
         <source>max repeat %1
 </source>
@@ -4580,7 +4590,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 </translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1277"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1272"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="385"/>
         <source>max class repeat %1
 </source>
@@ -4588,7 +4598,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 </translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1286"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1281"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="394"/>
         <source>max sequence %1
 </source>
@@ -4606,7 +4616,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
         <translation>ཝུའུ་ཁི་ལན་གྱི་ཚོད་འཛིན་ལྟེ་གནས་ནི་དབང་པོ་སྐྱོན་ཅན་ཡིན།</translation>
     </message>
     <message>
-        <location filename="../../main.cpp" line="110"/>
+        <location filename="../../main.cpp" line="117"/>
         <source>ukui-control-center</source>
         <translation>ཝུའུ་ཁི་ལན་གྱི་ཚོད་འཛིན་ལྟེ་གནས།</translation>
     </message>
@@ -5113,11 +5123,11 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../../searchwidget.cpp" line="175"/>
+        <location filename="../../searchwidget.cpp" line="65"/>
-        <location filename="../../searchwidget.cpp" line="176"/>
+        <location filename="../../searchwidget.cpp" line="66"/>
-        <location filename="../../searchwidget.cpp" line="183"/>
+        <location filename="../../searchwidget.cpp" line="73"/>
-        <location filename="../../searchwidget.cpp" line="184"/>
+        <location filename="../../searchwidget.cpp" line="75"/>
-        <location filename="../../searchwidget.cpp" line="189"/>
+        <location filename="../../searchwidget.cpp" line="80"/>
         <source>No search results</source>
         <translation>འཚོལ་ཞིབ་བྱས་འབྲས་མེད་པ།</translation>
     </message>
@@ -5323,7 +5333,7 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
         <translation>བསུབ་པ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/shortcut/shortcutui.cpp" line="280"/>
+        <location filename="../../../plugins/devices/shortcut/shortcutui.cpp" line="281"/>
         <source> or </source>
         <translation> ཡང་ན་དེ་ལྟར་ </translation>
     </message>
@@ -5496,111 +5506,111 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
         <translation>དེ་མིན།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="594"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="593"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="607"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="596"/>
         <source>Set</source>
         <translation>གཏན་འཁེལ་བྱ་དགོས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="599"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="591"/>
         <source>Wallpaper</source>
         <translation>གྱང་ཤོག</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="612"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="594"/>
         <source>Beep</source>
         <translation>སྦྲང་མ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="938"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="920"/>
         <source>Blue-Crystal</source>
         <translation>ཁ་དོག་སྔོན་པོའི་ཆུ་ཤེལ་</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="940"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="922"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1002"/>
         <source>Light-Seeking</source>
         <translation>འོད་ཟེར་འཚོལ་བ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="942"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="924"/>
         <source>DMZ-Black</source>
         <translation>DMZ-ནག་པོ</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="944"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="926"/>
         <source>DMZ-White</source>
         <translation>DMZ-མི་དཀར</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="946"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="928"/>
         <source>Dark-Sense</source>
         <translation>མུན་ནག་གི་ཚོར་སྣང་།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1016"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="998"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1002"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1026"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1008"/>
         <source>basic</source>
         <translation>གཞི་རྩའི་ཆ་ནས</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1000"/>
         <source>Classic</source>
         <translation>གནའ་གཞུང་།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1000"/>
         <source>classic</source>
         <translation>གནའ་གཞུང་།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1022"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1004"/>
         <source>HeYin</source>
         <translation>ཧའེ་དབྱིན།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1024"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1006"/>
         <source>hp</source>
         <translation>hp</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1026"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1008"/>
         <source>ukui</source>
         <translation>ཝུའུ་ཁི་ལན་གྱིས་བཤད་རྒྱུར</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1028"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1010"/>
         <source>daybreakBlue</source>
         <translation>ཉི་མ་ཤར་བའི་པུའུ་ལའེ་</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1030"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1012"/>
         <source>jamPurple</source>
         <translation>ཤིང་ཏོག་བསྣུར་མ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1032"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1014"/>
         <source>magenta</source>
         <translation>མེ་དམར།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1034"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1016"/>
         <source>sunRed</source>
         <translation>ཉི་མ་ཤར་བ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1036"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
         <source>sunsetOrange</source>
         <translation>ཉི་མ་ནུབ་པའི་ཨོ་ལན་ཀེ་ལན།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1038"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
         <source>dustGold</source>
         <translation>གད་སྙིགས་བླུགས་སྣ་ཚོགས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1040"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1022"/>
         <source>polarGreen</source>
         <translation>གླིང་སྣེའི་ཀེ་ལིན།</translation>
     </message>
@@ -5640,27 +5650,27 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
 <context>
     <name>TimeZoneChooser</name>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="33"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="34"/>
         <source>Cancel</source>
         <translation>ཕྱིར་འཐེན།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="34"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="35"/>
         <source>Confirm</source>
         <translation>གཏན་འཁེལ་བྱ་དགོས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="37"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="38"/>
         <source>Change Timezone</source>
         <translation>དུས་ཚོད་བསྒྱུར་བཅོས་བྱ་དགོས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="67"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="33"/>
         <source>Search Timezone</source>
         <translation>དུས་ཚོད་འཚོལ་ཞིབ་བྱེད་པའི་དུས་</translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="93"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="62"/>
         <source>To select a time zone, please click where near you on the map and select a city from the nearest city</source>
         <translation>དུས་ཚོད་ཀྱི་ས་ཁོངས་འདེམས་དགོས་ན། ས་བཀྲའི་སྟེང་གི་ཉེ་འདབས་ཀྱི་ས་ཆ་གང་དུ་སོང་ནས་ཆེས་ཉེ་བའི་གྲོང་ཁྱེར་ནས་གྲོང་ཁྱེར་ཞིག་འདེམས་རོགས།</translation>
     </message>
@@ -6131,28 +6141,49 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
         <translation>རྒྱང་རིང་གི་ཅོག་ཙེ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="17"/>
         <source>Allow others to view your desktop</source>
-        <translation>མི་གཞན་གྱིས་ཁྱོད་ཀྱི་ཅོག་ཙེའི་སྟེང་གི་ཅོག་ཙེ</translation>
+        <translation type="vanished">མི་གཞན་གྱིས་ཁྱོད་ཀྱི་ཅོག་ཙེའི་སྟེང་གི་ཅོག་ཙེ</translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="19"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="17"/>
+        <source>Connect to your desktop remotely</source>
+        <translation>རྒྱང་རིང་འབྲེལ་མཐུད་རང་གི་ཅོག་ངོས་</translation>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="20"/>
+        <source>Allow others to connect to your desktop remotely using RDP</source>
+        <translation>མི་གཞན་ལ་བཀོལ་ཆོག་RDPརྒྱང་རིང་འབྲེལ་མཐུད་རང་གི་ཅོག་ངོས་།</translation>
+        <extra-contents_path>/Vino/Allow others to connect to your desktop remotely using RDP</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="23"/>
+        <source>Allow others to connect to your desktop remotely using VNC</source>
+        <translation>མི་གཞན་ལ་སྤྱོད་ཆོག་VNCརྒྱང་རིང་འབྲེལ་མཐུད་རང་གི་ཅོག་ངོས་།</translation>
+        <extra-contents_path>/Vino/Allow others to connect to your desktop remotely using VNC</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="26"/>
         <source>Allow connection to control screen</source>
         <translation>འབྲེལ་མཐུད་བྱས་ནས་བརྙན་ཤེལ་ཚོད་འཛིན་བྱེད་དུ</translation>
         <extra-contents_path>/Vino/Allow connection to control screen</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="21"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="28"/>
         <source>You must confirm every visit for this machine</source>
         <translation>ཁྱེད་ཚོས་ངེས་པར་དུ་འཕྲུལ་ཆས་འདིའི་འཚམས་འདྲི་ཚང་མ་གཏན་འཁེལ</translation>
         <extra-contents_path>/Vino/You must confirm every visit for this machine</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="23"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="30"/>
         <source>Require user to enter this password: </source>
         <translation>སྤྱོད་མཁན་གྱིས་གསང་གྲངས་འདིའི་ནང་དུ་འཇུག་དགོས་པའི་བླང་བྱ་ </translation>
         <extra-contents_path>/Vino/Require user to enter this password:</extra-contents_path>
     </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="32"/>
+        <source>Edit</source>
+        <translation>རྩོམ་སྒྲིག</translation>
+    </message>
 </context>
 <context>
     <name>Vpn</name>
@@ -6741,7 +6772,7 @@ Common reasons are that the overall screen size is too big, or you enabled more
     </message>
     <message>
         <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="193"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="637"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="638"/>
         <source>Cancel</source>
         <translation>ཕྱིར་འཐེན།</translation>
     </message>
@@ -6751,42 +6782,42 @@ Common reasons are that the overall screen size is too big, or you enabled more
         <translation>ཉར་ཚགས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="638"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="639"/>
         <source>Confirm</source>
         <translation>གཏན་འཁེལ་བྱ་དགོས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="597"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="598"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="605"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="606"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="670"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="671"/>
         <source>Tips</source>
         <translation>གསལ་འདེབས་བྱེད་ཐབས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="597"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="598"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="670"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="671"/>
         <source>Invalid Id!</source>
         <translation>གོ་མི་ཆོད་པའི་ཐོབ་ཐང་ལག་ཁྱེར་</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="600"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="601"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="608"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="609"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="673"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="674"/>
         <source>OK</source>
         <translation>འགྲིགས།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="605"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="606"/>
         <source>Invalid Group Name!</source>
         <translation>གོ་མི་ཆོད་པའི་ཚོགས་པའི་མིང་།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="635"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="636"/>
         <source>Whether delete the group: “%1” ?</source>
         <translation>ཚོ་ཆུང་དེ་བསུབ་ཡོད་མེད་ལ་མ་བལྟོས་པར་&quot;%1&quot;ཡིན་ནམ།</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="636"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="637"/>
         <source>which will make some file components in the file system invalid!</source>
         <translation>དེས་ཡིག་ཆའི་མ་ལག་ཁྲོད་ཀྱི་ཡིག་ཆའི་ལྷུ་ལག་ཁ་ཤས་གོ་མི་ཆོད་པར་འགྱུར་སྲིད།</translation>
     </message>

shell/res/i18n/en_US.ts

@@ -14,22 +14,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="532"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="538"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="402"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="408"/>
         <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="534"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="540"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="536"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="542"/>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72,39 +72,49 @@
     </message>
     <message>
         <location filename="../../../plugins/system/about/about.cpp" line="251"/>
-        <location filename="../../../plugins/system/about/about.cpp" line="445"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="451"/>
         <source>Extend</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../plugins/system/about/about.cpp" line="280"/>
+        <source>Kylin Linux Desktop (Touch Screen) V10 (SP1)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../../../plugins/system/about/about.cpp" line="282"/>
+        <source>Kylin Linux Desktop (Tablet) V10 (SP1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/about/about.cpp" line="288"/>
         <source>Kylin Linux Desktop V10 (SP1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="395"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="401"/>
-        <location filename="../../../plugins/system/about/about.cpp" line="404"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="410"/>
         <source>avaliable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="444"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="450"/>
-        <location filename="../../../plugins/system/about/about.cpp" line="540"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="546"/>
         <source>expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="505"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="511"/>
         <source>The system needs to be restarted to set the HostName, whether to reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="506"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="512"/>
         <source>Reboot Now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/about.cpp" line="507"/>
+        <location filename="../../../plugins/system/about/about.cpp" line="513"/>
         <source>Reboot Later</source>
         <translation type="unfinished"></translation>
     </message>
@@ -263,7 +273,13 @@
         <extra-contents_path>/About/Status</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/aboutui.cpp" line="376"/>
+        <location filename="../../../plugins/system/about/aboutui.cpp" line="377"/>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+        <extra-contents_path>/About/Active</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/about/aboutui.cpp" line="378"/>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -279,7 +295,7 @@
 <context>
     <name>AddButton</name>
     <message>
-        <location filename="../../../libukcc/widgets/SettingWidget/addbutton.cpp" line="24"/>
+        <location filename="../../../libukcc/widgets/SettingWidget/addbutton.cpp" line="25"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
@@ -647,7 +663,7 @@
         <location filename="../../../plugins/application/autoboot/autobootui.cpp" line="17"/>
         <source>Autoboot Settings</source>
         <translation type="unfinished"></translation>
-        <extra-contents_path>/autoboot/Autoboot Settings</extra-contents_path>
+        <extra-contents_path>/Autoboot/Autoboot Settings</extra-contents_path>
     </message>
 </context>
 <context>
@@ -1256,14 +1272,19 @@ you can restore them to ensure the integrity of your system.</source>
     </message>
     <message>
         <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="102"/>
-        <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="115"/>
         <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="553"/>
         <source>Current Pwd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="146"/>
+        <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="115"/>
         <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="157"/>
+        <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="190"/>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="146"/>
         <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="554"/>
         <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="562"/>
         <source>New Pwd</source>
@@ -1271,7 +1292,6 @@ you can restore them to ensure the integrity of your system.</source>
     </message>
     <message>
         <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="186"/>
-        <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="190"/>
         <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="555"/>
         <location filename="../../../plugins/account/userinfo/changeuserpwd.cpp" line="563"/>
         <source>Sure Pwd</source>
@@ -1421,31 +1441,32 @@ you can restore them to ensure the integrity of your system.</source>
     </message>
     <message>
         <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="86"/>
-        <source>选择自定义颜色</source>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="89"/>
+        <source>Choose a custom color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="236"/>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="254"/>
         <source>HEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="250"/>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="290"/>
         <source>RGB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="411"/>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="457"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="430"/>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="476"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="95"/>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="94"/>
         <source>Custom color</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2545,45 +2566,45 @@ change system settings</source>
         <extra-contents_path>/Keyboard/Delay</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="59"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="60"/>
         <source>Short</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="60"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="61"/>
         <source>Long</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="72"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="73"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/Keyboard/Speed</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="74"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="75"/>
         <source>Slow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="75"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="76"/>
         <source>Fast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="86"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="87"/>
         <source>Input test</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/Keyboard/Input test</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="94"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="95"/>
         <source>Key tips</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/Keyboard/Key tips</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="103"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="104"/>
         <source>Input settings</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/Keyboard/Input settings</extra-contents_path>
@@ -2611,71 +2632,71 @@ change system settings</source>
     </message>
     <message>
         <location filename="../../mainwindow.cpp" line="182"/>
-        <location filename="../../mainwindow.cpp" line="1164"/>
+        <location filename="../../mainwindow.cpp" line="1166"/>
         <source>This function has been controlled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../mainwindow.cpp" line="200"/>
-        <source>Normal</source>
+        <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../mainwindow.cpp" line="203"/>
-        <location filename="../../mainwindow.cpp" line="458"/>
+        <location filename="../../mainwindow.cpp" line="460"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="416"/>
+        <location filename="../../mainwindow.cpp" line="417"/>
-        <location filename="../../mainwindow.cpp" line="436"/>
+        <location filename="../../mainwindow.cpp" line="438"/>
-        <location filename="../../mainwindow.cpp" line="573"/>
+        <location filename="../../mainwindow.cpp" line="575"/>
-        <location filename="../../mainwindow.cpp" line="1020"/>
+        <location filename="../../mainwindow.cpp" line="1022"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="456"/>
+        <location filename="../../mainwindow.cpp" line="458"/>
         <source>Option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="457"/>
+        <location filename="../../mainwindow.cpp" line="459"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="459"/>
+        <location filename="../../mainwindow.cpp" line="461"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="561"/>
+        <location filename="../../mainwindow.cpp" line="563"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="563"/>
+        <location filename="../../mainwindow.cpp" line="565"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="565"/>
+        <location filename="../../mainwindow.cpp" line="567"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="574"/>
+        <location filename="../../mainwindow.cpp" line="576"/>
         <source>Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="709"/>
+        <location filename="../../mainwindow.cpp" line="711"/>
         <source>Specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="1164"/>
+        <location filename="../../mainwindow.cpp" line="1166"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2938,7 +2959,7 @@ change system settings</source>
 <context>
     <name>Notice</name>
     <message>
-        <location filename="../../../plugins/system/notice/notice.cpp" line="55"/>
+        <location filename="../../../plugins/system/notice/notice.cpp" line="42"/>
         <source>Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3097,13 +3118,13 @@ change system settings</source>
     </message>
     <message>
         <location filename="../../../plugins/system/display/outputconfig.cpp" line="406"/>
+        <location filename="../../../plugins/system/display_hw/outputconfig.cpp" line="335"/>
         <source>auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../plugins/system/display/outputconfig.cpp" line="569"/>
-        <location filename="../../../plugins/system/display_hw/outputconfig.cpp" line="279"/>
+        <location filename="../../../plugins/system/display_hw/outputconfig.cpp" line="438"/>
-        <location filename="../../../plugins/system/display_hw/outputconfig.cpp" line="408"/>
         <source>%1 Hz</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3434,63 +3455,63 @@ Fax:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1212"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1207"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="320"/>
         <source>min length %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1222"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1217"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="330"/>
         <source>min digit num %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1231"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1226"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="339"/>
         <source>min upper num %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1240"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1235"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="348"/>
         <source>min lower num %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1249"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1244"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="357"/>
         <source>min other num %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1259"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1254"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="367"/>
         <source>min char class %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1268"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1263"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="376"/>
         <source>max repeat %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1277"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1272"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="385"/>
         <source>max class repeat %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1286"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1281"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="394"/>
         <source>max sequence %1
 </source>
@@ -3869,11 +3890,11 @@ Fax:
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../../searchwidget.cpp" line="64"/>
         <location filename="../../searchwidget.cpp" line="65"/>
-        <location filename="../../searchwidget.cpp" line="72"/>
+        <location filename="../../searchwidget.cpp" line="66"/>
         <location filename="../../searchwidget.cpp" line="73"/>
-        <location filename="../../searchwidget.cpp" line="78"/>
+        <location filename="../../searchwidget.cpp" line="75"/>
+        <location filename="../../searchwidget.cpp" line="80"/>
         <source>No search results</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4034,7 +4055,7 @@ Fax:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/shortcut/shortcutui.cpp" line="280"/>
+        <location filename="../../../plugins/devices/shortcut/shortcutui.cpp" line="281"/>
         <source> or </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4199,111 +4220,111 @@ Fax:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="594"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="593"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="607"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="596"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="599"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="591"/>
         <source>Wallpaper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="612"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="594"/>
         <source>Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="938"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="920"/>
         <source>Blue-Crystal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="940"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="922"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1002"/>
         <source>Light-Seeking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="942"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="924"/>
         <source>DMZ-Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="944"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="926"/>
         <source>DMZ-White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="946"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="928"/>
         <source>Dark-Sense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1016"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="998"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1002"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1026"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1008"/>
         <source>basic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1000"/>
         <source>classic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1000"/>
         <source>Classic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1022"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1004"/>
         <source>HeYin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1024"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1006"/>
         <source>hp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1026"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1008"/>
         <source>ukui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1028"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1010"/>
         <source>daybreakBlue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1030"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1012"/>
         <source>jamPurple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1032"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1014"/>
         <source>magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1034"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1016"/>
         <source>sunRed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1036"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
         <source>sunsetOrange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1038"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
         <source>dustGold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1040"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1022"/>
         <source>polarGreen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4339,27 +4360,27 @@ Fax:
 <context>
     <name>TimeZoneChooser</name>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="33"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="34"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="34"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="35"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="37"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="38"/>
         <source>Change Timezone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="67"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="33"/>
         <source>Search Timezone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="93"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="62"/>
         <source>To select a time zone, please click where near you on the map and select a city from the nearest city</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4760,27 +4781,44 @@ Fax:
     </message>
     <message>
         <location filename="../../../plugins/system/vino/vinoui.cpp" line="17"/>
-        <source>Allow others to view your desktop</source>
+        <source>Connect to your desktop remotely</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="19"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="20"/>
+        <source>Allow others to connect to your desktop remotely using RDP</source>
+        <translation type="unfinished"></translation>
+        <extra-contents_path>/Vino/Allow others to connect to your desktop remotely using RDP</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="23"/>
+        <source>Allow others to connect to your desktop remotely using VNC</source>
+        <translation type="unfinished"></translation>
+        <extra-contents_path>/Vino/Allow others to connect to your desktop remotely using VNC</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="26"/>
         <source>Allow connection to control screen</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/Vino/Allow connection to control screen</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="21"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="28"/>
         <source>You must confirm every visit for this machine</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/Vino/You must confirm every visit for this machine</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="23"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="30"/>
         <source>Require user to enter this password: </source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/Vino/Require user to enter this password:</extra-contents_path>
     </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="32"/>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Wallpaper</name>
@@ -4934,7 +4972,7 @@ Fax:
     </message>
     <message>
         <location filename="../../../plugins/system/display/widget.cpp" line="281"/>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2027"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2033"/>
         <source>Custom Time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4985,7 +5023,7 @@ Fax:
     </message>
     <message>
         <location filename="../../../plugins/system/display/widget.cpp" line="601"/>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2659"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2665"/>
         <source>Splice Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5057,19 +5095,19 @@ Fax:
     </message>
     <message>
         <location filename="../../../plugins/system/display/widget.cpp" line="1033"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1504"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1505"/>
         <source>The zoom has been modified, it will take effect after you log off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../plugins/system/display/widget.cpp" line="1034"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1505"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1506"/>
         <source>Log out now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../plugins/system/display/widget.cpp" line="1035"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1506"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1507"/>
         <source>Later</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5080,79 +5118,79 @@ Fax:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="1485"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="1491"/>
-        <location filename="../../../plugins/system/display/widget.cpp" line="1492"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="1498"/>
-        <location filename="../../../plugins/system/display/widget.cpp" line="1784"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="1790"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1640"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1641"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1943"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1944"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="1485"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="1491"/>
-        <location filename="../../../plugins/system/display/widget.cpp" line="1784"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="1790"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1943"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1944"/>
         <source>please insure at least one output!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="1493"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="1499"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1651"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1652"/>
         <source>Sorry, your configuration could not be applied.
 Common reasons are that the overall screen size is too big, or you enabled more displays than supported by your GPU.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2027"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2033"/>
         <source>All Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2271"/>
         <location filename="../../../plugins/system/display/widget.cpp" line="2277"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2283"/>
         <source>Follow the sunrise and sunset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2302"/>
         <location filename="../../../plugins/system/display/widget.cpp" line="2308"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="2296"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2314"/>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="2303"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="2297"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="2304"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/Display/Brightness</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2722"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2728"/>
         <source>Splicing Method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2725"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2731"/>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2790"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2796"/>
         <location filename="../../../plugins/system/display_hw/widget.cpp" line="543"/>
         <source>monitor</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/display/monitor</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2791"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2797"/>
         <source>as main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2799"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2805"/>
         <location filename="../../../plugins/system/display_hw/widget.cpp" line="546"/>
         <source>screen zoom</source>
         <translation type="unfinished"></translation>
         <extra-contents_path>/display/screen zoom</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/display/widget.cpp" line="2812"/>
+        <location filename="../../../plugins/system/display/widget.cpp" line="2818"/>
         <source>open monitor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5189,12 +5227,12 @@ Common reasons are that the overall screen size is too big, or you enabled more
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1641"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1642"/>
         <source>Open time should be earlier than close time!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1650"/>
+        <location filename="../../../plugins/system/display_hw/widget.cpp" line="1651"/>
         <source>Warnning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5223,7 +5261,7 @@ Common reasons are that the overall screen size is too big, or you enabled more
     </message>
     <message>
         <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="193"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="637"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="638"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5233,42 +5271,42 @@ Common reasons are that the overall screen size is too big, or you enabled more
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="597"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="598"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="605"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="606"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="670"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="671"/>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="597"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="598"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="670"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="671"/>
         <source>Invalid Id!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="600"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="601"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="608"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="609"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="673"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="674"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="605"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="606"/>
         <source>Invalid Group Name!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="635"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="636"/>
         <source>Whether delete the group: “%1” ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="636"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="637"/>
         <source>which will make some file components in the file system invalid!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="638"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="639"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>

shell/res/i18n/zh_CN.ts

@@ -494,7 +494,13 @@
         <extra-contents_path>/About/Status</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/about/aboutui.cpp" line="376"/>
+        <location filename="../../../plugins/system/about/aboutui.cpp" line="377"/>
+        <source>Active</source>
+        <translation>激活</translation>
+        <extra-contents_path>/About/Active</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/about/aboutui.cpp" line="378"/>
         <source>Serial</source>
         <translation>序列号</translation>
     </message>
@@ -592,7 +598,7 @@
 <context>
     <name>AddButton</name>
     <message>
-        <location filename="../../../libukcc/widgets/SettingWidget/addbutton.cpp" line="24"/>
+        <location filename="../../../libukcc/widgets/SettingWidget/addbutton.cpp" line="25"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
@@ -1380,7 +1386,7 @@
         <location filename="../../../plugins/application/autoboot/autobootui.cpp" line="17"/>
         <source>Autoboot Settings</source>
         <translation>开机启动设置</translation>
-        <extra-contents_path>/autoboot/Autoboot Settings</extra-contents_path>
+        <extra-contents_path>/Autoboot/Autoboot Settings</extra-contents_path>
     </message>
 </context>
 <context>
@@ -3044,8 +3050,9 @@ Please authenticate yourself to continue</source>
     </message>
     <message>
         <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="86"/>
-        <source>选择自定义颜色</source>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="89"/>
-        <translation type="unfinished"></translation>
+        <source>Choose a custom color</source>
+        <translation>选择自定义颜色</translation>
     </message>
     <message>
         <location filename="../../../plugins/personalized/wallpaper/colordialog.ui" line="254"/>
@@ -3068,7 +3075,7 @@ Please authenticate yourself to continue</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="95"/>
+        <location filename="../../../plugins/personalized/wallpaper/colordialog.cpp" line="94"/>
         <source>Custom color</source>
         <translation>自定颜色</translation>
     </message>
@@ -5899,45 +5906,45 @@ folder will be deleted!</source>
         <extra-contents_path>/Keyboard/Delay</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="59"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="60"/>
         <source>Short</source>
         <translation>短</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="60"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="61"/>
         <source>Long</source>
         <translation>长</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="72"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="73"/>
         <source>Speed</source>
         <translation>速度</translation>
         <extra-contents_path>/Keyboard/Speed</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="74"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="75"/>
         <source>Slow</source>
         <translation>慢</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="75"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="76"/>
         <source>Fast</source>
         <translation>快</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="86"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="87"/>
         <source>Input test</source>
         <translation>输入测试</translation>
         <extra-contents_path>/Keyboard/Input test</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="94"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="95"/>
         <source>Key tips</source>
         <translation>按键提示</translation>
         <extra-contents_path>/Keyboard/Key tips</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="103"/>
+        <location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="104"/>
         <source>Input settings</source>
         <translation>输入法设置</translation>
         <extra-contents_path>/Keyboard/Input settings</extra-contents_path>
@@ -6418,29 +6425,28 @@ Please retry or relogin!</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../../mainwindow.cpp" line="491"/>
         <source>Search</source>
-        <translation>搜索</translation>
+        <translation type="vanished">搜索</translation>
     </message>
     <message>
         <source>UKCC</source>
         <translation type="vanished">设置</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="456"/>
+        <location filename="../../mainwindow.cpp" line="417"/>
-        <location filename="../../mainwindow.cpp" line="511"/>
+        <location filename="../../mainwindow.cpp" line="438"/>
-        <location filename="../../mainwindow.cpp" line="659"/>
+        <location filename="../../mainwindow.cpp" line="575"/>
-        <location filename="../../mainwindow.cpp" line="1107"/>
+        <location filename="../../mainwindow.cpp" line="1022"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="531"/>
+        <location filename="../../mainwindow.cpp" line="458"/>
         <source>Option</source>
         <translation>选项</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="532"/>
+        <location filename="../../mainwindow.cpp" line="459"/>
         <source>Minimize</source>
         <translation>最小化</translation>
     </message>
@@ -6454,43 +6460,43 @@ Please retry or relogin!</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="214"/>
+        <location filename="../../mainwindow.cpp" line="200"/>
         <source>Restore</source>
         <translation>还原</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="217"/>
+        <location filename="../../mainwindow.cpp" line="203"/>
-        <location filename="../../mainwindow.cpp" line="533"/>
+        <location filename="../../mainwindow.cpp" line="460"/>
         <source>Maximize</source>
         <translation>最大化</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="534"/>
+        <location filename="../../mainwindow.cpp" line="461"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="647"/>
+        <location filename="../../mainwindow.cpp" line="563"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="649"/>
+        <location filename="../../mainwindow.cpp" line="565"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="651"/>
+        <location filename="../../mainwindow.cpp" line="567"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="660"/>
+        <location filename="../../mainwindow.cpp" line="576"/>
         <source>Version: </source>
         <translation>版本：</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="795"/>
+        <location filename="../../mainwindow.cpp" line="711"/>
         <source>Specified</source>
         <translation>指定插件</translation>
     </message>
@@ -6499,13 +6505,13 @@ Please retry or relogin!</source>
         <translation type="vanished">控制面板</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="1271"/>
+        <location filename="../../mainwindow.cpp" line="1166"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
         <location filename="../../mainwindow.cpp" line="182"/>
-        <location filename="../../mainwindow.cpp" line="1271"/>
+        <location filename="../../mainwindow.cpp" line="1166"/>
         <source>This function has been controlled</source>
         <translation>该功能已被管控</translation>
     </message>
@@ -9746,7 +9752,7 @@ E-mail: support@kylinos.cn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../main.cpp" line="110"/>
+        <location filename="../../main.cpp" line="117"/>
         <source>ukui-control-center</source>
         <translation>设置</translation>
     </message>
@@ -9892,63 +9898,63 @@ E-mail: support@kylinos.cn</source>
         <translation type="vanished">连接失败，尝试重新连接</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1212"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1207"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="320"/>
         <source>min length %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1222"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1217"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="330"/>
         <source>min digit num %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1231"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1226"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="339"/>
         <source>min upper num %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1240"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1235"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="348"/>
         <source>min lower num %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1249"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1244"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="357"/>
         <source>min other num %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1259"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1254"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="367"/>
         <source>min char class %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1268"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1263"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="376"/>
         <source>max repeat %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1277"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1272"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="385"/>
         <source>max class repeat %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1286"/>
+        <location filename="../../../plugins/account/userinfo/userinfo.cpp" line="1281"/>
         <location filename="../../../plugins/account/userinfo_intel/userinfo_intel.cpp" line="394"/>
         <source>max sequence %1
 </source>
@@ -10736,11 +10742,11 @@ E-mail: support@kylinos.cn</source>
         <translation type="obsolete">触控板</translation>
     </message>
     <message>
-        <location filename="../../searchwidget.cpp" line="175"/>
+        <location filename="../../searchwidget.cpp" line="65"/>
-        <location filename="../../searchwidget.cpp" line="176"/>
+        <location filename="../../searchwidget.cpp" line="66"/>
-        <location filename="../../searchwidget.cpp" line="183"/>
+        <location filename="../../searchwidget.cpp" line="73"/>
-        <location filename="../../searchwidget.cpp" line="184"/>
+        <location filename="../../searchwidget.cpp" line="75"/>
-        <location filename="../../searchwidget.cpp" line="189"/>
+        <location filename="../../searchwidget.cpp" line="80"/>
         <source>No search results</source>
         <translation>无搜索结果</translation>
     </message>
@@ -11094,7 +11100,7 @@ E-mail: support@kylinos.cn</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../../../plugins/devices/shortcut/shortcutui.cpp" line="280"/>
+        <location filename="../../../plugins/devices/shortcut/shortcutui.cpp" line="281"/>
         <source> or </source>
         <translation> 或 </translation>
     </message>
@@ -11645,56 +11651,56 @@ E-mail: support@kylinos.cn</source>
         <translation>相关设置</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="594"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="593"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="607"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="596"/>
         <source>Set</source>
         <translation>去设置</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="599"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="591"/>
         <source>Wallpaper</source>
         <translation>桌面壁纸</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="612"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="594"/>
         <source>Beep</source>
         <translation>提示音</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="938"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="920"/>
         <source>Blue-Crystal</source>
         <translation>典蓝</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="940"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="922"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1002"/>
         <source>Light-Seeking</source>
         <translation>光</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="942"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="924"/>
         <source>DMZ-Black</source>
         <translation>DMZ-黑</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="944"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="926"/>
         <source>DMZ-White</source>
         <translation>印白</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="946"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="928"/>
         <source>Dark-Sense</source>
         <translation>耀黑</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1016"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="998"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1002"/>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1026"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1008"/>
         <source>basic</source>
         <translation>基础</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1000"/>
         <source>Classic</source>
         <translation>典</translation>
     </message>
@@ -11707,57 +11713,57 @@ E-mail: support@kylinos.cn</source>
         <translation type="vanished">时尚</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1024"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1006"/>
         <source>hp</source>
         <translation>惠普</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1026"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1008"/>
         <source>ukui</source>
         <translation>寻光</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1022"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1004"/>
         <source>HeYin</source>
         <translation>印</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1000"/>
         <source>classic</source>
         <translation>经典</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1028"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1010"/>
         <source>daybreakBlue</source>
         <translation>蓝色</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1030"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1012"/>
         <source>jamPurple</source>
         <translation>紫色</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1032"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1014"/>
         <source>magenta</source>
         <translation>玫红色</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1034"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1016"/>
         <source>sunRed</source>
         <translation>红色</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1036"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1018"/>
         <source>sunsetOrange</source>
         <translation>橙色</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1038"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1020"/>
         <source>dustGold</source>
         <translation>黄色</translation>
     </message>
     <message>
-        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1040"/>
+        <location filename="../../../plugins/personalized/theme/theme.cpp" line="1022"/>
         <source>polarGreen</source>
         <translation>绿色</translation>
     </message>
@@ -11867,12 +11873,12 @@ E-mail: support@kylinos.cn</source>
 <context>
     <name>TimeZoneChooser</name>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="33"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="34"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="34"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="35"/>
         <source>Confirm</source>
         <translation>确定</translation>
     </message>
@@ -11881,7 +11887,7 @@ E-mail: support@kylinos.cn</source>
         <translation type="vanished">更改时区</translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="67"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="33"/>
         <source>Search Timezone</source>
         <translation>搜索时区</translation>
     </message>
@@ -11890,7 +11896,7 @@ E-mail: support@kylinos.cn</source>
         <translation type="vanished">搜索时区</translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="93"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="62"/>
         <source>To select a time zone, please click where near you on the map and select a city from the nearest city</source>
         <translation>若要选择时区，请点击地图上靠近你所在的位置，从最接近的城市中选取一个城市</translation>
     </message>
@@ -11903,7 +11909,7 @@ E-mail: support@kylinos.cn</source>
         <translation type="vanished">更改时区</translation>
     </message>
     <message>
-        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="37"/>
+        <location filename="../../../plugins/time-language/datetime/worldMap/timezonechooser.cpp" line="38"/>
         <source>Change Timezone</source>
         <translation>更改时区</translation>
     </message>
@@ -12858,28 +12864,49 @@ E-mail: support@kylinos.cn</source>
         <translation>远程桌面</translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="17"/>
         <source>Allow others to view your desktop</source>
-        <translation>允许其他人远程连接您的桌面</translation>
+        <translation type="vanished">允许其他人远程连接您的桌面</translation>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="19"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="17"/>
+        <source>Connect to your desktop remotely</source>
+        <translation>远程连接你的桌面</translation>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="20"/>
+        <source>Allow others to connect to your desktop remotely using RDP</source>
+        <translation>允许其他人使用RDP远程连接你的桌面</translation>
+        <extra-contents_path>/Vino/Allow others to connect to your desktop remotely using RDP</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="23"/>
+        <source>Allow others to connect to your desktop remotely using VNC</source>
+        <translation>允许其他人使用VNC远程连接你的桌面</translation>
+        <extra-contents_path>/Vino/Allow others to connect to your desktop remotely using VNC</extra-contents_path>
+    </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="26"/>
         <source>Allow connection to control screen</source>
         <translation>允许其他人远程连接您的桌面并控制您的屏幕</translation>
         <extra-contents_path>/Vino/Allow connection to control screen</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="21"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="28"/>
         <source>You must confirm every visit for this machine</source>
         <translation>您必须为本机机器确认每次访问</translation>
         <extra-contents_path>/Vino/You must confirm every visit for this machine</extra-contents_path>
     </message>
     <message>
-        <location filename="../../../plugins/system/vino/vinoui.cpp" line="23"/>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="30"/>
         <source>Require user to enter this password: </source>
         <translation>要求用户输入此密码: </translation>
         <extra-contents_path>/Vino/Require user to enter this password:</extra-contents_path>
     </message>
+    <message>
+        <location filename="../../../plugins/system/vino/vinoui.cpp" line="32"/>
+        <source>Edit</source>
+        <translation>编辑</translation>
+    </message>
 </context>
 <context>
     <name>Vpn</name>
@@ -13700,7 +13727,7 @@ Common reasons are that the overall screen size is too big, or you enabled more
     </message>
     <message>
         <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="193"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="637"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="638"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -13710,42 +13737,42 @@ Common reasons are that the overall screen size is too big, or you enabled more
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="638"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="639"/>
         <source>Confirm</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="597"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="598"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="605"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="606"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="670"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="671"/>
         <source>Tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="597"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="598"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="670"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="671"/>
         <source>Invalid Id!</source>
         <translation>无效组ID!</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="600"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="601"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="608"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="609"/>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="673"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="674"/>
         <source>OK</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="605"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="606"/>
         <source>Invalid Group Name!</source>
         <translation>无效组名!</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="635"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="636"/>
         <source>Whether delete the group: “%1” ?</source>
         <translation>是否删除用户组：“%1”？</translation>
     </message>
     <message>
-        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="636"/>
+        <location filename="../../../plugins/account/userinfo/changeusergroup.cpp" line="637"/>
         <source>which will make some file components in the file system invalid!</source>
         <translation>这将使得文件系统中的某些文件组建ID无效！</translation>
     </message>

shell/searchwidget.cpp

@@ -61,6 +61,7 @@ SearchWidget::SearchWidget(QWidget *parent)
         QString retValue = text();
 
         if (popup->model()->rowCount() == 0) {
+            Common::buriedSettings(QString("SearchWidget"), nullptr, QString("No search results"), retValue);
             if (m_model->data(m_model->index(m_model->rowCount() - 1, 0)) != tr("No search results"))
                 m_model->appendRow(new QStandardItem(tr("No search results")));
             m_model->setData(m_model->index(m_model->rowCount() - 1, 0), text(), Qt::UserRole);
@@ -70,6 +71,7 @@ SearchWidget::SearchWidget(QWidget *parent)
             if (!m_bIsChinese)
                 m_completer->setCompletionRole(Qt::DisplayRole);
             if (m_model->data(m_model->index(m_model->rowCount() - 1, 0)) == tr("No search results")) {
+                Common::buriedSettings(QString("SearchWidget"), nullptr, QString("No search results"), retValue);
                 while (m_model->data(m_model->index(m_model->rowCount() - 1, 0)) == tr("No search results")) {
                     m_model->clearItemData(m_model->index(m_model->rowCount() - 1, 0));
                     m_model->removeRow(m_model->rowCount() - 1);
@@ -157,7 +159,7 @@ bool SearchWidget::jumpContentPathWidget(QString path) {
                     bResult = true;
 
                     // 埋点搜索插件
-                    Common::buriedSettings(m_EnterNewPagelist[i].fullPagePath, nullptr, QString("search"));
+                    Common::buriedSettings(QString("SearchWidget"), nullptr, QString("search"), m_EnterNewPagelist[i].fullPagePath);
 
                     break;
                 }