Rework on the Equipment tab to make it look more Modern.

Note that this is a WIP and it does break functionality
- ie, not possible to add Equipments, but this will be
fixed in the next commit. Removed add / edit / remove
buttons, only a single '+' icon appears on the widget
now. the edit / delete will be done in place.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>

5 files changed, 69 insertions, 146 deletions

diff --git a/plus.png b/plus.png
new file mode 100644
index 000000000..1008f31ce
--- /dev/null
+++ b/plus.png
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 10645c12f..bbd9ebad8 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -61,8 +61,38 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
 		if (label)
 			label->setAlignment(Qt::AlignHCenter);
 	}
+
+	/*Thid couldn't be done on the ui file because element
+	is floating, instead of being fixed on the layout. */
+	QIcon plusIcon(":plus");
+	addCylinder = new QPushButton(plusIcon, QString(), ui->cylindersGroup);
+	addCylinder->setFlat(true);
+	addCylinder->setToolTip(tr("Add Cylinder"));
+	addWeight = new QPushButton(plusIcon, QString(), ui->weightGroup);
+	addWeight->setFlat(true);
+	addWeight->setToolTip(tr("Add Weight System"));
+}
+
+// We need to manually position the 'plus' on cylinder and weight.
+void MainTab::resizeEvent(QResizeEvent* event)
+{
+	if (ui->cylindersGroup->isVisible())
+		addCylinder->setGeometry( ui->cylindersGroup->contentsRect().width() - 30, 2, 24,24);
+
+	if (ui->weightGroup->isVisible())
+		addWeight->setGeometry( ui->weightGroup->contentsRect().width() - 30, 2, 24,24);
+
+    QTabWidget::resizeEvent(event);
 }
 
