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

Pass a fake dive site UUID to the callback.

Browse source 
This is the start of the preparations to edit the dive site,
passing a uuid so we can retrieve it later.

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-11 10:14:45 -08:00 • committed by Dirk Hohndel
parent d769c6016f
commit 42afb4972a
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/maintab.cpp
View file

@ -49,7 +49,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.extraData->setModel(extraDataModel); ui.extraData->setModel(extraDataModel);
closeMessage(); closeMessage();
connect(ui.manageDiveSite, SIGNAL(clicked()), this, SIGNAL(requestDiveSiteEdit())); connect(ui.manageDiveSite, SIGNAL(clicked()), this, SLOT(prepareDiveSiteEdit()));
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()));
@ -213,6 +213,11 @@ MainTab::~MainTab()
} }
} }
void MainTab::prepareDiveSiteEdit() {
//TODO: GET THE CORRECT DIVESITE UUID HERE
QUuid id = QUuid::createUuid();
emit requestDiveSiteEdit(id);
}
void MainTab::toggleTriggeredColumn() void MainTab::toggleTriggeredColumn()
{ {
QAction *action = qobject_cast<QAction *>(sender()); QAction *action = qobject_cast<QAction *>(sender());

5
qt-ui/maintab.h
View file

@ -10,6 +10,7 @@
#include <QTabWidget> #include <QTabWidget>
#include <QDialog> #include <QDialog>
#include <QMap> #include <QMap>
#include <QUuid>
#include "ui_maintab.h" #include "ui_maintab.h"
#include "completionmodels.h" #include "completionmodels.h"
@ -55,7 +56,7 @@ public:
signals: signals:
void addDiveFinished(); void addDiveFinished();
void dateTimeChanged(); void dateTimeChanged();
void requestDiveSiteEdit(); void requestDiveSiteEdit(QUuid diveSiteId);
public public
slots: slots:
void addCylinder_clicked(); void addCylinder_clicked();
@ -93,7 +94,7 @@ slots:
void photoDoubleClicked(const QString filePath); void photoDoubleClicked(const QString filePath);
void removeSelectedPhotos(); void removeSelectedPhotos();
void updateGpsCoordinates(); void updateGpsCoordinates();
void prepareDiveSiteEdit();
private: private:
Ui::MainTab ui; Ui::MainTab ui;
WeightModel *weightModel; WeightModel *weightModel;

4
qt-ui/mainwindow.cpp
View file

@ -111,7 +111,7 @@ 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()), this, SLOT(enableDiveSiteEdit())); connect(mainTab, SIGNAL(requestDiveSiteEdit(QUuid)), this, SLOT(enableDiveSiteEdit(QUuid)));
connect(locationInformation, SIGNAL(informationManagementEnded()), this, SLOT(setDefaultState())); connect(locationInformation, SIGNAL(informationManagementEnded()), this, SLOT(setDefaultState()));
#ifdef NO_PRINTING #ifdef NO_PRINTING
ui.printPlan->hide(); ui.printPlan->hide();
@ -214,7 +214,7 @@ LocationInformationWidget *MainWindow::locationInformationWidget() {
return qobject_cast<LocationInformationWidget*>(applicationState["EditDiveSite"].topLeft); return qobject_cast<LocationInformationWidget*>(applicationState["EditDiveSite"].topLeft);
} }
void MainWindow::enableDiveSiteEdit() { void MainWindow::enableDiveSiteEdit(QUuid id) {
locationInformationWidget()->setLocationName(current_dive->location); locationInformationWidget()->setLocationName(current_dive->location);
locationInformationWidget()->setLocationCoords(printGPSCoords(current_dive->latitude.udeg, current_dive->longitude.udeg)); locationInformationWidget()->setLocationCoords(printGPSCoords(current_dive->latitude.udeg, current_dive->longitude.udeg));
setApplicationState("EditDiveSite"); setApplicationState("EditDiveSite");

3
qt-ui/mainwindow.h
View file

@ -10,6 +10,7 @@
#include <QMainWindow> #include <QMainWindow>
#include <QAction> #include <QAction>
#include <QUrl> #include <QUrl>
#include <QUuid>
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
@ -159,7 +160,7 @@ slots:
void on_paste_triggered(); void on_paste_triggered();
void on_actionFilterTags_triggered(); void on_actionFilterTags_triggered();
void on_actionConfigure_Dive_Computer_triggered(); void on_actionConfigure_Dive_Computer_triggered();
void enableDiveSiteEdit(); void enableDiveSiteEdit(QUuid id);
void setDefaultState(); void setDefaultState();
protected: protected: