outstanding patches
Robert C. Helling
helling at lmu.de
Sat Oct 5 13:55:01 UTC 2013
On Fri, 4 Oct 2013, Dirk Hohndel wrote:
> I believe I have everything pushed that was sitting in my inbox.
>
> If you sent a patch and it hasn't been applied... oops. Please resend.
This patch modifies the dialog text for the question to make more sense.
Signed-off-by: Robert C. Helling <helling at atdotde.de>
--
.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO
Robert C. Helling Elite Master Course Theoretical and Mathematical Physics
Scientific Coordinator
Ludwig Maximilians Universitaet Muenchen, Dept. Physik
print "Just another Phone: +49 89 2180-4523 Theresienstr. 39, rm. B339
stupid .sig\n"; http://www.atdotde.de
-------------- next part --------------
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index f23970a..fe277c4 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -1146,9 +1146,9 @@ struct diveplan DivePlannerPointsModel::getDiveplan()
void DivePlannerPointsModel::cancelPlan()
{
if (mode == PLAN && rowCount()) {
- if (QMessageBox::warning(mainWindow(), tr("Save the Plan?"),
- tr("You have a working plan, \n are you sure that you wanna cancel it?"),
- QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok) {
+ if (QMessageBox::warning(mainWindow(), tr("Discard the Plan?"),
+ tr("You are about to discard your plan."),
+ QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) {
return;
}
}
diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui
index 1bcd912..7b49634 100644
--- a/qt-ui/diveplanner.ui
+++ b/qt-ui/diveplanner.ui
@@ -84,7 +84,7 @@
<item row="8" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ <set>QDialogButtonBox::Abort|QDialogButtonBox::Save</set>
</property>
</widget>
</item>
More information about the subsurface
mailing list