enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

formatting 

SVN revision: 73147
This commit is contained in:
Mike Blumenkrantz 2012-07-02 10:13:27 +00:00
parent 0fe8872ab7
commit 55e263ef55
3 changed files with 430 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/gadman/e_mod_config.c
View File

@ -130,7 +130,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_list_object_append(o, of, 1, 1, 0.5);
e_dialog_resizable_set(cfd->dia, 1);
e_widget_toolbook_page_append(otb, NULL, _("Add Gadget"), o, 1, 1, 1, 1, 0.5, 0.0);
ft = e_widget_table_add(evas, 0);
@ -188,7 +187,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
cfdata, NULL);
e_widget_frametable_object_append(of, cfdata->o_btn, 0, 1, 2, 1, 1, 1, 1, 0);
if (cfdata->fmdir == 1)
e_prefix_data_concat_static(path, "data/backgrounds");
else
@ -275,6 +273,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
return 1;
}
//Basic Callbacks
static void
_fill_gadgets_list(Evas_Object *ilist)
@ -413,6 +412,7 @@ _cb_fm_sel_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
cfdata = data;
e_widget_change(cfdata->o_sf);
}
static void
_cb_button_up(void *data1, void *data2 __UNUSED__)
{
@ -424,3 +424,4 @@ _cb_button_up(void *data1, void *data2 __UNUSED__)
e_fm2_parent_go(cfdata->o_fm);
e_widget_scrollframe_child_pos_set(cfdata->o_sf, 0, 0);
}

6
src/modules/gadman/e_mod_gadman.c
View File

@ -454,12 +454,14 @@ gadman_update_bg(void)
case BG_STD:
case BG_TRANS:
break;
case BG_COLOR:
obj = evas_object_rectangle_add(Man->gc_top->evas);
evas_object_color_set(obj, Man->conf->color_r, Man->conf->color_g,
Man->conf->color_b, 200);
edje_object_part_swallow(Man->full_bg, "e.swallow.bg", obj);
break;
case BG_CUSTOM:
ext = strrchr(Man->conf->custom_bg, '.');
if (!strcmp(ext, ".edj") || !strcmp(ext, ".EDJ"))
@ -479,6 +481,7 @@ gadman_update_bg(void)
}
edje_object_part_swallow(Man->full_bg, "e.swallow.bg", obj);
break;
default:
break;
}
@ -670,7 +673,7 @@ _save_widget_position(E_Gadcon_Client *gcc)
evas_object_geometry_get(gcc->o_frame, &x, &y, &w, &h);
current->cf->geom.pos_x = (double)x / (double)Man->width;
current->cf->geom.pos_y = (double)y / (double)Man->height;
current->cf->geom.size_w = (double)w / (double)Man->width;;
current->cf->geom.size_w = (double)w / (double)Man->width;
current->cf->geom.size_h = (double)h / (double)Man->height;
e_config_save_queue();
@ -734,7 +737,6 @@ _attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu)
e_util_menu_item_theme_icon_set(mi, "transform-scale");
e_menu_item_callback_set(mi, on_menu_edit, gcc);
/* plain / inset */
if (!gcc->cf->style)
gcc->cf->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_INSET);

1
src/modules/gadman/e_mod_main.c
View File

@ -146,3 +146,4 @@ _gadman_action_cb(E_Object *obj __UNUSED__, const char *params __UNUSED__)
{
gadman_gadgets_toggle();
}