summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--desktop-widgets/mainwindow.cpp5
-rw-r--r--desktop-widgets/mainwindow.h1
-rw-r--r--desktop-widgets/mainwindow.ui6
4 files changed, 1 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75266c662..fd3e9bcb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Desktop: remove "edit dive" from the log menu. Nowadays we edit in place.
- Desktop: disable UI elements that make no sense during editing [#1445]
- Mobil: setting for developer menu entry is remembered across sessions
- Mobile: remove UI components of the Webservice GPS interaction
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index d11d3c762..f6d877237 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1067,11 +1067,6 @@ void MainWindow::on_actionAddDive_triggered()
information()->updateDepthDuration();
}
-void MainWindow::on_actionEditDive_triggered()
-{
- editCurrentDive();
-}
-
void MainWindow::on_actionRenumber_triggered()
{
RenumberDialog::instance()->renumberOnlySelected(false);
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 6338c5e5b..c047a31e3 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -112,7 +112,6 @@ slots:
void on_actionDivelogs_de_triggered();
void on_actionEditDeviceNames_triggered();
void on_actionAddDive_triggered();
- void on_actionEditDive_triggered();
void on_actionRenumber_triggered();
void on_actionAutoGroup_triggered();
void on_actionYearlyStatistics_triggered();
diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui
index 5c7e20fad..1263b4093 100644
--- a/desktop-widgets/mainwindow.ui
+++ b/desktop-widgets/mainwindow.ui
@@ -82,7 +82,6 @@
<string>&amp;Log</string>
</property>
<addaction name="actionAddDive"/>
- <addaction name="actionEditDive"/>
<addaction name="actionDivePlanner"/>
<addaction name="actionReplanDive"/>
<addaction name="copy"/>
@@ -252,11 +251,6 @@
<string notr="true">Ctrl++</string>
</property>
</action>
- <action name="actionEditDive">
- <property name="text">
- <string>&amp;Edit dive</string>
- </property>
- </action>
<action name="copy">
<property name="text">
<string>&amp;Copy dive components</string>