Added transition config dialog. Still needs preview but I'm working on it.

SVN revision: 25433

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 92f65b3..8b56b6c 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -181,7 +181,8 @@ e_int_config_wallpaper_import.h \
 e_int_config_wallpaper_gradient.h \
 e_color_dialog.h  \
 e_fdo_menu_to_order.h \
-e_sys.h
+e_sys.h \
+e_int_config_transitions.h
  
 enlightenment_src = \
 e_user.c \
@@ -337,6 +338,7 @@ e_int_config_wallpaper_gradient.c \
 e_color_dialog.c \
 e_fdo_menu_to_order.c \
 e_sys.c \
+e_int_config_transitions.c \
 $(ENLIGHTENMENTHEADERS)
 
 enlightenment_SOURCES = \

diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index f7d06ab..53d400c 100644 (file)
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -70,7 +70,8 @@ e_configure_show(E_Container *con)
    e_configure_standard_item_add(eco, "enlightenment/icon_themes", _("Icon Theme"), e_int_config_icon_themes);
    e_configure_standard_item_add(eco, "enlightenment/mouse", _("Mouse Cursor"), e_int_config_cursor);
    e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display"), e_int_config_window_display);
-   e_configure_standard_item_add(eco, "enlightenment/shelf", _("Shelves"), e_int_config_shelf); 
+   e_configure_standard_item_add(eco, "enlightenment/e", _("Transitions"), e_int_config_transitions);
+   e_configure_standard_item_add(eco, "enlightenment/shelf", _("Shelves"), e_int_config_shelf);
    
    e_configure_header_item_add(eco, "enlightenment/screen_setup", _("Screen"));
    e_configure_standard_item_add(eco, "enlightenment/desktops", _("Virtual Desktops"), e_int_config_desks);
@@ -93,7 +94,7 @@ e_configure_show(E_Container *con)
    e_configure_standard_item_add(eco, "enlightenment/winlist", _("Window List"), e_int_config_winlist);
    e_configure_standard_item_add(eco, "enlightenment/window_manipulation", _("Window Manipulation"), e_int_config_window_manipulation);
    e_configure_standard_item_add(eco, "enlightenment/run", _("Run Command"), e_int_config_exebuf);
-   e_configure_standard_item_add(eco, "enlightenment/directories", _("Search Directories"), e_int_config_paths); 
+   e_configure_standard_item_add(eco, "enlightenment/directories", _("Search Directories"), e_int_config_paths);
 
    e_configure_header_item_add(eco, "enlightenment/extensions", _("Extensions"));
    e_configure_standard_item_add(eco, "enlightenment/modules", _("Modules"), e_int_config_modules);

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 9955c12..f0a28cb 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -156,4 +156,4 @@
 #include "e_color_dialog.h"
 #include "e_fdo_menu_to_order.h"
 #include "e_sys.h"
-
+#include "e_int_config_transitions.h"

