Author: mir3x
Date: Mon Sep 1 14:58:58 2014
New Revision: 26170
URL: http://svn.gna.org/viewcvs/freeciv?rev=26170&view=rev
Log:
Added missing text when upgrading units.
See patch #5149
Modified:
trunk/client/gui-qt/dialogs.cpp
Modified: trunk/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=26170&r1=26169&r2=26170&view=diff
==============================================================================
--- trunk/client/gui-qt/dialogs.cpp (original)
+++ trunk/client/gui-qt/dialogs.cpp Mon Sep 1 14:58:58 2014
@@ -1759,25 +1759,28 @@
return;
}
if (!get_units_upgrade_info(buf, sizeof(buf), punits)) {
- ask.setText(QString(buf));
ask.setWindowTitle(_("Upgrade Unit!"));
+ ask.setStandardButtons(QMessageBox::Ok);
+ ask.setIcon(QMessageBox::Information);
} else {
ask.setWindowTitle(_("Upgrade Obsolete Units"));
ask.setStandardButtons(QMessageBox::Cancel | QMessageBox::Ok);
+ ask.setIcon(QMessageBox::Question);
ask.setDefaultButton(QMessageBox::Cancel);
- ask.setIcon(QMessageBox::Question);
- ret = ask.exec();
-
- switch (ret) {
- case QMessageBox::Cancel:
- return;
- break;
- case QMessageBox::Ok:
- unit_list_iterate(punits, punit) {
- request_unit_upgrade(punit);
- } unit_list_iterate_end;
- break;
+ }
+ ask.setText(QString(buf));
+ ret = ask.exec();
+
+ switch (ret) {
+ case QMessageBox::Cancel:
+ return;
+ break;
+ case QMessageBox::Ok:
+ unit_list_iterate(punits, punit) {
+ request_unit_upgrade(punit);
}
+ unit_list_iterate_end;
+ break;
}
}
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
