From be4f5dfbab5e40116be28520874fbd4abf2fd6ab Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 17 Oct 2005 11:51:46 +0000 Subject: [PATCH] locks have been dialogified :) SVN revision: 17628 --- src/bin/Makefile.am | 4 +- src/bin/e_border.c | 126 ++---------- src/bin/e_border.h | 4 +- src/bin/e_includes.h | 1 + src/bin/e_int_border_locks.c | 364 +++++++++++++++++++++++++++++++++++ src/bin/e_int_border_locks.h | 12 ++ src/bin/e_widget.c | 2 - 7 files changed, 394 insertions(+), 119 deletions(-) create mode 100644 src/bin/e_int_border_locks.c create mode 100644 src/bin/e_int_border_locks.h diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index d72c418e4..a45987d71 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -94,7 +94,8 @@ e_widget_frametable.h \ e_widget_table.h \ e_config_dialog.h \ e_int_config_focus.h \ -e_icon_layout.h +e_icon_layout.h \ +e_int_border_locks.h enlightenment_src = \ e_user.c \ @@ -171,6 +172,7 @@ e_widget_table.c \ e_config_dialog.c \ e_int_config_focus.c \ e_icon_layout.c \ +e_int_border_locks.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ diff --git a/src/bin/e_border.c b/src/bin/e_border.c index e3b82a5d8..51c317400 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -2723,23 +2723,10 @@ _e_border_menus_del(E_Border *bd) { int was_menu = 0; - if (bd->border_locks_menu) + if (bd->border_locks_dialog) { - e_object_del(E_OBJECT(bd->border_locks_menu)); - bd->border_locks_menu = NULL; - was_menu = 1; - } - if (bd->border_locks_user_menu) - { - e_object_del(E_OBJECT(bd->border_locks_user_menu)); - bd->border_locks_user_menu = NULL; - was_menu = 1; - } - if (bd->border_locks_application_menu) - { - e_object_del(E_OBJECT(bd->border_locks_application_menu)); - bd->border_locks_application_menu = NULL; - was_menu = 1; + e_object_del(E_OBJECT(bd->border_locks_dialog)); + bd->border_locks_dialog = NULL; } if (bd->border_remember_menu) { @@ -5699,40 +5686,6 @@ _e_border_cb_border_menu_end(void *data, E_Menu *m) } } -#define NEW_LOCK_FN(var) \ -static void \ -_e_border_menu_cb_##var(void *data, E_Menu *m, E_Menu_Item *mi) \ -{ \ - E_Border *bd; \ - bd = data; \ - bd->var = e_menu_item_toggle_get(mi); \ - bd->changed = 1; \ -} - -NEW_LOCK_FN(lock_user_location) -NEW_LOCK_FN(lock_client_location) -NEW_LOCK_FN(lock_user_size) -NEW_LOCK_FN(lock_client_size) -NEW_LOCK_FN(lock_user_stacking) -NEW_LOCK_FN(lock_client_stacking) -NEW_LOCK_FN(lock_user_iconify) -NEW_LOCK_FN(lock_client_iconify) -NEW_LOCK_FN(lock_user_desk) -NEW_LOCK_FN(lock_client_desk) -NEW_LOCK_FN(lock_user_sticky) -NEW_LOCK_FN(lock_client_sticky) -NEW_LOCK_FN(lock_user_shade) -NEW_LOCK_FN(lock_client_shade) -NEW_LOCK_FN(lock_user_maximize) -NEW_LOCK_FN(lock_client_maximize) -NEW_LOCK_FN(lock_user_fullscreen) -NEW_LOCK_FN(lock_client_fullscreen) -NEW_LOCK_FN(lock_border) -NEW_LOCK_FN(lock_close) -/*NEW_LOCK_FN(lock_focus_in)*/ -/*NEW_LOCK_FN(lock_focus_out)*/ -NEW_LOCK_FN(lock_life) - static void _e_border_menu_cb_remember(void *data, E_Menu *m, E_Menu_Item *mi) { @@ -6176,6 +6129,14 @@ _e_border_menu_cb_remember_apply_run(void *data, E_Menu *m, E_Menu_Item *mi) e_config_save_queue(); } +static void +_e_border_menu_cb_locks(void *data, E_Menu *m, E_Menu_Item *mi) +{ + E_Border *bd; + bd = data; + e_int_border_locks(bd); +} + static void _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_X_Time timestamp) { @@ -6184,67 +6145,6 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_X_T if (bd->border_menu) return; - m = e_menu_new(); - bd->border_locks_user_menu = m; - -#define NEW_LOCK_MI(txt, var) \ - mi = e_menu_item_new(m); \ - e_menu_item_label_set(mi, txt); \ - e_menu_item_check_set(mi, 1); \ - e_menu_item_toggle_set(mi, bd->var); \ - e_menu_item_callback_set(mi, _e_border_menu_cb_##var, bd); - - NEW_LOCK_MI(_("Position"), lock_user_location); - NEW_LOCK_MI(_("Size"), lock_user_size); - NEW_LOCK_MI(_("Stacking"), lock_user_stacking); - NEW_LOCK_MI(_("Iconify"), lock_user_iconify); -/* NEW_LOCK_MI(_("Virtual Desktop)"), lock_user_desk);*/ - NEW_LOCK_MI(_("Sticky"), lock_user_sticky); - NEW_LOCK_MI(_("Shade"), lock_user_shade); - NEW_LOCK_MI(_("Maximize"), lock_user_maximize); - NEW_LOCK_MI(_("Fullscreen"), lock_user_fullscreen); - - m = e_menu_new(); - bd->border_locks_application_menu = m; - - NEW_LOCK_MI(_("Position"), lock_client_location); - NEW_LOCK_MI(_("Size"), lock_client_size); - NEW_LOCK_MI(_("Stacking"), lock_client_stacking); - NEW_LOCK_MI(_("Iconify"), lock_client_iconify); -/* NEW_LOCK_MI(_("Virtual Desktop"), lock_client_desk);*/ - NEW_LOCK_MI(_("Sticky"), lock_client_sticky); - NEW_LOCK_MI(_("Shade"), lock_client_shade); - NEW_LOCK_MI(_("Maximize"), lock_client_maximize); - NEW_LOCK_MI(_("Fullscreen"), lock_client_fullscreen); - - m = e_menu_new(); - bd->border_locks_menu = m; - - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("User")); - e_menu_item_submenu_set(mi, bd->border_locks_user_menu); - e_menu_item_icon_edje_set(mi, - (char *)e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/locks_user"), - "widgets/border/default/locks_user"); - - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Application")); - e_menu_item_submenu_set(mi, bd->border_locks_application_menu); - e_menu_item_icon_edje_set(mi, - (char *)e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/locks_application"), - "widgets/border/default/locks_application"); - - mi = e_menu_item_new(m); - e_menu_item_separator_set(mi, 1); - - NEW_LOCK_MI(_("Border"), lock_border); - NEW_LOCK_MI(_("Close"), lock_close); -/* NEW_LOCK_MI(_("Focus In"), lock_focus_in);*/ -/* NEW_LOCK_MI(_("Focus Out"), lock_focus_out);*/ - NEW_LOCK_MI(_("Lifespan"), lock_life); - m = e_menu_new(); bd->border_remember_menu = m; @@ -6462,8 +6362,8 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_X_T e_menu_item_separator_set(mi, 1); mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Locks")); - e_menu_item_submenu_set(mi, bd->border_locks_menu); + e_menu_item_label_set(mi, _("Window Locks")); + e_menu_item_callback_set(mi, _e_border_menu_cb_locks, bd); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/borders", "widgets/border/default/locks"), diff --git a/src/bin/e_border.h b/src/bin/e_border.h index 21c0f81f3..cb1a598e9 100644 --- a/src/bin/e_border.h +++ b/src/bin/e_border.h @@ -351,9 +351,7 @@ struct _E_Border Evas_List *stick_desks; E_Menu *border_menu; - E_Menu *border_locks_menu; - E_Menu *border_locks_user_menu; - E_Menu *border_locks_application_menu; + E_Config_Dialog *border_locks_dialog; E_Menu *border_remember_menu; E_Menu *border_stacking_menu; Evas_List *pending_move_resize; diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index 6a3442087..ee4cc0e3e 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -76,3 +76,4 @@ #include "e_config_dialog.h" #include "e_int_config_focus.h" #include "e_icon_layout.h" +#include "e_int_border_locks.h" diff --git a/src/bin/e_int_border_locks.c b/src/bin/e_int_border_locks.c new file mode 100644 index 000000000..3400f61b5 --- /dev/null +++ b/src/bin/e_int_border_locks.c @@ -0,0 +1,364 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#include "e.h" + +/* PROTOTYPES - same all the time */ +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 int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); +static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); + +/* Actual config data we will be playing with whil the dialog is active */ +struct _CFData +{ + E_Border *border; + /*- BASIC -*/ + int do_what_i_say; + int protect_from_me; + int keep_my_border; + int important_window; + int remember_locks; + /*- ADVANCED -*/ + struct { + struct { + int location; + int size; + int stacking; + int iconify; + int desk; // unused atm + int sticky; + int shade; + int maximize; + int fullscreen; + } user, client; + int border; + int close; + int focus_in; // unused atm + int focus_out; // unised atm + int life; + + int remember; + } lock; +}; + +/* a nice easy setup function that does the dirty work */ +void +e_int_border_locks(E_Border *bd) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View v; + + /* methods */ + 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 = _advanced_apply_data; + v.advanced.create_widgets = _advanced_create_widgets; + /* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(bd->zone->container, + _("Window Locks"), NULL, 0, &v, bd); +} + +/**--CREATE--**/ +static void +_fill_data(CFData *cfdata) +{ + cfdata->lock.user.location = (int)cfdata->border->lock_user_location & 0x1; + cfdata->lock.user.size = (int)cfdata->border->lock_user_size & 0x1; + cfdata->lock.user.stacking = (int)cfdata->border->lock_user_stacking & 0x1; + cfdata->lock.user.iconify = (int)cfdata->border->lock_user_iconify & 0x1; + cfdata->lock.user.desk = (int)cfdata->border->lock_user_desk & 0x1; + cfdata->lock.user.sticky = (int)cfdata->border->lock_user_sticky & 0x1; + cfdata->lock.user.shade = (int)cfdata->border->lock_user_shade & 0x1; + cfdata->lock.user.maximize = (int)cfdata->border->lock_user_maximize & 0x1; + cfdata->lock.user.fullscreen = (int)cfdata->border->lock_user_fullscreen & 0x1; + cfdata->lock.client.location = (int)cfdata->border->lock_client_location & 0x1; + cfdata->lock.client.size = (int)cfdata->border->lock_client_size & 0x1; + cfdata->lock.client.stacking = (int)cfdata->border->lock_client_stacking & 0x1; + cfdata->lock.client.iconify = (int)cfdata->border->lock_client_iconify & 0x1; + cfdata->lock.client.desk = (int)cfdata->border->lock_client_desk & 0x1; + cfdata->lock.client.sticky = (int)cfdata->border->lock_client_sticky & 0x1; + cfdata->lock.client.shade = (int)cfdata->border->lock_client_shade & 0x1; + cfdata->lock.client.maximize = (int)cfdata->border->lock_client_maximize & 0x1; + cfdata->lock.client.fullscreen = (int)cfdata->border->lock_client_fullscreen & 0x1; + cfdata->lock.border = (int)cfdata->border->lock_border & 0x1; + cfdata->lock.close = (int)cfdata->border->lock_close & 0x1; + cfdata->lock.focus_in = (int)cfdata->border->lock_focus_in & 0x1; + cfdata->lock.focus_out = (int)cfdata->border->lock_focus_out & 0x1; + cfdata->lock.life = (int)cfdata->border->lock_life & 0x1; + if ((cfdata->border->remember) && + (cfdata->border->remember->apply & E_REMEMBER_APPLY_LOCKS)) + cfdata->lock.remember = 1; + + /* figure out basic config from the current locks */ + if (cfdata->lock.user.location || cfdata->lock.user.size || + cfdata->lock.user.stacking || cfdata->lock.user.iconify || + cfdata->lock.user.desk || cfdata->lock.user.sticky || + cfdata->lock.user.shade || cfdata->lock.user.maximize || + cfdata->lock.user.fullscreen) + cfdata->protect_from_me = 1; + if (cfdata->lock.client.location || cfdata->lock.client.size || + cfdata->lock.client.stacking || cfdata->lock.client.iconify || + cfdata->lock.client.desk || cfdata->lock.client.sticky || + cfdata->lock.client.shade || cfdata->lock.client.maximize || + cfdata->lock.client.fullscreen) + cfdata->do_what_i_say = 1; + if (cfdata->lock.border) + cfdata->keep_my_border = 1; + if (cfdata->lock.close || cfdata->lock.life) + cfdata->important_window = 1; + cfdata->remember_locks = cfdata->lock.remember; +} + +static void * +_create_data(E_Config_Dialog *cfd) +{ + /* Create cfdata - cfdata is a temporary block of config data that this + * dialog will be dealing with while configuring. it will be applied to + * the running systems/config in the apply methods + */ + CFData *cfdata; + + cfdata = E_NEW(CFData, 1); + cfdata->border = cfd->data; + _fill_data(cfdata); + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, CFData *cfdata) +{ + /* Free the cfdata */ + free(cfdata); +} + +/**--APPLY--**/ +static int +_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +{ + /* Actually take our cfdata settings and apply them in real life */ + + if (cfdata->do_what_i_say) + { + cfdata->border->lock_client_location = 1; + cfdata->border->lock_client_size = 1; + cfdata->border->lock_client_stacking = 1; + cfdata->border->lock_client_iconify = 1; + cfdata->border->lock_client_desk = 0; + cfdata->border->lock_client_sticky = 1; + cfdata->border->lock_client_shade = 1; + cfdata->border->lock_client_maximize = 1; + cfdata->border->lock_client_fullscreen = 1; + } + if (cfdata->protect_from_me) + { + cfdata->border->lock_user_location = 1; + cfdata->border->lock_user_size = 1; + cfdata->border->lock_user_stacking = 1; + cfdata->border->lock_user_iconify = 1; + cfdata->border->lock_user_desk = 0; + cfdata->border->lock_user_sticky = 1; + cfdata->border->lock_user_shade = 1; + cfdata->border->lock_user_maximize = 1; + cfdata->border->lock_user_fullscreen = 1; + } + if (cfdata->important_window) + { + cfdata->border->lock_close = 1; + cfdata->border->lock_life = 1; + } + if (cfdata->keep_my_border) + { + cfdata->border->lock_border = 1; + } + if (cfdata->remember_locks) + { + if (!cfdata->border->remember) + { + cfdata->border->remember = e_remember_new(); + if (cfdata->border->remember) + { + e_remember_use(cfdata->border->remember); + e_remember_update(cfdata->border->remember, cfdata->border); + cfdata->border->remember->match |= E_REMEMBER_MATCH_NAME; + cfdata->border->remember->match |= E_REMEMBER_MATCH_CLASS; + cfdata->border->remember->match |= E_REMEMBER_MATCH_ROLE; + cfdata->border->remember->match |= E_REMEMBER_MATCH_TYPE; + cfdata->border->remember->match |= E_REMEMBER_MATCH_TRANSIENT; + cfdata->border->remember->apply |= E_REMEMBER_APPLY_LOCKS; + } + } + } + else + { + if (cfdata->border->remember) + { + cfdata->border->remember->apply &= ~E_REMEMBER_APPLY_LOCKS; + if (cfdata->border->remember->apply == 0) + { + e_remember_unuse(cfdata->border->remember); + e_remember_del(cfdata->border->remember); + cfdata->border->remember = NULL; + } + } + } + e_config_save_queue(); + return 1; /* Apply was OK */ +} + +static int +_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +{ + /* Actually take our cfdata settings and apply them in real life */ + cfdata->border->lock_user_location = cfdata->lock.user.location; + cfdata->border->lock_user_size = cfdata->lock.user.size; + cfdata->border->lock_user_stacking = cfdata->lock.user.stacking; + cfdata->border->lock_user_iconify = cfdata->lock.user.iconify; + cfdata->border->lock_user_desk = cfdata->lock.user.desk; + cfdata->border->lock_user_sticky = cfdata->lock.user.sticky; + cfdata->border->lock_user_shade = cfdata->lock.user.shade; + cfdata->border->lock_user_maximize = cfdata->lock.user.maximize; + cfdata->border->lock_user_fullscreen = cfdata->lock.user.fullscreen; + cfdata->border->lock_client_location = cfdata->lock.client.location; + cfdata->border->lock_client_size = cfdata->lock.client.size; + cfdata->border->lock_client_stacking = cfdata->lock.client.stacking; + cfdata->border->lock_client_iconify = cfdata->lock.client.iconify; + cfdata->border->lock_client_desk = cfdata->lock.client.desk; + cfdata->border->lock_client_sticky = cfdata->lock.client.sticky; + cfdata->border->lock_client_shade = cfdata->lock.client.shade; + cfdata->border->lock_client_maximize = cfdata->lock.client.maximize; + cfdata->border->lock_client_fullscreen = cfdata->lock.client.fullscreen; + cfdata->border->lock_border = cfdata->lock.border; + cfdata->border->lock_close = cfdata->lock.close; + cfdata->border->lock_focus_in = cfdata->lock.focus_in; + cfdata->border->lock_focus_out = cfdata->lock.focus_out; + cfdata->border->lock_life = cfdata->lock.life; + if (cfdata->lock.remember) + { + if (!cfdata->border->remember) + { + cfdata->border->remember = e_remember_new(); + if (cfdata->border->remember) + { + e_remember_use(cfdata->border->remember); + e_remember_update(cfdata->border->remember, cfdata->border); + cfdata->border->remember->match |= E_REMEMBER_MATCH_NAME; + cfdata->border->remember->match |= E_REMEMBER_MATCH_CLASS; + cfdata->border->remember->match |= E_REMEMBER_MATCH_ROLE; + cfdata->border->remember->match |= E_REMEMBER_MATCH_TYPE; + cfdata->border->remember->match |= E_REMEMBER_MATCH_TRANSIENT; + cfdata->border->remember->apply |= E_REMEMBER_APPLY_LOCKS; + } + } + } + else + { + if (cfdata->border->remember) + { + cfdata->border->remember->apply &= ~E_REMEMBER_APPLY_LOCKS; + if (cfdata->border->remember->apply == 0) + { + e_remember_unuse(cfdata->border->remember); + e_remember_del(cfdata->border->remember); + cfdata->border->remember = NULL; + } + } + } + e_config_save_queue(); + return 1; /* Apply was OK */ +} + +/**--GUI--**/ +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +{ + /* generate the core widget layout for a basic dialog */ + Evas_Object *o, *ob, *of; + + _fill_data(cfdata); + o = e_widget_list_add(evas, 0, 0); + + of = e_widget_framelist_add(evas, _("Generic Locks"), 0); + ob = e_widget_check_add(evas, _("Lock the Window so it does only what I tell it to"), &(cfdata->do_what_i_say)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Protect this window from me accidentally changing it"), &(cfdata->protect_from_me)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Protect this window from being accidentally closed because it is important"), &(cfdata->important_window)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Do not allow the border to change on this window"), &(cfdata->keep_my_border)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + ob = e_widget_check_add(evas, _("Remember these Locks for this window next time it appears"), &(cfdata->remember_locks)); + e_widget_list_object_append(o, ob, 0, 0, 1.0); + return o; +} + +static Evas_Object * +_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +{ + /* generate the core widget layout for an advanced dialog */ + Evas_Object *o, *ob, *of; + E_Radio_Group *rg; + + _fill_data(cfdata); + + o = e_widget_list_add(evas, 0, 0); + + of = e_widget_frametable_add(evas, _("Lock program changing:"), 0); + ob = e_widget_check_add(evas, _("Position"), &(cfdata->lock.client.location)); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Size"), &(cfdata->lock.client.size)); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Stacking"), &(cfdata->lock.client.stacking)); + e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Iconified state"), &(cfdata->lock.client.iconify)); + e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Stickiness"), &(cfdata->lock.client.sticky)); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Shaded state"), &(cfdata->lock.client.shade)); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Maximized state"), &(cfdata->lock.client.maximize)); + e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Fullscreen state"), &(cfdata->lock.client.fullscreen)); + e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_frametable_add(evas, _("Lock me from changing:"), 0); + ob = e_widget_check_add(evas, _("Position"), &(cfdata->lock.user.location)); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Size"), &(cfdata->lock.user.size)); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Stacking"), &(cfdata->lock.user.stacking)); + e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Iconified state"), &(cfdata->lock.user.iconify)); + e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Stickiness"), &(cfdata->lock.user.sticky)); + e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Shaded state"), &(cfdata->lock.user.shade)); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Maximized state"), &(cfdata->lock.user.maximize)); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("Fullscreen state"), &(cfdata->lock.user.fullscreen)); + e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1); + ob = e_widget_check_add(evas, _("The border style"), &(cfdata->lock.border)); + e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Stop me from:"), 0); + ob = e_widget_check_add(evas, _("Closing the window"), &(cfdata->lock.close)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Exiting my login with this window open"), &(cfdata->lock.life)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + ob = e_widget_check_add(evas, _("Remember these Locks"), &(cfdata->lock.remember)); + e_widget_list_object_append(o, ob, 0, 0, 1.0); + + return o; +} diff --git a/src/bin/e_int_border_locks.h b/src/bin/e_int_border_locks.h new file mode 100644 index 000000000..1f0f59696 --- /dev/null +++ b/src/bin/e_int_border_locks.h @@ -0,0 +1,12 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#ifdef E_TYPEDEFS +#else +#ifndef E_INT_BORDER_LOCKS_H +#define E_INT_BORDER_LOCKS_H + +EAPI void e_int_border_locks(E_Border *bd); + +#endif +#endif diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c index a71fd06f8..9aa054f91 100644 --- a/src/bin/e_widget.c +++ b/src/bin/e_widget.c @@ -417,7 +417,6 @@ e_widget_disabled_set(Evas_Object *obj, int disabled) { Evas_Object *o, *parent; - printf("disable focused %p!\n", obj); parent = obj; for (;;) { @@ -425,7 +424,6 @@ e_widget_disabled_set(Evas_Object *obj, int disabled) if (!o) break; parent = o; } - printf("jump %p\n", parent); e_widget_focus_jump(parent, 1); } if (sd->disable_func) sd->disable_func(obj);