Author: mir3x
Date: Tue Nov 29 12:41:59 2016
New Revision: 34648
URL: http://svn.gna.org/viewcvs/freeciv?rev=34648&view=rev
Log:
Qt client - fixed city dialog worklist autoresize
See bug #25342
Modified:
branches/S2_6/client/gui-qt/citydlg.cpp
branches/S2_6/client/gui-qt/mapctrl.cpp
branches/S2_6/client/gui-qt/shortcuts.cpp
branches/S2_6/client/gui-qt/shortcuts.h
branches/S2_6/data/themes/gui-qt/Classic/resource.qss
branches/S2_6/data/themes/gui-qt/Necrophos/resource.qss
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=34648&r1=34647&r2=34648&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/citydlg.cpp (original)
+++ branches/S2_6/client/gui-qt/citydlg.cpp Tue Nov 29 12:41:59 2016
@@ -1519,6 +1519,7 @@
prod_option_layout->addWidget(label, Qt::AlignRight);
prod_options = new QGroupBox(this);
prod_options->setLayout(prod_option_layout);
+ prod_options->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
/* prev/next and close buttons */
button = new QPushButton;
@@ -1628,8 +1629,9 @@
p_table_p->setSelectionMode(QAbstractItemView::SingleSelection);
production_combo_p->setFixedHeight(h);
p_table_p->setMinimumWidth(200);
- p_table_p->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+
p_table_p->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow);
p_table_p->setContextMenuPolicy(Qt::CustomContextMenu);
+ p_table_p->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
header = p_table_p->horizontalHeader();
header->setStretchLastSection(true);
@@ -2172,14 +2174,18 @@
****************************************************************************/
void city_dialog::update_sliders()
{
- struct cm_parameter *param;
+ struct cm_parameter param;
+ const struct cm_parameter *cparam;
int output;
QVariant qvar;
QLabel *label;
- param = new cm_parameter;
- if (cma_is_city_under_agent(pcity, param) == false) {
- return;
+ if (cma_is_city_under_agent(pcity, ¶m) == false) {
+ if (cma_table->currentRow() == -1 || cmafec_preset_num() == 0) {
+ return;
+ }
+ cparam = cmafec_preset_get_parameter(cma_table->currentRow());
+ cm_copy_parameter(¶m, cparam);
}
for (output = O_FOOD; output < 2 * O_LAST; output++) {
@@ -2189,28 +2195,27 @@
for (output = O_FOOD; output < O_LAST; output++) {
qvar = slider_tab[2 * output + 1]->property("FC");
label = reinterpret_cast<QLabel *>(qvar.value<void *>());
- label->setText(QString::number(param->factor[output]));
- slider_tab[2 * output + 1]->setValue(param->factor[output]);
+ label->setText(QString::number(param.factor[output]));
+ slider_tab[2 * output + 1]->setValue(param.factor[output]);
qvar = slider_tab[2 * output]->property("FC");
label = reinterpret_cast<QLabel *>(qvar.value<void *>());
- label->setText(QString::number(param->minimal_surplus[output]));
- slider_tab[2 * output]->setValue(param->minimal_surplus[output]);
+ label->setText(QString::number(param.minimal_surplus[output]));
+ slider_tab[2 * output]->setValue(param.minimal_surplus[output]);
}
slider_tab[2 * O_LAST + 1]->blockSignals(true);
qvar = slider_tab[2 * O_LAST + 1]->property("FC");
label = reinterpret_cast<QLabel *>(qvar.value<void *>());
- label->setText(QString::number(param->happy_factor));
- slider_tab[2 * O_LAST + 1]->setValue(param->happy_factor);
+ label->setText(QString::number(param.happy_factor));
+ slider_tab[2 * O_LAST + 1]->setValue(param.happy_factor);
slider_tab[2 * O_LAST + 1]->blockSignals(false);
cma_celeb_checkbox->blockSignals(true);
- cma_celeb_checkbox->setChecked(param->require_happy);
+ cma_celeb_checkbox->setChecked(param.require_happy);
cma_celeb_checkbox->blockSignals(false);
for (output = O_FOOD; output < 2 * O_LAST; output++) {
slider_tab[output]->blockSignals(false);
}
- delete param;
}
/****************************************************************************
Modified: branches/S2_6/client/gui-qt/mapctrl.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/mapctrl.cpp?rev=34648&r1=34647&r2=34648&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/mapctrl.cpp (original)
+++ branches/S2_6/client/gui-qt/mapctrl.cpp Tue Nov 29 12:41:59 2016
@@ -326,6 +326,13 @@
return;
}
+ sc = fc_shortcuts::sc()->get_shortcut(SC_RELOAD_THEME);
+ if (((key && key == sc->key) || bt == sc->mouse) && md == sc->mod) {
+ qtg_gui_load_theme(QString().toLocal8Bit().data(),
+ gui_options.gui_qt_default_theme_name);
+ return;
+ }
+
sc = fc_shortcuts::sc()->get_shortcut(SC_HIDE_WORKERS);
if (((key && key == sc->key) || bt == sc->mouse) && md == sc->mod) {
key_city_overlay(pos.x(), pos.y());
Modified: branches/S2_6/client/gui-qt/shortcuts.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/shortcuts.cpp?rev=34648&r1=34647&r2=34648&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/shortcuts.cpp (original)
+++ branches/S2_6/client/gui-qt/shortcuts.cpp Tue Nov 29 12:41:59 2016
@@ -50,7 +50,7 @@
RESPONSE_SAVE
};
-static int num_shortcuts = 46;
+static int num_shortcuts = 47;
fc_shortcut default_shortcuts[] = {
{SC_SCROLL_MAP, 0, Qt::RightButton, Qt::NoModifier, "Scroll map" },
{SC_CENTER_VIEW, Qt::Key_C, Qt::AllButtons, Qt::NoModifier,
@@ -142,6 +142,8 @@
_("Auto worker") },
{SC_PARADROP, Qt::Key_P, Qt::AllButtons, Qt::NoModifier,
_("Paradrop/clean pollution") },
+ {SC_RELOAD_THEME, Qt::Key_F5, Qt::AllButtons, Qt::ControlModifier
+ | Qt::ShiftModifier, _("Reload theme") },
};
Modified: branches/S2_6/client/gui-qt/shortcuts.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/shortcuts.h?rev=34648&r1=34647&r2=34648&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/shortcuts.h (original)
+++ branches/S2_6/client/gui-qt/shortcuts.h Tue Nov 29 12:41:59 2016
@@ -76,7 +76,8 @@
SC_BUY_MAP = 43,
SC_IFACE_LOCK = 44,
SC_AUTOMATE = 45,
- SC_PARADROP = 46
+ SC_PARADROP = 46,
+ SC_RELOAD_THEME = 47
};
Modified: branches/S2_6/data/themes/gui-qt/Classic/resource.qss
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/themes/gui-qt/Classic/resource.qss?rev=34648&r1=34647&r2=34648&view=diff
==============================================================================
--- branches/S2_6/data/themes/gui-qt/Classic/resource.qss (original)
+++ branches/S2_6/data/themes/gui-qt/Classic/resource.qss Tue Nov 29
12:41:59 2016
@@ -449,6 +449,16 @@
background: #e1cea1;
}
+city_dialog QFrame {
+ border: none
+}
+
+city_dialog QGroupBox {
+ border-radius: 5px;
+ margin-top: 2.5ex;
+ border: 1px solid #a5a5a5;
+}
+
QCheckBox:disabled, QRadioButton:disabled {
background-color: transparent;
color: #7b7b7b;
@@ -766,6 +776,13 @@
selection-color: rgba(85, 25, 25, 185);
}
+unit_hud_selector {
+ color: white;
+ background-image:url(LittleFingerpattern.png);
+ border: 2px solid #a5a5a5;
+}
+
+
hud_action {
selection-background-color: rgba(221, 204, 161, 220);
color: rgb(5,5,185);
Modified: branches/S2_6/data/themes/gui-qt/Necrophos/resource.qss
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/themes/gui-qt/Necrophos/resource.qss?rev=34648&r1=34647&r2=34648&view=diff
==============================================================================
--- branches/S2_6/data/themes/gui-qt/Necrophos/resource.qss (original)
+++ branches/S2_6/data/themes/gui-qt/Necrophos/resource.qss Tue Nov 29
12:41:59 2016
@@ -47,22 +47,33 @@
background: #006633;
}
+
QPushButton {
color: black;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe
,stop: 1 #eaeaea);
- border: 1px solid #a5a5a5;
- border-radius: 6px;
+ border: 2px solid #a5a5a5;
+ border-radius: 0px;
padding: 2px;
}
QPushButton:hover {
- color: white;
- background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2ebd26,
stop: 1 #29aa22);
- border: 1px solid black;
+ color: black;
+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5,
stop: 1 #e9ffe5);
+ border: 2px solid #0e8706;
}
QPushButton:disabled {
background: #c2c2c2;
+}
+
+QPushButton:default {
+ padding: 2px;
+}
+
+city_dialog QPushButton:hover {
+ color: black;
+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5,
stop: 1 #ededed);
+ border: 2px solid #0e8706;
}
QLabel {
@@ -80,13 +91,13 @@
padding: 0 0;
color: black;
selection-color: white;
- selection-background-color: #2ebd26;
+ selection-background-color: #5d8869;
}
QTableWidget::item:selected {
border: none;
padding: 0 0;
- background: #2ebd26;
+ background: #5d8869;
}
@@ -216,7 +227,11 @@
QMenu::item:selected {
color: white;
- background-color: #29aa22;
+ background-color: #5d8869;
+}
+
+QMenu::separator {
+ background: #595959;
}
minimap_view
@@ -374,20 +389,20 @@
padding: 0 0;
color: black;
selection-color: white;
- selection-background-color: #2ebd26;
+ selection-background-color: #5d8869;
}
QTreeView::item:selected {
border: none;
padding: 0 0;
- background: #2ebd26;
+ background: #5d8869;
}
QItemDelegate:selected {
border: none;
padding: 0 0;
- background-color: #2ebd26;
+ background-color: #5d8869;
}
QToolTip {
@@ -435,7 +450,7 @@
QGroupBox {
color: black;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0
#d6d6d6, stop: 1 #ebebeb);
+ background-color: #dcdcdc;
border: 1px solid #808080;
border-radius: 5px;
margin-top: 2ex;
@@ -472,6 +487,16 @@
city_dialog QScrollArea {
background: #c5c5c5;
+}
+
+city_dialog QFrame {
+ border: none
+}
+
+city_dialog QGroupBox {
+ border-radius: 5px;
+ margin-top: 2ex;
+ border: 1px solid #a5a5a5;
}
science_report QScrollArea {
@@ -559,7 +584,7 @@
QTreeWidget::item:selected {
border: none;
- background: #2ebd26;
+ background: #5d8869;
}
@@ -621,7 +646,7 @@
messagewdg QTableWidget::item:hover {
color: white;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0
#2ebd26, stop: 1 #29aa22);
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0
#5d8869, stop: 1 #5d8869);
border-radius: 9px;
}
@@ -681,6 +706,30 @@
selection-color: rgba(85, 25, 25, 185);
}
+hud_message_box QDialogButtonBox QPushButton {
+ border-radius: 0px;
+ padding: 0px;
+ min-width: 160px;
+}
+
+unit_hud_selector {
+ color: white;
+ background-image:url(LittleFingersun.png);
+ border: 2px solid #a5a5a5;
+}
+
+unit_hud_selector QGroupBox {
+ color: white;
+ background-image:url(LittleFingerpattern.png);
+ border: 1px solid #a5a5a5;
+ border-radius: 5px;
+ margin-top: 2ex;
+}
+
+unit_hud_selector QLabel {
+ color: white;
+}
+
hud_action {
selection-background-color: rgba(0, 200, 0, 220);
color: rgb(5,5,185);
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=34648&r1=34647&r2=34648&view=diff
==============================================================================
--- branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss (original)
+++ branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss Tue Nov 29
12:41:59 2016
@@ -320,9 +320,21 @@
border-radius: 9px;
}
+
minimap_view
{
selection-background-color: #1155BB;
+}
+
+QTreeWidget {
+ color: white;
+ background-color: #353b47;
+ border: none;
+}
+
+QTreeWidget::item:selected {
+ border: none;
+ background: #3399FF;
}
QComboBox QAbstractItemView {
@@ -701,16 +713,6 @@
background: #3399FF; min-width: 20px
}
-QTreeWidget {
- color: white;
- background-color: #353b47;
- border: none;
-}
-
-QTreeWidget::item:selected {
- border: none;
- background: #3399FF;
-}
fc_game_tab_widget {
background-image:url(LittleFingerpattern-game.png);
@@ -718,23 +720,29 @@
help_widget QTextBrowser
{
- background-color: #353b47;
+ background-color: #414a57;
color: white;
}
help_widget QWidget
{
- background-color: #353b47;
+ background-color: #414a57;
+ color: white;
+}
+
+help_widget QTreeWidget
+{
+ background-color: #414a57;
color: white;
}
help_widget QScrollArea QFrame {
- background-color: #353b47;
+ background-color: #414a57;
color: white;
}
help_widget QScrollArea {
- background-color: #353b47;
+ background-color: #414a57;
color: white;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
