mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make editing message consistent with button labels

Browse source 
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>
This commit is contained in:
Tim Wootton 2013-11-16 00:35:49 +00:00 • committed by Dirk Hohndel
parent 092e8463fe
commit 0e9cd09442
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-ui/maintab.cpp
View file

@ -130,20 +130,20 @@ void MainTab::enableEdition(EditMode newEditMode)
if (mainWindow() && mainWindow()->dive_list()->selectedTrips.count() == 1) { if (mainWindow() && mainWindow()->dive_list()->selectedTrips.count() == 1) {
// we are editing trip location and notes // 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.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(); ui.diveEquipmentMessage->animatedShow();
notesBackup[NULL].notes = ui.notes->toPlainText(); notesBackup[NULL].notes = ui.notes->toPlainText();
notesBackup[NULL].location = ui.location->text(); notesBackup[NULL].location = ui.location->text();
editMode = TRIP; editMode = TRIP;
} else { } else {
if (amount_selected > 1) { if (amount_selected > 1) {
ui.diveNotesMessage->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 Undo when ready.")); ui.diveEquipmentMessage->setText(tr("Multiple dives are being edited. Select Save or Cancel when done."));
} else { } else {
ui.diveNotesMessage->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 Undo when ready.")); ui.diveEquipmentMessage->setText(tr("This dive is being edited. Select Save or Cancel when done."));
} }
ui.diveNotesMessage->animatedShow(); ui.diveNotesMessage->animatedShow();
ui.diveEquipmentMessage->animatedShow(); ui.diveEquipmentMessage->animatedShow();

4
qt-ui/maintab.ui
View file

@ -221,7 +221,7 @@
<item row="15" column="0" colspan="2"> <item row="15" column="0" colspan="2">
<widget class="QDialogButtonBox" name="notesButtonBox"> <widget class="QDialogButtonBox" name="notesButtonBox">
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -333,7 +333,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QDialogButtonBox" name="equipmentButtonBox"> <widget class="QDialogButtonBox" name="equipmentButtonBox">
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
</property> </property>
</widget> </widget>
</item> </item>