Add filter type combo box

diff --git a/management-gui/mainwindow.cpp b/management-gui/mainwindow.cpp
index a662e21f3e952fbb2186f909491c0e3982377fcf..3649419b4a7d24b0a8381769c2afe8c471370869 100644 (file)
--- a/management-gui/mainwindow.cpp
+++ b/management-gui/mainwindow.cpp
@@ -56,6 +56,11 @@ MainWindow::MainWindow(QWidget *parent) :
        ui->myListView->header()->setStretchLastSection(false);
        ui->myListView->header()->resizeSection(4, 200);
 
+       ui->filterType->addItems(QStringList()
+                                                        << tr("Fixed String")
+                                                        << tr("Wildcard")
+                                                        << tr("Regexp"));
+
        connect(ui->myListView, SIGNAL(renameTest(int)), this, SLOT(openRenameScriptEditor(int)));
 
        setAcceptDrops(true);
@@ -379,5 +384,22 @@ void MainWindow::dropEvent(QDropEvent *event)
 
 void MainWindow::on_filterInput_textChanged(const QString &filter)
 {
-       myListFilterModel->setFilterFixedString(filter);
+       switch (ui->filterType->currentIndex())
+       {
+               case 1:
+                       myListFilterModel->setFilterWildcard(filter);
+               break;
+               case 2:
+                       myListFilterModel->setFilterRegExp(filter);
+               break;
+               case 0:
+               default:
+                       myListFilterModel->setFilterFixedString(filter);
+               break;
+       }
+}
+
+void MainWindow::on_filterType_currentIndexChanged(int)
+{
+       on_filterInput_textChanged(ui->filterInput->text());
 }

diff --git a/management-gui/mainwindow.h b/management-gui/mainwindow.h
index ee8774cdd1ce022cdb7fc46290dd8cb7ca6c3ca0..96f4c09cb94f86d4fc9a9bb895ba0af513ef4a4a 100644 (file)
--- a/management-gui/mainwindow.h
+++ b/management-gui/mainwindow.h
@@ -63,6 +63,8 @@ private slots:
        void on_actionAddRelatedEpisodeInfo_triggered();
        void on_filterInput_textChanged(const QString &filter);
 
+       void on_filterType_currentIndexChanged(int);
+
 protected:
        void dragEnterEvent(QDragEnterEvent *event);
        void dropEvent(QDropEvent *event);

diff --git a/management-gui/mainwindow.ui b/management-gui/mainwindow.ui
index 94f10ff397d4359637aa0e3cfeeb14c44c43691a..68a196349df2192b5bef2013331eac2be00adb5e 100644 (file)
--- a/management-gui/mainwindow.ui
+++ b/management-gui/mainwindow.ui
@@ -16,7 +16,14 @@
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <widget class="QLineEdit" name="filterInput"/>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLineEdit" name="filterInput"/>
+      </item>
+      <item>
+       <widget class="QComboBox" name="filterType"/>
+      </item>
+     </layout>
     </item>
     <item>
      <widget class="MyListView" name="myListView"/>
@@ -241,6 +248,12 @@
    <header>mylistview.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>filterInput</tabstop>
+  <tabstop>filterType</tabstop>
+  <tabstop>myListView</tabstop>
+  <tabstop>refreshButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>