Author: mir3x
Date: Wed Oct 26 00:06:28 2016
New Revision: 34253
URL: http://svn.gna.org/viewcvs/freeciv?rev=34253&view=rev
Log:
Qt client - added scrollbars to city dialog
See patch #7869
Modified:
branches/S2_6/client/gui-qt/citydlg.cpp
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=34253&r1=34252&r2=34253&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/citydlg.cpp (original)
+++ branches/S2_6/client/gui-qt/citydlg.cpp Wed Oct 26 00:06:28 2016
@@ -1243,7 +1243,7 @@
QHeaderView *header;
QLabel *lab2, *label, *ql, *some_label;
QPushButton *qpush2;
- QScrollArea *scroll, *scroll2, *scroll3;
+ QScrollArea *scroll, *scroll2, *scroll3, *scroll_info, *scroll_unit;
QSizePolicy size_expanding_policy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
QSizePolicy size_fixed_policy(QSizePolicy::Fixed, QSizePolicy::Fixed);
@@ -1258,11 +1258,11 @@
happines_shown = false;
central_splitter = new QSplitter;
- central_splitter->setOpaqueResize(true);
+ central_splitter->setOpaqueResize(false);
central_left_splitter = new QSplitter;
- central_left_splitter->setOpaqueResize(true);
+ central_left_splitter->setOpaqueResize(false);
prod_unit_splitter = new QSplitter;
- prod_unit_splitter->setOpaqueResize(true);
+ prod_unit_splitter->setOpaqueResize(false);
setParent(parent);
setMouseTracking(true);
@@ -1693,19 +1693,24 @@
split_widget2->setLayout(units_layout);
prod_unit_splitter->addWidget(split_widget1);
prod_unit_splitter->addWidget(split_widget2);
- prod_unit_splitter->setStretchFactor(0, 1);
- prod_unit_splitter->setStretchFactor(1, 5);
+ prod_unit_splitter->setStretchFactor(0, 40);
+ prod_unit_splitter->setStretchFactor(1, 60);
prod_unit_splitter->setOrientation(Qt::Horizontal);
leftbot_layout->addWidget(prod_unit_splitter);
top_widget = new QWidget;
top_widget->setLayout(lefttop_layout);
-
+ scroll_info = new QScrollArea();
+ scroll_unit = new QScrollArea();
+ scroll_info->setWidget(top_widget);
+ scroll_info->setWidgetResizable(true);
prod_happ_widget = new QWidget;
prod_happ_widget->setLayout(leftbot_layout);
- central_left_splitter->addWidget(top_widget);
- central_left_splitter->addWidget(prod_happ_widget);
- central_left_splitter->setStretchFactor(0, 1);
- central_left_splitter->setStretchFactor(1, 100);
+ scroll_unit->setWidget(prod_happ_widget);
+ scroll_unit->setWidgetResizable(true);
+ central_left_splitter->addWidget(scroll_info);
+ central_left_splitter->addWidget(scroll_unit);
+ central_left_splitter->setStretchFactor(0, 60);
+ central_left_splitter->setStretchFactor(1, 60);
central_left_splitter->setOrientation(Qt::Vertical);
left_layout->addWidget(central_left_splitter);
@@ -1715,8 +1720,8 @@
split_widget2->setLayout(right_layout);
central_splitter->addWidget(split_widget1);
central_splitter->addWidget(split_widget2);
- central_splitter->setStretchFactor(0, 100);
- central_splitter->setStretchFactor(1, 1);
+ central_splitter->setStretchFactor(0, 80);
+ central_splitter->setStretchFactor(1, 20);
central_splitter->setOrientation(Qt::Horizontal);
single_page_layout->addWidget(central_splitter);
setSizeGripEnabled(true);
@@ -1872,6 +1877,9 @@
prod_unit_splitter->restoreState(gui()->qt_settings.city_splitter1);
central_left_splitter->restoreState(gui()->qt_settings.city_splitter2);
central_splitter->restoreState(gui()->qt_settings.city_splitter3);
+ } else {
+ QRect rect = QApplication::desktop()->screenGeometry();
+ resize((rect.width() * 4) / 5, (rect.height() * 5) / 6);
}
}
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=34253&r1=34252&r2=34253&view=diff
==============================================================================
--- branches/S2_6/data/themes/gui-qt/Classic/resource.qss (original)
+++ branches/S2_6/data/themes/gui-qt/Classic/resource.qss Wed Oct 26
00:06:28 2016
@@ -433,6 +433,10 @@
color: black;
}
+city_dialog QScrollArea QWidget {
+ background: #e1cea1;
+}
+
city_dialog QScrollArea QFrame {
background: #e1cea1;
}
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=34253&r1=34252&r2=34253&view=diff
==============================================================================
--- branches/S2_6/data/themes/gui-qt/Necrophos/resource.qss (original)
+++ branches/S2_6/data/themes/gui-qt/Necrophos/resource.qss Wed Oct 26
00:06:28 2016
@@ -462,6 +462,10 @@
background-color: rgba(0, 0, 0,175);
}
+city_dialog QScrollArea QWidget {
+ background: #c5c5c5;
+}
+
city_dialog QScrollArea QFrame {
background: #c5c5c5;
}
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=34253&r1=34252&r2=34253&view=diff
==============================================================================
--- branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss (original)
+++ branches/S2_6/data/themes/gui-qt/NightStalker/resource.qss Wed Oct 26
00:06:28 2016
@@ -529,6 +529,10 @@
color: #3399FF;
}
+city_dialog QScrollArea QWidget {
+ background: #414a57;
+}
+
city_dialog QScrollArea QFrame {
background: #414a57;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
