Merge pull request #190 from iaom/0313-dev

Adjusted the focus logic of search result list;Update changelog.

debian/changelog

@@ -1,3 +1,24 @@
+ukui-search (0.2.0+0322) v101; urgency=medium
+
+  * Fit muti-screens mode. 
+    - 适配990多屏显示。
+  * Feat:Clear cache after web searching.
+    - 清除网页搜索缓存。
+  * Fix(frontend): Complete translations.
+    - 修复提示框按钮未汉化问题(bug38128)。
+  * Fix(frontend): NameLabel do not update when font-size changed.
+    - 修复字体大小更改时主页标签不刷新的bug(bug42681)。
+  * Feat(frontend): Reset geometry for ukui-search.
+    - 重新计算搜索主界面的显示位置,修复任务栏隐藏时主界面显示位置有误的问题(43730)。
+  * Fix(frontend): Mainwindow is blocked when searching.
+    - 修复搜索时主界面阻塞的问题(43315)。
+  * Fix:mkfifo fail when fifo path is not exits
+    - 修复切换用户后打开搜索失败的问题(42486)。
+  * Feat(frontend): Add tips when there is no network avaliable.
+    - 当无网络可用时添加提示图案。
+
+ -- zhangpengfei <zhangpengfei@kylinos.cn>  Mon, 22 Mar 2021 10:43:51 +0800
+
 ukui-search (0.2.0+0312) v101; urgency=medium
 
   * Fix: Index process may crash while system first boot.

libsearch/index/index-generator.cpp

@@ -116,6 +116,7 @@ bool IndexGenerator::creatAllIndex(QQueue<QString> *messageList)
         return false;
     }
     int size = _doc_list_content->size();
+    qDebug()<<"begin creatAllIndex for content"<<size;
     if(!size == 0)
     {
         GlobalSettings::getInstance()->setValue(CONTENT_INDEX_DATABASE_STATE,"0");

src/content-widget.cpp

@@ -164,10 +164,14 @@ void ContentWidget::initListView()
     this->hideListView();
     m_resultList->setFixedHeight(0);
 
+    m_resultListArea->setFocusProxy(m_bestListView);
+    m_bestListView->setFocus();
     connect(m_appShowMoreLabel, &ShowMoreLabel::showMoreClicked, this, [ = ]() {
         m_appListView->setList(m_appList);
         m_appShowMoreLabel->stopLoading();
         this->resetListHeight();
+        m_resultListArea->setFocusProxy(m_appListView);
+        m_appListView->setFocus();
     });
     connect(m_appShowMoreLabel, &ShowMoreLabel::retractClicked, this, [ = ]() {
         m_appListView->setList(m_appList.mid(0, 5));
@@ -178,6 +182,8 @@ void ContentWidget::initListView()
         m_settingListView->setList(m_settingList);
         m_settingShowMoreLabel->stopLoading();
         this->resetListHeight();
+        m_resultListArea->setFocusProxy(m_settingListView);
+        m_settingListView->setFocus();
     });
     connect(m_settingShowMoreLabel, &ShowMoreLabel::retractClicked, this, [ = ]() {
         m_settingListView->setList(m_settingList.mid(0, 5));
@@ -188,6 +194,8 @@ void ContentWidget::initListView()
         m_dirListView->setList(m_dirList);
         m_dirShowMoreLabel->stopLoading();
         this->resetListHeight();
+        m_resultListArea->setFocusProxy(m_dirListView);
+        m_dirListView->setFocus();
     });
     connect(m_dirShowMoreLabel, &ShowMoreLabel::retractClicked, this, [ = ]() {
         m_dirListView->setList(m_dirList.mid(0, 5));
@@ -198,6 +206,8 @@ void ContentWidget::initListView()
         m_fileListView->setList(m_fileList);
         m_fileShowMoreLabel->stopLoading();
         this->resetListHeight();
+        m_resultListArea->setFocusProxy(m_fileListView);
+        m_fileListView->setFocus();
     });
     connect(m_fileShowMoreLabel, &ShowMoreLabel::retractClicked, this, [ = ]() {
         m_fileListView->setList(m_fileList.mid(0, 5));
@@ -208,6 +218,8 @@ void ContentWidget::initListView()
         m_contentListView->setList(m_contentList);
         m_contentShowMoreLabel->stopLoading();
         this->resetListHeight();
+        m_resultListArea->setFocusProxy(m_contentListView);
+        m_contentListView->setFocus();
     });
     connect(m_contentShowMoreLabel, &ShowMoreLabel::retractClicked, this, [ = ]() {
         m_contentListView->setList(m_contentList.mid(0, 5));
@@ -281,6 +293,7 @@ void ContentWidget::setupConnect(SearchListView * listview) {
         listview->is_current_list = false;
     });
     connect(this, &ContentWidget::currentItemChanged, listview, [ = ]() {
+
         if (! listview->is_current_list) {
             listview->blockSignals(true);
             listview->clearSelection();