theme: rename "default" theme to "dark"

this inhibits maintenance and development of multiple stock themes

a symlink is created to 'default.edj' to preserve compatibility

config/default/base.src.in

@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131087;
+  value "config_version" int: 131088;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
   value "vsync" uchar: 0;
@@ -39,7 +39,7 @@ group "Elm_Config" struct {
   value "edje_collection_cache" int: 64;
   value "finger_size" int: 10;
   value "fps" double: 60.0;
-  value "theme" string: "default";
+  value "theme" string: "dark";
   value "modules" string: "prefs>prefs_iface:access_output>access/api:clock_input_ctxpopup>clock/api";
   value "tooltip_delay" double: 1.0;
   value "cursor_engine_only" uchar: 0;

config/mobile/base.src.in

@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131087;
+  value "config_version" int: 131088;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
   value "vsync" uchar: 0;
@@ -39,7 +39,7 @@ group "Elm_Config" struct {
   value "edje_collection_cache" int: 64;
   value "finger_size" int: 40;
   value "fps" double: 60.0;
-  value "theme" string: "default";
+  value "theme" string: "dark";
   value "modules" string: "prefs>prefs_iface:access_output>access/api:clock_input_ctxpopup>clock/api";
   value "tooltip_delay" double: 1.0;
   value "cursor_engine_only" uchar: 0;

config/standard/base.src.in

@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131087;
+  value "config_version" int: 131088;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
   value "vsync" uchar: 0;
@@ -39,7 +39,7 @@ group "Elm_Config" struct {
   value "edje_collection_cache" int: 64;
   value "finger_size" int: 10;
   value "fps" double: 60.0;
-  value "theme" string: "default";
+  value "theme" string: "dark";
   value "modules" string: "prefs>prefs_iface:access_output>access/api:clock_input_ctxpopup>clock/api";
   value "tooltip_delay" double: 1.0;
   value "cursor_engine_only" uchar: 0;

configure.ac

@@ -21,7 +21,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 # Due to a bug in automake 1.14 we need to use this after AM_INIT_AUTOMAKE
 # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15981
 AC_USE_SYSTEM_EXTENSIONS
-
+AC_PROG_LN_S
 CFOPT_WARNING=""
 
 #### Apply configuring with legacy api's only, eo api's or both.

data/Makefile.am

@@ -119,16 +119,7 @@ EXTRA_DIST += $(eluafiles_DATA)
 
 # themes
 
-elementaryfilesdir = $(datadir)/elementary/themes
-elementaryfiles_DATA = elementary/themes/default.edj
-CLEANFILES += elementary/themes/default.edj
-
-include elementary/themes/Makefile.am
-
-elementary/themes/default.edj: elementary/themes/default.edc $(elementary_themes_files) $(efl_ui_themes_files) $(elementary_fdo_files) $(top_builddir)/src/bin/edje/edje_cc${EXEEXT}
-	$(AM_V_EDJ) \
-	$(MKDIR_P) elementary/themes/; \
-	$(EDJE_CC) $(EDJE_CC_FLAGS) $(EDJE_CC_ELM_FLAGS) $< $@
+include elementary/themes/dark/Makefile.am
 
 # desktop files
 
@@ -140,43 +131,6 @@ elementaryicon_DATA = elementary/desktop/elementary.png
 
 EXTRA_DIST += $(elementarydesktop_DATA) $(elementaryicon_DATA)
 
-# fdo icon theme
-
-elementaryfdodir = $(datadir)/icons/Enlightenment-X/
-elementaryfdo_DATA = elementary/themes/fdo/index.theme elementary/themes/fdo/README
-
-EXTRA_DIST += $(elementaryfdo_DATA)
-
-elementaryfdo_actions_128dir = $(datadir)/icons/Enlightenment-X/actions/128
-elementaryfdo_actions_128_DATA = $(elementary_fdo_actions_128_files)
-
-elementaryfdo_categories_16dir = $(datadir)/icons/Enlightenment-X/categories/16
-elementaryfdo_categories_16_DATA = $(elementary_fdo_categories_16_files)
-
-elementaryfdo_categories_128dir = $(datadir)/icons/Enlightenment-X/categories/128
-elementaryfdo_categories_128_DATA = $(elementary_fdo_categories_128_files)
-
-elementaryfdo_emblems_96dir = $(datadir)/icons/Enlightenment-X/emblems/96
-elementaryfdo_emblems_96_DATA = $(elementary_fdo_emblems_96_files)
-
-elementaryfdo_places_16dir = $(datadir)/icons/Enlightenment-X/places/16
-elementaryfdo_places_16_DATA = $(elementary_fdo_places_16_files)
-
-elementaryfdo_places_128dir = $(datadir)/icons/Enlightenment-X/places/128
-elementaryfdo_places_128_DATA = $(elementary_fdo_places_128_files)
-
-elementaryfdo_status_128dir = $(datadir)/icons/Enlightenment-X/status/128
-elementaryfdo_status_128_DATA = $(elementary_fdo_status_128_files)
-
-elementaryfdo_devices_128dir = $(datadir)/icons/Enlightenment-X/devices/128
-elementaryfdo_devices_128_DATA = $(elementary_fdo_devices_128_files)
-
-elementaryfdo_apps_64dir = $(datadir)/icons/Enlightenment-X/apps/64
-elementaryfdo_apps_64_DATA = $(elementary_fdo_apps_64_files)
-
-elementaryfdo_intl_128dir = $(datadir)/icons/Enlightenment-X/intl/128
-elementaryfdo_intl_128_DATA = $(elementary_fdo_intl_128_files)
-
 # edje_externals
 
 elementaryedje_externalsdir = $(datadir)/elementary/edje_externals
@@ -274,15 +228,20 @@ elementary/objects/test_prefs.edj: elementary/objects/test_prefs.edc
 elementary/objects/test_focus_style.edj: elementary/objects/test_focus_style.edc
 	$(AM_V_EDJ) \
 	$(MKDIR_P) elementary/objects/; \
-	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/dark/img $< $@
 
 elementary/objects/test_tooltip.edj: elementary/objects/test_tooltip.edc
 	$(AM_V_EDJ) \
 	$(MKDIR_P) elementary/objects/; \
-	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/dark/img $< $@
 
 elementary/objects/test_prefs.epb: elementary/objects/test_prefs.epc
 	$(AM_V_EPB) \
 	$(MKDIR_P) elementary/objects/; \
 	$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) $< $@
 
+install-data-local:
+	(cd ${datadir}/elementary/themes; $(LN_S) -f dark.edj default.edj)
+
+uninstall-local:
+	(cd ${datadir}/elementary/themes; rm -f default.edj)

data/elementary/objects/test_focus_style.edc

@@ -434,19 +434,19 @@ collections {
       }
    } //group ends
 
-#include "../../../data/elementary/themes/macros.edc"
-#include "../../../data/elementary/themes/fonts.edc"
-#include "../../../data/elementary/themes/colorclasses.edc"
+#include "../../../data/elementary/themes/dark/macros.edc"
+#include "../../../data/elementary/themes/dark/fonts.edc"
+#include "../../../data/elementary/themes/dark/colorclasses.edc"
 
 // to customize check default style
-#include "../../../data/elementary/themes/edc/elm/check.edc"
+#include "../../../data/elementary/themes/dark/edc/elm/check.edc"
    group { name: "elm/check/base/focus_text";
       data.item: "focus_part" "elm.text";
       inherit: "elm/check/base/default";
    }
 
 // to customize button default style
-#include "../../../data/elementary/themes/edc/elm/button.edc"
+#include "../../../data/elementary/themes/dark/edc/elm/button.edc"
    group { name: "elm/button/base/focus_icon";
       data.item: "focus_part" "elm.swallow.content";
       inherit: "elm/button/base/default";