aboutsummaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/mainwindow.cpp32
-rw-r--r--desktop-widgets/mainwindow.h3
-rw-r--r--desktop-widgets/tab-widgets/maintab.cpp3
3 files changed, 0 insertions, 38 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index bbeb61f70..7796ddf04 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1092,36 +1092,6 @@ void MainWindow::on_actionViewAll_triggered()
ui.bottomSplitter->setCollapsible(1,false);
}
-void MainWindow::enterEditState()
-{
- stateBeforeEdit = state;
- if (state == VIEWALL || state == INFO_MAXIMIZED)
- return;
- toggleCollapsible(true);
- beginChangeState(EDIT);
- ui.topSplitter->setSizes({ EXPANDED, EXPANDED });
- ui.mainSplitter->setSizes({ EXPANDED, COLLAPSED });
- int appW = qApp->desktop()->size().width();
- QList<int> infoProfileSizes { round_int(appW * 0.3), round_int(appW * 0.7) };
-
- QSettings settings;
- settings.beginGroup("MainWindow");
- if (settings.value("mainSplitter").isValid()) {
- ui.topSplitter->restoreState(settings.value("topSplitter").toByteArray());
- if (ui.topSplitter->sizes().first() == 0 || ui.topSplitter->sizes().last() == 0)
- ui.topSplitter->setSizes(infoProfileSizes);
- } else {
- ui.topSplitter->setSizes(infoProfileSizes);
- }
-}
-
-void MainWindow::exitEditState()
-{
- if (stateBeforeEdit == state)
- return;
- enterState(stateBeforeEdit);
-}
-
void MainWindow::enterState(CurrentState newState)
{
state = newState;
@@ -1141,8 +1111,6 @@ void MainWindow::enterState(CurrentState newState)
case PROFILE_MAXIMIZED:
on_actionViewProfile_triggered();
break;
- case EDIT:
- break;
}
}
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 247bddaf3..1fb20a7ce 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -58,7 +58,6 @@ public:
INFO_MAXIMIZED,
PROFILE_MAXIMIZED,
LIST_MAXIMIZED,
- EDIT,
};
MainWindow();
@@ -81,8 +80,6 @@ public:
NotificationWidget *getNotificationWidget();
void enableDisableCloudActions();
void enableDisableOtherDCsActions();
- void enterEditState();
- void exitEditState();
void editDiveSite(dive_site *ds);
std::unique_ptr<MainTab> mainTab;
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index 311887169..14db8ae28 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -214,7 +214,6 @@ void MainTab::enableEdition(EditMode newEditMode)
ui.editDiveSiteButton->setEnabled(false);
MainWindow::instance()->diveList->setEnabled(false);
MainWindow::instance()->setEnabledToolbar(false);
- MainWindow::instance()->enterEditState();
ui.dateEdit->setEnabled(true);
displayMessage(tr("This dive is being edited."));
@@ -521,7 +520,6 @@ void MainTab::acceptChanges()
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
MainWindow::instance()->diveList->verticalScrollBar()->setSliderPosition(scrolledBy);
MainWindow::instance()->diveList->setFocus();
- MainWindow::instance()->exitEditState();
MainWindow::instance()->setEnabledToolbar(true);
ui.editDiveSiteButton->setEnabled(!ui.location->text().isEmpty());
editMode = NONE;
@@ -552,7 +550,6 @@ void MainTab::rejectChanges()
// show the profile and dive info
MainWindow::instance()->graphics->replot();
MainWindow::instance()->setEnabledToolbar(true);
- MainWindow::instance()->exitEditState();
ui.editDiveSiteButton->setEnabled(!ui.location->text().isEmpty());
}