summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop-widgets/CMakeLists.txt1
-rw-r--r--desktop-widgets/mainwindow.cpp4
-rw-r--r--desktop-widgets/preferences.h43
-rw-r--r--desktop-widgets/preferences/preferences_network.cpp1
-rw-r--r--desktop-widgets/preferences/preferencesdialog.cpp29
-rw-r--r--desktop-widgets/preferences/preferencesdialog.h8
-rw-r--r--profile-widget/divecartesianaxis.cpp2
-rw-r--r--profile-widget/divepixmapitem.cpp2
-rw-r--r--profile-widget/diveprofileitem.cpp2
-rw-r--r--profile-widget/profilewidget2.cpp2
-rw-r--r--profile-widget/ruleritem.cpp2
11 files changed, 31 insertions, 65 deletions
diff --git a/desktop-widgets/CMakeLists.txt b/desktop-widgets/CMakeLists.txt
index 62be916cc..0a0059ee3 100644
--- a/desktop-widgets/CMakeLists.txt
+++ b/desktop-widgets/CMakeLists.txt
@@ -30,7 +30,6 @@ set(SUBSURFACE_INTERFACE
mainwindow.cpp
modeldelegates.cpp
notificationwidget.cpp
- preferences.cpp
simplewidgets.cpp
starwidget.cpp
subsurfacewebservices.cpp
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 23b4fb9b0..dc45d1d8d 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -15,7 +15,6 @@
#include "version.h"
#include "divelistview.h"
#include "downloadfromdivecomputer.h"
-#include "preferences.h"
#include "subsurfacewebservices.h"
#include "divecomputermanagementdialog.h"
#include "about.h"
@@ -278,8 +277,6 @@ MainWindow::MainWindow() : QMainWindow(),
ui.menubar->show();
set_git_update_cb(&updateProgress);
- PreferencesDialogV2 *d = new PreferencesDialogV2();
- d->show();
}
MainWindow::~MainWindow()
@@ -1785,6 +1782,7 @@ void MainWindow::editCurrentDive()
}
}
+// TODO: Remove the dependency to the PreferencesDialog here.
#define PREF_PROFILE(QT_PREFS) \
QSettings s; \
s.beginGroup("TecDetails"); \
diff --git a/desktop-widgets/preferences.h b/desktop-widgets/preferences.h
deleted file mode 100644
index 4b619dde4..000000000
--- a/desktop-widgets/preferences.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef PREFERENCES_H
-#define PREFERENCES_H
-
-#include <QDialog>
-#include "pref.h"
-
-#include "ui_preferences.h"
-
-#ifndef Q_OS_ANDROID
- class QWebView;
-#endif
-
-class QAbstractButton;
-
-class PreferencesDialog : public QDialog {
- Q_OBJECT
-public:
- static PreferencesDialog *instance();
- void showEvent(QShowEvent *);
- void emitSettingsChanged();
-
-signals:
- void settingsChanged();
-public
-slots:
- void buttonClicked(QAbstractButton *button);
- void syncSettings();
- void loadSettings();
- void restorePrefs();
- void rememberPrefs();
- void facebookLoggedIn();
- void facebookDisconnect();
-private:
- explicit PreferencesDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
- void setUiFromPrefs();
- Ui::PreferencesDialog ui;
- struct preferences oldPrefs;
- #ifndef Q_OS_ANDROID
- QWebView *facebookWebView;
- #endif
-};
-
-#endif // PREFERENCES_H
diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp
index 000df1e7f..3780a6c91 100644
--- a/desktop-widgets/preferences/preferences_network.cpp
+++ b/desktop-widgets/preferences/preferences_network.cpp
@@ -1,6 +1,5 @@
#include "preferences_network.h"
#include "ui_preferences_network.h"
-#include "preferences.h"
#include "dive.h"
#include "subsurfacewebservices.h"
#include "subsurface-core/prefs-macros.h"
diff --git a/desktop-widgets/preferences/preferencesdialog.cpp b/desktop-widgets/preferences/preferencesdialog.cpp
index 5b4cc560e..d59296519 100644
--- a/desktop-widgets/preferences/preferencesdialog.cpp
+++ b/desktop-widgets/preferences/preferencesdialog.cpp
@@ -16,7 +16,18 @@
#include <QAbstractButton>
#include <QDebug>
-PreferencesDialogV2::PreferencesDialogV2()
+PreferencesDialog* PreferencesDialog::instance()
+{
+ PreferencesDialog *self = new PreferencesDialog();
+ return self;
+}
+
+void PreferencesDialog::emitSettingsChanged()
+{
+ emit settingsChanged();
+}
+
+PreferencesDialog::PreferencesDialog()
{
pagesList = new QListWidget();
pagesStack = new QStackedWidget();
@@ -48,14 +59,14 @@ PreferencesDialogV2::PreferencesDialogV2()
connect(pagesList, &QListWidget::currentRowChanged,
pagesStack, &QStackedWidget::setCurrentIndex);
connect(buttonBox, &QDialogButtonBox::clicked,
- this, &PreferencesDialogV2::buttonClicked);
+ this, &PreferencesDialog::buttonClicked);
}
-PreferencesDialogV2::~PreferencesDialogV2()
+PreferencesDialog::~PreferencesDialog()
{
}
-void PreferencesDialogV2::buttonClicked(QAbstractButton* btn)
+void PreferencesDialog::buttonClicked(QAbstractButton* btn)
{
QDialogButtonBox::ButtonRole role = buttonBox->buttonRole(btn);
switch(role) {
@@ -70,13 +81,13 @@ bool abstractpreferenceswidget_lessthan(AbstractPreferencesWidget *p1, AbstractP
return p1->positionHeight() <= p2->positionHeight();
}
-void PreferencesDialogV2::addPreferencePage(AbstractPreferencesWidget *page)
+void PreferencesDialog::addPreferencePage(AbstractPreferencesWidget *page)
{
pages.push_back(page);
qSort(pages.begin(), pages.end(), abstractpreferenceswidget_lessthan);
}
-void PreferencesDialogV2::refreshPages()
+void PreferencesDialog::refreshPages()
{
// Remove things
pagesList->clear();
@@ -95,7 +106,7 @@ void PreferencesDialogV2::refreshPages()
}
}
-void PreferencesDialogV2::applyRequested()
+void PreferencesDialog::applyRequested()
{
Q_FOREACH(AbstractPreferencesWidget *page, pages) {
page->syncSettings();
@@ -104,7 +115,7 @@ void PreferencesDialogV2::applyRequested()
accept();
}
-void PreferencesDialogV2::cancelRequested()
+void PreferencesDialog::cancelRequested()
{
Q_FOREACH(AbstractPreferencesWidget *page, pages) {
page->refreshSettings();
@@ -112,7 +123,7 @@ void PreferencesDialogV2::cancelRequested()
reject();
}
-void PreferencesDialogV2::defaultsRequested()
+void PreferencesDialog::defaultsRequested()
{
prefs = default_prefs;
Q_FOREACH(AbstractPreferencesWidget *page, pages) {
diff --git a/desktop-widgets/preferences/preferencesdialog.h b/desktop-widgets/preferences/preferencesdialog.h
index 720b94c25..611bd5fac 100644
--- a/desktop-widgets/preferences/preferencesdialog.h
+++ b/desktop-widgets/preferences/preferencesdialog.h
@@ -10,16 +10,18 @@ class QStackedWidget;
class QDialogButtonBox;
class QAbstractButton;
-class PreferencesDialogV2 : public QDialog {
+class PreferencesDialog : public QDialog {
Q_OBJECT
public:
- PreferencesDialogV2();
- virtual ~PreferencesDialogV2();
+ static PreferencesDialog* instance();
+ virtual ~PreferencesDialog();
void addPreferencePage(AbstractPreferencesWidget *page);
void refreshPages();
+ void emitSettingsChanged();
signals:
void settingsChanged();
private:
+ PreferencesDialog();
void cancelRequested();
void applyRequested();
void defaultsRequested();
diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp
index bf5a5380c..f40e1c3e5 100644
--- a/profile-widget/divecartesianaxis.cpp
+++ b/profile-widget/divecartesianaxis.cpp
@@ -1,7 +1,7 @@
#include "divecartesianaxis.h"
#include "divetextitem.h"
#include "helpers.h"
-#include "preferences.h"
+#include "preferences/preferencesdialog.h"
#include "diveplotdatamodel.h"
#include "animationfunctions.h"
#include "mainwindow.h"
diff --git a/profile-widget/divepixmapitem.cpp b/profile-widget/divepixmapitem.cpp
index 581f6f9b4..627473c2f 100644
--- a/profile-widget/divepixmapitem.cpp
+++ b/profile-widget/divepixmapitem.cpp
@@ -1,7 +1,7 @@
#include "divepixmapitem.h"
#include "animationfunctions.h"
#include "divepicturemodel.h"
-#include <preferences.h>
+#include "preferences/preferencesdialog.h"
#include <QDesktopServices>
#include <QGraphicsView>
diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp
index 7cdccee32..14efa9123 100644
--- a/profile-widget/diveprofileitem.cpp
+++ b/profile-widget/diveprofileitem.cpp
@@ -5,7 +5,7 @@
#include "animationfunctions.h"
#include "dive.h"
#include "profile.h"
-#include "preferences.h"
+#include "preferences/preferencesdialog.h"
#include "diveplannermodel.h"
#include "helpers.h"
#include "libdivecomputer/parser.h"
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 3ccd1bb6d..8ff8e8669 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -29,7 +29,7 @@
#include <QTableView>
#endif
#include "mainwindow.h"
-#include <preferences.h>
+#include "preferences/preferencesdialog.h"
/* This is the global 'Item position' variable.
* it should tell you where to position things up
diff --git a/profile-widget/ruleritem.cpp b/profile-widget/ruleritem.cpp
index 830985552..a5a61c0fe 100644
--- a/profile-widget/ruleritem.cpp
+++ b/profile-widget/ruleritem.cpp
@@ -1,5 +1,5 @@
#include "ruleritem.h"
-#include "preferences.h"
+#include "preferences/preferencesdialog.h"
#include "mainwindow.h"
#include "profilewidget2.h"
#include "display.h"
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 10:37:00 +0000