hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=18030c6532bb468eddeb2f3116b1c694d702d178
commit 18030c6532bb468eddeb2f3116b1c694d702d178 Author: Taehyub Kim <taehyub....@samsung.com> Date: Thu Jul 7 11:08:24 2016 +0900 tempalate: change the description Summary: change the description Test Plan: 1. open new file 2. see the template name Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet Differential Revision: https://phab.enlightenment.org/D4091 Conflicts: data/templates/Makefile.am --- data/templates/{basic.edc => Basic.edc} | 0 data/templates/{clip.edc => Clip.edc} | 0 data/templates/{empty.edc => Empty.edc} | 0 data/templates/{group.edc => Group.edc} | 0 data/templates/{image.edc => Image.edc} | 0 data/templates/Makefile.am | 137 +++++++++++---------- data/templates/{map.edc => Map.edc} | 0 data/templates/{proxy.edc => Proxy.edc} | 0 data/templates/{rect.edc => Rect.edc} | 0 .../{rotation+zoom.edc => Rotation+Zoom.edc} | 0 data/templates/{sound.edc => Sound.edc} | 0 data/templates/{spacer.edc => Spacer.edc} | 0 data/templates/{text.edc => Text.edc} | 0 data/templates/{textblock.edc => Textblock.edc} | 0 data/templates/{transition.edc => Transition.edc} | 0 data/templates/{tween.edc => Tween.edc} | 0 data/templates/{watchface.edc => Watchface.edc} | 0 data/templates/{watchface2.edc => Watchface2.edc} | 0 src/bin/menu.c | 2 +- src/bin/newfile.c | 2 +- 20 files changed, 71 insertions(+), 70 deletions(-) diff --git a/data/templates/basic.edc b/data/templates/Basic.edc similarity index 100% rename from data/templates/basic.edc rename to data/templates/Basic.edc diff --git a/data/templates/clip.edc b/data/templates/Clip.edc similarity index 100% rename from data/templates/clip.edc rename to data/templates/Clip.edc diff --git a/data/templates/empty.edc b/data/templates/Empty.edc similarity index 100% rename from data/templates/empty.edc rename to data/templates/Empty.edc diff --git a/data/templates/group.edc b/data/templates/Group.edc similarity index 100% rename from data/templates/group.edc rename to data/templates/Group.edc diff --git a/data/templates/image.edc b/data/templates/Image.edc similarity index 100% rename from data/templates/image.edc rename to data/templates/Image.edc diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am index 03213ae..66cc785 100644 --- a/data/templates/Makefile.am +++ b/data/templates/Makefile.am @@ -4,96 +4,97 @@ EDJE_CC = @edje_cc@ EDJE_FLAGS = -id $(top_srcdir)/data/images -sd $(top_srcdir)/data/sounds filesdir = $(datadir)/$(PACKAGE)/templates -files_DATA = basic.edc \ - basic.edj \ - clip.edc \ - clip.edj \ - empty.edc \ - empty.edj \ - group.edc \ - group.edj \ - image.edc \ - image.edj \ - map.edc \ - map.edj \ - proxy.edc \ - proxy.edj \ - rect.edc \ - rect.edj \ - rotation+zoom.edc \ - rotation+zoom.edj \ - sound.edc \ - sound.edj \ - spacer.edc \ - spacer.edj \ - text.edc \ - text.edj \ - textblock.edc \ - textblock.edj \ - transition.edc \ - transition.edj \ - tween.edc \ - tween.edj \ - watchface.edc \ - watchface.edj \ - watchface2.edc \ - watchface2.edj +files_DATA = Basic.edc \ + Basic.edj \ + Clip.edc \ + Clip.edj \ + Empty.edc \ + Empty.edj \ + Group.edc \ + Group.edj \ + Image.edc \ + Image.edj \ + Map.edc \ + Map.edj \ + Proxy.edc \ + Proxy.edj \ + Rect.edc \ + Rect.edj \ + Rotation+Zoom.edc \ + Rotation+Zoom.edj \ + Sound.edc \ + Sound.edj \ + Spacer.edc \ + Spacer.edj \ + Text.edc \ + Text.edj \ + Textblock.edc \ + Textblock.edj \ + Transition.edc \ + Transition.edj \ + Tween.edc \ + Tween.edj \ + Watchface.edc \ + Watchface.edj \ + Watchface2.edc \ + Watchface2.edj EXTRA_DIST = $(files_DATA) srcdir = $(top_srcdir)/data/templates builddir = $(top_builddir)/data/templates -basic.edj: Makefile basic.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/basic.edc $(builddir)/basic.edj +Basic.edj: Makefile Basic.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Basic.edc $(builddir)/Basic.edj -empty.edj: Makefile empty.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/empty.edc $(builddir)/empty.edj +Empty.edj: Makefile Empty.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Empty.edc $(builddir)/Empty.edj -map.edj: Makefile map.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/map.edc $(builddir)/map.edj +Map.edj: Makefile Map.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Map.edc $(builddir)/Map.edj -textblock.edj: Makefile textblock.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/textblock.edc $(builddir)/textblock.edj +Textblock.edj: Makefile Textblock.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Textblock.edc $(builddir)/Textblock.edj -transition.edj: Makefile transition.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/transition.edc $(builddir)/transition.edj +Transition.edj: Makefile Transition.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Transition.edc $(builddir)/Transition.edj -tween.edj: Makefile tween.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/tween.edc $(builddir)/tween.edj +Tween.edj: Makefile Tween.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Tween.edc $(builddir)/Tween.edj -rect.edj: Makefile rect.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/rect.edc $(builddir)/rect.edj +Rect.edj: Makefile Rect.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Rect.edc $(builddir)/Rect.edj -rotation+zoom.edj: Makefile rotation+zoom.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/rotation+zoom.edc $(builddir)/rotation+zoom.edj +Rotation+Zoom.edj: Makefile Rotation+Zoom.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Rotation+Zoom.edc $(builddir)/Rotation+Zoom.edj -group.edj: Makefile group.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/group.edc $(builddir)/group.edj +Group.edj: Makefile Group.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Group.edc $(builddir)/Group.edj -image.edj: Makefile image.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/image.edc $(builddir)/image.edj +Image.edj: Makefile Image.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Image.edc $(builddir)/Image.edj -text.edj: Makefile text.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/text.edc $(builddir)/text.edj +Text.edj: Makefile Text.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Text.edc $(builddir)/Text.edj -proxy.edj: Makefile proxy.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/proxy.edc $(builddir)/proxy.edj +Proxy.edj: Makefile Proxy.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Proxy.edc $(builddir)/Proxy.edj -clip.edj: Makefile clip.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/clip.edc $(builddir)/clip.edj +Clip.edj: Makefile Clip.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Clip.edc $(builddir)/Clip.edj -spacer.edj: Makefile spacer.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/spacer.edc $(builddir)/spacer.edj +Spacer.edj: Makefile Spacer.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Spacer.edc $(builddir)/Spacer.edj -sound.edj: Makefile sound.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/sound.edc $(builddir)/sound.edj +Sound.edj: Makefile Sound.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Sound.edc $(builddir)/Sound.edj -watchface.edj: Makefile watchface.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/watchface.edc $(builddir)/watchface.edj +Watchface.edj: Makefile Watchface.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Watchface.edc $(builddir)/Watchface.edj -watchface2.edj: Makefile watchface2.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/watchface2.edc $(builddir)/watchface2.edj +Watchface2.edj: Makefile Watchface2.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Watchface2.edc $(builddir)/Watchface2.edj clean-local: rm -f *.edj + rm -f $(datadir)/$(PACKAGE)/templates/*edj diff --git a/data/templates/map.edc b/data/templates/Map.edc similarity index 100% rename from data/templates/map.edc rename to data/templates/Map.edc diff --git a/data/templates/proxy.edc b/data/templates/Proxy.edc similarity index 100% rename from data/templates/proxy.edc rename to data/templates/Proxy.edc diff --git a/data/templates/rect.edc b/data/templates/Rect.edc similarity index 100% rename from data/templates/rect.edc rename to data/templates/Rect.edc diff --git a/data/templates/rotation+zoom.edc b/data/templates/Rotation+Zoom.edc similarity index 100% rename from data/templates/rotation+zoom.edc rename to data/templates/Rotation+Zoom.edc diff --git a/data/templates/sound.edc b/data/templates/Sound.edc similarity index 100% rename from data/templates/sound.edc rename to data/templates/Sound.edc diff --git a/data/templates/spacer.edc b/data/templates/Spacer.edc similarity index 100% rename from data/templates/spacer.edc rename to data/templates/Spacer.edc diff --git a/data/templates/text.edc b/data/templates/Text.edc similarity index 100% rename from data/templates/text.edc rename to data/templates/Text.edc diff --git a/data/templates/textblock.edc b/data/templates/Textblock.edc similarity index 100% rename from data/templates/textblock.edc rename to data/templates/Textblock.edc diff --git a/data/templates/transition.edc b/data/templates/Transition.edc similarity index 100% rename from data/templates/transition.edc rename to data/templates/Transition.edc diff --git a/data/templates/tween.edc b/data/templates/Tween.edc similarity index 100% rename from data/templates/tween.edc rename to data/templates/Tween.edc diff --git a/data/templates/watchface.edc b/data/templates/Watchface.edc similarity index 100% rename from data/templates/watchface.edc rename to data/templates/Watchface.edc diff --git a/data/templates/watchface2.edc b/data/templates/Watchface2.edc similarity index 100% rename from data/templates/watchface2.edc rename to data/templates/Watchface2.edc diff --git a/src/bin/menu.c b/src/bin/menu.c index e5fe355..de9734e 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -138,7 +138,7 @@ newfile_open(menu_data *md) Evas_Object *layout = elm_layout_add(base_win_get()); elm_layout_file_set(layout, EDJE_PATH, "newfile_layout"); - elm_object_part_text_set(layout, "elm.text.title", _("New File: Choose a template")); + elm_object_part_text_set(layout, "elm.text.title", _("New File: Choose a Template")); elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "", newfile_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/newfile.c b/src/bin/newfile.c index edc2e5f..d92df2e 100644 --- a/src/bin/newfile.c +++ b/src/bin/newfile.c @@ -125,7 +125,7 @@ newfile_default_set(Eina_Bool default_edc) Eina_Bool success = EINA_TRUE; char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/templates/basic.edc", + snprintf(buf, sizeof(buf), "%s/templates/Basic.edc", elm_app_data_dir_get()); success = eina_file_copy(buf,config_input_path_get(), EINA_FILE_COPY_DATA, NULL, NULL); --