From ad04389bd58a0eec41c52053dd74db10141cc607 Mon Sep 17 00:00:00 2001
From: zhangjiaping <zhangjiaping@kylinos.cn>
Date: Tue, 16 Mar 2021 11:05:21 +0800
Subject: [PATCH] fix(frontend): Complete translations.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Description: 修复提示框按钮未汉化问题

Log: 修复提示框按钮未汉化问题
Bug: http://172.17.66.192/biz/bug-view-38128.html
---
 src/mainwindow.cpp                |  2 +-
 src/settings-widget.cpp           |  5 +++--
 translations/ukui-search/bo.ts    | 17 +++++++++++------
 translations/ukui-search/tr.ts    | 17 +++++++++++------
 translations/ukui-search/zh_CN.ts | 17 +++++++++++------
 5 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7164735..82ed0b8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -329,7 +329,7 @@ void MainWindow::moveToPanel()
                                           "/org/ukui/SettingsDaemon/wayland",
                                           "org.ukui.SettingsDaemon.wayland",
                                           QDBusConnection::sessionBus());
-    if (primaryScreenInterface.isValid()) {
+    if (QDBusReply<int>(primaryScreenInterface.call("x")).isValid()) {
         QDBusReply<int> x = primaryScreenInterface.call("x");
         QDBusReply<int> width = primaryScreenInterface.call("width");
         QDBusReply<int> height = primaryScreenInterface.call("height");
diff --git a/src/settings-widget.cpp b/src/settings-widget.cpp
index 577f361..ca00704 100644
--- a/src/settings-widget.cpp
+++ b/src/settings-widget.cpp
@@ -286,7 +286,7 @@ void SettingsWidget::refreshIndexState()
 void SettingsWidget::onBtnDelClicked(const QString& path) {
     QMessageBox message(QMessageBox::Question, tr("Search"), tr("Whether to delete this directory?"));
     QPushButton * buttonYes = message.addButton(tr("Yes"), QMessageBox::YesRole);
-    QPushButton * buttonNo = message.addButton(tr("No"), QMessageBox::NoRole);
+    message.addButton(tr("No"), QMessageBox::NoRole);
     message.exec();
     if (message.clickedButton() != buttonYes) {
         return;
@@ -517,6 +517,7 @@ void SettingsWidget::showWarningDialog(const int & errorCode)
             break;
         }
     }
-    QMessageBox message(QMessageBox::Warning, tr("Search"), errorMessage, QMessageBox::Ok, this);
+    QMessageBox message(QMessageBox::Warning, tr("Search"), errorMessage);
+    message.addButton(tr("OK"), QMessageBox::AcceptRole);
     message.exec();
 }
diff --git a/translations/ukui-search/bo.ts b/translations/ukui-search/bo.ts
index 7dd4a25..4d225c4 100644
--- a/translations/ukui-search/bo.ts
+++ b/translations/ukui-search/bo.ts
@@ -121,7 +121,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../src/main.cpp" line="171"/>
+        <location filename="../../src/main.cpp" line="182"/>
         <source>ukui-search is already running!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -137,27 +137,27 @@
 <context>
     <name>SearchDetailView</name>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="490"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="494"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="498"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="502"/>
         <source>Last time modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="216"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="220"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="197"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="201"/>
         <source>Introduction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="335"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="339"/>
         <source>Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -317,6 +317,11 @@
         <source>Set blocked folder failed!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="521"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShowMoreLabel</name>
diff --git a/translations/ukui-search/tr.ts b/translations/ukui-search/tr.ts
index 146e6d2..5273c3b 100644
--- a/translations/ukui-search/tr.ts
+++ b/translations/ukui-search/tr.ts
@@ -121,7 +121,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../src/main.cpp" line="171"/>
+        <location filename="../../src/main.cpp" line="182"/>
         <source>ukui-search is already running!</source>
         <translation>ukui-bul zaten çalışıyor!</translation>
     </message>
@@ -137,27 +137,27 @@
 <context>
     <name>SearchDetailView</name>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="490"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="494"/>
         <source>Path</source>
         <translation>Yol</translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="498"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="502"/>
         <source>Last time modified</source>
         <translation>Son değiştirilme zamanı</translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="216"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="220"/>
         <source>Application</source>
         <translation>Uygulama</translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="197"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="201"/>
         <source>Introduction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="335"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="339"/>
         <source>Document</source>
         <translation>Belge</translation>
     </message>
@@ -321,6 +321,11 @@
         <source>Set blocked folder failed!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="521"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShowMoreLabel</name>
diff --git a/translations/ukui-search/zh_CN.ts b/translations/ukui-search/zh_CN.ts
index f1afd6a..5cf8bda 100644
--- a/translations/ukui-search/zh_CN.ts
+++ b/translations/ukui-search/zh_CN.ts
@@ -121,7 +121,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../src/main.cpp" line="171"/>
+        <location filename="../../src/main.cpp" line="182"/>
         <source>ukui-search is already running!</source>
         <translation></translation>
     </message>
@@ -137,27 +137,27 @@
 <context>
     <name>SearchDetailView</name>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="490"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="494"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="498"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="502"/>
         <source>Last time modified</source>
         <translation>上次修改时间</translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="216"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="220"/>
         <source>Application</source>
         <translation>应用</translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="197"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="201"/>
         <source>Introduction: %1</source>
         <translation>软件介绍: %1</translation>
     </message>
     <message>
-        <location filename="../../src/control/search-detail-view.cpp" line="335"/>
+        <location filename="../../src/control/search-detail-view.cpp" line="339"/>
         <source>Document</source>
         <translation>文件</translation>
     </message>
@@ -272,6 +272,11 @@
         <source>Set blocked folder failed!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="521"/>
+        <source>OK</source>
+        <translation>好的</translation>
+    </message>
     <message>
         <location filename="../../src/settings-widget.cpp" line="348"/>
         <source>Creating ...</source>