mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove information panel from mainwindow.ui

Browse source 
Now it's created in the mainwindow.cpp as part of the new
way to configure the interface.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-02-09 18:58:40 -02:00 • committed by Dirk Hohndel
parent c30aee1ae5
commit 238c0573da
10 changed files with 44 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/divelistview.cpp
View file

@ -8,7 +8,9 @@
#include "filtermodels.h" #include "filtermodels.h"
#include "modeldelegates.h" #include "modeldelegates.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "divepicturewidget.h"
#include <QSettings> #include <QSettings>
#include <QKeyEvent>
#include <QFileDialog> #include <QFileDialog>
#include "qthelper.h" #include "qthelper.h"
#include "undobuffer.h" #include "undobuffer.h"

4
qt-ui/globe.cpp
View file

@ -3,7 +3,11 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "helpers.h" #include "helpers.h"
#include "divelistview.h" #include "divelistview.h"
#include "maintab.h"
#include <QTimer> #include <QTimer>
#include <QContextMenuEvent>
#include <QMouseEvent>
#include <marble/AbstractFloatItem.h> #include <marble/AbstractFloatItem.h>
#include <marble/GeoDataPlacemark.h> #include <marble/GeoDataPlacemark.h>

57
qt-ui/mainwindow.cpp
View file

