Move searcher to filter area

The search function is now moved to filters area for more consistency
Fix #554

Author: juuz0

resources/css/_contentManager.css

@@ -68,7 +68,8 @@ QMenu::item:selected {
 QLineEdit {
     font-family: 'Selawik';
     padding: 4px;
-    border: 1px solid #cccccc;
+    border: none;
+    border-bottom: 1px solid #cccccc;
     color: #666666;
     font-size: 16px;
     height: 32px;

src/contentmanagerside.cpp

@@ -54,6 +54,18 @@ ContentManagerSide::ContentManagerSide(QWidget *parent) :
         }
         mp_contentManager->setCurrentContentTypeFilter(m_contentTypeFilters);
     });
+
+    auto searcher = mp_ui->searcher;
+    searcher->setPlaceholderText(gt("search-files"));
+    QFile file(QString::fromUtf8(":/css/_contentManager.css"));
+    file.open(QFile::ReadOnly);
+    QString styleSheet = QString(file.readAll());
+    searcher->setStyleSheet(styleSheet);
+    QIcon searchIcon = QIcon(":/icons/search.svg");
+    searcher->addAction(searchIcon, QLineEdit::LeadingPosition);
+    connect(searcher, &QLineEdit::textChanged, [searcher](){
+        KiwixApp::instance()->getContentManager()->setSearch(searcher->text());
+    });
 
     ContentTypeFilter* videosFilter = new ContentTypeFilter("pictures", this);
     ContentTypeFilter* picturesFilter = new ContentTypeFilter("videos", this);

src/contentmanagerside.ui

@@ -46,7 +46,7 @@
      <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,0,0,0,0,0,0,0">
+     <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,0,0,0,0,0,0,0,0">
       <property name="spacing">
        <number>0</number>
       </property>
@@ -65,6 +65,9 @@
       <property name="bottomMargin">
        <number>0</number>
       </property>
+      <item>
+       <widget class="QLineEdit" name="searcher"/>
+      </item>
       <item>
        <widget class="QRadioButton" name="allFileButton">
         <property name="sizePolicy">

src/contentmanagerview.cpp

@@ -19,19 +19,9 @@ ContentManagerView::ContentManagerView(QWidget *parent)
     mp_ui->m_view->setItemDelegate(managerDelegate);
     mp_ui->m_view->setCursor(Qt::PointingHandCursor);
 
-    auto searcher = mp_ui->searcher;
-    searcher->setPlaceholderText(gt("search-files"));
-    searcher->setStyleSheet(styleSheet);
-
     loader = new KiwixLoader(mp_ui->loading);
     mp_ui->stackedWidget->setCurrentIndex(0);
 
-    QIcon searchIcon = QIcon(":/icons/search.svg");
-    searcher->addAction(searchIcon, QLineEdit::LeadingPosition);
-
-    connect(searcher, &QLineEdit::textChanged, [searcher](){
-        KiwixApp::instance()->getContentManager()->setSearch(searcher->text());
-    });
     connect(mp_ui->m_view, &QTreeView::clicked, [=](QModelIndex index) {
         if (index.column() == (mp_ui->m_view->model()->columnCount() - 1))
             return;

src/contentmanagerview.h

@@ -17,7 +17,6 @@ class ContentManagerView : public QWidget
     explicit ContentManagerView(QWidget *parent = nullptr);
     ~ContentManagerView();
     QTreeView* getView() { return mp_ui->m_view; }
-    QLineEdit* &getSearcher() { return mp_ui->searcher; }
 
 public slots:
     void showLoader(bool show);

src/contentmanagerview.ui

@@ -17,15 +17,15 @@
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="contents">
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <layout class="QVBoxLayout" name="verticalLayout">
-         <item>
-          <widget class="QLineEdit" name="searcher"/>
-         </item>
+         <property name="spacing">
+          <number>0</number>
+         </property>
          <item>
           <widget class="QTreeView" name="m_view"/>
          </item>