+void MainTab::showEvent(QShowEvent* event)
+{
+	QTabWidget::showEvent(event);
+	addCylinder->setGeometry( ui->cylindersGroup->contentsRect().width() - 30, 2, 24,24);
+	addWeight->setGeometry( ui->weightGroup->contentsRect().width() - 30, 2, 24,24);
+}
+
+
 bool MainTab::eventFilter(QObject* object, QEvent* event)
 {
 	if (event->type() == QEvent::FocusIn) {
diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h
index c571df086..2bdb63fbc 100644
--- a/qt-ui/maintab.h
+++ b/qt-ui/maintab.h
@@ -38,6 +38,8 @@ public:
 	void reload();
 
 	bool eventFilter(QObject* , QEvent*);
+    virtual void resizeEvent(QResizeEvent* );
+    virtual void showEvent(QShowEvent* );
 
 public Q_SLOTS:
 	void on_addCylinder_clicked();
@@ -63,6 +65,8 @@ private:
 	CylindersModel *cylindersModel;
 	NotesBackup notesBackup;
 	struct dive* currentDive;
+	QPushButton *addCylinder;
+	QPushButton *addWeight;
 };
 
 #endif
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index 0a31897a4..0784980eb 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -14,7 +14,7 @@
    <string>TabWidget</string>
   </property>
   <property name="currentIndex">
-   <number>0</number>
+   <number>1</number>
   </property>
   <widget class="QWidget" name="notesTab">
    <attribute name="title">
@@ -78,22 +78,22 @@
      </widget>
     </item>
     <item row="5" column="0">
-        <layout class="QHBoxLayout" name="ratingVisibilityLabels">
-	  <item>
-	    <widget class="QLabel" name="label_14">
-	      <property name="text">
-		<string>Rating</string>
-	      </property>
-	    </widget>
-	  </item>
-	  <item>
-	    <widget class="QLabel" name="visibilityLabel">
-	      <property name="text">
-		<string>Visibility</string>
-	      </property>
-	    </widget>
-	  </item>
-	</layout>
+     <layout class="QHBoxLayout" name="ratingVisibilityLabels">
+      <item>
+       <widget class="QLabel" name="label_14">
+        <property name="text">
+         <string>Rating</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="visibilityLabel">
+        <property name="text">
+         <string>Visibility</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
     <item row="5" column="1">
      <widget class="QLabel" name="label_19">
@@ -110,14 +110,14 @@
      </widget>
     </item>
     <item row="6" column="0">
-      <layout class="QHBoxLayout" name="ratingVisibilityWidgets">
-	<item>
-	  <widget class="StarWidget" name="rating" native="true"/>
-	</item>
-	<item>
-	  <widget class="StarWidget" name="visibility" native="true"/>
-	</item>
-      </layout>
+     <layout class="QHBoxLayout" name="ratingVisibilityWidgets">
+      <item>
+       <widget class="StarWidget" name="rating" native="true"/>
+      </item>
+      <item>
+       <widget class="StarWidget" name="visibility" native="true"/>
+      </item>
+     </layout>
     </item>
     <item row="10" column="1">
      <widget class="QPushButton" name="editReset">
@@ -151,55 +151,17 @@
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
-      <widget class="QGroupBox" name="groupBox">
+      <widget class="QGroupBox" name="cylindersGroup">
        <property name="title">
         <string>Cylinders</string>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QTableView" name="cylinders"/>
         </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QPushButton" name="editCylinder">
-            <property name="text">
-             <string>Edit</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="addCylinder">
-            <property name="text">
-             <string>Add</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QPushButton" name="delCylinder">
-            <property name="text">
-             <string>Delete</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
        </layout>
       </widget>
-      <widget class="QGroupBox" name="groupBox_3">
+      <widget class="QGroupBox" name="weightGroup">
        <property name="title">
         <string>Weight</string>
        </property>
@@ -207,44 +169,6 @@
         <item>
          <widget class="QTableView" name="weights"/>
         </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="QPushButton" name="editWeight">
-            <property name="text">
-             <string>Edit</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="addWeight">
-            <property name="text">
-             <string>Add</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QPushButton" name="delWeight">
-            <property name="text">
-             <string>Delete</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
        </layout>
       </widget>
      </widget>
@@ -271,24 +195,15 @@
     </item>
     <item>
      <layout class="QGridLayout" name="diveInfoUpperGridLayout">
-      <property name="leftMargin">
-       <number>10</number>
-      </property>
-      <property name="topMargin">
-       <number>10</number>
-      </property>
-      <property name="rightMargin">
-       <number>10</number>
-      </property>
-      <property name="bottomMargin">
-       <number>10</number>
-      </property>
       <property name="horizontalSpacing">
        <number>10</number>
       </property>
       <property name="verticalSpacing">
        <number>15</number>
       </property>
+      <property name="margin">
+       <number>10</number>
+      </property>
       <item row="0" column="0">
        <widget class="QLabel" name="sacLabel">
         <property name="font">
@@ -386,16 +301,7 @@
     </item>
     <item>
      <layout class="QGridLayout" name="diveInfoLowerGridLayout">
-      <property name="leftMargin">
-       <number>10</number>
-      </property>
-      <property name="topMargin">
-       <number>10</number>
-      </property>
-      <property name="rightMargin">
-       <number>10</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>10</number>
       </property>
       <property name="spacing">
@@ -598,16 +504,7 @@
     </item>
     <item>
      <layout class="QGridLayout" name="statsUpperGridLayout">
-      <property name="leftMargin">
-       <number>10</number>
-      </property>
-      <property name="topMargin">
-       <number>10</number>
-      </property>
-      <property name="rightMargin">
-       <number>10</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>10</number>
       </property>
       <property name="spacing">
@@ -750,16 +647,7 @@
     </item>
     <item>
      <layout class="QGridLayout" name="statsLowerGridLayout">
-      <property name="leftMargin">
-       <number>10</number>
-      </property>
-      <property name="topMargin">
-       <number>10</number>
-      </property>
-      <property name="rightMargin">
-       <number>10</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>10</number>
       </property>
       <property name="spacing">
diff --git a/subsurface.qrc b/subsurface.qrc
index e1939f28e..6ec97071f 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -2,5 +2,6 @@
  <qresource>
     <file alias="star">star.svg</file>
     <file alias="subsurface-icon">subsurface-icon.png</file>
+	<file alias="plus">plus.png</file>
  </qresource>
  </RCC>