diff options
| author |  Tim Wootton <tim@tee-jay.demon.co.uk> | 2013-11-16 00:35:49 +0000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-17 13:44:52 -0800 |
| commit | 0e9cd0944284fede48ddc032af94a89349508e5f (patch) | |
| tree | 2a41c7ec40d3ee4aa68ca0f0eff3386d8ee61abe | |
| parent | 092e8463fef3b942cdeb3f958b0005fe403f5879 (diff) | |
| download | subsurface-0e9cd0944284fede48ddc032af94a89349508e5f.tar.gz | |
Make editing message consistent with button labels
Changes Ok button to a Save button Modifies editing messages to reference
buttons Save and Cancel.
Fixes #245
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/maintab.cpp | 12 | ||||
| -rw-r--r-- | qt-ui/maintab.ui | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 6d22a8dd3..7c5e7ade6 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -130,20 +130,20 @@ void MainTab::enableEdition(EditMode newEditMode) if (mainWindow() && mainWindow()->dive_list()->selectedTrips.count() == 1) { // we are editing trip location and notes - ui.diveNotesMessage->setText(tr("This trip is being edited. Select Save or Undo when ready.")); + ui.diveNotesMessage->setText(tr("This trip is being edited. Select Save or Cancel when done.")); ui.diveNotesMessage->animatedShow(); - ui.diveEquipmentMessage->setText(tr("This trip is being edited. Select Save or Undo when ready.")); + ui.diveEquipmentMessage->setText(tr("This trip is being edited. Select Save or Cancel when done.")); ui.diveEquipmentMessage->animatedShow(); notesBackup[NULL].notes = ui.notes->toPlainText(); notesBackup[NULL].location = ui.location->text(); editMode = TRIP; } else { if (amount_selected > 1) { - ui.diveNotesMessage->setText(tr("Multiple dives are being edited. Select Save or Undo when ready.")); - ui.diveEquipmentMessage->setText(tr("Multiple dives are being edited. Select Save or Undo when ready.")); + ui.diveNotesMessage->setText(tr("Multiple dives are being edited. Select Save or Cancel when done.")); + ui.diveEquipmentMessage->setText(tr("Multiple dives are being edited. Select Save or Cancel when done.")); } else { - ui.diveNotesMessage->setText(tr("This dive is being edited. Select Save or Undo when ready.")); - ui.diveEquipmentMessage->setText(tr("This dive is being edited. Select Save or Undo when ready.")); + ui.diveNotesMessage->setText(tr("This dive is being edited. Select Save or Cancel when done.")); + ui.diveEquipmentMessage->setText(tr("This dive is being edited. Select Save or Cancel when done.")); } ui.diveNotesMessage->animatedShow(); ui.diveEquipmentMessage->animatedShow(); diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index 72e1e5338..83d978712 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -221,7 +221,7 @@ <item row="15" column="0" colspan="2"> <widget class="QDialogButtonBox" name="notesButtonBox"> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set> </property> </widget> </item> @@ -333,7 +333,7 @@ <item row="2" column="0"> <widget class="QDialogButtonBox" name="equipmentButtonBox"> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set> </property> </widget> </item> |