Commit 74023a8c authored by Ludovic Fauvet's avatar Ludovic Fauvet

Rename EDJE macros to make them more readable

parent 19b4833c
......@@ -66,11 +66,11 @@
#define EDJPATH "edje"
#define ICONPATH "icon"
#define IMAGESPATH "images"
#define VIDEOPLAYEREDJ get_resource_path( EDJPATH "/video_player.edj")
#define AUDIOPLAYERMINIEDJ get_resource_path( EDJPATH "/audio_player_mini.edj")
#define AUDIOPLAYEREDJ get_resource_path( EDJPATH "/audio_player.edj")
#define ABOUTEDJ get_resource_path( EDJPATH "/about.edj")
#define THEMEEDJ get_resource_path( EDJPATH "/theme.edj")
#define VIDEOPLAYER_EDJ get_resource_path( EDJPATH "/video_player.edj")
#define AUDIOPLAYERMINI_EDJ get_resource_path( EDJPATH "/audio_player_mini.edj")
#define AUDIOPLAYER_EDJ get_resource_path( EDJPATH "/audio_player.edj")
#define ABOUT_EDJ get_resource_path( EDJPATH "/about.edj")
#define THEME_EDJ get_resource_path( EDJPATH "/theme.edj")
#define RES_DIR "/opt/usr/apps/" PACKAGE "/res/"
#define ICON_DIR RES_DIR "/images/"
......
......@@ -654,7 +654,7 @@ set_sliders_callbacks(audio_player *mpd, Evas_Object *slider)
static void
swallow_mini_player(audio_player *mpd, Evas_Object *layout)
{
elm_layout_file_set(layout, AUDIOPLAYERMINIEDJ, "audio_player");
elm_layout_file_set(layout, AUDIOPLAYERMINI_EDJ, "audio_player");
/* set the progress bar at the top of the table */
mpd->slider = elm_slider_add(layout);
......@@ -689,7 +689,7 @@ add_fullscreen_item_table(audio_player *mpd, Evas_Object *parent)
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_layout_file_set(layout, AUDIOPLAYEREDJ, "audio_player");
elm_layout_file_set(layout, AUDIOPLAYER_EDJ, "audio_player");
/* More button */
if (mpd->more_state == FALSE)
......
......@@ -495,7 +495,7 @@ intf_create(application *app)
EDJE_COLOR_CLASS_SET_VLC_ORANGE("W0641"); // slider thumb
// Extend theme
elm_theme_extension_add(NULL, THEMEEDJ);
elm_theme_extension_add(NULL, THEME_EDJ);
/* Handle rotations */
if (elm_win_wm_rotation_supported_get(intf->win)) {
......
......@@ -98,7 +98,7 @@ create_about_section(Evas_Object *parent)
Evas_Object *layout = elm_layout_add(parent);
/* */
elm_layout_file_set(layout, ABOUTEDJ, "about");
elm_layout_file_set(layout, ABOUT_EDJ, "about");
/* Cone */
Evas_Object *cone = elm_image_add(layout);
......
......@@ -415,7 +415,7 @@ create_video_player(interface *intf, playback_service *p_ps, Evas_Object *parent
/* Create the layout */
Evas_Object *layout = p_sys->layout = elm_layout_add(parent);
elm_layout_file_set(layout, VIDEOPLAYEREDJ, "media_player_renderer");
elm_layout_file_set(layout, VIDEOPLAYER_EDJ, "media_player_renderer");
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(layout);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment