enlightenment
/
enlightenment
6
7
Fork 9
Code Issues 19 Pull Requests Projects Releases Wiki Activity

provide gui config for some config vars with no gui right now.

Browse Source 
SVN revision: 66515
devs/princeamd/enlightenment-0.17-elive
Carsten Haitzler 12 years ago
parent 7fd02afae4
commit 1ae388fea2
5 changed files with 125 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/bin/e_config.h
  2. 1
      src/modules/conf_window_manipulation/Makefile.am
  3. 1
      src/modules/conf_window_manipulation/e_int_config_window_manip.h
  4. 114
      src/modules/conf_window_manipulation/e_int_config_window_process.c
  5. 3
      src/modules/conf_window_manipulation/e_mod_main.c

12
src/bin/e_config.h
Unescape View File

@ -123,14 +123,14 @@ struct _E_Config
int allow_manip; // GUI
int border_fix_on_shelf_toggle; // GUI
int allow_above_fullscreen; // GUI
int kill_if_close_not_possible;
int kill_process;
double kill_timer_wait;
int ping_clients;
int kill_if_close_not_possible; // GUI
int kill_process; // GUI
double kill_timer_wait; // GUI
int ping_clients; // GUI
const char *transition_start; // GUI
const char *transition_desk; // GUI
const char *transition_change; // GUI
Eina_List *remembers;
Eina_List *remembers; // GUI
int remember_internal_windows; // GUI
int move_info_follows; // GUI
int resize_info_follows; // GUI
@ -251,7 +251,7 @@ struct _E_Config
int thumb_nice;
int ping_clients_interval;
int ping_clients_interval; // GUI
int cache_flush_poll_interval; // GUI
int thumbscroll_enable; // GUI

1
src/modules/conf_window_manipulation/Makefile.am
Unescape View File

@ -24,6 +24,7 @@ module_la_SOURCES = e_mod_main.c \
e_int_config_window_geometry.c \
e_int_config_window_maxpolicy.c \
e_int_config_window_stacking.c \
e_int_config_window_process.c \
e_int_config_window_display.c \
e_int_config_window_display.h \
e_int_config_focus.c \

1
src/modules/conf_window_manipulation/e_int_config_window_manip.h
Unescape View File

@ -6,6 +6,7 @@
E_Config_Dialog *e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__);
E_Config_Dialog *e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__);
E_Config_Dialog *e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__);
E_Config_Dialog *e_int_config_window_process(E_Container *con, const char *params __UNUSED__);
#endif
#endif

114
src/modules/conf_window_manipulation/e_int_config_window_process.c
Unescape View File

@ -0,0 +1,114 @@
#include "e.h"
/* PROTOTYPES - same all the time */
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(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
/* Actual config data we will be playing with whil the dialog is active */
struct _E_Config_Dialog_Data
{
int kill_if_close_not_possible;
int kill_process;
double kill_timer_wait;
int ping_clients;
int ping_clients_interval;
};
/* a nice easy setup function that does the dirty work */
E_Config_Dialog *
e_int_config_window_process(E_Container *con, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "windows/window_process"))
return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
/* methods */
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply;
v->basic.create_widgets = _basic_create;
v->basic.check_changed = _basic_check_changed;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Window Stacking"),
"E", "windows/window_process",
"preferences-window-process", 0, v, NULL);
return cfd;
}
static void *
_create_data(E_Config_Dialog *cfd __UNUSED__)
{
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
if (!cfdata) return NULL;
cfdata->kill_if_close_not_possible = e_config->kill_if_close_not_possible;
cfdata->kill_process = e_config->kill_process;
cfdata->kill_timer_wait = e_config->kill_timer_wait;
cfdata->ping_clients = e_config->ping_clients;
cfdata->ping_clients_interval = e_config->ping_clients_interval;
return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
E_FREE(cfdata);
}
static int
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
e_config->kill_if_close_not_possible = cfdata->kill_if_close_not_possible;
e_config->kill_process = cfdata->kill_process;
e_config->kill_timer_wait = cfdata->kill_timer_wait;
e_config->ping_clients = cfdata->ping_clients;
e_config->ping_clients_interval = cfdata->ping_clients_interval;
e_config_save_queue();
return 1;
}
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return ((e_config->kill_if_close_not_possible != cfdata->kill_if_close_not_possible) ||
(e_config->kill_process != cfdata->kill_process) ||
(e_config->kill_timer_wait != cfdata->kill_timer_wait) ||
(e_config->ping_clients != cfdata->ping_clients) ||
(e_config->ping_clients_interval != cfdata->ping_clients_interval));
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob;
o = e_widget_list_add(evas, 0, 0);
ob = e_widget_check_add(evas, _("Kill process if unclosable"), &(cfdata->kill_if_close_not_possible));
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_check_add(evas, _("Kill process instead of client"), &(cfdata->kill_process));
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_label_add(evas, _("Kill timeout:"));
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f sec"), 1.0, 30.0, 1.0, 0,
&(cfdata->kill_timer_wait), NULL, 100);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_check_add(evas, _("Ping clients"), &(cfdata->ping_clients));
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_label_add(evas, _("Ping interval:"));
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1.0, 256.0, 1.0, 0,
NULL, &(cfdata->ping_clients_interval), 100);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
return o;
}

3
src/modules/conf_window_manipulation/e_mod_main.c
Unescape View File

@ -21,6 +21,7 @@ e_modapi_init(E_Module *m)
e_configure_registry_item_add("windows/window_stacking", 40, _("Window Stacking"), NULL, "preferences-window-stacking", e_int_config_window_stacking);
e_configure_registry_item_add("windows/window_maxpolicy", 50, _("Window Maximize Policy"), NULL, "preferences-window-maximize", e_int_config_window_maxpolicy);
e_configure_registry_item_add("windows/client_list_menu", 60, _("Client List Menu"), NULL, "preferences-winlist", e_int_config_clientlist);
e_configure_registry_item_add("windows/window_process", 70, _("Window Process Management"), NULL, "preferences-window-process", e_int_config_window_process);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -30,12 +31,14 @@ EAPI int
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "windows/window_process"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/client_list_menu"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_maxpolicy_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_stacking_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_geometry"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_focus"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_display"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("windows/window_process");
e_configure_registry_item_del("windows/client_list_menu");
e_configure_registry_item_del("windows/window_maxpolicy");
e_configure_registry_item_del("windows/window_stacking");

Write Preview
Loading…
Cancel
Save