theme name scheme change to cope with different applications.

layout_add() assumed elm/layout/dialer/ prefix, but since not every
application is a dialer, it would be strange.

Then rename:
  - every group from "elm/layout/dialer" prefix to "elm/layout/ofono-efl";
  - group "elm/layout/dialer/main" to "elm/layout/ofono-efl/dialer";
  - file main.edc to dialer.edc

diff --git a/Makefile.am b/Makefile.am
index c7ac66a..9e39f9c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,10 +186,10 @@ data/themes/includes/call.edc \
 data/themes/includes/colors.edc \
 data/themes/includes/contacts-bg.edc \
 data/themes/includes/contacts.edc \
+data/themes/includes/dialer.edc \
 data/themes/includes/history-bg.edc \
 data/themes/includes/history.edc \
 data/themes/includes/keypad.edc \
-data/themes/includes/main.edc \
 data/themes/includes/multiparty-list.edc \
 data/themes/includes/popup.edc \
 data/themes/includes/scroller.edc

diff --git a/data/themes/default.edc b/data/themes/default.edc
index 6597c41..5fc944b 100644 (file)
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1,7 +1,7 @@
 collections {
 
 #include "includes/colors.edc"
-#include "includes/main.edc"
+#include "includes/dialer.edc"
 #include "includes/keypad.edc"
 #include "includes/call.edc"
 #include "includes/contacts-bg.edc"

diff --git a/data/themes/includes/answer_screen.edc b/data/themes/includes/answer_screen.edc
index 4d37d21..decf02c 100644 (file)
--- a/data/themes/includes/answer_screen.edc
+++ b/data/themes/includes/answer_screen.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/answer";
+   name: "elm/layout/ofono-efl/answer";
    min: WIDTH HEIGHT;
    parts {
 

diff --git a/data/themes/includes/call.edc b/data/themes/includes/call.edc
index 3cd8319..a9757b5 100644 (file)
--- a/data/themes/includes/call.edc
+++ b/data/themes/includes/call.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/call";
+   name: "elm/layout/ofono-efl/call";
 
    /*
     * Represents the dialer ongoing voice call(s) screen.
@@ -2314,7 +2314,7 @@ group {
 }
 
 group {
-   name: "elm/layout/dialer/activecall";
+   name: "elm/layout/ofono-efl/activecall";
 
    /*
     * Represents the active call in the other screens (not callscreen)

diff --git a/data/themes/includes/contacts-bg.edc b/data/themes/includes/contacts-bg.edc
index 3b36565..4ac8122 100644 (file)
--- a/data/themes/includes/contacts-bg.edc
+++ b/data/themes/includes/contacts-bg.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/contacts_bg";
+   name: "elm/layout/ofono-efl/contacts_bg";
 
    images {
       image: "bg_keypad.jpg" COMP;

diff --git a/data/themes/includes/contacts.edc b/data/themes/includes/contacts.edc
index 714ddb0..eb7cc50 100644 (file)
--- a/data/themes/includes/contacts.edc
+++ b/data/themes/includes/contacts.edc
@@ -240,7 +240,7 @@ group {
 }
 
 group {
-   name: "elm/layout/dialer/contacts_details";
+   name: "elm/layout/ofono-efl/contacts_details";
 
    parts {
 

diff --git a/data/themes/includes/main.edc b/data/themes/includes/dialer.edc
similarity index 99%
rename from data/themes/includes/main.edc
rename to data/themes/includes/dialer.edc
index fb52f02..62b2b12 100644 (file)
--- a/data/themes/includes/main.edc
+++ b/data/themes/includes/dialer.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/main";
+   name: "elm/layout/ofono-efl/dialer";
 
    min: WIDTH HEIGHT;
 

diff --git a/data/themes/includes/history-bg.edc b/data/themes/includes/history-bg.edc
index 55728ab..a1a7d69 100644 (file)
--- a/data/themes/includes/history-bg.edc
+++ b/data/themes/includes/history-bg.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/history_bg";
+   name: "elm/layout/ofono-efl/history_bg";
 
    images {
       image: "bg_keypad.jpg" COMP;

diff --git a/data/themes/includes/history.edc b/data/themes/includes/history.edc
index 0605ac9..1ac84d3 100644 (file)
--- a/data/themes/includes/history.edc
+++ b/data/themes/includes/history.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/history/img";
+   name: "elm/layout/ofono-efl/history/img";
 
    parts {
       part {

diff --git a/data/themes/includes/keypad.edc b/data/themes/includes/keypad.edc
index 4f4518c..bd9bf9a 100644 (file)
--- a/data/themes/includes/keypad.edc
+++ b/data/themes/includes/keypad.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/keypad";
+   name: "elm/layout/ofono-efl/keypad";
 
    /*
     * Represents the dialer keypad with the current number display and buttons.

diff --git a/data/themes/includes/multiparty-list.edc b/data/themes/includes/multiparty-list.edc
index cdc69b7..f9ee51b 100644 (file)
--- a/data/themes/includes/multiparty-list.edc
+++ b/data/themes/includes/multiparty-list.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/multiparty-details";
+   name: "elm/layout/ofono-efl/multiparty-details";
 
    images {
       image: "ico_multiparty_hangup.png" COMP;

diff --git a/data/themes/includes/popup.edc b/data/themes/includes/popup.edc
index 3e14132..7adacff 100644 (file)
--- a/data/themes/includes/popup.edc
+++ b/data/themes/includes/popup.edc
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/popup";
+   name: "elm/layout/ofono-efl/popup";
 
    images {
       image: "loading_0.png" COMP;

diff --git a/dialer/gui.c b/dialer/gui.c
index 64a9806..3880899 100644 (file)
--- a/dialer/gui.c
+++ b/dialer/gui.c
@@ -259,7 +259,7 @@ Eina_Bool gui_init(void)
                                        _gui_call_sync, NULL);
        evas_object_show(flip);
 
-       main_layout = lay = layout_add(win, "main");
+       main_layout = lay = layout_add(win, "dialer");
        EINA_SAFETY_ON_NULL_RETURN_VAL(lay, EINA_FALSE);
        evas_object_size_hint_weight_set(lay,
                                EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

diff --git a/utils/util.c b/utils/util.c
index 92d15b6..9b8fbe7 100644 (file)
--- a/utils/util.c
+++ b/utils/util.c
@@ -130,8 +130,8 @@ Evas_Object *picture_icon_get(Evas_Object *parent, const char *picture)
 Evas_Object *layout_add(Evas_Object *parent, const char *style)
 {
        Evas_Object *layout = elm_layout_add(parent);
-       if (!elm_layout_theme_set(layout, "layout", "dialer", style)) {
-               CRITICAL("No theme for 'elm/layout/dialer/%s' at %s",
+       if (!elm_layout_theme_set(layout, "layout", "ofono-efl", style)) {
+               CRITICAL("No theme for 'elm/layout/ofono-efl/%s' at %s",
                                style, def_theme);
                evas_object_del(layout);
                return NULL;