From 8ecf55348fe6afe25ee21755f07a6d711c1810c2 Mon Sep 17 00:00:00 2001 From: Kamil Lipiszko Date: Wed, 23 Nov 2016 13:45:23 +0100 Subject: [PATCH] move resources not embedded in edj files into res/images director Change-Id: Ib04a5756b3f9664599b2c23b828876043f6f6aa5 --- clock/project_def.prop | 2 +- clock/res/{edje => }/images/tabs/clock_tabs_ic_alarm.png | Bin .../res/{edje => }/images/tabs/clock_tabs_ic_stopwatch.png | Bin clock/res/{edje => }/images/tabs/clock_tabs_ic_timer.png | Bin .../res/{edje => }/images/tabs/clock_tabs_ic_worldclock.png | Bin clock/src/View/MainView.cpp | 8 ++++---- 6 files changed, 5 insertions(+), 5 deletions(-) rename clock/res/{edje => }/images/tabs/clock_tabs_ic_alarm.png (100%) rename clock/res/{edje => }/images/tabs/clock_tabs_ic_stopwatch.png (100%) rename clock/res/{edje => }/images/tabs/clock_tabs_ic_timer.png (100%) rename clock/res/{edje => }/images/tabs/clock_tabs_ic_worldclock.png (100%) diff --git a/clock/project_def.prop b/clock/project_def.prop index dcad828..9a8e6c4 100644 --- a/clock/project_def.prop +++ b/clock/project_def.prop @@ -70,5 +70,5 @@ USER_EXT_EDC0_EDCS_FONT_DIRS_ABS = # Resource Filter USER_RES_INCLUDE = -USER_RES_EXCLUDE = +USER_RES_EXCLUDE = res/edje/images diff --git a/clock/res/edje/images/tabs/clock_tabs_ic_alarm.png b/clock/res/images/tabs/clock_tabs_ic_alarm.png similarity index 100% rename from clock/res/edje/images/tabs/clock_tabs_ic_alarm.png rename to clock/res/images/tabs/clock_tabs_ic_alarm.png diff --git a/clock/res/edje/images/tabs/clock_tabs_ic_stopwatch.png b/clock/res/images/tabs/clock_tabs_ic_stopwatch.png similarity index 100% rename from clock/res/edje/images/tabs/clock_tabs_ic_stopwatch.png rename to clock/res/images/tabs/clock_tabs_ic_stopwatch.png diff --git a/clock/res/edje/images/tabs/clock_tabs_ic_timer.png b/clock/res/images/tabs/clock_tabs_ic_timer.png similarity index 100% rename from clock/res/edje/images/tabs/clock_tabs_ic_timer.png rename to clock/res/images/tabs/clock_tabs_ic_timer.png diff --git a/clock/res/edje/images/tabs/clock_tabs_ic_worldclock.png b/clock/res/images/tabs/clock_tabs_ic_worldclock.png similarity index 100% rename from clock/res/edje/images/tabs/clock_tabs_ic_worldclock.png rename to clock/res/images/tabs/clock_tabs_ic_worldclock.png diff --git a/clock/src/View/MainView.cpp b/clock/src/View/MainView.cpp index 2cadb08..fabae87 100644 --- a/clock/src/View/MainView.cpp +++ b/clock/src/View/MainView.cpp @@ -158,13 +158,13 @@ void MainView::CreateToolbarItem(const char *icon_path, const char *msgid, IView void MainView::CreateToolbarButtons() { CreateToolbarItem(Utils::GetAppResourcePath(Utils::APP_DIR_RESOURCE, - "edje/images/tabs/clock_tabs_ic_alarm.png"), "IDS_COM_BODY_ALARM", alarm_); + "images/tabs/clock_tabs_ic_alarm.png"), "IDS_COM_BODY_ALARM", alarm_); CreateToolbarItem(Utils::GetAppResourcePath(Utils::APP_DIR_RESOURCE, - "edje/images/tabs/clock_tabs_ic_worldclock.png"), "IDS_COM_BODY_WORLD_CLOCK", world_clock_); + "images/tabs/clock_tabs_ic_worldclock.png"), "IDS_COM_BODY_WORLD_CLOCK", world_clock_); CreateToolbarItem(Utils::GetAppResourcePath(Utils::APP_DIR_RESOURCE, - "edje/images/tabs/clock_tabs_ic_stopwatch.png"), "IDS_COM_BODY_STOPWATCH", stop_watch_); + "images/tabs/clock_tabs_ic_stopwatch.png"), "IDS_COM_BODY_STOPWATCH", stop_watch_); CreateToolbarItem(Utils::GetAppResourcePath(Utils::APP_DIR_RESOURCE, - "edje/images/tabs/clock_tabs_ic_timer.png"), "IDS_COM_BODY_TIMER", timer_); + "images/tabs/clock_tabs_ic_timer.png"), "IDS_COM_BODY_TIMER", timer_); } void MainView::CreateToolbar() -- 2.7.4