From e49d6213ad129284a45d53c3fcdc03249e84efe2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 3 Sep 2015 14:20:19 -0300 Subject: 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 Signed-off-by: Dirk Hohndel --- desktop-widgets/mainwindow.ui | 761 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 761 insertions(+) create mode 100644 desktop-widgets/mainwindow.ui (limited to 'desktop-widgets/mainwindow.ui') diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui new file mode 100644 index 000000000..5e3200cfc --- /dev/null +++ b/desktop-widgets/mainwindow.ui @@ -0,0 +1,761 @@ + + + MainWindow + + + + 0 + 0 + 861 + 800 + + + + + + 0 + + + 0 + + + + + + + + Qt::Vertical + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + + + + + + + + + 0 + 0 + 861 + 23 + + + + + &File + + + + + + + + + + + + + + + + + + + + + + + + + &Log + + + + + + + + + + + + + + + + + &View + + + + + + + + + + + + + + + + &Help + + + + + + + + + &Import + + + + + + + + + &Edit + + + + + Share on + + + + + + + + + + + + + + + &New logbook + + + New + + + Ctrl+N + + + + + &Open logbook + + + Open + + + Ctrl+O + + + + + &Save + + + Save + + + Ctrl+S + + + + + Sa&ve as + + + Save as + + + Ctrl+Shift+S + + + + + &Close + + + Close + + + Ctrl+W + + + + + &Print + + + Ctrl+P + + + + + P&references + + + Ctrl+, + + + QAction::PreferencesRole + + + + + &Quit + + + Ctrl+Q + + + QAction::QuitRole + + + + + Import from &dive computer + + + Ctrl+D + + + + + Import &GPS data from Subsurface web service + + + Ctrl+G + + + + + Edit device &names + + + + + &Add dive + + + Ctrl++ + + + + + &Edit dive + + + + + &Copy dive components + + + Ctrl+C + + + + + &Paste dive components + + + Ctrl+V + + + + + &Renumber + + + Ctrl+R + + + + + true + + + Auto &group + + + + + &Yearly statistics + + + Ctrl+Y + + + + + &Dive list + + + Ctrl+2 + + + + + &Profile + + + Ctrl+3 + + + + + &Info + + + Ctrl+4 + + + + + &All + + + Ctrl+1 + + + + + P&revious DC + + + Left + + + + + &Next DC + + + Right + + + + + &About Subsurface + + + QAction::AboutRole + + + + + User &manual + + + F1 + + + + + &Globe + + + Ctrl+5 + + + + + P&lan dive + + + Ctrl+L + + + + + &Import log files + + + Import divelog files from other applications + + + Ctrl+I + + + + + Import &from divelogs.de + + + + + true + + + &Full screen + + + Toggle full screen + + + F11 + + + + + false + + + + + false + + + + + false + + + + + false + + + + + &Check for updates + + + + + &Export + + + Export dive logs + + + Ctrl+E + + + + + Configure &dive computer + + + Ctrl+Shift+C + + + QAction::NoRole + + + + + Edit &dive in planner + + + + + true + + + + :/icon_o2:/icon_o2 + + + Toggle pO₂ graph + + + + + true + + + + :/icon_n2:/icon_n2 + + + Toggle pN₂ graph + + + + + true + + + + :/icon_he:/icon_he + + + Toggle pHe graph + + + + + true + + + + :/icon_ceiling_dc:/icon_ceiling_dc + + + Toggle DC reported ceiling + + + + + true + + + + :/icon_ceiling_calculated:/icon_ceiling_calculated + + + Toggle calculated ceiling + + + + + true + + + + :/icon_ceiling_alltissues:/icon_ceiling_alltissues + + + Toggle calculating all tissues + + + + + true + + + + :/icon_ceiling_3m:/icon_ceiling_3m + + + Toggle calculated ceiling with 3m increments + + + + + true + + + + :/icon_HR:/icon_HR + + + Toggle heart rate + + + + + true + + + + :/icon_mod:/icon_mod + + + Toggle MOD + + + + + true + + + + :/icon_ead:/icon_ead + + + Toggle EAD, END, EADD + + + + + true + + + + :/icon_NDLTTS:/icon_NDLTTS + + + Toggle NDL, TTS + + + + + true + + + + :/icon_lung:/icon_lung + + + Toggle SAC rate + + + + + true + + + + :/ruler:/ruler + + + Toggle ruler + + + + + true + + + + :/scale:/scale + + + Scale graph + + + + + true + + + + :/pictures:/pictures + + + Toggle pictures + + + + + true + + + + :/gaschange:/gaschange + + + Toggle tank bar + + + + + true + + + &Filter divelist + + + Ctrl+F + + + + + true + + + + :/icon_tissue:/icon_tissue + + + Toggle tissue graph + + + + + User &survey + + + + + &Undo + + + Ctrl+Z + + + + + &Redo + + + Ctrl+Shift+Z + + + + + &Find moved images + + + + + Open c&loud storage + + + + + Save to clo&ud storage + + + + + &Manage dive sites + + + + + Dive Site &Edit + + + + + Facebook + + + + + + NotificationWidget + QWidget +
notificationwidget.h
+ 1 + + + MultiFilter + QWidget +
simplewidgets.h
+ 1 + + + + + + + -- cgit v1.2.3-70-g09d2 From c1b2907071432f6a313605950fa95c8eff000a55 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 9 Oct 2015 18:11:18 -0300 Subject: Fix warnings Also, disable Facebook temporarely since I'm removing the preferences widget in a few commits. Facebook will have to change to use a new way of connection that I'm still creating. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- desktop-widgets/mainwindow.ui | 1 - desktop-widgets/preferences.cpp | 3 +++ desktop-widgets/preferences/preferences_network.h | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'desktop-widgets/mainwindow.ui') diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui index 5e3200cfc..c62e1df7f 100644 --- a/desktop-widgets/mainwindow.ui +++ b/desktop-widgets/mainwindow.ui @@ -142,7 +142,6 @@ Share on - diff --git a/desktop-widgets/preferences.cpp b/desktop-widgets/preferences.cpp index 2ec9ee96d..29e9d2458 100644 --- a/desktop-widgets/preferences.cpp +++ b/desktop-widgets/preferences.cpp @@ -142,6 +142,8 @@ void PreferencesDialog::buttonClicked(QAbstractButton *button) } #undef SB +#if 0 +// TODO: Copy this later. void PreferencesDialog::on_resetSettings_clicked() { QSettings s; @@ -163,6 +165,7 @@ void PreferencesDialog::on_resetSettings_clicked() close(); } } +#endif void PreferencesDialog::emitSettingsChanged() { diff --git a/desktop-widgets/preferences/preferences_network.h b/desktop-widgets/preferences/preferences_network.h index 8f35adeb0..3e17d51b0 100644 --- a/desktop-widgets/preferences/preferences_network.h +++ b/desktop-widgets/preferences/preferences_network.h @@ -9,17 +9,19 @@ namespace Ui { class PreferencesNetwork : public AbstractPreferencesWidget { Q_OBJECT + public: PreferencesNetwork(); virtual ~PreferencesNetwork(); virtual void refreshSettings(); virtual void syncSettings(); +public slots: + void proxyType_changed(int i); + private: Ui::PreferencesNetwork *ui; - void cloudPinNeeded(); - void proxyType_changed(int i); void passwordUpdateSuccessfull(); }; -- cgit v1.2.3-70-g09d2