summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gadgets/bryce_config.c4
-rw-r--r--src/gadgets/demo.c38
-rw-r--r--src/gadgets/wireless/wireless.c2
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)
72 b = z_bryce_add(e_comp->elm, buf, bi->orient, bi->anchor); 72 b = z_bryce_add(e_comp->elm, buf, bi->orient, bi->anchor);
73 site = z_bryce_site_get(b); 73 site = z_bryce_site_get(b);
74 74
75 z_gadget_site_gadget_add(site, "Start", 0); 75 z_gadget_site_gadget_add(site, "Wireless", 0);
76 z_gadget_site_gadget_add(site, "Clock", 0);
77 z_gadget_site_gadget_add(site, "IBar", 0);
78 z_gadget_site_gravity_set(site, gravity); 76 z_gadget_site_gravity_set(site, gravity);
79 z_bryce_style_set(b, bi->style); 77 z_bryce_style_set(b, bi->style);
80 z_bryce_autohide_set(b, bi->autohide); 78 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)
140 E_Menu_Item *mi; 140 E_Menu_Item *mi;
141 141
142 mi = e_menu_item_new(m); 142 mi = e_menu_item_new(m);
143 e_menu_item_label_set(mi, _("Gadgets 2.0")); 143 e_menu_item_label_set(mi, _("Lockscreen Gadgets"));
144 e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper"); 144 e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper");
145 e_menu_item_callback_set(mi, _gadget_conf, NULL); 145 e_menu_item_callback_set(mi, _gadget_conf, NULL);
146 146
@@ -155,9 +155,8 @@ gadget_demo(void)
155{ 155{
156 Evas_Object *b, *site; 156 Evas_Object *b, *site;
157 157
158 if (!eina_streq(getenv("USER"), "zmike")) return; 158 if (!eina_streq(getenv("USER"), "cedric")) return;
159 159
160 if (e_comp->w > 1200) return;
161 z_gadget_type_add("Start", start_create); 160 z_gadget_type_add("Start", start_create);
162 clock_init(); 161 clock_init();
163 ibar_init(); 162 ibar_init();
@@ -165,6 +164,39 @@ gadget_demo(void)
165 z_gadget_init(); 164 z_gadget_init();
166 z_bryce_init(); 165 z_bryce_init();
167 166
167 if (!e_config->null_container_win)
168 {
169 Eina_List *l;
170 E_Config_Binding_Mouse *ebm;
171
172 e_module_disable(e_module_find("connman"));
173 EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, ebm)
174 {
175 if (eina_streq(ebm->action, "window_move"))
176 {
177 e_bindings_mouse_add(E_BINDING_CONTEXT_ANY, ebm->button, ebm->modifiers,
178 ebm->any_mod, "gadget_move", NULL);
179 }
180 else if (eina_streq(ebm->action, "window_resize"))
181 {
182 e_bindings_mouse_add(E_BINDING_CONTEXT_ANY, ebm->button, ebm->modifiers,
183 ebm->any_mod, "gadget_resize", NULL);
184 }
185 else if (eina_streq(ebm->action, "window_menu"))
186 {
187 e_bindings_mouse_add(E_BINDING_CONTEXT_ANY, ebm->button, ebm->modifiers,
188 ebm->any_mod, "gadget_menu", NULL);
189 e_bindings_mouse_add(E_BINDING_CONTEXT_ANY, ebm->button, ebm->modifiers,
190 ebm->any_mod, "bryce_menu", NULL);
191 }
192 }
193 e_bindings_wheel_add(E_BINDING_CONTEXT_ANY, 0, 1, E_BINDING_MODIFIER_CTRL, 0, "bryce_resize", NULL);
194 e_bindings_wheel_add(E_BINDING_CONTEXT_ANY, 0, -1, E_BINDING_MODIFIER_CTRL, 0, "bryce_resize", NULL);
195 e_config->null_container_win = 1;
196 ecore_job_add(_bryce_conf, NULL);
197 e_config_save_queue();
198 }
199
168 //b = z_bryce_add(e_comp->elm, "demo"); 200 //b = z_bryce_add(e_comp->elm, "demo");
169 //site = z_bryce_site_get(b); 201 //site = z_bryce_site_get(b);
170 202
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)
536 E_EXPAND(bt); 536 E_EXPAND(bt);
537 E_FILL(bt); 537 E_FILL(bt);
538 evas_object_show(bt); 538 evas_object_show(bt);
539 elm_object_text_set(bt, "Okay"); 539 elm_object_text_set(bt, "Deal with it");
540 evas_object_smart_callback_add(bt, "clicked", _wireless_edit_send, NULL); 540 evas_object_smart_callback_add(bt, "clicked", _wireless_edit_send, NULL);
541 elm_box_pack_end(box, bt); 541 elm_box_pack_end(box, bt);
542 542