Author: mir3x
Date: Tue Nov 29 12:52:08 2016
New Revision: 34650
URL: http://svn.gna.org/viewcvs/freeciv?rev=34650&view=rev
Log:
Qt client - fixed city dialog worklist autoresize ( and reverted revision
r34648 which got some unwanted changes)
See bug #25342
Modified:
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/mapctrl.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/mapctrl.cpp?rev=34650&r1=34649&r2=34650&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/mapctrl.cpp (original)
+++ branches/S2_6/client/gui-qt/mapctrl.cpp Tue Nov 29 12:52:08 2016
@@ -326,13 +326,6 @@
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=34650&r1=34649&r2=34650&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/shortcuts.cpp (original)
+++ branches/S2_6/client/gui-qt/shortcuts.cpp Tue Nov 29 12:52:08 2016
@@ -50,7 +50,7 @@
RESPONSE_SAVE
};
-static int num_shortcuts = 47;
+static int num_shortcuts = 46;
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,8 +142,6 @@
_("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=34650&r1=34649&r2=34650&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/shortcuts.h (original)
+++ branches/S2_6/client/gui-qt/shortcuts.h Tue Nov 29 12:52:08 2016
@@ -76,8 +76,7 @@
SC_BUY_MAP = 43,
SC_IFACE_LOCK = 44,
SC_AUTOMATE = 45,
- SC_PARADROP = 46,
- SC_RELOAD_THEME = 47
+ SC_PARADROP = 46
};
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=34650&r1=34649&r2=34650&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:52:08 2016
@@ -449,16 +449,6 @@
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;
@@ -776,13 +766,6 @@
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=34650&r1=34649&r2=34650&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:52:08 2016
@@ -47,33 +47,22 @@
background: #006633;
}
-
QPushButton {
color: black;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe
,stop: 1 #eaeaea);
- border: 2px solid #a5a5a5;
- border-radius: 0px;
+ border: 1px solid #a5a5a5;
+ border-radius: 6px;
padding: 2px;
}
QPushButton:hover {
- color: black;
- background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5,
stop: 1 #e9ffe5);
- border: 2px solid #0e8706;
+ color: white;
+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2ebd26,
stop: 1 #29aa22);
+ border: 1px solid black;
}
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 {
@@ -91,13 +80,13 @@
padding: 0 0;
color: black;
selection-color: white;
- selection-background-color: #5d8869;
+ selection-background-color: #2ebd26;
}
QTableWidget::item:selected {
border: none;
padding: 0 0;
- background: #5d8869;
+ background: #2ebd26;
}
@@ -227,11 +216,7 @@
QMenu::item:selected {
color: white;
- background-color: #5d8869;
-}
-
-QMenu::separator {
- background: #595959;
+ background-color: #29aa22;
}
minimap_view
@@ -389,20 +374,20 @@
padding: 0 0;
color: black;
selection-color: white;
- selection-background-color: #5d8869;
+ selection-background-color: #2ebd26;
}
QTreeView::item:selected {
border: none;
padding: 0 0;
- background: #5d8869;
+ background: #2ebd26;
}
QItemDelegate:selected {
border: none;
padding: 0 0;
- background-color: #5d8869;
+ background-color: #2ebd26;
}
QToolTip {
@@ -450,7 +435,7 @@
QGroupBox {
color: black;
- background-color: #dcdcdc;
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0
#d6d6d6, stop: 1 #ebebeb);
border: 1px solid #808080;
border-radius: 5px;
margin-top: 2ex;
@@ -487,16 +472,6 @@
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 {
@@ -584,7 +559,7 @@
QTreeWidget::item:selected {
border: none;
- background: #5d8869;
+ background: #2ebd26;
}
@@ -646,7 +621,7 @@
messagewdg QTableWidget::item:hover {
color: white;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0
#5d8869, stop: 1 #5d8869);
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0
#2ebd26, stop: 1 #29aa22);
border-radius: 9px;
}
@@ -706,30 +681,6 @@
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=34650&r1=34649&r2=34650&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:52:08 2016
@@ -320,21 +320,9 @@
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 {
@@ -713,6 +701,16 @@
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);
@@ -720,29 +718,23 @@
help_widget QTextBrowser
{
- background-color: #414a57;
+ background-color: #353b47;
color: white;
}
help_widget QWidget
{
- background-color: #414a57;
- color: white;
-}
-
-help_widget QTreeWidget
-{
- background-color: #414a57;
+ background-color: #353b47;
color: white;
}
help_widget QScrollArea QFrame {
- background-color: #414a57;
+ background-color: #353b47;
color: white;
}
help_widget QScrollArea {
- background-color: #414a57;
+ background-color: #353b47;
color: white;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
