fix: modify for code review

modify for code review Log: modify for code review
linuxdeepin · Jun 22, 2022 · 054821c · 054821c
1 parent 1303d5a
commit 054821c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/src/grand-search-daemon/searcher/web/statictextworker.cpp b/src/grand-search-daemon/searcher/web/statictextworker.cpp
@@ -127,6 +127,13 @@ QString StaticTextWorker::createUrl(const QString &searchEngine) const
 
     auto config = Configer::instance()->group(GRANDSEARCH_WEB_GROUP);
     QString searchEngineAddr = config->value(GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, QString(""));
+    if(searchEngineAddr.isEmpty()) {
+        if (SearchHelper::instance()->isSimplifiedChinese()) {
+            searchEngineAddr = baidu;
+        } else {
+            searchEngineAddr = google;
+        }
+    }
 
     static const QHash<QString, QString> searchEngineChinese{{GRANDSEARCH_WEB_SEARCHENGINE_GOOGLE, "https://www.google.com/search?q=%0"},
                                                 {GRANDSEARCH_WEB_SEARCHENGINE_BING, "https://bing.com/search?q=%0"},

diff --git a/src/grand-search/gui/searchconfig/searchenginewidget.cpp b/src/grand-search/gui/searchconfig/searchenginewidget.cpp
@@ -106,8 +106,9 @@ SearchEngineWidget::SearchEngineWidget(QWidget *parent)
     m_mainLayout->addWidget(m_comboboxWidget);
     m_comboboxWidget->setProperty(GRANDSEARCH_SEARCH_GROUP, GRANDSEARCH_WEB_SEARCHENGINE);
 
-    m_lineEdit =  new QLineEdit(this);
-    if(userChoice == "Custom"){
+    m_lineEdit =  new Dtk::Widget::DLineEdit(this);
+    m_lineEdit->setPlaceholderText(tr("You need to use \"%0\" to replace the keyword in the URL"));
+    if(userChoice == GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM){
         QString searchEngineCustom = SearchConfig::instance()->getConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, "").toString();
         m_lineEdit->setText(searchEngineCustom);
         m_lineEdit->setVisible(true);
@@ -117,7 +118,7 @@ SearchEngineWidget::SearchEngineWidget(QWidget *parent)
     m_mainLayout->addWidget(m_lineEdit);
 
     connect(m_comboboxWidget, &ComboboxWidget::checkedChanged, this, &SearchEngineWidget::checkedChangedIndex);
-    connect(m_lineEdit, &QLineEdit::textChanged, this, &SearchEngineWidget::setCustomSearchEngineAddress);
+    connect(m_lineEdit, &DLineEdit::textChanged, this, &SearchEngineWidget::setCustomSearchEngineAddress);
 }
 
 SearchEngineWidget::~SearchEngineWidget()
@@ -139,7 +140,7 @@ void SearchEngineWidget::checkedChangedIndex(int index)
         }
         SearchConfig::instance()->setConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE, text);
 
-        if(text == "Custom"){
+        if(text == GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM){
             QString searchEngineCustom = SearchConfig::instance()->getConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, "").toString();
             m_lineEdit->setText(searchEngineCustom);
             m_lineEdit->setVisible(true);
@@ -161,7 +162,18 @@ int SearchEngineWidget::getIndex(const QString text) const
     return index;
 }
 
-void SearchEngineWidget::setCustomSearchEngineAddress(QString text)
+void SearchEngineWidget::setCustomSearchEngineAddress(const QString &text)
 {
-    SearchConfig::instance()->setConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, text);
+    if (text.isEmpty()) {
+        m_lineEdit->setAlert(false);
+        return;
+    }
+
+    if (!text.contains("%0")) {
+        m_lineEdit->setAlert(true);
+        m_lineEdit->showAlertMessage(tr("Invalid URL"), m_lineEdit, 2000);
+    } else {
+        m_lineEdit->setAlert(false);
+        SearchConfig::instance()->setConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, text);
+    }
 }
diff --git a/src/grand-search/gui/searchconfig/searchenginewidget.h b/src/grand-search/gui/searchconfig/searchenginewidget.h
@@ -42,7 +42,7 @@ class SearchEngineWidget : public Dtk::Widget::DWidget
 
 private slots:
     void checkedChangedIndex(int index);
-    void setCustomSearchEngineAddress(QString text);
+    void setCustomSearchEngineAddress(const QString &text);
 
 private:
     int getIndex(const QString text) const;
@@ -51,7 +51,7 @@ private slots:
     QVBoxLayout *m_mainLayout = nullptr;
     QLabel *m_groupLabel= nullptr;
     QLabel *m_contentLabel = nullptr;
-    QLineEdit *m_lineEdit = nullptr;
+    Dtk::Widget::DLineEdit *m_lineEdit = nullptr;
 
     QHash<QString, QString> m_groupName;        // <searchGroupName, displayGroupName>
     GrandSearch::ComboboxWidget* m_comboboxWidget;

diff --git a/translations/dde-grand-search_zh_CN.ts b/translations/dde-grand-search_zh_CN.ts
@@ -354,6 +354,16 @@
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
+    <message>
+        <location filename="../src/grand-search/gui/searchconfig/searchenginewidget.cpp" line="87"/>
+        <source>You need to use &quot;%0&quot; to replace the keyword in the URL</source>
+        <translation>需要使用 &quot;%0&quot; 来替换URL中关键词</translation>
+    </message>
+    <message>
+        <location filename="../src/grand-search/gui/searchconfig/searchenginewidget.cpp" line="87"/>
+        <source>Invalid URL</source>
+        <translation>URL格式错误</translation>
+    </message>
 </context>
 <context>
     <name>StaticTextWorker</name>