Author: mir3x Date: Sun Jan 3 13:50:46 2016 New Revision: 31327 URL: http://svn.gna.org/viewcvs/freeciv?rev=31327&view=rev Log: Added colors in treaty page. Based on suggestion by Jacob Nevins <jtn>
See patch #6747 Modified: branches/S2_5/client/gui-qt/diplodlg.cpp Modified: branches/S2_5/client/gui-qt/diplodlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/diplodlg.cpp?rev=31327&r1=31326&r2=31327&view=diff ============================================================================== --- branches/S2_5/client/gui-qt/diplodlg.cpp (original) +++ branches/S2_5/client/gui-qt/diplodlg.cpp Sun Jan 3 13:50:46 2016 @@ -21,7 +21,7 @@ // gui-qt #include "qtg_cxxside.h" - +#include "colors.h" #include "diplodlg.h" typedef advance *p_advance; @@ -32,8 +32,10 @@ ****************************************************************************/ diplo_wdg::diplo_wdg(int counterpart, int initiated_from): QWidget() { + color *colr; QString text; QString text2; + QString text_color; QLabel *plr1_label; QLabel *plr2_label; QLabel *label; @@ -45,10 +47,14 @@ QPushButton *add_clause1; QPushButton *add_clause2; QPixmap *pix = NULL; + QPalette palette; struct sprite *sprite, *sprite2; char plr_buf[4 * MAX_LEN_NAME]; QHeaderView *header; - + struct color *textcolors[2] = { + get_color(tileset, COLOR_MAPVIEW_CITYTEXT), + get_color(tileset, COLOR_MAPVIEW_UNKNOWN) + }; if (counterpart == initiated_from) { initiated_from = client_player_number(); } @@ -64,12 +70,27 @@ text = "<b><h3><center>" + QString(nation_plural_for_player(player_by_number(initiated_from))) + "</center></h3></b>"; + colr = get_player_color(tileset, player_by_number(initiated_from)); + text = "<style>h3{background-color: " + + colr->qcolor.name() + ";}</style>" + text; + palette.setColor(QPalette::WindowText, color_best_contrast(colr, + textcolors, ARRAY_SIZE(textcolors))->qcolor); + label3->setPalette(palette); label3->setText(text); + label3->setMinimumWidth(300); label4 = new QLabel; text = "<b><h3><center>" + QString(nation_plural_for_player(player_by_number(counterpart))) - + "</center></h3></b>"; + + "</center></h3></b></body>"; + colr = get_player_color(tileset, player_by_number(counterpart)); + text = "<style>h3{background-color: " + + colr->qcolor.name() + ";}</style>" + text; + palette.setColor(QPalette::WindowText, color_best_contrast(colr, + textcolors, ARRAY_SIZE(textcolors))->qcolor); + label4->setPalette(palette); + label4->setText(text); + label4->setMinimumWidth(300); layout->addWidget(label3, 0, 5); layout->addWidget(label4, 5, 5); plr1_label = new QLabel; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits