From 27322fc7706d6105068604bde10f9cce34793702 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 19 Feb 2016 21:49:44 -0500 Subject: [PATCH] elitist biz-trip package --- src/gadgets/bryce_config.c | 4 +--- src/gadgets/demo.c | 38 ++++++++++++++++++++++++++++++--- src/gadgets/wireless/wireless.c | 2 +- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/gadgets/bryce_config.c b/src/gadgets/bryce_config.c index fded15a..72a8358 100644 --- a/src/gadgets/bryce_config.c +++ b/src/gadgets/bryce_config.c @@ -72,9 +72,7 @@ _editor_bryce_add(Evas_Object *obj) b = z_bryce_add(e_comp->elm, buf, bi->orient, bi->anchor); site = z_bryce_site_get(b); - z_gadget_site_gadget_add(site, "Start", 0); - z_gadget_site_gadget_add(site, "Clock", 0); - z_gadget_site_gadget_add(site, "IBar", 0); + z_gadget_site_gadget_add(site, "Wireless", 0); z_gadget_site_gravity_set(site, gravity); z_bryce_style_set(b, bi->style); z_bryce_autohide_set(b, bi->autohide); diff --git a/src/gadgets/demo.c b/src/gadgets/demo.c index 887434a..8a88806 100644 --- a/src/gadgets/demo.c +++ b/src/gadgets/demo.c @@ -140,7 +140,7 @@ _gadget_menu(void *d EINA_UNUSED, E_Menu *m) E_Menu_Item *mi; mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Gadgets 2.0")); + e_menu_item_label_set(mi, _("Lockscreen Gadgets")); e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper"); e_menu_item_callback_set(mi, _gadget_conf, NULL); @@ -155,9 +155,8 @@ gadget_demo(void) { Evas_Object *b, *site; - if (!eina_streq(getenv("USER"), "zmike")) return; + if (!eina_streq(getenv("USER"), "cedric")) return; - if (e_comp->w > 1200) return; z_gadget_type_add("Start", start_create); clock_init(); ibar_init(); @@ -165,6 +164,39 @@ gadget_demo(void) z_gadget_init(); z_bryce_init(); + if (!e_config->null_container_win) + { + Eina_List *l; + E_Config_Binding_Mouse *ebm; + + e_module_disable(e_module_find("connman")); + EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, ebm) + { + if (eina_streq(ebm->action, "window_move")) + { + e_bindings_mouse_add(E_BINDING_CONTEXT_ANY, ebm->button, ebm->modifiers, + ebm->any_mod, "gadget_move", NULL); + } + else if (eina_streq(ebm->action, "window_resize")) + { + e_bindings_mouse_add(E_BINDING_CONTEXT_ANY, ebm->button, ebm->modifiers, + ebm->any_mod, "gadget_resize", NULL); + } + else if (eina_streq(ebm->action, "window_menu")) + { + e_bindings_mouse_add(E_BINDING_CONTEXT_ANY, ebm->button, ebm->modifiers, + ebm->any_mod, "gadget_menu", NULL); + e_bindings_mouse_add(E_BINDING_CONTEXT_ANY, ebm->button, ebm->modifiers, + ebm->any_mod, "bryce_menu", NULL); + } + } + e_bindings_wheel_add(E_BINDING_CONTEXT_ANY, 0, 1, E_BINDING_MODIFIER_CTRL, 0, "bryce_resize", NULL); + e_bindings_wheel_add(E_BINDING_CONTEXT_ANY, 0, -1, E_BINDING_MODIFIER_CTRL, 0, "bryce_resize", NULL); + e_config->null_container_win = 1; + ecore_job_add(_bryce_conf, NULL); + e_config_save_queue(); + } + //b = z_bryce_add(e_comp->elm, "demo"); //site = z_bryce_site_get(b); diff --git a/src/gadgets/wireless/wireless.c b/src/gadgets/wireless/wireless.c index aa427f3..c019116 100644 --- a/src/gadgets/wireless/wireless.c +++ b/src/gadgets/wireless/wireless.c @@ -536,7 +536,7 @@ _wireless_gadget_edit(Instance *inst, int type) E_EXPAND(bt); E_FILL(bt); evas_object_show(bt); - elm_object_text_set(bt, "Okay"); + elm_object_text_set(bt, "Deal with it"); evas_object_smart_callback_add(bt, "clicked", _wireless_edit_send, NULL); elm_box_pack_end(box, bt);