From c47972a18912ae306b072b7d6348d99c1b8a6637 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabrava@intel.com>
Date: Fri, 31 Oct 2014 15:40:57 -0200
Subject: [PATCH] tagfilter.ui -> filterwidget.ui

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/{tagfilter.ui => listfilter.ui} | 7 +++++++
 qt-ui/simplewidgets.cpp               | 5 +++--
 qt-ui/simplewidgets.h                 | 2 +-
 subsurface.pro                        | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)
 rename qt-ui/{tagfilter.ui => listfilter.ui} (79%)

diff --git a/qt-ui/tagfilter.ui b/qt-ui/listfilter.ui
similarity index 79%
rename from qt-ui/tagfilter.ui
rename to qt-ui/listfilter.ui
index 91078ed82..41a8dfa94 100644
--- a/qt-ui/tagfilter.ui
+++ b/qt-ui/listfilter.ui
@@ -14,6 +14,13 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QLineEdit" name="filterTag"/>
    </item>
diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp
index d00fab81e..a5ad49923 100644
--- a/qt-ui/simplewidgets.cpp
+++ b/qt-ui/simplewidgets.cpp
@@ -459,10 +459,11 @@ void DiveComponentSelection::buttonClicked(QAbstractButton *button)
 TagFilter::TagFilter(QWidget *parent) : QWidget(parent)
 {
 	ui.setupUi(this);
+	ui.label->setText(tr("Tags: "));
 	QSortFilterProxyModel *filter = new QSortFilterProxyModel();
 	filter->setSourceModel(TagFilterModel::instance());
-	connect(ui.filterTag, SIGNAL(textChanged(QString)), filter, SLOT(setFilterFixedString(QString)));
-	ui.tagView->setModel(filter);
+	connect(ui.filterInternalList, SIGNAL(textChanged(QString)), filter, SLOT(setFilterFixedString(QString)));
+	ui.filterList->setModel(filter);
 }
 
 void TagFilter::showEvent(QShowEvent *event)
diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h
index 48a57493b..d4eece859 100644
--- a/qt-ui/simplewidgets.h
+++ b/qt-ui/simplewidgets.h
@@ -137,7 +137,7 @@ public:
 	virtual void showEvent(QShowEvent *);
 	virtual void hideEvent(QHideEvent *);
 private:
-	Ui::TagFilter ui;
+	Ui::FilterWidget ui;
 };
 
 class MultiFilter : public QScrollArea {
diff --git a/subsurface.pro b/subsurface.pro
index b7e5ec934..7b38fd6f1 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -228,7 +228,7 @@ FORMS = \
 	qt-ui/usersurvey.ui \
 	qt-ui/divecomponentselection.ui \
 	qt-ui/configuredivecomputerdialog.ui \
-	qt-ui/tagfilter.ui \
+	qt-ui/listfilter.ui \
 	qt-ui/diveshareexportdialog.ui
 
 # Nether usermanual or printing is supported on android right now