Fix minor fixes/tweaks.

experimental/ecdb/trunk/data/themes/default/groups/burn_data.edc

@@ -142,28 +142,6 @@ group {
          }
       }
 
-      part {
-         name: "ecdb/burn_data/vol_name";
-         type: SWALLOW;
-         repeat_events: 1;
-
-         description {
-            state: "default" 0.0;
-
-            rel1 {
-               to: "ecdb/burn_data/speed";
-               relative: 0.0 1.0;
-               offset: 0 5;
-            }
-
-            rel2 {
-               to: "ecdb/burn_data/speed";
-               relative: 1.0 1.0;
-               offset: 0 30;
-            }
-         }
-      }
-
       part {
          name: "ecdb/burn_data/settings";
          type: SWALLOW;
@@ -173,13 +151,13 @@ group {
             state: "default" 0.0;
 
             rel1 {
-               to: "ecdb/burn_data/vol_name";
+               to: "ecdb/burn_data/speed";
                relative: 0.0 1.0;
                offset: 0 5;
             }
 
             rel2 {
-               to: "ecdb/burn_data/vol_name";
+               to: "ecdb/burn_data/speed";
                relative: 1.0 1.0;
                offset: 0 30;
             }
@@ -204,7 +182,7 @@ group {
             rel2 {
                to: "bg";
                relative: 1.0 1.0;
-               offset: -235 -26;
+               offset: -205 -26;
             }
          }
       }

experimental/ecdb/trunk/data/themes/default/groups/config_inwin.edc

@@ -83,7 +83,7 @@ group {
          description {
             state: "active" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 210;
          }
       }
 

experimental/ecdb/trunk/src/ecdb_burn_data_gui.c

@@ -5,7 +5,6 @@ typedef struct _Burn_Data_Data Burn_Data_Data;
 struct _Burn_Data_Data
 {
    Ecdb_Burn_Project *proj;
-   Evas_Object *entry;
    Evas_Object *capacity;
    Evas_Object *swallow;
    Evas_Object *sc;
@@ -385,6 +384,9 @@ _proj_name(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
    proj = data;
    name = ecdb_entry_text_get(obj);
+   if (proj->volume_id)
+      free(proj->volume_id);
+
    proj->volume_id = strdup(name);
 }
 
@@ -520,12 +522,6 @@ ecdb_burn_data_page_show(void)
       b = edje_object_part_swallow_get(swallow, "ecdb/burn_data/filelist");
       ecdb_widget_focus_callback_add(b, "ecdb/burn_data/filelist");
 
-      // Use focus out callback here, same as below
-      b = ecdb_entry_add(swallow, "ecdb/burn_data/vol_name");
-      ecdb_entry_text_set(b, "Volume Name");
-      evas_object_show(b);
-      bdd->entry = b;
-
       // FIXME Turn this into a normal widget
       b = ecdb_widget_add(swallow, "ecdb/burn_data/capacity");
       edje_object_file_set(b, em->theme_path, "ecdb/capacity");
@@ -543,6 +539,7 @@ ecdb_burn_data_page_show(void)
       evas_object_smart_callback_add(b, "proj_config", _joliet_config,
                                                                   bdd->proj);
       ecdb_config_inwin_child_add(t, b, 0, 0, 1, 1);
+      evas_object_name_set(b, "ecdb/burn_data/joliet");
       evas_object_show(b);
 
       b = ecdb_check_add(t, NULL);
@@ -552,6 +549,7 @@ ecdb_burn_data_page_show(void)
       evas_object_smart_callback_add(b, "proj_config", _rockridge_config,
                                                                   bdd->proj);
       ecdb_config_inwin_child_add(t, b, 0, 1, 1, 1);
+      evas_object_name_set(b, "ecdb/burn_data/rockridge");
       evas_object_show(b);
 
       b = ecdb_check_add(t, NULL);
@@ -561,6 +559,7 @@ ecdb_burn_data_page_show(void)
       evas_object_smart_callback_add(b, "proj_config", _symlinks_config,
                                                                   bdd->proj);
       ecdb_config_inwin_child_add(t, b, 0, 2, 1, 1);
+      evas_object_name_set(b, "ecdb/burn_data/symlinks");
       evas_object_show(b);
 
       b = ecdb_check_add(t, NULL);
@@ -569,6 +568,7 @@ ecdb_burn_data_page_show(void)
       evas_object_smart_callback_add(b, "proj_config", _hidden_config,
                                                                   bdd->proj);
       ecdb_config_inwin_child_add(t, b, 0, 3, 1, 1);
+      evas_object_name_set(b, "ecdb/burn_data/hidden");
       evas_object_show(b);
 
       b = ecdb_check_add(t, NULL);
@@ -577,6 +577,7 @@ ecdb_burn_data_page_show(void)
       evas_object_smart_callback_add(b, "proj_config", _multi_config,
                                                                   bdd->proj);
       ecdb_config_inwin_child_add(t, b, 1, 0, 1, 1);
+      evas_object_name_set(b, "ecdb/burn_data/multi");
       evas_object_show(b);
 
       b = ecdb_check_add(t, NULL);
@@ -584,6 +585,7 @@ ecdb_burn_data_page_show(void)
       evas_object_smart_callback_add(b, "clicked", _sim_clicked, bdd->proj);
       evas_object_smart_callback_add(b, "proj_config", _sim_config, bdd->proj);
       ecdb_config_inwin_child_add(t, b, 1, 1, 1, 1);
+      evas_object_name_set(b, "ecdb/burn_data/sim");
       evas_object_show(b);
 
       b = ecdb_check_add(t, NULL);
@@ -593,6 +595,7 @@ ecdb_burn_data_page_show(void)
       evas_object_smart_callback_add(b, "proj_config", _underrun_config,
                                                                   bdd->proj);
       ecdb_config_inwin_child_add(t, b, 1, 2, 1, 1);
+      evas_object_name_set(b, "ecdb/burn_data/underrun");
       evas_object_show(b);
 
       b = ecdb_entry_add(t, NULL);
@@ -602,12 +605,14 @@ ecdb_burn_data_page_show(void)
       evas_object_smart_callback_add(b, "proj_config", _proj_config,
                                                                   bdd->proj);
       ecdb_config_inwin_child_add(t, b, 1, 3, 1, 1);
+      evas_object_name_set(b, "ecdb/burn_data/name");
       evas_object_show(b);
 
       b = ecdb_button_add(t, NULL);
       ecdb_button_label_set(b, "Apply");
       evas_object_smart_callback_add(b, "clicked", _apply_clicked, t);
       ecdb_config_inwin_child_add(t, b, 0, 4, 2, 1);
+      evas_object_name_set(b, "ecdb/burn_data/apply");
       evas_object_show(b);
       
       // At the end so t is a valid pointer

experimental/ecdb/trunk/src/ecdb_widgets.c

@@ -2,13 +2,11 @@
 #include "ecdb.h"
 
 static void
-_widget_focus_handle(void *data, Evas_Object *o)
+_widget_focus_handle(const char *name, Evas_Object *o)
 {
    static char *old_source;
-   const char *name;
    Evas_Object *eo;
 
-   name = data;
    // Some widgets aren't named (such as when in combo), so check
    if (!name)
       return;
@@ -33,14 +31,20 @@ static void
 _mouse_down_edje(void *data, Evas_Object *o, const char *emission,
 																		const char *source)
 {
-   _widget_focus_handle(data, o);
+   const char *name;
+
+   name = evas_object_name_get(o);
+   _widget_focus_handle(name, o);
 }
 
 static void
 _mouse_down_evas(void *data, Evas *e __UNUSED__, Evas_Object *eo,
                                              void *ev_data __UNUSED__)
 {
-   _widget_focus_handle(data, eo);
+   const char *name;
+
+   name = evas_object_name_get(eo);
+   _widget_focus_handle(name, eo);
 }
 
 void
@@ -64,8 +68,7 @@ ecdb_widget_add(Evas_Object *parent, const char *name)
    }
 
    edje_object_signal_callback_add(o, "mouse,down,*", "*",
-                                                _mouse_down_edje,
+                                                _mouse_down_edje, NULL);
-                                                (void *)name);
 
    if (name)
    {