From 4b520a8fbc08136d2050fc39b80766725f650fac Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabrava@intel.com>
Date: Fri, 30 May 2014 14:50:49 -0300
Subject: Add a new widget on the main tab: Pictures.

Currently this does nothing, but since "dive photos" can also mean
photos that were taken during the trip to the dive, some of them
will not be visible on the profile. this currently shows nothing,
because I didn't work out the Model bits yet.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/divepicturewidget.cpp |  2 +-
 qt-ui/divepicturewidget.h   |  4 ++--
 qt-ui/maintab.ui            | 25 ++++++++++++++++++++-----
 3 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'qt-ui')

diff --git a/qt-ui/divepicturewidget.cpp b/qt-ui/divepicturewidget.cpp
index aea415725..a74bba0e6 100644
--- a/qt-ui/divepicturewidget.cpp
+++ b/qt-ui/divepicturewidget.cpp
@@ -20,7 +20,7 @@ int DivePictureModel::rowCount(const QModelIndex &parent) const
 
 }
 
-DivePictureView::DivePictureView(QWidget *parent): QListView(parent)
+DivePictureWidget::DivePictureWidget(QWidget *parent): QListView(parent)
 {
 
 }
diff --git a/qt-ui/divepicturewidget.h b/qt-ui/divepicturewidget.h
index 260d3caa7..7761db32b 100644
--- a/qt-ui/divepicturewidget.h
+++ b/qt-ui/divepicturewidget.h
@@ -16,10 +16,10 @@ class DivePictureDelegate : QStyledItemDelegate {
 	virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 };
 
-class DivePictureView : public QListView{
+class DivePictureWidget : public QListView{
 	Q_OBJECT
 public:
-	DivePictureView(QWidget *parent);
+	DivePictureWidget(QWidget *parent);
 };
 
 class DivePictureThumbnailThread : public QThread {
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index 276c7922f..31ed1309d 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -38,7 +38,7 @@
          <x>0</x>
          <y>0</y>
          <width>662</width>
-         <height>644</height>
+         <height>649</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
@@ -157,7 +157,7 @@
          </widget>
         </item>
         <item row="8" column="1">
-		 <widget class="TagWidget" name="buddy">
+         <widget class="TagWidget" name="buddy">
           <property name="readOnly">
            <bool>false</bool>
           </property>
@@ -290,7 +290,7 @@
          <x>0</x>
          <y>0</y>
          <width>662</width>
-         <height>644</height>
+         <height>649</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_5">
@@ -370,7 +370,7 @@
          <x>0</x>
          <y>0</y>
          <width>662</width>
-         <height>644</height>
+         <height>649</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_6">
@@ -680,7 +680,7 @@
          <x>0</x>
          <y>0</y>
          <width>662</width>
-         <height>644</height>
+         <height>649</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_7">
@@ -813,6 +813,16 @@
     </item>
    </layout>
   </widget>
+  <widget class="QWidget" name="tab">
+   <attribute name="title">
+    <string>Photos</string>
+   </attribute>
+   <layout class="QVBoxLayout" name="verticalLayout_2">
+    <item>
+     <widget class="DivePictureWidget" name="listView"/>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>
@@ -844,6 +854,11 @@
    <extends>QPlainTextEdit</extends>
    <header>qt-ui/tagwidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>DivePictureWidget</class>
+   <extends>QListView</extends>
+   <header>divepicturewidget.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
-- 
cgit v1.2.3-70-g09d2