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

Connect the signals

Browse source 
Connect the signals and slots so we can use the stuff I programmed.

Sorry for the noise on the patch - most of this is whitespace
fixes done by the QtCreator.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-06-04 00:44:00 -03:00 • committed by Dirk Hohndel
parent ddc7717ab8
commit d29d2a43ec
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/maintab.cpp
View file

@ -57,7 +57,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.extraData->setModel(extraDataModel); ui.extraData->setModel(extraDataModel);
closeMessage(); closeMessage();
connect(ui.addDiveSite, SIGNAL(clicked()), this, SLOT(prepareDiveSiteEdit())); connect(ui.addDiveSite, SIGNAL(clicked()), this, SIGNAL(requestDiveSiteAdd()));
QAction *action = new QAction(tr("Apply changes"), this); QAction *action = new QAction(tr("Apply changes"), this);
connect(action, SIGNAL(triggered(bool)), this, SLOT(acceptChanges())); connect(action, SIGNAL(triggered(bool)), this, SLOT(acceptChanges()));

29
qt-ui/mainwindow.cpp
View file

@ -139,10 +139,14 @@ MainWindow::MainWindow() : QMainWindow(),
connect(DivePlannerPointsModel::instance(), SIGNAL(planCreated()), this, SLOT(planCreated())); connect(DivePlannerPointsModel::instance(), SIGNAL(planCreated()), this, SLOT(planCreated()));
connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled())); connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled()));
connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan())); connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan()));
connect(mainTab, SIGNAL(requestDiveSiteEdit(uint32_t)), this, SLOT(enableDiveSiteEdit(uint32_t))); connect(mainTab, SIGNAL(requestDiveSiteAdd()), this, SLOT(enableDiveSiteCreation()));
connect(locationInformation, SIGNAL(informationManagementEnded()), this, SLOT(setDefaultState())); connect(locationInformation, SIGNAL(informationManagementEnded()), this, SLOT(setDefaultState()));
connect(locationInformation, SIGNAL(informationManagementEnded()), information(), SLOT(showLocation())); connect(locationInformation, SIGNAL(informationManagementEnded()), information(), SLOT(showLocation()));
connect(locationInformation, SIGNAL(coordinatesChanged()), globe(), SLOT(repopulateLabels())); connect(locationInformation, SIGNAL(coordinatesChanged()), globe(), SLOT(repopulateLabels()));
connect(globeGps, SIGNAL(coordinatesChanged()), locationInformation, SLOT(updateGpsCoordinates()));
connect(locationInformation, SIGNAL(startEditDiveSite(uint32_t)), globeGps, SLOT(prepareForGetDiveCoordinates()));
connect(locationInformation, SIGNAL(endEditDiveSite()), globeGps, SLOT(prepareForGetDiveCoordinates()));
connect(information(), SIGNAL(diveSiteChanged()), globeGps, SLOT(centerOnCurrentDive()));
#ifdef NO_PRINTING #ifdef NO_PRINTING
plannerDetails->printPlan()->hide(); plannerDetails->printPlan()->hide();
@ -220,7 +224,7 @@ void MainWindow::enableDiveSiteCreation() {
setApplicationState("EditDiveSite"); setApplicationState("EditDiveSite");
} }
void MainWindow::enableDiveSiteEdit(uint32_t id) { void MainWindow::enableDiveSiteEdit(uint32_t id) {
locationInformationWidget()->editDiveSite(id); locationInformationWidget()->editDiveSite(id);
setApplicationState("EditDiveSite"); setApplicationState("EditDiveSite");
} }
@ -417,8 +421,8 @@ 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 ||
information()->isEditing() || information()->isEditing() ||
currentApplicationState == "EditDiveSite") { currentApplicationState == "EditDiveSite") {
QMessageBox::warning(this, tr("Warning"), message); QMessageBox::warning(this, tr("Warning"), message);
return false; return false;
} }
@ -567,7 +571,7 @@ void MainWindow::on_actionEditDeviceNames_triggered()
bool MainWindow::plannerStateClean() bool MainWindow::plannerStateClean()
{ {
if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING || if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
information()->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;
} }
@ -643,7 +647,7 @@ void MainWindow::on_actionReplanDive_triggered()
return; return;
else if (strcmp(current_dive->dc.model, "planned dive")) { else if (strcmp(current_dive->dc.model, "planned dive")) {
if (QMessageBox::warning(this, tr("Warning"), tr("trying to replan a dive that's not a planned dive."), if (QMessageBox::warning(this, tr("Warning"), tr("trying to replan a dive that's not a planned dive."),
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel)
return; return;
} }
// put us in PLAN mode // put us in PLAN mode
@ -727,6 +731,7 @@ void MainWindow::on_actionEditDive_triggered()
disableShortcuts(); disableShortcuts();
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::ADD); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::ADD);
graphics()->setAddState(); graphics()->setAddState();
globe()->endGetDiveCoordinates();
setApplicationState("EditDive"); setApplicationState("EditDive");
DivePlannerPointsModel::instance()->loadFromDive(current_dive); DivePlannerPointsModel::instance()->loadFromDive(current_dive);
information()->enableEdition(MainTab::MANUALLY_ADDED_DIVE); information()->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
@ -1128,7 +1133,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 ||
information()->isEditing()) { information()->isEditing()) {
on_actionQuit_triggered(); on_actionQuit_triggered();
event->ignore(); event->ignore();
return; return;
@ -1340,7 +1345,7 @@ int MainWindow::file_save_as(void)
// create a file dialog that allows us to save to a new file // create a file dialog that allows us to save to a new file
QFileDialog selection_dialog(this, tr("Save file as"), default_filename, QFileDialog selection_dialog(this, tr("Save file as"), default_filename,
tr("Subsurface XML files (*.ssrf *.xml *.XML)")); tr("Subsurface XML files (*.ssrf *.xml *.XML)"));
selection_dialog.setAcceptMode(QFileDialog::AcceptSave); selection_dialog.setAcceptMode(QFileDialog::AcceptSave);
selection_dialog.setFileMode(QFileDialog::AnyFile); selection_dialog.setFileMode(QFileDialog::AnyFile);
selection_dialog.setDefaultSuffix(""); selection_dialog.setDefaultSuffix("");
@ -1466,10 +1471,10 @@ void MainWindow::showV2Dialog()
// here we need to ask the user if / how they want to do the reverse geo coding // here we need to ask the user if / how they want to do the reverse geo coding
// for now this is just a warning that things could take a long time // for now this is just a warning that things could take a long time
QMessageBox d(QMessageBox::Information, QMessageBox d(QMessageBox::Information,
tr("Welcom to Subsurface %1").arg(subsurface_version()), tr("Welcom to Subsurface %1").arg(subsurface_version()),
tr("Importing data files from earlier versions of Subsurface can take a significant amount of time"), tr("Importing data files from earlier versions of Subsurface can take a significant amount of time"),
QMessageBox::Ok, QMessageBox::Ok,
this); this);
d.exec(); d.exec();
} }