fix(frontend): Adjust ui according to blueprint.

Description: 根据设计稿调整UI细节,添加弹窗

Log: 根据设计稿调整UI细节,添加弹窗

src/control/highlight-item-delegate.cpp

@@ -35,7 +35,7 @@ void HighlightItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem
         ctx.palette.setColor(QPalette::Text, optionV4.palette.color(QPalette::Active, QPalette::HighlightedText));
 
     QRect textRect = style->subElementRect(QStyle::SE_ItemViewItemText, &optionV4);
-    textRect.adjust(0, -3, 0, 0);
+    textRect.adjust(-20, -5, 0, 0);
     painter->save();
     painter->translate(textRect.topLeft());
     painter->setClipRect(textRect.translated(-textRect.topLeft()));
@@ -64,7 +64,7 @@ QString HighlightItemDelegate::getHtmlText(QPainter *painter, const QStyleOption
     int indexFindLeft = 0;
     QString indexString = index.model()->data(index,Qt::DisplayRole).toString();
     QFontMetrics m_QFontMetrics = painter->fontMetrics();
-    QString indexColString = m_QFontMetrics.elidedText(indexString, Qt::ElideRight, itemOption.rect.width() - 2); //当字体超过Item的长度时显示为省略号
+    QString indexColString = m_QFontMetrics.elidedText(indexString, Qt::ElideRight, itemOption.rect.width() + 10); //当字体超过Item的长度时显示为省略号
     QString htmlString;
     if ((indexColString.toUpper()).contains((m_regFindKeyWords.toUpper()))) {
         indexFindLeft = indexColString.toUpper().indexOf(m_regFindKeyWords.toUpper()); //得到查找字体在当前整个Item字体中的位置

src/control/search-detail-view.cpp

@@ -260,7 +260,9 @@ bool SearchDetailView::openAction(const int& type, const QString& path) {
         case SearchListView::ResType::Setting: {
             //打开控制面板对应页面
             QProcess  process;
-            process.startDetached(QString("ukui-control-center --%1").arg(path.left(path.indexOf("/")).toLower()));
+            if (path.left(path.indexOf("/")).toLower() == "wallpaper")
+                process.startDetached(QString("ukui-control-center --background"));
+            else process.startDetached(QString("ukui-control-center --%1").arg(path.left(path.indexOf("/")).toLower()));
             return true;
             break;
         }

src/input-box.cpp

@@ -84,7 +84,7 @@ void SearchBarHLayout::initUI()
     m_queryWidget->setStyleSheet("border:0px;background:transparent");
 
     QHBoxLayout* queryWidLayout= new QHBoxLayout;
-    queryWidLayout->setContentsMargins(4,0,0,0);
+    queryWidLayout->setContentsMargins(8,4,0,0);
     queryWidLayout->setAlignment(Qt::AlignJustify);
     queryWidLayout->setSpacing(5);
     m_queryWidget->setLayout(queryWidLayout);
@@ -99,13 +99,13 @@ void SearchBarHLayout::initUI()
     m_queryText = new QLabel;
     m_queryText->setText(tr("Search"));
     m_queryText->setStyleSheet("background:transparent;color:#626c6e;");
-//    m_queryText->setContentsMargins(0,0,0,4);
+    m_queryText->setContentsMargins(0,0,0,4);
     m_queryText->adjustSize();
 
     queryWidLayout->addWidget(m_queryIcon);
     queryWidLayout->addWidget(m_queryText);
     m_queryWidget->setGeometry(QRect((m_queryLineEdit->width() - (m_queryIcon->width() + m_queryText->width() + 15)) / 2 - 10, 0,
-                                     m_queryIcon->width() + m_queryText->width() + 10, 35)); //设置图标初始位置
+                                     m_queryIcon->width() + m_queryText->width() + 20, 35)); //设置图标初始位置
 
     m_animation= new QPropertyAnimation(m_queryWidget,"geometry");
     m_animation->setDuration(100); //动画时长
@@ -130,7 +130,7 @@ void SearchBarHLayout::focusOut() {
         m_queryText->adjustSize();
     }
     m_queryWidget->setGeometry(QRect((m_queryLineEdit->width() - (m_queryIcon->width() + m_queryText->width() + 15)) / 2 - 10, 0,
-                                     m_queryIcon->width() + m_queryText->width() + 10, 35)); //使图标回到初始位置
+                                     m_queryIcon->width() + m_queryText->width() + 20, 35)); //使图标回到初始位置
 }
 
 void SearchBarHLayout::clearText() {
@@ -148,7 +148,7 @@ bool SearchBarHLayout::eventFilter(QObject *watched, QEvent *event)
              if (m_queryLineEdit->text().isEmpty()) {
                  m_animation->stop();
                  m_animation->setStartValue(m_queryWidget->geometry());
-                 m_animation->setEndValue(QRect(0, 0, m_queryIcon->width() + 5, 35));
+                 m_animation->setEndValue(QRect(0, 0, m_queryIcon->width() + 10, 35));
                  m_animation->setEasingCurve(QEasingCurve::OutQuad);
                  m_animation->start();
              }
@@ -160,7 +160,7 @@ bool SearchBarHLayout::eventFilter(QObject *watched, QEvent *event)
                     m_queryText->adjustSize();
                     m_animation->setStartValue(QRect(0, 0, m_queryIcon->width() + 5, 35));
                     m_animation->setEndValue(QRect((m_queryLineEdit->width() - (m_queryIcon->width() + m_queryText->width() + 10)) / 2, 0,
-                                                 m_queryIcon->width() + m_queryText->width() + 10, 35));
+                                                 m_queryIcon->width() + m_queryText->width() + 20, 35));
                     m_animation->setEasingCurve(QEasingCurve::InQuad);
                     m_animation->start();
                 }

