From abc5d5864cbf8e47d102b04d359a89fce13d0eb8 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabrava@intel.com>
Date: Wed, 17 Sep 2014 14:17:41 -0300
Subject: Add the Tag Widget on the MainWindow

Place the TagWidget on the correct place on the main  window.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/mainwindow.ui     | 9 ++++++++-
 qt-ui/simplewidgets.cpp | 5 +++++
 qt-ui/simplewidgets.h   | 4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 6b27e6687..c1580af06 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -145,6 +145,7 @@
         </widget>
         <widget class="PlannerSettingsWidget" name="plannerSettingsWidget"/>
        </widget>
+       <widget class="TagFilter" name="tagFilter" native="true"/>
        <widget class="QStackedWidget" name="globePane">
         <property name="currentIndex">
          <number>0</number>
@@ -162,7 +163,7 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="page_5">
+	<widget class="QWidget" name="page_5">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
@@ -879,6 +880,12 @@ p, li { white-space: pre-wrap; }
    <header>diveplanner.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>TagFilter</class>
+   <extends>QWidget</extends>
+   <header>simplewidgets.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../subsurface.qrc"/>
diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp
index 772c8d1b9..e9bfc3cba 100644
--- a/qt-ui/simplewidgets.cpp
+++ b/qt-ui/simplewidgets.cpp
@@ -455,3 +455,8 @@ void DiveComponentSelection::buttonClicked(QAbstractButton *button)
 		selective_copy_dive(&displayed_dive, targetDive, *what, true);
 	}
 }
+
+TagFilter::TagFilter(QWidget *parent): QWidget(parent)
+{
+	ui.setupUi(this);
+}
diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h
index 7b838347e..c9f5dc203 100644
--- a/qt-ui/simplewidgets.h
+++ b/qt-ui/simplewidgets.h
@@ -129,7 +129,9 @@ private:
 class TagFilter : public QWidget {
 	Q_OBJECT
 public:
-	TagFilter(QWidget *parent);
+	TagFilter(QWidget *parent = 0);
+private:
+	Ui::TagFilter ui;
 };
 
 bool isGnome3Session();
-- 
cgit v1.2.3-70-g09d2