Author: mir3x
Date: Fri Dec 19 15:50:58 2014
New Revision: 27347

URL: http://svn.gna.org/viewcvs/freeciv?rev=27347&view=rev
Log:
Removed oxygen icons

Patch submitted by Louis Moureaux <louis94>

See bug #23094


Added:
    branches/S2_5/data/themes/gui-qt/icons/
    branches/S2_5/data/themes/gui-qt/icons/Makefile.am
Removed:
    branches/S2_5/data/themes/gui-qt/oxygen/
Modified:
    branches/S2_5/client/gui-qt/fc_client.cpp
    branches/S2_5/configure.ac
    branches/S2_5/data/themes/gui-qt/Makefile.am

Modified: branches/S2_5/client/gui-qt/fc_client.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/fc_client.cpp?rev=27347&r1=27346&r2=27347&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/fc_client.cpp   (original)
+++ branches/S2_5/client/gui-qt/fc_client.cpp   Fri Dec 19 15:50:58 2014
@@ -738,9 +738,10 @@
 ****************************************************************************/
 QIcon fc_icons::get_icon(const QString &id)
 {
-  return QIcon(fileinfoname(get_data_dirs(),
-                            QString("themes/gui-qt/oxygen/"
+  QIcon fallback = QIcon(fileinfoname(get_data_dirs(),
+                            QString("themes/gui-qt/icons/"
                                     + id + ".png").toLocal8Bit().data()));
+  return QIcon::fromTheme(id, fallback);
 }
 
 /****************************************************************************
@@ -749,7 +750,7 @@
 QString fc_icons::get_path(const QString &id)
 {
   return fileinfoname(get_data_dirs(),
-                      QString("themes/gui-qt/oxygen/"
+                      QString("themes/gui-qt/icons/"
                               + id + ".png").toLocal8Bit().data());
 }
 

Modified: branches/S2_5/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=27347&r1=27346&r2=27347&view=diff
==============================================================================
--- branches/S2_5/configure.ac  (original)
+++ branches/S2_5/configure.ac  Fri Dec 19 15:50:58 2014
@@ -1468,7 +1468,7 @@
          data/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/Makefile
          data/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Toolbar/Makefile
          data/themes/gui-qt/Makefile
-         data/themes/gui-qt/oxygen/Makefile
+         data/themes/gui-qt/icons/Makefile
          data/themes/gui-sdl/Makefile
          data/themes/gui-sdl/human/Makefile
          data/wonders/Makefile

Modified: branches/S2_5/data/themes/gui-qt/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/themes/gui-qt/Makefile.am?rev=27347&r1=27346&r2=27347&view=diff
==============================================================================
--- branches/S2_5/data/themes/gui-qt/Makefile.am        (original)
+++ branches/S2_5/data/themes/gui-qt/Makefile.am        Fri Dec 19 15:50:58 2014
@@ -1,4 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = oxygen
-
+SUBDIRS = icons

Added: branches/S2_5/data/themes/gui-qt/icons/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/themes/gui-qt/icons/Makefile.am?rev=27347&view=auto
==============================================================================
--- branches/S2_5/data/themes/gui-qt/icons/Makefile.am  (added)
+++ branches/S2_5/data/themes/gui-qt/icons/Makefile.am  Fri Dec 19 15:50:58 2014
@@ -0,0 +1,26 @@
+## Process this file with automake to produce Makefile.in
+
+## Override automake so that "make install" puts these in proper place:
+pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-qt/oxygen
+
+## 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
+
+EXTRA_DIST = $(pkgdata_DATA)


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

Reply via email to