Author: mir3x
Date: Sun Nov 6 22:20:45 2016
New Revision: 34422
URL: http://svn.gna.org/viewcvs/freeciv?rev=34422&view=rev
Log:
Qt client - capitalized text in unit label
See patch patch #7940
Modified:
branches/S2_6/client/gui-qt/hudwidget.cpp
Modified: branches/S2_6/client/gui-qt/hudwidget.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/hudwidget.cpp?rev=34422&r1=34421&r2=34422&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/hudwidget.cpp (original)
+++ branches/S2_6/client/gui-qt/hudwidget.cpp Sun Nov 6 22:20:45 2016
@@ -391,8 +391,11 @@
{
QVBoxLayout *vbox;
QVBoxLayout *unit_lab;
+ QSpacerItem *sp;
setParent(parent);
+
main_layout = new QHBoxLayout;
+ sp = new QSpacerItem(50, 2);
vbox = new QVBoxLayout;
unit_lab = new QVBoxLayout;
unit_lab->setContentsMargins(6, 9, 0, 3);
@@ -401,6 +404,7 @@
main_layout->addLayout(unit_lab);
main_layout->addWidget(&tile_label);
unit_icons = new unit_actions(this, nullptr);
+ vbox->addSpacerItem(sp);
vbox->addWidget(&text_label);
vbox->addWidget(unit_icons);
main_layout->addLayout(vbox);
@@ -471,6 +475,8 @@
return;
}
+ font.setCapitalization(QFont::AllUppercase);
+ font.setBold(true);
setFixedHeight(parentWidget()->height() / 12);
text_label.setFixedHeight((height() * 2) / 10);
move((gui()->mapview_wdg->width()
@@ -515,10 +521,10 @@
text_str = text_str + QString(_(" +1 unit"));
}
text_label.setText(text_str);
- font.setPixelSize((text_label.height() * 8) / 10);
+ font.setPixelSize((text_label.height() * 9) / 10);
text_label.setFont(font);
fm = new QFontMetrics(font);
- text_label.setFixedWidth(fm->width(text_str) + 3);
+ text_label.setFixedWidth(fm->width(text_str) + 20);
delete fm;
unit_pixmap = qtg_canvas_create(tileset_unit_width(tileset),
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
