summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt3
-rw-r--r--desktop-widgets/CMakeLists.txt19
-rw-r--r--desktop-widgets/diveplanner.cpp6
-rw-r--r--desktop-widgets/maintab.cpp2
-rw-r--r--desktop-widgets/mainwindow.cpp2
-rw-r--r--desktop-widgets/modeldelegates.cpp2
-rw-r--r--desktop-widgets/printer.cpp1
-rw-r--r--desktop-widgets/printer.h1
-rw-r--r--desktop-widgets/simplewidgets.cpp2
-rw-r--r--desktop-widgets/socialnetworks.cpp2
-rw-r--r--profile-widget/CMakeLists.txt19
-rw-r--r--profile-widget/animationfunctions.cpp (renamed from desktop-widgets/profile/animationfunctions.cpp)0
-rw-r--r--profile-widget/animationfunctions.h (renamed from desktop-widgets/profile/animationfunctions.h)0
-rw-r--r--profile-widget/divecartesianaxis.cpp (renamed from desktop-widgets/profile/divecartesianaxis.cpp)0
-rw-r--r--profile-widget/divecartesianaxis.h (renamed from desktop-widgets/profile/divecartesianaxis.h)0
-rw-r--r--profile-widget/diveeventitem.cpp (renamed from desktop-widgets/profile/diveeventitem.cpp)0
-rw-r--r--profile-widget/diveeventitem.h (renamed from desktop-widgets/profile/diveeventitem.h)0
-rw-r--r--profile-widget/divelineitem.cpp (renamed from desktop-widgets/profile/divelineitem.cpp)0
-rw-r--r--profile-widget/divelineitem.h (renamed from desktop-widgets/profile/divelineitem.h)0
-rw-r--r--profile-widget/divepixmapitem.cpp (renamed from desktop-widgets/profile/divepixmapitem.cpp)0
-rw-r--r--profile-widget/divepixmapitem.h (renamed from desktop-widgets/profile/divepixmapitem.h)0
-rw-r--r--profile-widget/diveprofileitem.cpp (renamed from desktop-widgets/profile/diveprofileitem.cpp)2
-rw-r--r--profile-widget/diveprofileitem.h (renamed from desktop-widgets/profile/diveprofileitem.h)0
-rw-r--r--profile-widget/diverectitem.cpp (renamed from desktop-widgets/profile/diverectitem.cpp)0
-rw-r--r--profile-widget/diverectitem.h (renamed from desktop-widgets/profile/diverectitem.h)0
-rw-r--r--profile-widget/divetextitem.cpp (renamed from desktop-widgets/profile/divetextitem.cpp)0
-rw-r--r--profile-widget/divetextitem.h (renamed from desktop-widgets/profile/divetextitem.h)0
-rw-r--r--profile-widget/divetooltipitem.cpp (renamed from desktop-widgets/profile/divetooltipitem.cpp)0
-rw-r--r--profile-widget/divetooltipitem.h (renamed from desktop-widgets/profile/divetooltipitem.h)0
-rw-r--r--profile-widget/profilewidget2.cpp (renamed from desktop-widgets/profile/profilewidget2.cpp)0
-rw-r--r--profile-widget/profilewidget2.h (renamed from desktop-widgets/profile/profilewidget2.h)0
-rw-r--r--profile-widget/ruleritem.cpp (renamed from desktop-widgets/profile/ruleritem.cpp)0
-rw-r--r--profile-widget/ruleritem.h (renamed from desktop-widgets/profile/ruleritem.h)0
-rw-r--r--profile-widget/tankitem.cpp (renamed from desktop-widgets/profile/tankitem.cpp)0
-rw-r--r--profile-widget/tankitem.h (renamed from desktop-widgets/profile/tankitem.h)0
-rw-r--r--qt-models/CMakeLists.txt1
36 files changed, 32 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdee60858..b5b0195a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,6 +313,8 @@ endif()
add_subdirectory(translations)
add_subdirectory(subsurface-core)
add_subdirectory(qt-models)
+add_subdirectory(profile-widget)
+add_subdirectory(desktop-widgets)
if(FBSUPPORT)
add_definitions(-DFBSUPPORT)
@@ -338,7 +340,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID)
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lpthread)
endif()
-add_subdirectory(desktop-widgets)
# create the executables
if(SUBSURFACE_MOBILE)
diff --git a/desktop-widgets/CMakeLists.txt b/desktop-widgets/CMakeLists.txt
index 2c373b83f..635a8b68e 100644
--- a/desktop-widgets/CMakeLists.txt
+++ b/desktop-widgets/CMakeLists.txt
@@ -75,23 +75,6 @@ endif()
source_group("Subsurface Interface" FILES ${SUBSURFACE_INTERFACE})
-# the profile widget
-set(SUBSURFACE_PROFILE_LIB_SRCS
- profile/profilewidget2.cpp
- profile/diverectitem.cpp
- profile/divepixmapitem.cpp
- profile/divelineitem.cpp
- profile/divetextitem.cpp
- profile/animationfunctions.cpp
- profile/divecartesianaxis.cpp
- profile/diveprofileitem.cpp
- profile/diveeventitem.cpp
- profile/divetooltipitem.cpp
- profile/ruleritem.cpp
- profile/tankitem.cpp
-)
-source_group("Subsurface Profile" FILES ${SUBSURFACE_PROFILE_LIB_SRCS})
-
# the yearly statistics widget.
set(SUBSURFACE_STATISTICS_LIB_SRCS
statistics/statisticswidget.cpp
@@ -101,8 +84,6 @@ set(SUBSURFACE_STATISTICS_LIB_SRCS
)
source_group("Subsurface Statistics" FILES ${SUBSURFACE_STATISTICS_LIB_SRCS})
-add_library(subsurface_profile STATIC ${SUBSURFACE_PROFILE_LIB_SRCS})
-target_link_libraries(subsurface_profile ${QT_LIBRARIES})
add_library(subsurface_statistics STATIC ${SUBSURFACE_STATISTICS_LIB_SRCS})
target_link_libraries(subsurface_statistics ${QT_LIBRARIES})
add_library(subsurface_generated_ui STATIC ${SUBSURFACE_UI_HDRS})
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index b4413d11a..86f03b1d2 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -5,7 +5,7 @@
#include "helpers.h"
#include "cylindermodel.h"
#include "models.h"
-#include "profile/profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
#include "diveplannermodel.h"
#include <QGraphicsSceneMouseEvent>
@@ -328,11 +328,11 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f)
modeMapper->setMapping(ui.recreational_deco, int(RECREATIONAL));
modeMapper->setMapping(ui.buehlmann_deco, int(BUEHLMANN));
modeMapper->setMapping(ui.vpmb_deco, int(VPMB));
-
+
connect(ui.recreational_deco, SIGNAL(clicked()), modeMapper, SLOT(map()));
connect(ui.buehlmann_deco, SIGNAL(clicked()), modeMapper, SLOT(map()));
connect(ui.vpmb_deco, SIGNAL(clicked()), modeMapper, SLOT(map()));
-
+
connect(ui.lastStop, SIGNAL(toggled(bool)), plannerModel, SLOT(setLastStop6m(bool)));
connect(ui.verbatim_plan, SIGNAL(toggled(bool)), plannerModel, SLOT(setVerbatim(bool)));
connect(ui.display_duration, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayDuration(bool)));
diff --git a/desktop-widgets/maintab.cpp b/desktop-widgets/maintab.cpp
index 0afb7b4c0..4d4cd3a5e 100644
--- a/desktop-widgets/maintab.cpp
+++ b/desktop-widgets/maintab.cpp
@@ -13,7 +13,7 @@
#include "diveplannermodel.h"
#include "divelistview.h"
#include "display.h"
-#include "profile/profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
#include "diveplanner.h"
#include "divesitehelpers.h"
#include "cylindermodel.h"
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index e1e0d81a2..43b433d62 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -21,7 +21,7 @@
#include "updatemanager.h"
#include "planner.h"
#include "filtermodels.h"
-#include "profile/profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
#include "globe.h"
#include "divecomputer.h"
#include "maintab.h"
diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp
index 881037a83..1b1a31c0b 100644
--- a/desktop-widgets/modeldelegates.cpp
+++ b/desktop-widgets/modeldelegates.cpp
@@ -5,7 +5,7 @@
#include "cylindermodel.h"
#include "models.h"
#include "starwidget.h"
-#include "profile/profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
#include "tankinfomodel.h"
#include "weigthsysteminfomodel.h"
#include "weightmodel.h"
diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp
index f0197d446..33ee71b55 100644
--- a/desktop-widgets/printer.cpp
+++ b/desktop-widgets/printer.cpp
@@ -8,6 +8,7 @@
#include <QPainter>
#include <QWebElementCollection>
#include <QWebElement>
+#include "profile-widget/profilewidget2.h"
Printer::Printer(QPaintDevice *paintDevice, print_options *printOptions, template_options *templateOptions, PrintMode printMode)
{
diff --git a/desktop-widgets/printer.h b/desktop-widgets/printer.h
index 979cacd6a..e5f16d77d 100644
--- a/desktop-widgets/printer.h
+++ b/desktop-widgets/printer.h
@@ -6,7 +6,6 @@
#include <QRect>
#include <QPainter>
-#include "profile/profilewidget2.h"
#include "printoptions.h"
#include "templateedit.h"
diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 62a9cc646..43ad1ddc0 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -14,7 +14,7 @@
#include "libdivecomputer/parser.h"
#include "divelistview.h"
#include "display.h"
-#include "profile/profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
#include "undocommands.h"
class MinMaxAvgWidgetPrivate {
diff --git a/desktop-widgets/socialnetworks.cpp b/desktop-widgets/socialnetworks.cpp
index 6e191267a..0794c764e 100644
--- a/desktop-widgets/socialnetworks.cpp
+++ b/desktop-widgets/socialnetworks.cpp
@@ -16,7 +16,7 @@
#include <QMessageBox>
#include <QInputDialog>
#include "mainwindow.h"
-#include "profile/profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
#include "pref.h"
#include "helpers.h"
#include "ui_socialnetworksdialog.h"
diff --git a/profile-widget/CMakeLists.txt b/profile-widget/CMakeLists.txt
new file mode 100644
index 000000000..f0a1d8439
--- /dev/null
+++ b/profile-widget/CMakeLists.txt
@@ -0,0 +1,19 @@
+# the profile widget
+set(SUBSURFACE_PROFILE_LIB_SRCS
+ profilewidget2.cpp
+ diverectitem.cpp
+ divepixmapitem.cpp
+ divelineitem.cpp
+ divetextitem.cpp
+ animationfunctions.cpp
+ divecartesianaxis.cpp
+ diveprofileitem.cpp
+ diveeventitem.cpp
+ divetooltipitem.cpp
+ ruleritem.cpp
+ tankitem.cpp
+)
+source_group("Subsurface Profile" FILES ${SUBSURFACE_PROFILE_LIB_SRCS})
+
+add_library(subsurface_profile STATIC ${SUBSURFACE_PROFILE_LIB_SRCS})
+target_link_libraries(subsurface_profile ${QT_LIBRARIES}) \ No newline at end of file
diff --git a/desktop-widgets/profile/animationfunctions.cpp b/profile-widget/animationfunctions.cpp
index a19d50c9d..a19d50c9d 100644
--- a/desktop-widgets/profile/animationfunctions.cpp
+++ b/profile-widget/animationfunctions.cpp
diff --git a/desktop-widgets/profile/animationfunctions.h b/profile-widget/animationfunctions.h
index 3cfcff563..3cfcff563 100644
--- a/desktop-widgets/profile/animationfunctions.h
+++ b/profile-widget/animationfunctions.h
diff --git a/desktop-widgets/profile/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp
index bf5a5380c..bf5a5380c 100644
--- a/desktop-widgets/profile/divecartesianaxis.cpp
+++ b/profile-widget/divecartesianaxis.cpp
diff --git a/desktop-widgets/profile/divecartesianaxis.h b/profile-widget/divecartesianaxis.h
index cc7d0bcf7..cc7d0bcf7 100644
--- a/desktop-widgets/profile/divecartesianaxis.h
+++ b/profile-widget/divecartesianaxis.h
diff --git a/desktop-widgets/profile/diveeventitem.cpp b/profile-widget/diveeventitem.cpp
index 0bbc84267..0bbc84267 100644
--- a/desktop-widgets/profile/diveeventitem.cpp
+++ b/profile-widget/diveeventitem.cpp
diff --git a/desktop-widgets/profile/diveeventitem.h b/profile-widget/diveeventitem.h
index f358fee6d..f358fee6d 100644
--- a/desktop-widgets/profile/diveeventitem.h
+++ b/profile-widget/diveeventitem.h
diff --git a/desktop-widgets/profile/divelineitem.cpp b/profile-widget/divelineitem.cpp
index f9e288a44..f9e288a44 100644
--- a/desktop-widgets/profile/divelineitem.cpp
+++ b/profile-widget/divelineitem.cpp
diff --git a/desktop-widgets/profile/divelineitem.h b/profile-widget/divelineitem.h
index ec88e9da5..ec88e9da5 100644
--- a/desktop-widgets/profile/divelineitem.h
+++ b/profile-widget/divelineitem.h
diff --git a/desktop-widgets/profile/divepixmapitem.cpp b/profile-widget/divepixmapitem.cpp
index 581f6f9b4..581f6f9b4 100644
--- a/desktop-widgets/profile/divepixmapitem.cpp
+++ b/profile-widget/divepixmapitem.cpp
diff --git a/desktop-widgets/profile/divepixmapitem.h b/profile-widget/divepixmapitem.h
index 02c1523f7..02c1523f7 100644
--- a/desktop-widgets/profile/divepixmapitem.h
+++ b/profile-widget/divepixmapitem.h
diff --git a/desktop-widgets/profile/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp
index 2c814678a..7cdccee32 100644
--- a/desktop-widgets/profile/diveprofileitem.cpp
+++ b/profile-widget/diveprofileitem.cpp
@@ -11,7 +11,7 @@
#include "libdivecomputer/parser.h"
#include "mainwindow.h"
#include "maintab.h"
-#include "profile/profilewidget2.h"
+#include "profilewidget2.h"
#include "diveplanner.h"
#include <QSettings>
diff --git a/desktop-widgets/profile/diveprofileitem.h b/profile-widget/diveprofileitem.h
index 0bba7f7a3..0bba7f7a3 100644
--- a/desktop-widgets/profile/diveprofileitem.h
+++ b/profile-widget/diveprofileitem.h
diff --git a/desktop-widgets/profile/diverectitem.cpp b/profile-widget/diverectitem.cpp
index 8cb60c3f5..8cb60c3f5 100644
--- a/desktop-widgets/profile/diverectitem.cpp
+++ b/profile-widget/diverectitem.cpp
diff --git a/desktop-widgets/profile/diverectitem.h b/profile-widget/diverectitem.h
index e616cf591..e616cf591 100644
--- a/desktop-widgets/profile/diverectitem.h
+++ b/profile-widget/diverectitem.h
diff --git a/desktop-widgets/profile/divetextitem.cpp b/profile-widget/divetextitem.cpp
index 3bf00d68f..3bf00d68f 100644
--- a/desktop-widgets/profile/divetextitem.cpp
+++ b/profile-widget/divetextitem.cpp
diff --git a/desktop-widgets/profile/divetextitem.h b/profile-widget/divetextitem.h
index be0adf292..be0adf292 100644
--- a/desktop-widgets/profile/divetextitem.h
+++ b/profile-widget/divetextitem.h
diff --git a/desktop-widgets/profile/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp
index d4818422b..d4818422b 100644
--- a/desktop-widgets/profile/divetooltipitem.cpp
+++ b/profile-widget/divetooltipitem.cpp
diff --git a/desktop-widgets/profile/divetooltipitem.h b/profile-widget/divetooltipitem.h
index 4fa7ec2d7..4fa7ec2d7 100644
--- a/desktop-widgets/profile/divetooltipitem.h
+++ b/profile-widget/divetooltipitem.h
diff --git a/desktop-widgets/profile/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 3ccd1bb6d..3ccd1bb6d 100644
--- a/desktop-widgets/profile/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
diff --git a/desktop-widgets/profile/profilewidget2.h b/profile-widget/profilewidget2.h
index f11ec5be1..f11ec5be1 100644
--- a/desktop-widgets/profile/profilewidget2.h
+++ b/profile-widget/profilewidget2.h
diff --git a/desktop-widgets/profile/ruleritem.cpp b/profile-widget/ruleritem.cpp
index 830985552..830985552 100644
--- a/desktop-widgets/profile/ruleritem.cpp
+++ b/profile-widget/ruleritem.cpp
diff --git a/desktop-widgets/profile/ruleritem.h b/profile-widget/ruleritem.h
index 4fad0451c..4fad0451c 100644
--- a/desktop-widgets/profile/ruleritem.h
+++ b/profile-widget/ruleritem.h
diff --git a/desktop-widgets/profile/tankitem.cpp b/profile-widget/tankitem.cpp
index c0e75a371..c0e75a371 100644
--- a/desktop-widgets/profile/tankitem.cpp
+++ b/profile-widget/tankitem.cpp
diff --git a/desktop-widgets/profile/tankitem.h b/profile-widget/tankitem.h
index fd685fc82..fd685fc82 100644
--- a/desktop-widgets/profile/tankitem.h
+++ b/profile-widget/tankitem.h
diff --git a/qt-models/CMakeLists.txt b/qt-models/CMakeLists.txt
index 463d61412..c9bcf5c3d 100644
--- a/qt-models/CMakeLists.txt
+++ b/qt-models/CMakeLists.txt
@@ -23,6 +23,7 @@ set(SUBSURFACE_MODELS_LIB_SRCS
divesitepicturesmodel.cpp
ssrfsortfilterproxymodel.cpp
)
+
source_group("Subsurface Models" FILES ${SUBSURFACE_MODELS})
add_library(subsurface_models STATIC ${SUBSURFACE_MODELS_LIB_SRCS})
target_link_libraries(subsurface_models ${QT_LIBRARIES}) \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 03:28:45 +0000