From 099e03498e5f75fdb0ab98ef5102848c8141ac69 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Fri, 27 Nov 2009 18:16:51 +0000
Subject: [PATCH] Remove some printfs. Add config struct for Indicator Window.

SVN revision: 44026
---
 src/modules/illume2/e_mod_config.c        | 22 +++++++++++++++++++++-
 src/modules/illume2/e_mod_config.h        |  2 +-
 src/modules/illume2/e_mod_layout_illume.c |  8 +++++---
 src/modules/illume2/e_mod_windows.c       | 15 ++++++++++++++-
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/modules/illume2/e_mod_config.c b/src/modules/illume2/e_mod_config.c
index 1843e52d6..e719820d2 100644
--- a/src/modules/illume2/e_mod_config.c
+++ b/src/modules/illume2/e_mod_config.c
@@ -33,6 +33,10 @@ il_config_init(E_Module *m)
    E_CONFIG_VAL(D, T, policy.home.name, STR);
    E_CONFIG_VAL(D, T, policy.home.title, STR);
    E_CONFIG_VAL(D, T, policy.home.win_type, STR);
+   E_CONFIG_VAL(D, T, policy.indicator.class, STR);
+   E_CONFIG_VAL(D, T, policy.indicator.name, STR);
+   E_CONFIG_VAL(D, T, policy.indicator.title, STR);
+   E_CONFIG_VAL(D, T, policy.indicator.win_type, STR);
 
    il_cfg = e_config_domain_load("module.illume2", conf_edd);
    if ((il_cfg) && 
@@ -74,7 +78,14 @@ il_config_init(E_Module *m)
                eina_stringshare_add("Illume-Home");
              il_cfg->policy.home.title = 
                eina_stringshare_add("Illume Home");
-             il_cfg->policy.home.win_type = NULL;
+             il_cfg->policy.indicator.win_type = NULL;
+             il_cfg->policy.indicator.class = 
+               eina_stringshare_add("Illume-Indicator");
+             il_cfg->policy.indicator.name = 
+               eina_stringshare_add("Illume-Indicator");
+             il_cfg->policy.indicator.title = 
+               eina_stringshare_add("Illume Indicator");
+             il_cfg->policy.indicator.win_type = NULL;
           }
         il_cfg->version = (IL_CONFIG_MAJ << 16) | IL_CONFIG_MIN;
      }
@@ -127,6 +138,15 @@ il_config_shutdown(void)
    if (il_cfg->policy.home.win_type) 
      eina_stringshare_del(il_cfg->policy.home.win_type);
 
+   if (il_cfg->policy.indicator.class) 
+     eina_stringshare_del(il_cfg->policy.indicator.class);
+   if (il_cfg->policy.indicator.name) 
+     eina_stringshare_del(il_cfg->policy.indicator.name);
+   if (il_cfg->policy.indicator.title) 
+     eina_stringshare_del(il_cfg->policy.indicator.title);
+   if (il_cfg->policy.indicator.win_type) 
+     eina_stringshare_del(il_cfg->policy.indicator.win_type);
+
    if (il_cfg->mod_dir) eina_stringshare_del(il_cfg->mod_dir);
 
    E_FREE(il_cfg);
diff --git a/src/modules/illume2/e_mod_config.h b/src/modules/illume2/e_mod_config.h
index d7e791959..59b71691d 100644
--- a/src/modules/illume2/e_mod_config.h
+++ b/src/modules/illume2/e_mod_config.h
@@ -27,7 +27,7 @@ struct _Il_Config
              const char *name;
              const char *title;
              const char *win_type;
-          } vkbd, softkey, home;
+          } vkbd, softkey, home, indicator;
      } policy;
 
    // Not User Configurable. Placeholders
diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c
index 413dcbd55..1cf44930e 100644
--- a/src/modules/illume2/e_mod_layout_illume.c
+++ b/src/modules/illume2/e_mod_layout_illume.c
@@ -6,29 +6,31 @@
 static void
 _border_add(E_Border *bd)
 { // handle a border being added
+/*
    printf("Border Add\n");
    if (bd->client.icccm.transient_for)
      printf("Transient For\n");
    else if (bd->client.icccm.client_leader)
      printf("Client Leader\n");
+*/
 }
 
 static void
 _border_del(E_Border *bd)
 { // handle a border being deleted
-   printf("Border Del\n");
+
 }
 
 static void
 _border_focus_in(E_Border *bd)
 { // do something if focus enters a window
-   printf("Border Focus In\n");
+
 }
 
 static void
 _border_focus_out(E_Border *bd)
 { // do something if the focus exits a window
-   printf("Border Focus Out\n");
+
 }
 
 static void
diff --git a/src/modules/illume2/e_mod_windows.c b/src/modules/illume2/e_mod_windows.c
index 1d2c94235..930bc2017 100644
--- a/src/modules/illume2/e_mod_windows.c
+++ b/src/modules/illume2/e_mod_windows.c
@@ -48,9 +48,22 @@ _il_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static Evas_Object *
 _il_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
-   Evas_Object *list;
+   Evas_Object *list, *of, *ow;
 
    list = e_widget_list_add(evas, 0, 0);
+
+   of = e_widget_framelist_add(evas, _("Home"), 0);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Indicator"), 0);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Keyboard"), 0);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Softkey"), 0);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
    return list;
 }