Added General Settings Dialogue

SVN revision: 19451

src/bin/Makefile.am

@@ -123,6 +123,7 @@ e_int_config_window_display.h \
 e_int_config_background.h \
 e_int_config_theme.h \
 e_int_config_menus.h \
+e_int_config_general.h \
 e_deskpreview.h \
 e_exebuf.h \
 e_int_config_modules.h \
@@ -230,6 +231,7 @@ e_int_config_window_display.c \
 e_int_config_background.c \
 e_int_config_theme.c \
 e_int_config_menus.c \
+e_int_config_general.c \
 e_deskpreview.c \
 e_exebuf.c \
 e_int_config_modules.c \

src/bin/e_configure.c

@@ -64,6 +64,7 @@ e_configure_show(E_Container *con)
    e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background Settings"), e_int_config_background);
    e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme Selector"), e_int_config_theme);   
    e_configure_standard_item_add(eco, "enlightenment/modules", _("Module Settings"), e_int_config_modules);
+   e_configure_standard_item_add(eco, "enlightenment/e", _("General Settings"), e_int_config_general);
    e_configure_standard_item_add(eco, "enlightenment/desktops", _("Desktop Settings"), e_int_config_desks);
    e_configure_standard_item_add(eco, "enlightenment/e", _("Focus Settings"), e_int_config_focus);
    e_configure_standard_item_add(eco, "enlightenment/favorites", _("Menu Settings"), e_int_config_menus);

src/bin/e_includes.h

@@ -103,6 +103,7 @@
 #include "e_int_config_background.h"
 #include "e_int_config_theme.h"
 #include "e_int_config_menus.h"
+#include "e_int_config_general.h"
 #include "e_deskpreview.h"
 #include "e_exebuf.h"
 #include "e_int_config_modules.h"

src/bin/e_int_config_general.c

@@ -0,0 +1,156 @@
+#include "e.h"
+
+typedef struct _CFData CFData;
+
+static void        *_create_data(E_Config_Dialog *cfd);
+static void        _free_data(E_Config_Dialog *cfd, CFData *cfdata);
+static int         _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+/*
+static int         _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+*/
+
+struct _CFData 
+{
+   int show_splash;
+   double framerate;
+   int use_e_cursor;
+   int cursor_size;
+   
+   /* Not Implemented Yet
+   char *transition_start;
+   char *transition_desk;
+   char *transition_change;
+   int kill_if_close_not_possible;
+   int kill_process;
+   double kill_timer_wait;
+   int ping_clients;
+   double pint_clients_wait;
+   int image_cache;
+   int font_cache;
+   int edje_cache;
+   int edje_collection_cache;
+   double cache_flush_interval;
+   */
+};
+
+E_Config_Dialog *
+e_int_config_general(E_Container *con) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View v;
+   
+   v.create_cfdata = _create_data;
+   v.free_cfdata = _free_data;
+   v.basic.apply_cfdata = _basic_apply_data;
+   v.basic.create_widgets = _basic_create_widgets;
+   v.advanced.apply_cfdata = NULL;
+   v.advanced.create_widgets = NULL;
+   
+   cfd = e_config_dialog_new(con, _("General Settings"), NULL, 0, &v, NULL);
+   return cfd;
+}
+
+static void
+_fill_data(CFData *cfdata) 
+{
+   cfdata->show_splash = e_config->show_splash;
+   cfdata->framerate = e_config->framerate;
+   cfdata->use_e_cursor = e_config->use_e_cursor;
+   cfdata->cursor_size = e_config->cursor_size;
+   /* Not Implemented Yet
+   cfdata->transition_start = e_config->transition_start;
+   cfdata->transition_desk = e_config->transition_desk;
+   cfdata->transition_change = e_config->transition_change;
+   */
+   
+   /* Advanced */
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd) 
+{
+   CFData *cfdata;
+   
+   cfdata = E_NEW(CFData, 1);
+   _fill_data(cfdata);
+   return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog *cfd, CFData *cfdata) 
+{
+   free(cfdata);
+}
+
+static int
+_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+{
+   e_border_button_bindings_ungrab_all();
+   e_config->show_splash = cfdata->show_splash;
+   if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0;
+   e_config->framerate = cfdata->framerate;
+   e_config->use_e_cursor = cfdata->use_e_cursor;
+   /* Trap for idiots that may set cursor size == 0 */
+   if (cfdata->cursor_size <= 0) cfdata->cursor_size = 1;
+   e_config->cursor_size = cfdata->cursor_size;
+   e_border_button_bindings_grab_all();
+   e_config_save_queue();
+   return 1;
+}
+
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+{
+   Evas_Object *o, *of, *ob, *ot;
+   
+   _fill_data(cfdata);
+   
+   o = e_widget_list_add(evas, 0, 0);
+   
+   of = e_widget_framelist_add(evas, _("General Settings"), 0);
+   ot = e_widget_table_add(evas, 1);
+   ob = e_widget_check_add(evas, _("Show Splash Screen At Boot"), &(cfdata->show_splash));
+   e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);   
+   ob = e_widget_label_add(evas, _("Framerate"));
+   e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0.0, 200.0, 5.0, 0, &(cfdata->framerate), NULL, 200);
+   e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
+   e_widget_framelist_object_append(of, ot);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+   
+   of = e_widget_framelist_add(evas, _("Mouse Pointer Settings"), 0);
+   ot = e_widget_table_add(evas, 1);   
+   ob = e_widget_check_add(evas, _("Use E Mouse Pointer"), &(cfdata->use_e_cursor));
+   e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);   
+   ob = e_widget_label_add(evas, _("Mouse Pointer Size"));
+   e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 1024, 1, 0, NULL, &(cfdata->cursor_size), 200);
+   e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
+   e_widget_framelist_object_append(of, ot);   
+   e_widget_list_object_append(o, of, 1, 1, 0.5);   
+   return o;
+}
+
+/*
+static int
+_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+{
+   e_border_button_bindings_ungrab_all();
+   
+   e_border_button_bindings_grab_all();
+   e_config_save_queue();
+   return 1;
+}
+
+static Evas_Object *
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+{
+   Evas_Object *o;
+   
+   _fill_data(cfdata);
+   
+   return o;
+}
+*/