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: tagfilter.ui -> filterwidget.ui

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/listfilter.ui     | 34 ++++++++++++++++++++++++++++++++++
 qt-ui/simplewidgets.cpp |  5 +++--
 qt-ui/simplewidgets.h   |  2 +-
 qt-ui/tagfilter.ui      | 27 ---------------------------
 subsurface.pro          |  2 +-
 5 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 qt-ui/listfilter.ui
 delete mode 100644 qt-ui/tagfilter.ui

diff --git a/qt-ui/listfilter.ui b/qt-ui/listfilter.ui
new file mode 100644
index 000000000..41a8dfa94
--- /dev/null
+++ b/qt-ui/listfilter.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TagFilter</class>
+ <widget class="QWidget" name="TagFilter">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <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>
+   <item>
+    <widget class="QListView" name="tagView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
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/qt-ui/tagfilter.ui b/qt-ui/tagfilter.ui
deleted file mode 100644
index 91078ed82..000000000
--- a/qt-ui/tagfilter.ui
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TagFilter</class>
- <widget class="QWidget" name="TagFilter">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLineEdit" name="filterTag"/>
-   </item>
-   <item>
-    <widget class="QListView" name="tagView"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
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
-- 
cgit v1.2.3-70-g09d2