mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Undo: use undo commands for name and description editing in widget
In the dive site widget, use the undo commands instead of editing only on accept. This introduces an inconsistency betwee the name and description and the other fields. This will be fixed in follow-up commits. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
08d789b933
commit
0882ca64b0
2 changed files with 9 additions and 22 deletions
|
@ -9,6 +9,7 @@
|
|||
#include "core/divesitehelpers.h"
|
||||
#include "desktop-widgets/modeldelegates.h"
|
||||
#include "core/subsurface-qt/DiveListNotifier.h"
|
||||
#include "command.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QShowEvent>
|
||||
|
@ -180,20 +181,6 @@ void LocationInformationWidget::acceptChanges()
|
|||
}
|
||||
|
||||
char *uiString;
|
||||
uiString = copy_qstring(ui.diveSiteName->text());
|
||||
if (!same_string(uiString, diveSite->name)) {
|
||||
free(diveSite->name);
|
||||
diveSite->name = uiString;
|
||||
} else {
|
||||
free(uiString);
|
||||
}
|
||||
uiString = copy_qstring(ui.diveSiteDescription->text());
|
||||
if (!same_string(uiString, diveSite->description)) {
|
||||
free(diveSite->description);
|
||||
diveSite->description = uiString;
|
||||
} else {
|
||||
free(uiString);
|
||||
}
|
||||
uiString = copy_qstring(ui.diveSiteCountry->text());
|
||||
// if the user entered a different country, first update the local taxonomy
|
||||
// this below will get copied into the diveSite
|
||||
|
@ -301,16 +288,16 @@ void LocationInformationWidget::on_diveSiteCountry_textChanged(const QString& te
|
|||
markChangedWidget(ui.diveSiteCountry);
|
||||
}
|
||||
|
||||
void LocationInformationWidget::on_diveSiteDescription_textChanged(const QString &text)
|
||||
void LocationInformationWidget::on_diveSiteDescription_editingFinished()
|
||||
{
|
||||
if (diveSite && !same_string(qPrintable(text), diveSite->description))
|
||||
markChangedWidget(ui.diveSiteDescription);
|
||||
if (diveSite)
|
||||
Command::editDiveSiteDescription(diveSite, ui.diveSiteDescription->text());
|
||||
}
|
||||
|
||||
void LocationInformationWidget::on_diveSiteName_textChanged(const QString &text)
|
||||
void LocationInformationWidget::on_diveSiteName_editingFinished()
|
||||
{
|
||||
if (diveSite && !same_string(qPrintable(text), diveSite->name))
|
||||
markChangedWidget(ui.diveSiteName);
|
||||
if (diveSite)
|
||||
Command::editDiveSiteName(diveSite, ui.diveSiteName->text());
|
||||
}
|
||||
|
||||
void LocationInformationWidget::on_diveSiteNotes_textChanged()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue