Author: mir3x
Date: Sun Oct 23 20:05:37 2016
New Revision: 34226
URL: http://svn.gna.org/viewcvs/freeciv?rev=34226&view=rev
Log:
Qt client - use custom close/minimize/buttons for no titlebar mode
See patch #7856
Added:
branches/S2_6/data/themes/gui-qt/icons/cclose.png (with props)
branches/S2_6/data/themes/gui-qt/icons/cmax.png (with props)
branches/S2_6/data/themes/gui-qt/icons/cmin.png (with props)
Modified:
branches/S2_6/client/gui-qt/fc_client.cpp
branches/S2_6/data/themes/gui-qt/icons/Makefile.am
Modified: branches/S2_6/client/gui-qt/fc_client.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fc_client.cpp?rev=34226&r1=34225&r2=34226&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/fc_client.cpp (original)
+++ branches/S2_6/client/gui-qt/fc_client.cpp Sun Oct 23 20:05:37 2016
@@ -728,18 +728,26 @@
{
QHBoxLayout *hb;
QPushButton *qpb;
+ int h;
+ QFont *f = fc_font::instance()->get_font(fonts::default_font);
+
+ if (f->pointSize() > 0) {
+ h = f->pointSize();
+ } else {
+ h = f->pixelSize();
+ }
mw = qmw;
hb = new QHBoxLayout();
- qpb = new QPushButton(style()->standardIcon(
- QStyle::SP_TitleBarMinButton), "");
+ qpb = new QPushButton(fc_icons::instance()->get_icon("cmin"), "");
+ qpb->setFixedSize(h, h);
connect(qpb, SIGNAL(clicked()), SLOT(minimize()));
hb->addWidget(qpb);
- qpb = new QPushButton(style()->standardIcon(
- QStyle::SP_TitleBarMaxButton), "");
+ qpb = new QPushButton(fc_icons::instance()->get_icon("cmax"), "");
+ qpb->setFixedSize(h, h);
connect(qpb, SIGNAL(clicked()), SLOT(maximize()));
hb->addWidget(qpb);
- qpb = new QPushButton(style()->standardIcon(
- QStyle::SP_TitleBarCloseButton), "");
+ qpb = new QPushButton(fc_icons::instance()->get_icon("cclose"), "");
+ qpb->setFixedSize(h, h);
connect(qpb, SIGNAL(clicked()), SLOT(close_fc()));
hb->addWidget(qpb);
setLayout(hb);
Modified: branches/S2_6/data/themes/gui-qt/icons/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/themes/gui-qt/icons/Makefile.am?rev=34226&r1=34225&r2=34226&view=diff
==============================================================================
--- branches/S2_6/data/themes/gui-qt/icons/Makefile.am (original)
+++ branches/S2_6/data/themes/gui-qt/icons/Makefile.am Sun Oct 23 20:05:37 2016
@@ -7,6 +7,9 @@
ai.png \
building.png \
buildroad.png \
+ cclose.png \
+ cmax.png \
+ cmin.png \
chopchop.png \
cities.png \
city-close.png \
Added: branches/S2_6/data/themes/gui-qt/icons/cclose.png
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/themes/gui-qt/icons/cclose.png?rev=34226&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/S2_6/data/themes/gui-qt/icons/cclose.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: branches/S2_6/data/themes/gui-qt/icons/cmax.png
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/themes/gui-qt/icons/cmax.png?rev=34226&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/S2_6/data/themes/gui-qt/icons/cmax.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: branches/S2_6/data/themes/gui-qt/icons/cmin.png
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/themes/gui-qt/icons/cmin.png?rev=34226&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/S2_6/data/themes/gui-qt/icons/cmin.png
------------------------------------------------------------------------------
svn:mime-type = image/png
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
