CANCEL changes -- next option of CANCEL not intuitive

[Dirk Hohndel]

On Sun, Nov 23, 2014 at 07:02:19AM -0800, Dirk Hohndel wrote:
> > Not sure if this in "stupid" but it isn't intuitive.  Start to change a dive.  Then hit CANCEL.  This pops a dialogue box with two options:
> > 1.  Close without saving.
> > 2.  Cancel
> > 
> > Hmm.  Since I pressed Cancel should I keep going down that path (introspective question).  I'm not really "Closing" anything.  I think it is the wording that struck me as odd.
> > 
> > Since the description in the box above the two buttons is "You are about to discard your changes" perhaps the two buttons should be:
> > 1. Discard changes.
> > 2. Keep Changes.
> > 
> > Note, pressing CANCEL after pressing CANCEL does indeed CANCEL the CANCEL.  And if you followed that on the first pass -- well, I'm needing to head to bed on this thought!
> 
> You’re making a good point. I’ll modify the wording.

Here's what I came up with. We now ask 'Apply changes' or 'Discard
changes' and then the 'Discard' or 'Cancel' in the verification dialog
should make sense.

Comments?

/D


>From bf14d3180427a8197e7dfbcb29fed1002efbbb80 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk at hohndel.org>
Date: Sun, 23 Nov 2014 07:41:25 -0800
Subject: [PATCH] Make the button labels for apply / cancel of edits more
 consistent

Before you could 'Cancel' the edit and then would be asked if you wanted
to 'Discard' your changes or 'Cancel'. So clicking 'Cancel' cancelled the
action of having clicked 'Cancel'. That's so confusing, it's even hard to
explain. Yes, it uses "typical" language for user interaction and kind of
makes sense, but it's not easy to understand for the non-technical user.

With the new labels the user is asked to whether they want to 'Apply' the
changes or 'Discard' them. And when they choose 'Discard' the verification
question is still 'Discard' or 'Cancel'. That seems much more consistent.

Signed-off-by: Dirk Hohndel <dirk at hohndel.org>
---
 qt-ui/maintab.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 3c7489f730f3..68775c8c1d7c 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -51,11 +51,11 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
 	ui.extraData->setModel(extraDataModel);
 	closeMessage();
 
-	QAction *action = new QAction(tr("Save"), this);
+	QAction *action = new QAction(tr("Apply changes"), this);
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(acceptChanges()));
 	addMessageAction(action);
 
-	action = new QAction(tr("Cancel"), this);
+	action = new QAction(tr("Discard changes"), this);
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(rejectChanges()));
 
 	QShortcut *closeKey = new QShortcut(QKeySequence(Qt::Key_Escape), this);
-- 
1.8.0.rc0.18.gf84667d