Author: mir3x
Date: Sun Oct 23 20:08:41 2016
New Revision: 34229

URL: http://svn.gna.org/viewcvs/freeciv?rev=34229&view=rev
Log:
Qt client - control popup info colors from theme

See patch #7857

Modified:
    trunk/client/gui-qt/mapview.cpp
    trunk/data/themes/gui-qt/Classic/resource.qss
    trunk/data/themes/gui-qt/Necrophos/resource.qss
    trunk/data/themes/gui-qt/NightStalker/resource.qss
    trunk/data/themes/gui-qt/System/resource.qss

Modified: trunk/client/gui-qt/mapview.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/mapview.cpp?rev=34229&r1=34228&r2=34229&view=diff
==============================================================================
--- trunk/client/gui-qt/mapview.cpp     (original)
+++ trunk/client/gui-qt/mapview.cpp     Sun Oct 23 20:08:41 2016
@@ -1335,17 +1335,11 @@
 **************************************************************************/
 void info_tile::paint(QPainter *painter, QPaintEvent *event)
 {
-  QPen pen;
   QFontMetrics fm(info_font);
   int pos, h;
 
   h = fm.height();
   pos = h;
-  pen.setWidth(1);
-  pen.setColor(QColor(232, 255, 0));
-  painter->setBrush(QColor(0, 0, 0, 205));
-  painter->drawRect(0, 0, width(), height());
-  painter->setPen(pen);
   painter->setFont(info_font);
   for (int i = 0; i < str_list.count(); i++) {
     painter->drawText(5, pos, str_list.at(i));

Modified: trunk/data/themes/gui-qt/Classic/resource.qss
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/Classic/resource.qss?rev=34229&r1=34228&r2=34229&view=diff
==============================================================================
--- trunk/data/themes/gui-qt/Classic/resource.qss       (original)
+++ trunk/data/themes/gui-qt/Classic/resource.qss       Sun Oct 23 20:08:41 2016
@@ -636,6 +636,12 @@
   selection-background-color: #c3b48e;
 }
 
+info_tile {
+color: #ffecba;
+  border: 1px solid black;
+  background-color: rgba(0, 0, 0,195);
+}
+
 notify_dialog {
   color: #ffecba;
   border: 1px solid #ffecba;

Modified: trunk/data/themes/gui-qt/Necrophos/resource.qss
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/Necrophos/resource.qss?rev=34229&r1=34228&r2=34229&view=diff
==============================================================================
--- trunk/data/themes/gui-qt/Necrophos/resource.qss     (original)
+++ trunk/data/themes/gui-qt/Necrophos/resource.qss     Sun Oct 23 20:08:41 2016
@@ -450,6 +450,12 @@
   border: 1px solid #006633;
 }
 
+info_tile {
+  color: #dcffcf;
+  border: 1px solid #77AA77;
+  background-color: rgba(0, 0, 0,195);
+}
+
 notify_dialog {
   color: #dcffcf;
   border: 1px solid #dcffcf;

Modified: trunk/data/themes/gui-qt/NightStalker/resource.qss
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/NightStalker/resource.qss?rev=34229&r1=34228&r2=34229&view=diff
==============================================================================
--- trunk/data/themes/gui-qt/NightStalker/resource.qss  (original)
+++ trunk/data/themes/gui-qt/NightStalker/resource.qss  Sun Oct 23 20:08:41 2016
@@ -317,6 +317,11 @@
   selection-background-color: #3399FF;
 }
 
+info_tile {
+  color: white;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 rgba(0, 0, 
125,195) stop:1 rgba(25, 25, 95, 225));
+  border: 2px solid #0000AA;
+}
 
 notify_dialog {
   color: white;

Modified: trunk/data/themes/gui-qt/System/resource.qss
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/System/resource.qss?rev=34229&r1=34228&r2=34229&view=diff
==============================================================================
--- trunk/data/themes/gui-qt/System/resource.qss        (original)
+++ trunk/data/themes/gui-qt/System/resource.qss        Sun Oct 23 20:08:41 2016
@@ -25,7 +25,7 @@
   color: rgb( 240, 240, 240);
 }
 
-notify_dialog {
+info_tile, notify_dialog {
   color: #e8ff00;
   border: 1px solid #e8ff00;
   background-color: rgba(0, 0, 0,175);


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to