Author: mir3x
Date: Tue Feb 3 08:45:57 2015
New Revision: 27946
URL: http://svn.gna.org/viewcvs/freeciv?rev=27946&view=rev
Log:
Added a few icons Qt client
See bug #23213
Added:
trunk/data/themes/gui-qt/icons/flag.png (with props)
trunk/data/themes/gui-qt/icons/go-down.png (with props)
trunk/data/themes/gui-qt/icons/go-up.png (with props)
trunk/data/themes/gui-qt/icons/help-donate.png (with props)
trunk/data/themes/gui-qt/icons/list-add.png (with props)
trunk/data/themes/gui-qt/icons/meeting-observer.png (with props)
trunk/data/themes/gui-qt/icons/preferences-other.png (with props)
Modified:
trunk/client/gui-qt/citydlg.cpp
trunk/client/gui-qt/fc_client.cpp
trunk/client/gui-qt/pages.cpp
trunk/data/themes/gui-qt/icons/Makefile.am
Modified: trunk/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=27946&r1=27945&r2=27946&view=diff
==============================================================================
--- trunk/client/gui-qt/citydlg.cpp (original)
+++ trunk/client/gui-qt/citydlg.cpp Tue Feb 3 08:45:57 2015
@@ -811,8 +811,8 @@
"go-up"), "");
work_add_but = new QPushButton(fc_icons::instance()->get_icon(
"list-add"), "");
- work_rem_but = new QPushButton(fc_icons::instance()->get_icon(
- "edit-delete"), "");
+ work_rem_but = new QPushButton(style()->standardIcon(
+ QStyle::SP_DialogDiscardButton), "");
work_but_layout->addWidget(work_add_but);
work_but_layout->addWidget(work_next_but);
work_but_layout->addWidget(work_prev_but);
Modified: trunk/client/gui-qt/fc_client.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.cpp?rev=27946&r1=27945&r2=27946&view=diff
==============================================================================
--- trunk/client/gui-qt/fc_client.cpp (original)
+++ trunk/client/gui-qt/fc_client.cpp Tue Feb 3 08:45:57 2015
@@ -736,10 +736,10 @@
****************************************************************************/
QIcon fc_icons::get_icon(const QString &id)
{
- QIcon fallback = QIcon(fileinfoname(get_data_dirs(),
+ QIcon icon = QIcon(fileinfoname(get_data_dirs(),
QString("themes/gui-qt/icons/"
+ id + ".png").toLocal8Bit().data()));
- return QIcon::fromTheme(id, fallback);
+ return QIcon(icon);
}
/****************************************************************************
Modified: trunk/client/gui-qt/pages.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/pages.cpp?rev=27946&r1=27945&r2=27946&view=diff
==============================================================================
--- trunk/client/gui-qt/pages.cpp (original)
+++ trunk/client/gui-qt/pages.cpp Tue Feb 3 08:45:57 2015
@@ -541,7 +541,7 @@
pages_layout[PAGE_START]->addWidget(start_players_tree, 0, 0, 2, 8);
but = new QPushButton;
but->setText(_("Disconnect"));
- but->setIcon(fc_icons::instance()->get_icon("network-disconnect"));
+ but->setIcon(style()->standardPixmap(QStyle::SP_DialogCancelButton));
QObject::connect(but, SIGNAL(clicked()), this, SLOT(slot_disconnect()));
pages_layout[PAGE_START]->addWidget(but, 5, 4);
but = new QPushButton;
@@ -559,7 +559,7 @@
SLOT(slot_pregame_observe()));
but = new QPushButton;
but->setText(_("Start"));
- but->setIcon(fc_icons::instance()->get_icon("fork"));
+ but->setIcon(style()->standardPixmap(QStyle::SP_DialogOkButton));
pages_layout[PAGE_START]->addWidget(but, 5, 7);
QObject::connect(but, SIGNAL(clicked()), this,
SLOT(slot_pregame_start()));
Modified: trunk/data/themes/gui-qt/icons/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/icons/Makefile.am?rev=27946&r1=27945&r2=27946&view=diff
==============================================================================
--- trunk/data/themes/gui-qt/icons/Makefile.am (original)
+++ trunk/data/themes/gui-qt/icons/Makefile.am Tue Feb 3 08:45:57 2015
@@ -3,24 +3,13 @@
## Override automake so that "make install" puts these in proper place:
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-qt/icons
-## Uncomment those once we have icons
-# pkgdata_DATA = \
-# configure.png \
-# edit-find.png \
-# flag.png \
-# go-up.png \
-# list-remove.png \
-# network-disconnect.png \
-# preferences-other.png \
-# edit-delete.png \
-# fork.png \
-# help-donate.png \
-# meeting-chair.png \
-# network-server.png \
-# preferences-system.png \
-# go-down.png \
-# list-add.png \
-# meeting-observer.png \
-# object-locked.png
+pkgdata_DATA = \
+ flag.png \
+ go-down.png \
+ go-up.png \
+ help-donate.png \
+ list-add.png \
+ meeting-observer.png \
+ preferences-other.png
EXTRA_DIST = $(pkgdata_DATA)
Added: trunk/data/themes/gui-qt/icons/flag.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/icons/flag.png?rev=27946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/themes/gui-qt/icons/flag.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/themes/gui-qt/icons/go-down.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/icons/go-down.png?rev=27946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/themes/gui-qt/icons/go-down.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/themes/gui-qt/icons/go-up.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/icons/go-up.png?rev=27946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/themes/gui-qt/icons/go-up.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/themes/gui-qt/icons/help-donate.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/icons/help-donate.png?rev=27946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/themes/gui-qt/icons/help-donate.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/themes/gui-qt/icons/list-add.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/icons/list-add.png?rev=27946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/themes/gui-qt/icons/list-add.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/themes/gui-qt/icons/meeting-observer.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/icons/meeting-observer.png?rev=27946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/themes/gui-qt/icons/meeting-observer.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/themes/gui-qt/icons/preferences-other.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-qt/icons/preferences-other.png?rev=27946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/themes/gui-qt/icons/preferences-other.png
------------------------------------------------------------------------------
svn:mime-type = image/png
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
