Author: mir3x
Date: Wed Dec 14 10:36:51 2016
New Revision: 34713
URL: http://svn.gna.org/viewcvs/freeciv?rev=34713&view=rev
Log:
Qt client - used label for current units in city dialog instead groupbox
See patch #8045
Modified:
branches/S2_6/client/gui-qt/citydlg.cpp
branches/S2_6/client/gui-qt/citydlg.h
branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss
Modified: branches/S2_6/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/citydlg.cpp?rev=34713&r1=34712&r2=34713&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/citydlg.cpp (original)
+++ branches/S2_6/client/gui-qt/citydlg.cpp Wed Dec 14 10:36:51 2016
@@ -1328,7 +1328,7 @@
QGroupBox *group_box, *map_box, *prod_options,
*qgbox, *qgbprod, *qsliderbox, *result_box;
QHBoxLayout *hbox, *hbox_layout, *prod_option_layout,
- *v_layout, *work_but_layout;
+ *work_but_layout;
QHeaderView *header;
QLabel *lab2, *label, *ql, *some_label;
QPushButton *qpush2;
@@ -1339,8 +1339,9 @@
QSlider *slider;
QStringList info_list, str_list;
QVBoxLayout *lefttop_layout, *units_layout, *worklist_layout,
- *right_layout, *vbox, *vbox_layout, *zoom_vbox;
- QWidget *split_widget1, *split_widget2, *info_wdg;
+ *right_layout, *vbox, *vbox_layout, *zoom_vbox, *v_layout;
+ QWidget *split_widget1, *split_widget2, *info_wdg, *curr_unit_wdg,
+ *supp_unit_wdg, *curr_impr_wdg;;
int h = 2 * fm.height() + 2;
small_font = fc_font::instance()->get_font(fonts::city_label);
@@ -1370,7 +1371,6 @@
/* map view */
map_box = new QGroupBox(this);
- v_layout = new QHBoxLayout;
/* City information widget texts about surpluses and so on */
info_wdg = new QWidget(this);
@@ -1439,12 +1439,12 @@
map_box->setTitle(_("City map"));
/* current/supported units/improvements widgets */
- supp_units = new QGroupBox();
- supp_units->setProperty("themed_groupbox", true);
- curr_units = new QGroupBox();
- curr_units->setProperty("themed_groupbox", true);
- curr_impr = new QGroupBox();
- curr_impr->setProperty("themed_groupbox", true);
+ supp_units = new QLabel();
+ curr_units = new QLabel();
+ curr_impr = new QLabel();
+ curr_units->setAlignment(Qt::AlignCenter);
+ curr_impr->setAlignment(Qt::AlignCenter);
+ supp_units->setAlignment(Qt::AlignCenter);
supported_units = new unit_info(true);
scroll = new QScrollArea;
scroll->setWidgetResizable(true);
@@ -1567,26 +1567,31 @@
lefttop_layout->addStretch(1);
/* Layout for units/buildings */
- v_layout = new QHBoxLayout;
+ curr_unit_wdg = new QWidget();
+ supp_unit_wdg = new QWidget();
+ curr_impr_wdg = new QWidget();
+ v_layout = new QVBoxLayout;
+ v_layout->addWidget(curr_impr);
v_layout->addWidget(scroll3);
v_layout->setContentsMargins(0 , 0 , 0, 0);
v_layout->setSpacing(0);
- curr_impr->setLayout(v_layout);
- curr_impr->setTitle(_("Improvements"));
- v_layout = new QHBoxLayout;
+ curr_impr_wdg->setLayout(v_layout);
+ v_layout = new QVBoxLayout;
+ v_layout->addWidget(curr_units);
v_layout->addWidget(scroll2);
v_layout->setContentsMargins(0 , 0 , 0, 0);
v_layout->setSpacing(0);
- curr_units->setLayout(v_layout);
- v_layout = new QHBoxLayout;
+ curr_unit_wdg->setLayout(v_layout);
+ v_layout = new QVBoxLayout;
+ v_layout->addWidget(supp_units);
v_layout->addWidget(scroll);
v_layout->setContentsMargins(0 , 0 , 0, 0);
v_layout->setSpacing(0);
- supp_units->setLayout(v_layout);
-
- units_layout->addWidget(curr_units);
- units_layout->addWidget(supp_units);
- units_layout->addWidget(curr_impr);
+ supp_unit_wdg->setLayout(v_layout);
+
+ units_layout->addWidget(curr_unit_wdg);
+ units_layout->addWidget(supp_unit_wdg);
+ units_layout->addWidget(curr_impr_wdg);
units_layout->setSpacing(0);
units_layout->setContentsMargins(0 , 0 , 0, 0);
@@ -2883,7 +2888,7 @@
} unit_list_iterate_end;
n = unit_list_size(units);
fc_snprintf(buf, sizeof(buf), _("Supported units %d"), n);
- supp_units->setTitle(QString(buf));
+ supp_units->setText(QString(buf));
supported_units->update_units();
supported_units->setUpdatesEnabled(true);
current_units->setUpdatesEnabled(true);
@@ -2904,7 +2909,7 @@
n = unit_list_size(units);
fc_snprintf(buf, sizeof(buf), _("Present units %d"), n);
- curr_units->setTitle(QString(buf));
+ curr_units->setText(QString(buf));
current_units->update_units();
current_units->setUpdatesEnabled(true);
@@ -3160,7 +3165,7 @@
city_buildings->setUpdatesEnabled(true);
city_buildings->setUpdatesEnabled(true);
- curr_impr->setTitle(QString(_("Improvements - upkeep %1")).arg(upkeep));
+ curr_impr->setText(QString(_("Improvements - upkeep %1")).arg(upkeep));
}
/****************************************************************************
Modified: branches/S2_6/client/gui-qt/citydlg.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/citydlg.h?rev=34713&r1=34712&r2=34713&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/citydlg.h (original)
+++ branches/S2_6/client/gui-qt/citydlg.h Wed Dec 14 10:36:51 2016
@@ -412,9 +412,9 @@
QLabel *cma_info_text;
QLabel *cma_result;
QLabel *cma_result_pix;
- QGroupBox *supp_units;
- QGroupBox *curr_units;
- QGroupBox *curr_impr;
+ QLabel *supp_units;
+ QLabel *curr_units;
+ QLabel *curr_impr;
progress_bar *production_combo_p;
QTableWidget *p_table_p;
QTableWidget *nationality_table;
Modified: branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss?rev=34713&r1=34712&r2=34713&view=diff
==============================================================================
--- branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss (original)
+++ branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss Wed Dec 14
10:36:51 2016
@@ -33,23 +33,10 @@
border: 1px solid gray;
}
-*[themed_groupbox="true"] {
- color: yellow;
- background-color: #414a57;
- border: none;
- border-radius: none;
- margin-top: 2.5ex;
-}
-
*[themed_border="true"] {
border: 2px solid #3399FF;
}
-*[themed_groupbox="true"]::title {
- subcontrol-origin: margin;
- subcontrol-position: top center; /* position at the top center */
- padding: 0 0px;
-}
*[city_scroll="true"] {
border: none;
@@ -561,6 +548,7 @@
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0
#3d4552, stop: 1 #383f4c);
border: 1px solid #454545;
border-radius: 5px;
+ margin-top: 2ex;
}
QComboBox:hover {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
