<URL: http://bugs.freeciv.org/Ticket/Display.html?id=35695 >

This is a new theme for the SDL client, called "human". It was created
by Hogne Håskjold and is based on the "deluxe2" theme and the Ubuntu
"human" theme. It was one of Hogne's goals to replace any remaining
images with uncertain origin and I think it's safe now to put this theme
into SVN and ship it with Freeciv. The autoconf patches to get the theme
installed together with the SDL client are attached, too, and I'd really
love to see this theme shipped with the beta3 release :-)
Index: configure.ac
===================================================================
--- configure.ac	(Revision 12610)
+++ configure.ac	(Arbeitskopie)
@@ -721,6 +721,9 @@
 	  data/civ2/Makefile
 	  data/scenario/Makefile
 	  data/nation/Makefile
+	  data/themes/Makefile
+	  data/themes/gui-sdl/Makefile
+	  data/themes/gui-sdl/human/Makefile
 	  utility/Makefile
 	  utility/ftwl/Makefile
 	  dependencies/Makefile
Index: data/themes/gui-sdl/human/Makefile.am
===================================================================
--- data/themes/gui-sdl/human/Makefile.am	(Revision 0)
+++ data/themes/gui-sdl/human/Makefile.am	(Revision 0)
@@ -0,0 +1,36 @@
+## 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-sdl/human
+
+pkgdata_DATA =          	\
+	Vera.ttf		\
+	backgrounds.themespec 	\
+	bg.png			\
+	bg2.png			\
+	city.png		\
+	city.spec		\
+	city_fist.png		\
+	city_fist.spec		\
+	colors.themespec	\
+	dip_icons.png		\
+	dip_icons.spec		\
+	icons.png		\
+	icons.spec		\
+	options_bg.png		\
+	small_theme_buttons.png		\
+	small_theme_buttons.spec	\
+	tech_tree.png		\
+	tech_tree.spec		\
+	theme.themespec		\
+	theme_boxs.png		\
+	theme_boxs.spec		\
+	theme_buttons.png	\
+	theme_buttons.spec	\
+	theme_orders_buttons.png	\
+	theme_orders_buttons.spec	\
+	theme_scrolls.png	\
+	theme_scrolls.spec	\
+	world.png
+
+EXTRA_DIST = $(pkgdata_DATA)
Index: data/themes/gui-sdl/Makefile.am
===================================================================
--- data/themes/gui-sdl/Makefile.am	(Revision 0)
+++ data/themes/gui-sdl/Makefile.am	(Revision 0)
@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = human
Index: data/themes/Makefile.am
===================================================================
--- data/themes/Makefile.am	(Revision 0)
+++ data/themes/Makefile.am	(Revision 0)
@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+
+if CLIENT_GUI_SDL
+SUBDIRS = gui-sdl
+endif
Index: data/Makefile.am
===================================================================
--- data/Makefile.am	(Revision 12610)
+++ data/Makefile.am	(Arbeitskopie)
@@ -50,7 +50,7 @@
 	default.serv
 
 if CLIENT
-CLIENTDATADIRS = amplio misc flags isotrident trident isophex stdsounds
+CLIENTDATADIRS = amplio misc flags isotrident trident isophex stdsounds themes
 else
 CLIENTDATADIRS = 
 endif
Index: client/gui-sdl/themes.c
===================================================================
--- client/gui-sdl/themes.c	(Revision 12610)
+++ client/gui-sdl/themes.c	(Arbeitskopie)
@@ -26,7 +26,7 @@
 #include "themes_common.h"
 #include "themes_g.h"
 
-char gui_sdl_theme_name[512] = "deluxe2";
+char gui_sdl_theme_name[512] = "human";
 
 /*****************************************************************************
   Loads a gui-sdl theme directory/theme_name
Index: configure.ac
===================================================================
--- configure.ac	(Revision 12617)
+++ configure.ac	(Arbeitskopie)
@@ -733,6 +733,9 @@
 	  data/civ2/Makefile
 	  data/scenario/Makefile
 	  data/nation/Makefile
+	  data/themes/Makefile
+	  data/themes/gui-sdl/Makefile
+	  data/themes/gui-sdl/human/Makefile
 	  utility/Makefile
 	  utility/ftwl/Makefile
 	  dependencies/Makefile
Index: data/themes/gui-sdl/human/Makefile.am
===================================================================
--- data/themes/gui-sdl/human/Makefile.am	(Revision 0)
+++ data/themes/gui-sdl/human/Makefile.am	(Revision 0)
@@ -0,0 +1,36 @@
+## 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-sdl/human
+
+pkgdata_DATA =          	\
+	Vera.ttf		\
+	backgrounds.themespec 	\
+	bg.png			\
+	bg2.png			\
+	city.png		\
+	city.spec		\
+	city_fist.png		\
+	city_fist.spec		\
+	colors.themespec	\
+	dip_icons.png		\
+	dip_icons.spec		\
+	icons.png		\
+	icons.spec		\
+	options_bg.png		\
+	small_theme_buttons.png		\
+	small_theme_buttons.spec	\
+	tech_tree.png		\
+	tech_tree.spec		\
+	theme.themespec		\
+	theme_boxs.png		\
+	theme_boxs.spec		\
+	theme_buttons.png	\
+	theme_buttons.spec	\
+	theme_orders_buttons.png	\
+	theme_orders_buttons.spec	\
+	theme_scrolls.png	\
+	theme_scrolls.spec	\
+	world.png
+
+EXTRA_DIST = $(pkgdata_DATA)
Index: data/themes/gui-sdl/Makefile.am
===================================================================
--- data/themes/gui-sdl/Makefile.am	(Revision 0)
+++ data/themes/gui-sdl/Makefile.am	(Revision 0)
@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = human
Index: data/themes/Makefile.am
===================================================================
--- data/themes/Makefile.am	(Revision 0)
+++ data/themes/Makefile.am	(Revision 0)
@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+
+if CLIENT_GUI_SDL
+SUBDIRS = gui-sdl
+endif
Index: data/Makefile.am
===================================================================
--- data/Makefile.am	(Revision 12617)
+++ data/Makefile.am	(Arbeitskopie)
@@ -53,7 +53,7 @@
 
 if CLIENT
 CLIENTDATADIRS = amplio misc flags buildings isotrident trident isophex \
- hex2t stdsounds
+ hex2t stdsounds themes
 else
 CLIENTDATADIRS = 
 endif
Index: client/gui-sdl/themes.c
===================================================================
--- client/gui-sdl/themes.c	(Revision 12617)
+++ client/gui-sdl/themes.c	(Arbeitskopie)
@@ -26,7 +26,7 @@
 #include "themes_common.h"
 #include "themes_g.h"
 
-char gui_sdl_theme_name[512] = "deluxe2";
+char gui_sdl_theme_name[512] = "human";
 
 /*****************************************************************************
   Loads a gui-sdl theme directory/theme_name
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to