@ -22,6 +22,7 @@
#include "planner.h" #include "planner.h"
#include "filtermodels.h" #include "filtermodels.h"
#include "globe.h" #include "globe.h"
#include "maintab.h"
#ifndef NO_PRINTING #ifndef NO_PRINTING
#include <QPrintDialog> #include <QPrintDialog>
#include "printdialog.h" #include "printdialog.h"
@ -85,7 +86,7 @@ MainWindow::MainWindow() : QMainWindow(),
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(readSettings())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(readSettings()));
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveListView, SLOT(update())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveListView, SLOT(update()));
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveListView, SLOT(reloadHeaderActions())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveListView, SLOT(reloadHeaderActions()));
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.InfoWidget, SLOT(updateDiveInfo())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), information(), SLOT(updateDiveInfo()));
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.divePlannerWidget, SLOT(settingsChanged())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.divePlannerWidget, SLOT(settingsChanged()));
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.plannerSettingsWidget, SLOT(settingsChanged())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.plannerSettingsWidget, SLOT(settingsChanged()));
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), TankInfoModel::instance(), SLOT(update())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), TankInfoModel::instance(), SLOT(update()));
@ -119,7 +120,7 @@ MainWindow::MainWindow() : QMainWindow(),
ui.globePane->hide(); ui.globePane->hide();
ui.menuView->removeAction(ui.actionViewGlobe); ui.menuView->removeAction(ui.actionViewGlobe);
#else #else
connect(globe(), SIGNAL(coordinatesChanged()), ui.InfoWidget, SLOT(updateGpsCoordinates())); connect(globe(), SIGNAL(coordinatesChanged()), information(), SLOT(updateGpsCoordinates()));
#endif #endif
#ifdef NO_USERMANUAL #ifdef NO_USERMANUAL
ui.menuHelp->removeAction(ui.actionUserManual); ui.menuHelp->removeAction(ui.actionUserManual);
@ -199,7 +200,7 @@ MainWindow *MainWindow::instance()
void MainWindow::refreshDisplay(bool doRecreateDiveList) void MainWindow::refreshDisplay(bool doRecreateDiveList)
{ {
showError(get_error_string()); showError(get_error_string());
ui.InfoWidget->reload(); information()->reload();
TankInfoModel::instance()->update(); TankInfoModel::instance()->update();
globe()->reload(); globe()->reload();
if (doRecreateDiveList) if (doRecreateDiveList)
@ -232,7 +233,7 @@ void MainWindow::current_dive_changed(int divenr)
globe()->centerOnCurrentDive(); globe()->centerOnCurrentDive();
} }
ui.newProfile->plotDive(); ui.newProfile->plotDive();
ui.InfoWidget->updateDiveInfo(); information()->updateDiveInfo();
} }
void MainWindow::on_actionNew_triggered() void MainWindow::on_actionNew_triggered()
@ -280,10 +281,10 @@ ProfileWidget2 *MainWindow::graphics() const
void MainWindow::cleanUpEmpty() void MainWindow::cleanUpEmpty()
{ {
ui.InfoWidget->clearStats(); information()->clearStats();
ui.InfoWidget->clearInfo(); information()->clearInfo();
ui.InfoWidget->clearEquipment(); information()->clearEquipment();
ui.InfoWidget->updateDiveInfo(true); information()->updateDiveInfo(true);
ui.newProfile->setEmptyState(); ui.newProfile->setEmptyState();
dive_list()->reload(DiveTripModel::TREE); dive_list()->reload(DiveTripModel::TREE);
globe()->reload(); globe()->reload();
@ -295,7 +296,7 @@ void MainWindow::cleanUpEmpty()
bool MainWindow::okToClose(QString message) bool MainWindow::okToClose(QString message)
{ {
if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING || if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
ui.InfoWidget->isEditing()) { information()->isEditing()) {
QMessageBox::warning(this, tr("Warning"), message); QMessageBox::warning(this, tr("Warning"), message);
return false; return false;
} }
@ -394,9 +395,9 @@ void MainWindow::on_actionPreferences_triggered()
void MainWindow::on_actionQuit_triggered() void MainWindow::on_actionQuit_triggered()
{ {
if (ui.InfoWidget->isEditing()) { if (information()->isEditing()) {
ui.InfoWidget->rejectChanges(); information()->rejectChanges();
if (ui.InfoWidget->isEditing()) if (information()->isEditing())
// didn't discard the edits // didn't discard the edits
return; return;
} }
@ -442,7 +443,7 @@ void MainWindow::on_actionEditDeviceNames_triggered()
bool MainWindow::plannerStateClean() bool MainWindow::plannerStateClean()
{ {
if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING || if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
ui.InfoWidget->isEditing()) { information()->isEditing()) {
QMessageBox::warning(this, tr("Warning"), tr("Please save or cancel the current dive edit before trying to add a dive.")); QMessageBox::warning(this, tr("Warning"), tr("Please save or cancel the current dive edit before trying to add a dive."));
return false; return false;
} }
@ -472,7 +473,7 @@ void MainWindow::planCreated()
set_dive_nr_for_current_dive(); set_dive_nr_for_current_dive();
} }
// make sure our UI is in a consistent state // make sure our UI is in a consistent state
ui.InfoWidget->updateDiveInfo(); information()->updateDiveInfo();
showProfile(); showProfile();
refreshDisplay(); refreshDisplay();
} }
@ -578,12 +579,12 @@ void MainWindow::on_actionAddDive_triggered()
setupForAddAndPlan("manually added dive"); // don't translate, stored in the XML file setupForAddAndPlan("manually added dive"); // don't translate, stored in the XML file
// now show the mostly empty main tab // now show the mostly empty main tab
ui.InfoWidget->updateDiveInfo(); information()->updateDiveInfo();
// show main tab // show main tab
ui.InfoWidget->setCurrentIndex(0); information()->setCurrentIndex(0);
ui.InfoWidget->addDiveStarted(); information()->addDiveStarted();
ui.infoPane->setCurrentIndex(MAINTAB); ui.infoPane->setCurrentIndex(MAINTAB);
ui.newProfile->setAddState(); ui.newProfile->setAddState();
@ -744,7 +745,7 @@ void MainWindow::on_actionPreviousDC_triggered()
unsigned nrdc = number_of_computers(current_dive); unsigned nrdc = number_of_computers(current_dive);
dc_number = (dc_number + nrdc - 1) % nrdc; dc_number = (dc_number + nrdc - 1) % nrdc;
ui.newProfile->plotDive(); ui.newProfile->plotDive();
ui.InfoWidget->updateDiveInfo(); information()->updateDiveInfo();
} }
void MainWindow::on_actionNextDC_triggered() void MainWindow::on_actionNextDC_triggered()
@ -752,7 +753,7 @@ void MainWindow::on_actionNextDC_triggered()
unsigned nrdc = number_of_computers(current_dive); unsigned nrdc = number_of_computers(current_dive);
dc_number = (dc_number + 1) % nrdc; dc_number = (dc_number + 1) % nrdc;
ui.newProfile->plotDive(); ui.newProfile->plotDive();
ui.InfoWidget->updateDiveInfo(); information()->updateDiveInfo();
} }
void MainWindow::on_actionFullScreen_triggered(bool checked) void MainWindow::on_actionFullScreen_triggered(bool checked)
@ -986,7 +987,7 @@ void MainWindow::writeSettings()
void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::closeEvent(QCloseEvent *event)
{ {
if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING || if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
ui.InfoWidget->isEditing()) { information()->isEditing()) {
on_actionQuit_triggered(); on_actionQuit_triggered();
event->ignore(); event->ignore();
return; return;
@ -1025,7 +1026,7 @@ GlobeGPS *MainWindow::globe()
MainTab *MainWindow::information() MainTab *MainWindow::information()
{ {
return ui.InfoWidget; return qobject_cast<MainTab*>(applicationState["Default"].topLeft);
} }
void MainWindow::loadRecentFiles(QSettings *s) void MainWindow::loadRecentFiles(QSettings *s)
@ -1200,8 +1201,8 @@ int MainWindow::file_save_as(void)
if (filename.isNull() || filename.isEmpty()) if (filename.isNull() || filename.isEmpty())
return report_error("No filename to save into"); return report_error("No filename to save into");
if (ui.InfoWidget->isEditing()) if (information()->isEditing())
ui.InfoWidget->acceptChanges(); information()->acceptChanges();
if (save_dives(filename.toUtf8().data())) { if (save_dives(filename.toUtf8().data())) {
showError(get_error_string()); showError(get_error_string());
@ -1223,8 +1224,8 @@ int MainWindow::file_save(void)
if (!existing_filename) if (!existing_filename)
return file_save_as(); return file_save_as();
if (ui.InfoWidget->isEditing()) if (information()->isEditing())
ui.InfoWidget->acceptChanges(); information()->acceptChanges();
current_default = prefs.default_filename; current_default = prefs.default_filename;
if (strcmp(existing_filename, current_default) == 0) { if (strcmp(existing_filename, current_default) == 0) {
@ -1392,7 +1393,7 @@ void MainWindow::editCurrentDive()
ui.newProfile->setAddState(); ui.newProfile->setAddState();
ui.infoPane->setCurrentIndex(MAINTAB); ui.infoPane->setCurrentIndex(MAINTAB);
DivePlannerPointsModel::instance()->loadFromDive(d); DivePlannerPointsModel::instance()->loadFromDive(d);
ui.InfoWidget->enableEdition(MainTab::MANUALLY_ADDED_DIVE); information()->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
} else if (defaultDC == "planned dive") { } else if (defaultDC == "planned dive") {
disableShortcuts(); disableShortcuts();
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN);
@ -1402,7 +1403,7 @@ void MainWindow::editCurrentDive()
//ui.stackedWidget->setCurrentIndex(PLANNERPROFILE); // Planner. //ui.stackedWidget->setCurrentIndex(PLANNERPROFILE); // Planner.
ui.infoPane->setCurrentIndex(PLANNERWIDGET); ui.infoPane->setCurrentIndex(PLANNERWIDGET);
DivePlannerPointsModel::instance()->loadFromDive(d); DivePlannerPointsModel::instance()->loadFromDive(d);
ui.InfoWidget->enableEdition(MainTab::MANUALLY_ADDED_DIVE); information()->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
} }
} }
@ -1477,7 +1478,7 @@ void MainWindow::on_paste_triggered()
{ {
// take the data in our copyPasteDive and apply it to selected dives // take the data in our copyPasteDive and apply it to selected dives
selective_copy_dive(&copyPasteDive, &displayed_dive, what, false); selective_copy_dive(&copyPasteDive, &displayed_dive, what, false);
ui.InfoWidget->showAndTriggerEditSelective(what); information()->showAndTriggerEditSelective(what);
} }
void MainWindow::on_actionFilterTags_triggered() void MainWindow::on_actionFilterTags_triggered()

9
qt-ui/mainwindow.ui
View file

@ -36,9 +36,6 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="MainTab" name="InfoWidget" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_2"> <widget class="QWidget" name="page_2">
@ -833,12 +830,6 @@ p, li { white-space: pre-wrap; }
<header>kmessagewidget.h</header> <header>kmessagewidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>MainTab</class>
<extends>QWidget</extends>
<header>qt-ui/maintab.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>DivePlannerWidget</class> <class>DivePlannerWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>

2
qt-ui/modeldelegates.cpp
View file

@ -3,8 +3,10 @@
#include "gettextfromc.h" #include "gettextfromc.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "models.h" #include "models.h"
#include "starwidget.h"
#include <QCompleter> #include <QCompleter>
#include <QKeyEvent>
QSize DiveListDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const QSize DiveListDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {

1
qt-ui/profile/diveprofileitem.cpp
View file

@ -9,6 +9,7 @@
#include "helpers.h" #include "helpers.h"
#include "libdivecomputer/parser.h" #include "libdivecomputer/parser.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "maintab.h"
#include <QSettings> #include <QSettings>

3
qt-ui/profile/profilewidget2.cpp
View file

@ -10,7 +10,9 @@
#include "ruleritem.h" #include "ruleritem.h"
#include "tankitem.h" #include "tankitem.h"
#include "pref.h" #include "pref.h"
#include "divepicturewidget.h"
#include "models.h" #include "models.h"
#include "maintab.h"
#include <libdivecomputer/parser.h> #include <libdivecomputer/parser.h>
#include <QScrollBar> #include <QScrollBar>
@ -18,6 +20,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QInputDialog> #include <QInputDialog>
#include <QDebug> #include <QDebug>
#include <QWheelEvent>
#ifndef QT_NO_DEBUG #ifndef QT_NO_DEBUG
#include <QTableView> #include <QTableView>

1
qt-ui/simplewidgets.cpp
View file

@ -5,6 +5,7 @@
#include <QFileDialog> #include <QFileDialog>
#include <QShortcut> #include <QShortcut>
#include <QCalendarWidget> #include <QCalendarWidget>
#include <QKeyEvent>
#include "file.h" #include "file.h"
#include "mainwindow.h" #include "mainwindow.h"

1
qt-ui/subsurfacewebservices.cpp
View file

@ -4,6 +4,7 @@
#include "usersurvey.h" #include "usersurvey.h"
#include "divelist.h" #include "divelist.h"
#include "globe.h" #include "globe.h"
#include "maintab.h"
#include <errno.h> #include <errno.h>

1
qt-ui/tagwidget.cpp
View file

@ -1,5 +1,6 @@
#include "tagwidget.h" #include "tagwidget.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "maintab.h"
#include <QCompleter> #include <QCompleter>
TagWidget::TagWidget(QWidget *parent) : GroupedLineEdit(parent), m_completer(NULL), lastFinishedTag(false) TagWidget::TagWidget(QWidget *parent) : GroupedLineEdit(parent), m_completer(NULL), lastFinishedTag(false)