diff options
| -rw-r--r-- | qt-ui/mainwindow.cpp | 11 | ||||
| -rw-r--r-- | qt-ui/mainwindow.h | 1 | ||||
| -rw-r--r-- | qt-ui/mainwindow.ui | 8 |
3 files changed, 19 insertions, 1 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 971b31c1c..2b3b30a6a 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -39,6 +39,8 @@ #include "usersurvey.h" #include "divesitehelpers.h" #include "windowtitleupdate.h" +#include "locationinformation.h" + #ifndef NO_USERMANUAL #include "usermanual.h" #endif @@ -107,11 +109,16 @@ MainWindow::MainWindow() : QMainWindow(), profLayout->addWidget(toolBar); profLayout->addWidget(profileWidget); profileContainer->setLayout(profLayout); + + LocationInformationWidget * diveSiteEdit = new LocationInformationWidget(); + QWidget *diveSitePictures = new QWidget(); // Placeholder + registerApplicationState("Default", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("AddDive", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("EditDive", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("PlanDive", plannerWidget, profileContainer, plannerSettings, plannerDetails ); registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, globeGps ); + registerApplicationState("EditDiveSite", diveSiteEdit, diveSitePictures, diveListView, globeGps); setApplicationState("Default"); @@ -197,6 +204,10 @@ MainWindow::~MainWindow() m_Instance = NULL; } +void MainWindow::on_actionDiveSiteEdit_triggered() { + setApplicationState("EditDiveSite"); +} + void MainWindow::enableDisableCloudActions() { #ifdef USE_LIBGIT23_API diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index b1f6c5ca3..f3a0f221b 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -139,6 +139,7 @@ slots: void on_actionReplanDive_triggered(); void on_action_Check_for_Updates_triggered(); + void on_actionDiveSiteEdit_triggered(); void current_dive_changed(int divenr); void initialUiSetup(); diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index a2c63740b..20ee70738 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -62,7 +62,7 @@ <x>0</x> <y>0</y> <width>861</width> - <height>29</height> + <height>22</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -119,6 +119,7 @@ <addaction name="actionViewGlobe"/> <addaction name="separator"/> <addaction name="actionYearlyStatistics"/> + <addaction name="actionDiveSiteEdit"/> <addaction name="actionPreviousDC"/> <addaction name="actionNextDC"/> <addaction name="separator"/> @@ -731,6 +732,11 @@ <string>&Manage dive sites</string> </property> </action> + <action name="actionDiveSiteEdit"> + <property name="text"> + <string>Dive Site Edit</string> + </property> + </action> </widget> <customwidgets> <customwidget> |