Move qt-ui to desktop-widgets

Since we have now destkop and mobile versions, 'qt-ui' was a very
poor name choice for a folder that contains only destkop-enabled
widgets.

Also, move the graphicsview-common.h/cpp to subsurface-core because
it doesn't depend on qgraphicsview, it merely implements all the
colors that we use throughout Subsurface, and we will use colors on both
desktop and mobile versions

Same thing applies for metrics.h/cpp

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

CMakeLists.txt

@@ -37,10 +37,10 @@ set(CMAKE_MODULE_PATH
 include_directories(.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_BINARY_DIR}
-	${CMAKE_BINARY_DIR}/qt-ui
+	${CMAKE_BINARY_DIR}/desktop-widgets
-	qt-ui
+	desktop-widgets/
 	qt-models
-	qt-ui/profile
+	desktop-widgets/profile
 	subsurface-core/
 )
 
@@ -362,7 +362,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID)
 	set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lpthread)
 endif()
 
-add_subdirectory(qt-ui)
+add_subdirectory(desktop-widgets)
 
 # create the executables
 if(SUBSURFACE_MOBILE)

desktop-widgets/CMakeLists.txt

@@ -23,12 +23,10 @@ set(SUBSURFACE_INTERFACE
 	diveshareexportdialog.cpp
 	downloadfromdivecomputer.cpp
 	globe.cpp
-	graphicsview-common.cpp
 	kmessagewidget.cpp
 	maintab.cpp
 	mainwindow.cpp
 	modeldelegates.cpp
-	metrics.cpp
 	notificationwidget.cpp
 	preferences.cpp
 	simplewidgets.cpp

desktop-widgets/maintab.ui

@@ -525,8 +525,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>70</width>
+         <width>445</width>
-         <height>16</height>
+         <height>754</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="equipmentTabScrollAreaLayout">
@@ -1229,7 +1229,7 @@
   <customwidget>
    <class>TagWidget</class>
    <extends>QPlainTextEdit</extends>
-   <header>qt-ui/tagwidget.h</header>
+   <header>tagwidget.h</header>
   </customwidget>
   <customwidget>
    <class>DivePictureWidget</class>

desktop-widgets/mainwindow.cpp

@@ -50,6 +50,7 @@
 #include <QUndoStack>
 #include <qthelper.h>
 #include <QtConcurrentRun>
+#include "subsurface-core/color.h"
 
 #if defined(FBSUPPORT)
 #include "socialnetworks.h"

desktop-widgets/profile/divecartesianaxis.h

@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <QGraphicsLineItem>
-#include <graphicsview-common.h>
+#include "subsurface-core/color.h"
 
 class QPropertyAnimation;
 class DiveTextItem;

desktop-widgets/profile/diveprofileitem.h

@@ -5,7 +5,6 @@
 #include <QGraphicsPolygonItem>
 #include <QModelIndex>
 
-#include "graphicsview-common.h"
 #include "divelineitem.h"
 
 /* This is the Profile Item, it should be used for quite a lot of things

desktop-widgets/profile/divetextitem.cpp

@@ -1,6 +1,9 @@
 #include "divetextitem.h"
 #include "mainwindow.h"
 #include "profilewidget2.h"
+#include "subsurface-core/color.h"
+
+#include <QBrush>
 
 DiveTextItem::DiveTextItem(QGraphicsItem *parent) : QGraphicsItemGroup(parent),
 	internalAlignFlags(Qt::AlignHCenter | Qt::AlignVCenter),

desktop-widgets/profile/divetextitem.h

@@ -3,8 +3,8 @@
 
 #include <QObject>
 #include <QGraphicsItemGroup>
-#include "graphicsview-common.h"
+
-#include <QBrush>
+class QBrush;
 
 /* A Line Item that has animated-properties. */
 class DiveTextItem : public QObject, public QGraphicsItemGroup {

desktop-widgets/profile/profilewidget2.h

@@ -13,7 +13,6 @@
 //  *
 //  * It needs to be dynamic, things should *flow* on it, not just appear / disappear.
 //  */
-#include "graphicsview-common.h"
 #include "divelineitem.h"
 #include "diveprofileitem.h"
 #include "display.h"