Author: mir3x
Date: Fri Sep 16 12:03:05 2016
New Revision: 33817
URL: http://svn.gna.org/viewcvs/freeciv?rev=33817&view=rev
Log:
Qt client - Fuel not shown in new sidebar unit display
Reported by Jacob Nevins <jtn>
See bug #25038
Modified:
trunk/client/gui-qt/dialogs.cpp
trunk/client/gui-qt/mapview.cpp
Modified: trunk/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=33817&r1=33816&r2=33817&view=diff
==============================================================================
--- trunk/client/gui-qt/dialogs.cpp (original)
+++ trunk/client/gui-qt/dialogs.cpp Fri Sep 16 12:03:05 2016
@@ -2837,11 +2837,10 @@
} else {
p.drawPixmap(x, y, *tmp_pix);
}
-
+ str = QString(move_points_text(punit->moves_left, false));
if (utype_fuel(unit_type_get(punit))) {
- str = QString(move_points_text((rate * f) + punit->moves_left, false));
- } else {
- str = QString(move_points_text(punit->moves_left, false));
+ str = str + "(" + QString(move_points_text((rate * f)
+ + punit->moves_left, false)) + ")";
}
/* TRANS: MP = Movement points */
str = QString(_("MP:")) + str;
Modified: trunk/client/gui-qt/mapview.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/mapview.cpp?rev=33817&r1=33816&r2=33817&view=diff
==============================================================================
--- trunk/client/gui-qt/mapview.cpp (original)
+++ trunk/client/gui-qt/mapview.cpp Fri Sep 16 12:03:05 2016
@@ -1001,6 +1001,7 @@
gui()->sw_cunit->set_tooltip(QString());
return;
} else {
+ QString mp;
struct unit *punit;
struct canvas *unit_pixmap;
struct canvas *tile_pixmap;
@@ -1035,11 +1036,17 @@
gui()->sw_cunit->height());
qtg_canvas_free(unit_pixmap);
gui()->sw_cunit->set_label(get_unit_info_label_text1(punitlist));
+ mp = QString(move_points_text(punit->moves_left, false));
+ if (utype_fuel(unit_type_get(punit))) {
+ mp = mp + QString("(") + QString(move_points_text((
+ unit_type_get(punit)->move_rate * ((punit->fuel) - 1)
+ + punit->moves_left), false)) + QString(")");
+ }
+ /* TRANS: MP = Movement points */
+ mp = QString(_("MP: ")) + mp;
labels = QString(_("HP: %1/%2")).arg(QString::number(punit->hp),
QString::number(unit_type_get(punit)->hp))
- + '\n'
- + QString("MP: %1").arg(move_points_text(
- unit_list_get(punitlist, 0)->moves_left, FALSE));
+ + '\n' + mp;
gui()->sw_cunit->set_custom_labels(labels);
gui()->sw_cunit->update_final_pixmap();
gui()->sw_cunit->set_tooltip(popup_info_text(punit->tile));
@@ -1047,6 +1054,7 @@
}
}
}
+
/****************************************************************************
Update the mouse cursor. Cursor type depends on what user is doing and
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
