Revert "theme: rename "default" theme to "dark""

This reverts commit d764e0b279.

The whole idea of renaming the default theme is an "api break" even if
config is changed. and symlinks don't work on windows as a solution.
(well on ntfs only as only as administrator, so they don't exist).

modifying config for switch from default to dark also will break the
case where someone put ~/.elementary/themes/default.edj there and it just
is different to the system one and how their theme changes on them as
it switches to dark.

basically we can't rename a theme like this mid-flight in efl. default is
default and has to stay that name. it can change the look, but not the
name.

i think the apparent reasoning behind this is not a good one. the work on
flat is temporary. i don't think we will ever maintain multiple "default
themes" as its just far too much work.

we can maintain color SCHEMES which are just a list of colorclasses and
colors for them - that's separate to a theme and would override. right now
these things don't exist. we are not going to create a dark.edj and a
light.edj just to store differing default colorclass values. we should be
doing the above with colorclass "color palette/scheme/whatever" files
that override those named colorclasses globally on init.

so reverting because this is an api break and we shouldn't break api
unless there is really absolutely no other choice.

here the choice is to just temporarily work in a branch and modify
default and then merge the branch when done.

config/default/base.src.in

@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131088;
+  value "config_version" int: 131087;
   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: "dark";
+  value "theme" string: "default";
   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: 131088;
+  value "config_version" int: 131087;
   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: "dark";
+  value "theme" string: "default";
   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: 131088;
+  value "config_version" int: 131087;
   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: "dark";
+  value "theme" string: "default";
   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,7 +119,16 @@ EXTRA_DIST += $(eluafiles_DATA)
 
 # themes
 
-include elementary/themes/dark/Makefile.am
+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) $< $@
 
 # desktop files
 
@@ -131,6 +140,43 @@ 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
@@ -228,20 +274,15 @@ 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/dark/img $< $@
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/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/dark/img $< $@
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/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/dark/macros.edc"
-#include "../../../data/elementary/themes/dark/fonts.edc"
-#include "../../../data/elementary/themes/dark/colorclasses.edc"
+#include "../../../data/elementary/themes/macros.edc"
+#include "../../../data/elementary/themes/fonts.edc"
+#include "../../../data/elementary/themes/colorclasses.edc"
 
 // to customize check default style
-#include "../../../data/elementary/themes/dark/edc/elm/check.edc"
+#include "../../../data/elementary/themes/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/dark/edc/elm/button.edc"
+#include "../../../data/elementary/themes/edc/elm/button.edc"
    group { name: "elm/button/base/focus_icon";
       data.item: "focus_part" "elm.swallow.content";
       inherit: "elm/button/base/default";