diff --git a/configure.ac b/configure.ac index b2aaf8b..5bded44 100644 --- a/configure.ac +++ b/configure.ac @@ -89,7 +89,7 @@ src/include/Makefile src/bin/Makefile data/Makefile data/images/Makefile -data/theme/Makefile +data/themes/Makefile data/.proto/Makefile ]) diff --git a/data/Makefile.am b/data/Makefile.am index ddcbe49..ed3a550 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = images theme .proto +SUBDIRS = images themes .proto diff --git a/data/sample/etypers.edj b/data/sample/etypers.edj deleted file mode 100644 index 15f52ff..0000000 Binary files a/data/sample/etypers.edj and /dev/null differ diff --git a/data/theme/Makefile.am b/data/themes/Makefile.am similarity index 53% rename from data/theme/Makefile.am rename to data/themes/Makefile.am index f5aae18..f4e9868 100644 --- a/data/theme/Makefile.am +++ b/data/themes/Makefile.am @@ -1,17 +1,17 @@ MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ -EDJE_FLAGS = -id $(top_srcdir)/data/theme/images +EDJE_FLAGS = -id $(top_srcdir)/data/themes/images -filesdir = $(datadir)/$(PACKAGE)/theme +filesdir = $(datadir)/$(PACKAGE)/themes files_DATA = enventor.edj EXTRA_DIST = enventor.edc enventor.edj: Makefile $(EXTRA_DIST) $(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/theme/enventor.edc \ - $(top_builddir)/data/theme/enventor.edj + $(top_srcdir)/data/themes/enventor.edc \ + $(top_builddir)/data/themes/enventor.edj clean-local: rm -f *.edj diff --git a/data/theme/content.edc b/data/themes/content.edc similarity index 100% rename from data/theme/content.edc rename to data/themes/content.edc diff --git a/data/theme/enventor.edc b/data/themes/enventor.edc similarity index 100% rename from data/theme/enventor.edc rename to data/themes/enventor.edc diff --git a/data/theme/images.edc b/data/themes/images.edc similarity index 100% rename from data/theme/images.edc rename to data/themes/images.edc diff --git a/data/theme/images/arrow_down.png b/data/themes/images/arrow_down.png similarity index 100% rename from data/theme/images/arrow_down.png rename to data/themes/images/arrow_down.png diff --git a/data/theme/images/arrow_left.png b/data/themes/images/arrow_left.png similarity index 100% rename from data/theme/images/arrow_left.png rename to data/themes/images/arrow_left.png diff --git a/data/theme/images/arrow_right.png b/data/themes/images/arrow_right.png similarity index 100% rename from data/theme/images/arrow_right.png rename to data/themes/images/arrow_right.png diff --git a/data/theme/images/arrow_up.png b/data/themes/images/arrow_up.png similarity index 100% rename from data/theme/images/arrow_up.png rename to data/themes/images/arrow_up.png diff --git a/data/theme/images/bt_base1.png b/data/themes/images/bt_base1.png similarity index 100% rename from data/theme/images/bt_base1.png rename to data/themes/images/bt_base1.png diff --git a/data/theme/images/bt_base2.png b/data/themes/images/bt_base2.png similarity index 100% rename from data/theme/images/bt_base2.png rename to data/themes/images/bt_base2.png diff --git a/data/theme/images/bt_dis_base.png b/data/themes/images/bt_dis_base.png similarity index 100% rename from data/theme/images/bt_dis_base.png rename to data/themes/images/bt_dis_base.png diff --git a/data/theme/images/bt_dis_hilight.png b/data/themes/images/bt_dis_hilight.png similarity index 100% rename from data/theme/images/bt_dis_hilight.png rename to data/themes/images/bt_dis_hilight.png diff --git a/data/theme/images/bt_glow.png b/data/themes/images/bt_glow.png similarity index 100% rename from data/theme/images/bt_glow.png rename to data/themes/images/bt_glow.png diff --git a/data/theme/images/bt_hilight.png b/data/themes/images/bt_hilight.png similarity index 100% rename from data/theme/images/bt_hilight.png rename to data/themes/images/bt_hilight.png diff --git a/data/theme/images/bt_shine.png b/data/themes/images/bt_shine.png similarity index 100% rename from data/theme/images/bt_shine.png rename to data/themes/images/bt_shine.png diff --git a/data/theme/images/bt_sm_base2.png b/data/themes/images/bt_sm_base2.png similarity index 100% rename from data/theme/images/bt_sm_base2.png rename to data/themes/images/bt_sm_base2.png diff --git a/data/theme/images/bt_sm_hilight.png b/data/themes/images/bt_sm_hilight.png similarity index 100% rename from data/theme/images/bt_sm_hilight.png rename to data/themes/images/bt_sm_hilight.png diff --git a/data/theme/images/bt_sm_shine.png b/data/themes/images/bt_sm_shine.png similarity index 100% rename from data/theme/images/bt_sm_shine.png rename to data/themes/images/bt_sm_shine.png diff --git a/data/theme/images/content_glow.png b/data/themes/images/content_glow.png similarity index 100% rename from data/theme/images/content_glow.png rename to data/themes/images/content_glow.png diff --git a/data/theme/images/cur_box.png b/data/themes/images/cur_box.png similarity index 100% rename from data/theme/images/cur_box.png rename to data/themes/images/cur_box.png diff --git a/data/theme/images/cur_glow.png b/data/themes/images/cur_glow.png similarity index 100% rename from data/theme/images/cur_glow.png rename to data/themes/images/cur_glow.png diff --git a/data/theme/images/cur_hi.png b/data/themes/images/cur_hi.png similarity index 100% rename from data/theme/images/cur_hi.png rename to data/themes/images/cur_hi.png diff --git a/data/theme/images/cur_shad.png b/data/themes/images/cur_shad.png similarity index 100% rename from data/theme/images/cur_shad.png rename to data/themes/images/cur_shad.png diff --git a/data/theme/images/cur_shine.png b/data/themes/images/cur_shine.png similarity index 100% rename from data/theme/images/cur_shine.png rename to data/themes/images/cur_shine.png diff --git a/data/theme/images/folder.png b/data/themes/images/folder.png similarity index 100% rename from data/theme/images/folder.png rename to data/themes/images/folder.png diff --git a/data/theme/images/menu_layout.png b/data/themes/images/menu_layout.png similarity index 100% rename from data/theme/images/menu_layout.png rename to data/themes/images/menu_layout.png diff --git a/data/theme/images/minus.png b/data/themes/images/minus.png similarity index 100% rename from data/theme/images/minus.png rename to data/themes/images/minus.png diff --git a/data/theme/images/part_highlight.png b/data/themes/images/part_highlight.png similarity index 100% rename from data/theme/images/part_highlight.png rename to data/themes/images/part_highlight.png diff --git a/data/theme/images/plus.png b/data/themes/images/plus.png similarity index 100% rename from data/theme/images/plus.png rename to data/themes/images/plus.png diff --git a/data/theme/images/preference.png b/data/themes/images/preference.png similarity index 100% rename from data/theme/images/preference.png rename to data/themes/images/preference.png diff --git a/data/theme/images/sb_runnerh.png b/data/themes/images/sb_runnerh.png similarity index 100% rename from data/theme/images/sb_runnerh.png rename to data/themes/images/sb_runnerh.png diff --git a/data/theme/images/sb_runnerv.png b/data/themes/images/sb_runnerv.png similarity index 100% rename from data/theme/images/sb_runnerv.png rename to data/themes/images/sb_runnerv.png diff --git a/data/theme/images/shelf_inset.png b/data/themes/images/shelf_inset.png similarity index 100% rename from data/theme/images/shelf_inset.png rename to data/themes/images/shelf_inset.png diff --git a/data/theme/images/sl_bt2_2.png b/data/themes/images/sl_bt2_2.png similarity index 100% rename from data/theme/images/sl_bt2_2.png rename to data/themes/images/sl_bt2_2.png diff --git a/data/theme/images/swallow.png b/data/themes/images/swallow.png similarity index 100% rename from data/theme/images/swallow.png rename to data/themes/images/swallow.png diff --git a/data/theme/images/warning.png b/data/themes/images/warning.png similarity index 100% rename from data/theme/images/warning.png rename to data/themes/images/warning.png diff --git a/data/theme/layout.edc b/data/themes/layout.edc similarity index 100% rename from data/theme/layout.edc rename to data/themes/layout.edc diff --git a/data/theme/menu.edc b/data/themes/menu.edc similarity index 100% rename from data/theme/menu.edc rename to data/themes/menu.edc diff --git a/data/theme/theme_ext.edc b/data/themes/theme_ext.edc similarity index 100% rename from data/theme/theme_ext.edc rename to data/themes/theme_ext.edc diff --git a/src/bin/main.c b/src/bin/main.c index 695054b..b96ba0f 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -429,7 +429,7 @@ elm_setup() elm_app_info_set("/usr/local/bin", "enventor", "/usr/local/share/enventor"); - snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/theme/enventor.edj", + snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor.edj", elm_app_data_dir_get()); elm_theme_extension_add(NULL, EDJE_PATH);