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

Re-enable the dive site edit

Browse source 
Since now we found the perfect way to deal with dive site handling on the
dive, we can reenable this widget.

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-07-25 12:30:20 -03:00 • committed by Dirk Hohndel
parent 156ad42a3c
commit 1aaa37e511
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qt-ui/mainwindow.cpp
View file

@ -39,6 +39,8 @@
#include "usersurvey.h" #include "usersurvey.h"
#include "divesitehelpers.h" #include "divesitehelpers.h"
#include "windowtitleupdate.h" #include "windowtitleupdate.h"
#include "locationinformation.h"
#ifndef NO_USERMANUAL #ifndef NO_USERMANUAL
#include "usermanual.h" #include "usermanual.h"
#endif #endif
@ -107,11 +109,16 @@ MainWindow::MainWindow() : QMainWindow(),
profLayout->addWidget(toolBar); profLayout->addWidget(toolBar);
profLayout->addWidget(profileWidget); profLayout->addWidget(profileWidget);
profileContainer->setLayout(profLayout); profileContainer->setLayout(profLayout);
LocationInformationWidget * diveSiteEdit = new LocationInformationWidget();
QWidget *diveSitePictures = new QWidget(); // Placeholder
registerApplicationState("Default", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("Default", mainTab, profileContainer, diveListView, globeGps );
registerApplicationState("AddDive", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("AddDive", mainTab, profileContainer, diveListView, globeGps );
registerApplicationState("EditDive", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("EditDive", mainTab, profileContainer, diveListView, globeGps );
registerApplicationState("PlanDive", plannerWidget, profileContainer, plannerSettings, plannerDetails ); registerApplicationState("PlanDive", plannerWidget, profileContainer, plannerSettings, plannerDetails );
registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, globeGps ); registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, globeGps );
registerApplicationState("EditDiveSite", diveSiteEdit, diveSitePictures, diveListView, globeGps);
setApplicationState("Default"); setApplicationState("Default");
@ -197,6 +204,10 @@ MainWindow::~MainWindow()
m_Instance = NULL; m_Instance = NULL;
} }
void MainWindow::on_actionDiveSiteEdit_triggered() {
setApplicationState("EditDiveSite");
}
void MainWindow::enableDisableCloudActions() void MainWindow::enableDisableCloudActions()
{ {
#ifdef USE_LIBGIT23_API #ifdef USE_LIBGIT23_API

1
qt-ui/mainwindow.h
View file

@ -139,6 +139,7 @@ slots:
void on_actionReplanDive_triggered(); void on_actionReplanDive_triggered();
void on_action_Check_for_Updates_triggered(); void on_action_Check_for_Updates_triggered();
void on_actionDiveSiteEdit_triggered();
void current_dive_changed(int divenr); void current_dive_changed(int divenr);
void initialUiSetup(); void initialUiSetup();

8
qt-ui/mainwindow.ui
View file

@ -62,7 +62,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>861</width> <width>861</width>
<height>29</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -119,6 +119,7 @@
<addaction name="actionViewGlobe"/> <addaction name="actionViewGlobe"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionYearlyStatistics"/> <addaction name="actionYearlyStatistics"/>
<addaction name="actionDiveSiteEdit"/>
<addaction name="actionPreviousDC"/> <addaction name="actionPreviousDC"/>
<addaction name="actionNextDC"/> <addaction name="actionNextDC"/>
<addaction name="separator"/> <addaction name="separator"/>
@ -731,6 +732,11 @@
<string>&amp;Manage dive sites</string> <string>&amp;Manage dive sites</string>
</property> </property>
</action> </action>
<action name="actionDiveSiteEdit">
<property name="text">
<string>Dive Site Edit</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>