diff --git a/src/bin/e_int_config_transitions.c b/src/bin/e_int_config_transitions.c
new file mode 100644 (file)
index 0000000..3b7fa98
--- /dev/null
+++ b/src/bin/e_int_config_transitions.c
@@ -0,0 +1,212 @@
+#include "e.h"
+
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+
+static void _event_cb_changed(void *data);
+static void _trans_cb_changed(void *data);
+
+struct _E_Config_Dialog_Data 
+{
+   char *transition_start;
+   char *transition_desk;
+   char *transition_change;
+   
+   Evas_Object *event_list;
+   Evas_Object *trans_list;
+};
+
+EAPI E_Config_Dialog *
+e_int_config_transitions(E_Container *con) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+   
+   v = E_NEW(E_Config_Dialog_View, 1);
+   if (!v) return NULL;
+   
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.apply_cfdata = _basic_apply_data;
+   v->basic.create_widgets = _basic_create_widgets;
+   
+   cfd = e_config_dialog_new(con, _("Transition Settings"),"E", 
+                            "_config_transitions_dialog", "enlightenment/e", 
+                            0, v, NULL);
+   if (!cfd) return NULL;
+   return cfd;
+}
+
+static void 
+_fill_data(E_Config_Dialog_Data *cfdata) 
+{
+   if (e_config->transition_start)
+     cfdata->transition_start = strdup(e_config->transition_start);
+   if (e_config->transition_desk)
+     cfdata->transition_desk = strdup(e_config->transition_desk);
+   if (e_config->transition_change)
+     cfdata->transition_change = strdup(e_config->transition_change);
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd) 
+{
+   E_Config_Dialog_Data *cfdata;
+   
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _fill_data(cfdata);
+   return cfdata;
+}
+
+static void 
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   free(cfdata);
+}
+
+static int 
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   if (cfdata->transition_start) 
+     {
+       if (e_config->transition_start)
+         evas_stringshare_del(e_config->transition_start);
+       if (e_theme_transition_find(cfdata->transition_start)) 
+         e_config->transition_start = evas_stringshare_add(cfdata->transition_start);
+     }
+
+   if (cfdata->transition_desk) 
+     {
+   
+       if (e_config->transition_desk)
+         evas_stringshare_del(e_config->transition_desk);
+       if (e_theme_transition_find(cfdata->transition_desk)) 
+         e_config->transition_desk = evas_stringshare_add(cfdata->transition_desk);
+     }
+
+   if (cfdata->transition_change) 
+     {   
+       if (e_config->transition_change)
+         evas_stringshare_del(e_config->transition_change);
+       if (e_theme_transition_find(cfdata->transition_change)) 
+         e_config->transition_change = evas_stringshare_add(cfdata->transition_change);
+     }
+
+   e_config_save_queue();
+   return 1;
+}
+
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *o, *of, *ot, *il;
+   Evas_List *l;
+   char *t;
+   
+   o = e_widget_list_add(evas, 1, 0);
+   ot = e_widget_table_add(evas, 0);
+
+   of = e_widget_framelist_add(evas, _("Events"), 0);
+   il = e_widget_ilist_add(evas, 48, 48, NULL);
+   cfdata->event_list = il;
+   e_widget_min_size_set(il, 160, 200);
+   e_widget_ilist_append(il, NULL, _("Startup"), _event_cb_changed, cfdata, NULL);
+   e_widget_ilist_append(il, NULL, _("Desk Change"), _event_cb_changed, cfdata, NULL);
+   e_widget_ilist_append(il, NULL, _("Background Change"), _event_cb_changed, cfdata, NULL);
+   e_widget_ilist_go(il);
+   e_widget_framelist_object_append(of, il);
+   e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
+
+   of = e_widget_framelist_add(evas, _("Transitions"), 0);
+   il = e_widget_ilist_add(evas, 48, 48, NULL);
+   cfdata->trans_list = il;
+   e_widget_min_size_set(il, 160, 200);
+
+   l = e_theme_transition_list();
+   for (l = e_theme_transition_list(); l; l = l->next) 
+     {
+       t = l->data;
+       if (!t) continue;
+       e_widget_ilist_append(il, NULL, t, _trans_cb_changed, cfdata, NULL);
+     }
+   e_widget_ilist_go(il);
+   
+   e_widget_framelist_object_append(of, il);
+   e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
+
+   e_widget_list_object_append(o, ot, 1, 1, 0.5);
+   
+   return o;
+}
+
+static void 
+_event_cb_changed(void *data) 
+{
+   E_Config_Dialog_Data *cfdata;
+   const char *list, *trans;
+   int sel, i;
+   
+   cfdata = data;
+   sel = e_widget_ilist_selected_get(cfdata->event_list);
+   switch (sel) 
+     {
+      case 0:
+       trans = e_config->transition_start;
+       break;
+      case 1:
+       trans = e_config->transition_desk;
+       break;
+      case 2:
+       trans = e_config->transition_change;
+       break;
+     }
+
+   if (!trans) 
+     {
+       e_widget_ilist_unselect(cfdata->trans_list);
+       return;
+     }
+
+   for (i = 0; i < e_widget_ilist_count(cfdata->trans_list); i++) 
+     {
+       list = e_widget_ilist_nth_label_get(cfdata->trans_list, i);
+       if (!list) continue;
+       if (!strcmp(trans, list)) 
+         {
+            e_widget_ilist_selected_set(cfdata->trans_list, i);
+            return;
+         }
+     }
+   
+   e_widget_ilist_unselect(cfdata->trans_list);
+}
+
+static void 
+_trans_cb_changed(void *data) 
+{
+   E_Config_Dialog_Data *cfdata;
+   const char *t;
+   int sel;
+   char buf[4096];
+   
+   cfdata = data;
+   sel = e_widget_ilist_selected_get(cfdata->event_list);
+
+   t = e_widget_ilist_selected_label_get(cfdata->trans_list);
+   if (!t) return;
+   
+   switch (sel) 
+     {
+      case 0:
+       cfdata->transition_start = strdup(t);
+       break;
+      case 1:
+       cfdata->transition_desk = strdup(t);
+       break;
+      case 2:
+       cfdata->transition_change = strdup(t);
+       break;
+     }
+}

diff --git a/src/bin/e_int_config_transitions.h b/src/bin/e_int_config_transitions.h
new file mode 100644 (file)
index 0000000..b66dd0f
--- /dev/null
+++ b/src/bin/e_int_config_transitions.h
@@ -0,0 +1,9 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_INT_CONFIG_TRANSITIONS_H
+#define E_INT_CONFIG_TRANSITIONS_H
+
+EAPI E_Config_Dialog *e_int_config_transitions(E_Container *con);
+
+#endif
+#endif