src/mainwindow.cpp

@@ -202,6 +202,7 @@ void MainWindow::initUi()
     mainlayout->addWidget(m_titleFrame);
     mainlayout->addWidget(m_contentFrame);
     mainlayout->addWidget(m_searchWidget);
+    mainlayout->setContentsMargins(16, 0, 16, 10);
 
     connect(QApplication::primaryScreen(), &QScreen::geometryChanged,
             this, &MainWindow::monitorResolutionChange);

src/settings-widget.cpp

@@ -4,14 +4,16 @@
 #include <QFileDialog>
 #include <QDir>
 #include <QDebug>
+#include <QMessageBox>
 #include "folder-list-item.h"
 #include "global-settings.h"
 #include "file-utils.h"
 #include "index/file-searcher.h"
 
 extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
-SettingsWidget::SettingsWidget(QWidget *parent) : QWidget(parent)
+SettingsWidget::SettingsWidget(QWidget *parent) : QDialog(parent)
 {
+    this->setWindowIcon(QIcon::fromTheme("kylin-search"));
     this->setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint);
     this->setAttribute(Qt::WA_TranslucentBackground);
     initUi();
@@ -27,13 +29,12 @@ SettingsWidget::~SettingsWidget()
  * @brief SettingsWidget::initUi 初始化界面UI
  */
 void SettingsWidget::initUi() {
-    this->setFixedWidth(528);
+//    this->setFixedWidth(528);
-    this->setMinimumHeight(460);
+//    this->setMinimumHeight(460);
-    this->setMaximumHeight(680);
+//    this->setMaximumHeight(680);
     m_mainLyt = new QVBoxLayout(this);
-    m_mainLyt->setContentsMargins(24, 9, 16, 24);
+    m_mainLyt->setContentsMargins(24, 9, 24, 24);
     this->setLayout(m_mainLyt);
-    this->setStyleSheet("QLabel{color: palette(text);}");
 
     //标题栏
     m_titleFrame = new QFrame(this);
@@ -47,7 +48,7 @@ void SettingsWidget::initUi() {
     m_titleLabel->setText(tr("Search"));
     m_closeBtn = new QPushButton(m_titleFrame);
     m_closeBtn->setFixedSize(24, 24);
-    m_closeBtn->setIcon(QIcon(":/res/icons/close.svg"));
+//    m_closeBtn->setIcon(QIcon(":/res/icons/close.svg"));
 //    m_closeBtn->setStyleSheet("QPushButton{background: transparent;}"
 //                              "QPushButton:hover:!pressed{background: transparent;}");
     m_closeBtn->setIcon(QIcon::fromTheme("window-close-symbolic"));
@@ -67,14 +68,12 @@ void SettingsWidget::initUi() {
 
     //设置
     m_settingLabel = new QLabel(this);
-    m_settingLabel->setText(tr("Settings"));
+    m_settingLabel->setText(tr("<h2>Settings</h2>"));
-    m_settingLabel->setStyleSheet("QLabel{font-size: 24px; color: palette(text);}");
     m_mainLyt->addWidget(m_settingLabel);
 
     //文件索引
     m_indexTitleLabel = new QLabel(this);
-    m_indexTitleLabel->setText(tr("Index State"));
+    m_indexTitleLabel->setText(tr("<h3>Index State</h3>"));
-    m_indexTitleLabel->setStyleSheet("QLabel{font-size: 16px; font-weight:bold; color: palette(text);}");
     m_indexStateLabel = new QLabel(this);
     m_indexStateLabel->setText(tr("..."));
     m_indexNumLabel = new QLabel(this);
@@ -86,8 +85,7 @@ void SettingsWidget::initUi() {
 
     //文件索引设置（黑名单）
     m_indexSettingLabel = new QLabel(this);
-    m_indexSettingLabel->setText(tr("File Index Settings"));
+    m_indexSettingLabel->setText(tr("<h3>File Index Settings</h3>"));
-    m_indexSettingLabel->setStyleSheet("QLabel{font-size: 16px; font-weight:bold; color: palette(text);}");
     m_indexDescLabel = new QLabel(this);
     m_indexDescLabel->setText(tr("Following folders will not be searched. You can set it by adding and removing folders."));
     m_indexDescLabel->setWordWrap(true);
@@ -119,8 +117,7 @@ void SettingsWidget::initUi() {
 
     //搜索引擎设置
     m_searchEngineLabel = new QLabel(this);
-    m_searchEngineLabel->setText(tr("Search Engine Settings"));
+    m_searchEngineLabel->setText(tr("<h3>Search Engine Settings</h3>"));
-    m_searchEngineLabel->setStyleSheet("QLabel{font-size: 16px; font-weight:bold; color: palette(text);}");
     m_engineDescLabel = new QLabel(this);
     m_engineDescLabel->setText(tr("Please select search engine you preferred."));
     m_engineDescLabel->setWordWrap(true);
@@ -183,13 +180,17 @@ void SettingsWidget::initUi() {
  */
 void SettingsWidget::setupBlackList(const QStringList& list) {
     clearLayout(m_dirListLyt);
+    m_blockdirs = 0;
     Q_FOREACH(QString path, list) {
         FolderListItem * item = new FolderListItem(m_dirListWidget, path);
         m_dirListLyt->addWidget(item);
-        item->setMaximumWidth(470);
+        item->setMaximumWidth(this->width() - 52);
         connect(item, SIGNAL(onDelBtnClicked(const QString&)), this, SLOT(onBtnDelClicked(const QString&)));
+        m_blockdirs ++;
     }
-    m_dirListLyt->addStretch();
+    this->resize();
+    m_dirListWidget->setFixedWidth(this->width() - 52);
+//    m_dirListLyt->addStretch();
 }
 
 /**
@@ -239,6 +240,12 @@ void SettingsWidget::refreshIndexState()
  * @param path 文件夹路径
  */
 void SettingsWidget::onBtnDelClicked(const QString& path) {
+    QMessageBox message(QMessageBox::Question, tr("Search"), tr("Whether to delete this directory?"), QMessageBox::No | QMessageBox::Yes, this);
+    message.exec();
+    if (message.clickedButton() != message.button(QMessageBox::Yes)) {
+        return;
+    }
+
     QString returnMessage;
     if (GlobalSettings::getInstance()->setBlockDirs(path, returnMessage, true)) {
         qDebug()<<"Remove block dir in onBtnDelClicked() successed.";
@@ -246,13 +253,17 @@ void SettingsWidget::onBtnDelClicked(const QString& path) {
             if (item->getPath() == path) {
                 item->deleteLater();
                 item = NULL;
+                m_blockdirs --;
+                this->resize();
                 return;
             }
         }
-
     } else {
         qWarning()<<returnMessage;
         qDebug()<<"Remove block dir in onBtnAddClicked() failed. Message: "<<returnMessage;
+
+        QMessageBox message(QMessageBox::Warning, tr("Search"), returnMessage, QMessageBox::Ok, this);
+        message.exec();
     }
 }
 
@@ -338,6 +349,10 @@ void SettingsWidget::onBtnAddClicked() {
     } else {
         qWarning()<<returnMessage;
         qDebug()<<"Add block dir in onBtnAddClicked() failed. Message: "<<returnMessage<<" ->settings-widget.cpp #238";
+//        QMessageBox::warning(this, tr("Search"), returnMessage);
+
+        QMessageBox message(QMessageBox::Warning, tr("Search"), returnMessage, QMessageBox::Ok, this);
+        message.exec();
     }
 }
 
@@ -386,3 +401,15 @@ void SettingsWidget::paintEvent(QPaintEvent *event) {
     p.restore();
 
 }
+
+/**
+ * @brief SettingsWidget::resize 重新计算窗口应有大小
+ */
+void SettingsWidget::resize()
+{
+    if (m_blockdirs <= 1) {
+        this->setFixedSize(528, 455);
+    } else {
+        this->setFixedSize(528, 425 + 30 * m_blockdirs);
+    }
+}

src/settings-widget.h

@@ -2,6 +2,7 @@
 #define SETTINGSWIDGET_H
 
 #include <QWidget>
+#include <QDialog>
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -12,7 +13,7 @@
 #include <QScrollArea>
 #include <QTimer>
 
-class SettingsWidget : public QWidget
+class SettingsWidget : public QDialog
 {
     Q_OBJECT
 public:
@@ -29,6 +30,7 @@ private:
     void clearLayout(QLayout *);
     void refreshIndexState();
     void paintEvent(QPaintEvent *);
+    void resize();
     //标题栏
     QVBoxLayout * m_mainLyt = nullptr;
     QFrame * m_titleFrame = nullptr;
@@ -74,6 +76,8 @@ private:
 
     QTimer * m_timer;
 
+    int m_blockdirs = 0; //黑名单文件夹数量
+
 Q_SIGNALS:
     void settingWidgetClosed();
 

translations/ukui-search/bo.ts

@@ -145,113 +145,121 @@
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="47"/>
+        <location filename="../../src/settings-widget.cpp" line="48"/>
+        <location filename="../../src/settings-widget.cpp" line="242"/>
+        <location filename="../../src/settings-widget.cpp" line="264"/>
+        <location filename="../../src/settings-widget.cpp" line="353"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="70"/>
+        <location filename="../../src/settings-widget.cpp" line="78"/>
-        <source>Settings</source>
+        <location filename="../../src/settings-widget.cpp" line="80"/>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="76"/>
-        <source>Index State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="79"/>
-        <location filename="../../src/settings-widget.cpp" line="81"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="89"/>
+        <location filename="../../src/settings-widget.cpp" line="90"/>
-        <source>File Index Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="92"/>
         <source>Following folders will not be searched. You can set it by adding and removing folders.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="101"/>
+        <location filename="../../src/settings-widget.cpp" line="99"/>
         <source>Add ignored folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/settings-widget.cpp" line="122"/>
-        <source>Search Engine Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="125"/>
         <source>Please select search engine you preferred.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="138"/>
+        <location filename="../../src/settings-widget.cpp" line="135"/>
         <source>baidu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="140"/>
+        <location filename="../../src/settings-widget.cpp" line="137"/>
         <source>sougou</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="142"/>
+        <location filename="../../src/settings-widget.cpp" line="139"/>
         <source>360</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="326"/>
+        <location filename="../../src/settings-widget.cpp" line="336"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="265"/>
+        <location filename="../../src/settings-widget.cpp" line="275"/>
         <source>Creating ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="268"/>
+        <location filename="../../src/settings-widget.cpp" line="71"/>
+        <source>&lt;h2&gt;Settings&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="76"/>
+        <source>&lt;h3&gt;Index State&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="88"/>
+        <source>&lt;h3&gt;File Index Settings&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="120"/>
+        <source>&lt;h3&gt;Search Engine Settings&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="242"/>
+        <source>Whether to delete this directory?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="278"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="276"/>
+        <location filename="../../src/settings-widget.cpp" line="286"/>
         <source>Index Entry: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="320"/>
+        <location filename="../../src/settings-widget.cpp" line="330"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="321"/>
+        <location filename="../../src/settings-widget.cpp" line="331"/>
         <source>select blocked folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="322"/>
+        <location filename="../../src/settings-widget.cpp" line="332"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="323"/>
+        <location filename="../../src/settings-widget.cpp" line="333"/>
         <source>Position: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="324"/>
+        <location filename="../../src/settings-widget.cpp" line="334"/>
         <source>FileName: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="325"/>
+        <location filename="../../src/settings-widget.cpp" line="335"/>
         <source>FileType: </source>
         <translation type="unfinished"></translation>
     </message>

translations/ukui-search/tr.ts

@@ -145,113 +145,121 @@
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="47"/>
+        <location filename="../../src/settings-widget.cpp" line="48"/>
+        <location filename="../../src/settings-widget.cpp" line="242"/>
+        <location filename="../../src/settings-widget.cpp" line="264"/>
+        <location filename="../../src/settings-widget.cpp" line="353"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="70"/>
+        <location filename="../../src/settings-widget.cpp" line="78"/>
-        <source>Settings</source>
+        <location filename="../../src/settings-widget.cpp" line="80"/>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="76"/>
-        <source>Index State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="79"/>
-        <location filename="../../src/settings-widget.cpp" line="81"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="89"/>
+        <location filename="../../src/settings-widget.cpp" line="90"/>
-        <source>File Index Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="92"/>
         <source>Following folders will not be searched. You can set it by adding and removing folders.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="101"/>
+        <location filename="../../src/settings-widget.cpp" line="99"/>
         <source>Add ignored folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/settings-widget.cpp" line="122"/>
-        <source>Search Engine Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="125"/>
         <source>Please select search engine you preferred.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="138"/>
+        <location filename="../../src/settings-widget.cpp" line="135"/>
         <source>baidu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="140"/>
+        <location filename="../../src/settings-widget.cpp" line="137"/>
         <source>sougou</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="142"/>
+        <location filename="../../src/settings-widget.cpp" line="139"/>
         <source>360</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="326"/>
+        <location filename="../../src/settings-widget.cpp" line="336"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="265"/>
+        <location filename="../../src/settings-widget.cpp" line="275"/>
         <source>Creating ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="268"/>
+        <location filename="../../src/settings-widget.cpp" line="71"/>
+        <source>&lt;h2&gt;Settings&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="76"/>
+        <source>&lt;h3&gt;Index State&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="88"/>
+        <source>&lt;h3&gt;File Index Settings&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="120"/>
+        <source>&lt;h3&gt;Search Engine Settings&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="242"/>
+        <source>Whether to delete this directory?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="278"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="276"/>
+        <location filename="../../src/settings-widget.cpp" line="286"/>
         <source>Index Entry: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="320"/>
+        <location filename="../../src/settings-widget.cpp" line="330"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="321"/>
+        <location filename="../../src/settings-widget.cpp" line="331"/>
         <source>select blocked folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="322"/>
+        <location filename="../../src/settings-widget.cpp" line="332"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="323"/>
+        <location filename="../../src/settings-widget.cpp" line="333"/>
         <source>Position: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="324"/>
+        <location filename="../../src/settings-widget.cpp" line="334"/>
         <source>FileName: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="325"/>
+        <location filename="../../src/settings-widget.cpp" line="335"/>
         <source>FileType: </source>
         <translation type="unfinished"></translation>
     </message>

translations/ukui-search/zh_CN.ts

@@ -145,121 +145,121 @@
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="47"/>
+        <location filename="../../src/settings-widget.cpp" line="48"/>
+        <location filename="../../src/settings-widget.cpp" line="242"/>
+        <location filename="../../src/settings-widget.cpp" line="264"/>
+        <location filename="../../src/settings-widget.cpp" line="353"/>
         <source>Search</source>
         <translation>搜索</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="70"/>
+        <location filename="../../src/settings-widget.cpp" line="71"/>
-        <source>Settings</source>
+        <source>&lt;h2&gt;Settings&lt;/h2&gt;</source>
-        <translation>配置项</translation>
+        <translation>&lt;h2&gt;设置&lt;/h2&gt;</translation>
     </message>
     <message>
         <location filename="../../src/settings-widget.cpp" line="76"/>
-        <source>Index State</source>
+        <source>&lt;h3&gt;Index State&lt;/h3&gt;</source>
-        <translation>索引状态</translation>
+        <translation>&lt;h3&gt;索引状态&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="79"/>
+        <location filename="../../src/settings-widget.cpp" line="78"/>
-        <location filename="../../src/settings-widget.cpp" line="81"/>
+        <location filename="../../src/settings-widget.cpp" line="80"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="89"/>
+        <location filename="../../src/settings-widget.cpp" line="88"/>
-        <source>File Index Settings</source>
+        <source>&lt;h3&gt;File Index Settings&lt;/h3&gt;</source>
-        <translation>文件索引设置</translation>
+        <translation>&lt;h3&gt;文件索引设置&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="92"/>
+        <location filename="../../src/settings-widget.cpp" line="90"/>
         <source>Following folders will not be searched. You can set it by adding and removing folders.</source>
         <translation>搜索将不再查看以下文件夹。通过增加和删除文件夹可进行文件索引设置。</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="101"/>
+        <location filename="../../src/settings-widget.cpp" line="99"/>
         <source>Add ignored folders</source>
         <translation>添加文件夹至黑名单</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="122"/>
+        <location filename="../../src/settings-widget.cpp" line="120"/>
-        <source>Search Engine Settings</source>
+        <source>&lt;h3&gt;Search Engine Settings&lt;/h3&gt;</source>
-        <translation>搜索引擎设置</translation>
+        <translation>&lt;h3&gt;搜索引擎设置&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="125"/>
+        <location filename="../../src/settings-widget.cpp" line="122"/>
         <source>Please select search engine you preferred.</source>
         <translation>设置互联网搜索引擎</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="138"/>
+        <location filename="../../src/settings-widget.cpp" line="135"/>
         <source>baidu</source>
         <translation>百度</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="140"/>
+        <location filename="../../src/settings-widget.cpp" line="137"/>
         <source>sougou</source>
         <translation>搜狗</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="142"/>
+        <location filename="../../src/settings-widget.cpp" line="139"/>
         <source>360</source>
         <translation>360</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="326"/>
+        <location filename="../../src/settings-widget.cpp" line="242"/>
+        <source>Whether to delete this directory?</source>
+        <translation>是否要删除此目录</translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="336"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <source>Parent folder has been blocked!</source>
+        <location filename="../../src/settings-widget.cpp" line="275"/>
-        <translation type="vanished">12345</translation>
-    </message>
-    <message>
-        <source>Confirm</source>
-        <translation type="vanished">确认</translation>
-    </message>
-    <message>
-        <location filename="../../src/settings-widget.cpp" line="265"/>
         <source>Creating ...</source>
         <translation>正在索引</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="268"/>
+        <location filename="../../src/settings-widget.cpp" line="278"/>
         <source>Done</source>
         <translation>索引完成</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="276"/>
+        <location filename="../../src/settings-widget.cpp" line="286"/>
         <source>Index Entry: %1</source>
         <translation>索引项: %1</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="320"/>
+        <location filename="../../src/settings-widget.cpp" line="330"/>
         <source>Directories</source>
         <translation>文件夹</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="321"/>
+        <location filename="../../src/settings-widget.cpp" line="331"/>
         <source>select blocked folder</source>
         <translation>选择屏蔽文件夹</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="322"/>
+        <location filename="../../src/settings-widget.cpp" line="332"/>
         <source>Select</source>
         <translation>选择</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="323"/>
+        <location filename="../../src/settings-widget.cpp" line="333"/>
         <source>Position: </source>
         <translation>位置：</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="324"/>
+        <location filename="../../src/settings-widget.cpp" line="334"/>
         <source>FileName: </source>
         <translation>名称：</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="325"/>
+        <location filename="../../src/settings-widget.cpp" line="335"/>
         <source>FileType: </source>
         <translation>类型：</translation>
     </message>