vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

finish renaming all '[sub]subdialog' to 'widget' 

SVN revision: 68440
This commit is contained in:
Leif Middelschulte 2012-02-25 10:50:14 +00:00
parent 23a469ae03
commit 37a99accde
7 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/conf_randr/e-module-conf_randr.edc
View File

@ -38,7 +38,7 @@ collections {
//The graphical representation of a single monitor, including its decorations
group {
name: "e/conf/randr/dialog/subdialog/arrangement/output";
name: "e/conf/randr/dialog/widget/arrangement/output";
styles {
style {
@ -471,7 +471,7 @@ collections {
//representation is dragged. Its size matches the size of the monitor
//dragged.
group{
name: "e/conf/randr/dialog/subdialog/arrangement/suggestion";
name: "e/conf/randr/dialog/widget/arrangement/suggestion";
data {
item: "distance_min" "20";
}
@ -552,7 +552,7 @@ collections {
/************Subdialog - Policies**************/
/**********************************************/
group{
name: "e/conf/randr/dialog/subdialog/policies";
name: "e/conf/randr/dialog/widget/policies";
parts {
part {
name: "current_displays_setup/clipper";
@ -828,7 +828,7 @@ collections {
// Text objects for rotation and reflection
group {
name: "e/conf/randr/dialog/subdialog/orientation";
name: "e/conf/randr/dialog/widget/orientation";
parts {
part {

46
src/modules/conf_randr/e_int_config_randr.c
View File

@ -126,10 +126,10 @@ free_cfdata(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
arrangement_widget_free_data(cfd, cfdata);
evas_object_del(cfdata->gui.widgets.arrangement.dialog);
evas_object_del(cfdata->gui.widgets.policies.dialog);
evas_object_del(cfdata->gui.widgets.resolutions.dialog);
evas_object_del(cfdata->gui.widgets.orientation.dialog);
evas_object_del(cfdata->gui.widgets.arrangement.widget);
evas_object_del(cfdata->gui.widgets.policies.widget);
evas_object_del(cfdata->gui.widgets.resolutions.widget);
evas_object_del(cfdata->gui.widgets.orientation.widget);
EINA_LIST_FREE(cfdata->output_dialog_data_list, dialog_data)
{
@ -304,25 +304,25 @@ basic_create_widgets(E_Config_Dialog *cfd, Evas *canvas, E_Config_Dialog_Data *c
e_config_runtime_info->gui.canvas = canvas;
if (!(cfdata->gui.widgets.arrangement.dialog = arrangement_widget_basic_create_widgets(canvas))) goto _dialog_create_subdialog_arrangement_fail;
if (!(cfdata->gui.widgets.policies.dialog = policy_widget_basic_create_widgets(canvas))) goto _dialog_create_subdialog_policies_fail;
if (!(cfdata->gui.widgets.resolutions.dialog = resolution_widget_basic_create_widgets(canvas))) goto _dialog_create_subdialog_resolutions_fail;
if (!(cfdata->gui.widgets.orientation.dialog = orientation_widget_basic_create_widgets(canvas))) goto _dialog_create_subdialog_orientation_fail;
if (!(cfdata->gui.widgets.arrangement.widget = arrangement_widget_basic_create_widgets(canvas))) goto _dialog_create_widget_arrangement_fail;
if (!(cfdata->gui.widgets.policies.widget = policy_widget_basic_create_widgets(canvas))) goto _dialog_create_widget_policies_fail;
if (!(cfdata->gui.widgets.resolutions.widget = resolution_widget_basic_create_widgets(canvas))) goto _dialog_create_widget_resolutions_fail;
if (!(cfdata->gui.widgets.orientation.widget = orientation_widget_basic_create_widgets(canvas))) goto _dialog_create_widget_orientation_fail;
EINA_SAFETY_ON_FALSE_GOTO((table = e_widget_table_add(canvas, EINA_FALSE)), _dialog_create_widgets_fail);
EINA_SAFETY_ON_FALSE_GOTO((wl = e_widget_list_add(canvas, EINA_FALSE, EINA_TRUE)), _dialog_create_widget_list_fail);
//e_widget_table_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h);
e_widget_table_object_append(table, cfdata->gui.widgets.arrangement.dialog, 1, 1, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
e_widget_table_object_append(table, cfdata->gui.widgets.arrangement.widget, 1, 1, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
/*
e_widget_table_object_append(table, cfdata->gui.widgets.policies.dialog, 1, 2, 1, 1, 0, 0, 0, 0);
e_widget_table_object_append(table, cfdata->gui.widgets.orientation.dialog, 2, 2, 1, 1, 0, 0, 0, 0);
e_widget_table_object_append(table, cfdata->gui.widgets.resolutions.dialog, 3, 2, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
e_widget_table_object_append(table, cfdata->gui.widgets.policies.widget, 1, 2, 1, 1, 0, 0, 0, 0);
e_widget_table_object_append(table, cfdata->gui.widgets.orientation.widget, 2, 2, 1, 1, 0, 0, 0, 0);
e_widget_table_object_append(table, cfdata->gui.widgets.resolutions.widget, 3, 2, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
*/
//e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align);
e_widget_list_object_append(wl, cfdata->gui.widgets.policies.dialog, 0, 0, 0.0);
e_widget_list_object_append(wl, cfdata->gui.widgets.orientation.dialog, 0, 0, 0.0);
e_widget_list_object_append(wl, cfdata->gui.widgets.resolutions.dialog, EVAS_HINT_FILL, EVAS_HINT_EXPAND, 1.0);
e_widget_list_object_append(wl, cfdata->gui.widgets.policies.widget, 0, 0, 0.0);
e_widget_list_object_append(wl, cfdata->gui.widgets.orientation.widget, 0, 0, 0.0);
e_widget_list_object_append(wl, cfdata->gui.widgets.resolutions.widget, EVAS_HINT_FILL, EVAS_HINT_EXPAND, 1.0);
e_widget_table_object_append(table, wl, 1, 2, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
cfdata->gui.widget_list = wl;
@ -335,14 +335,14 @@ basic_create_widgets(E_Config_Dialog *cfd, Evas *canvas, E_Config_Dialog_Data *c
_dialog_create_widget_list_fail:
evas_object_del(table);
_dialog_create_widgets_fail:
evas_object_del(cfdata->gui.widgets.orientation.dialog);
_dialog_create_subdialog_orientation_fail:
evas_object_del(cfdata->gui.widgets.resolutions.dialog);
_dialog_create_subdialog_resolutions_fail:
evas_object_del(cfdata->gui.widgets.policies.dialog);
_dialog_create_subdialog_policies_fail:
evas_object_del(cfdata->gui.widgets.arrangement.dialog);
_dialog_create_subdialog_arrangement_fail:
evas_object_del(cfdata->gui.widgets.orientation.widget);
_dialog_create_widget_orientation_fail:
evas_object_del(cfdata->gui.widgets.resolutions.widget);
_dialog_create_widget_resolutions_fail:
evas_object_del(cfdata->gui.widgets.policies.widget);
_dialog_create_widget_policies_fail:
evas_object_del(cfdata->gui.widgets.arrangement.widget);
_dialog_create_widget_arrangement_fail:
return NULL;
}

16
src/modules/conf_randr/e_int_config_randr.h
View File

@ -23,21 +23,21 @@ struct _E_Config_Dialog_Data
E_Config_Randr_Dialog_Confirmation_Dialog_Data *confirmation_dialog;
struct {
struct {
Evas_Object *dialog, *area, *widget_list, *swallowing_edje, *suggestion, *check_display_disconnected_outputs;
Evas_Object *widget, *area, *widget_list, *swallowing_edje, *suggestion, *check_display_disconnected_outputs;
int suggestion_dist_min, check_val_display_disconnected_outputs;
} arrangement;
struct {
Evas_Object *dialog;
Evas_Object *widget;
//Evas_Object *swallowing_edje;
Evas_Object *radio_above, *radio_right, *radio_below, *radio_left, *radio_clone, *radio_none;
int radio_val;
//Evas_Object *current_displays_setup, *current_displays_setup_background, *new_display, *new_display_background;
} policies;
struct {
Evas_Object *dialog;
Evas_Object *widget;
} resolutions;
struct {
Evas_Object *dialog;
Evas_Object *widget;
//Evas_Object *swallowing_edje;
Evas_Object *radio_normal, *radio_rot90, *radio_rot180, *radio_rot270, *radio_reflect_horizontal, *radio_reflect_vertical;
int radio_val;
@ -75,7 +75,7 @@ struct _Config
E_Config_Dialog *e_int_config_randr(E_Container *con, const char *params __UNUSED__);
// Functions for the arrangement subdialog interaction
// Functions for the arrangement widget interaction
Eina_Bool arrangement_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *arrangement_widget_basic_create_widgets(Evas *canvas);
Eina_Bool arrangement_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
@ -84,7 +84,7 @@ void arrangement_widget_free_data(E_Config_Dialog *cfd, E_Config_Dialog_
void arrangement_widget_keep_changes(E_Config_Dialog_Data *cfdata);
void arrangement_widget_discard_changes(E_Config_Dialog_Data *cfdata);
// Functions for the policies subdialog interaction
// Functions for the policies widget interaction
Eina_Bool policy_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *policy_widget_basic_create_widgets(Evas *canvas);
Eina_Bool policy_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
@ -93,7 +93,7 @@ void policy_widget_keep_changes(E_Config_Dialog_Data *cfdata);
void policy_widget_discard_changes(E_Config_Dialog_Data *cfdata);
void policy_widget_update_radio_buttons(Evas_Object *crtc);
// Functions for the resolutions subdialog interaction
// Functions for the resolutions widget interaction
Eina_Bool resolution_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *resolution_widget_basic_create_widgets(Evas *canvas);
Eina_Bool resolution_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
@ -102,7 +102,7 @@ void resolution_widget_keep_changes(E_Config_Dialog_Data *cfdata);
void resolution_widget_discard_changes(E_Config_Dialog_Data *cfdata);
void resolution_widget_update_list(Evas_Object *crtc);
// Functions for the orientation subdialog interaction
// Functions for the orientation widget interaction
Eina_Bool orientation_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *orientation_widget_basic_create_widgets(Evas *canvas);
Eina_Bool orientation_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);

4
src/modules/conf_randr/e_int_config_randr_arrangement.c
View File

@ -200,7 +200,7 @@ _arrangement_widget_rep_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Da
evas_object_data_set(rep, "rep_info", output_dialog_data);
//set theme for monitor representation
EINA_SAFETY_ON_FALSE_GOTO(edje_object_file_set(rep, _theme_file_path, "e/conf/randr/dialog/subdialog/arrangement/output"), _arrangement_widget_rep_add_edje_set_fail);
EINA_SAFETY_ON_FALSE_GOTO(edje_object_file_set(rep, _theme_file_path, "e/conf/randr/dialog/widget/arrangement/output"), _arrangement_widget_rep_add_edje_set_fail);
//indicate monitor state
if (!(output_dialog_data->crtc && output_dialog_data->crtc->current_mode))
state_signal = "disabled";
@ -376,7 +376,7 @@ _arrangement_widget_suggestion_add(Evas *evas)
const char *theme_data_item = NULL;
e_config_runtime_info->gui.widgets.arrangement.suggestion = edje_object_add(evas);
edje_object_file_set(e_config_runtime_info->gui.widgets.arrangement.suggestion, _theme_file_path, "e/conf/randr/dialog/subdialog/arrangement/suggestion");
edje_object_file_set(e_config_runtime_info->gui.widgets.arrangement.suggestion, _theme_file_path, "e/conf/randr/dialog/widget/arrangement/suggestion");
if ((theme_data_item = edje_object_data_get(e_config_runtime_info->gui.widgets.arrangement.suggestion, "distance_min")))
e_config_runtime_info->gui.widgets.arrangement.suggestion_dist_min = MIN(MAX(atoi(theme_data_item), 0), 100);
else

34
src/modules/conf_randr/e_int_config_randr_orientation.c
View File

@ -55,36 +55,36 @@ orientation_widget_create_data(E_Config_Dialog_Data *cfdata)
Evas_Object *
orientation_widget_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
Evas_Object *widget;
E_Radio_Group *rg;
//char signal[29];
if (!canvas || !e_config_runtime_info) return NULL;
if (e_config_runtime_info->gui.widgets.orientation.dialog) return e_config_runtime_info->gui.widgets.orientation.dialog;
if (e_config_runtime_info->gui.widgets.orientation.widget) return e_config_runtime_info->gui.widgets.orientation.widget;
if (!(subdialog = e_widget_framelist_add(canvas, _("Display Orientation"), EINA_FALSE))) return NULL;
if (!(widget = e_widget_framelist_add(canvas, _("Display Orientation"), EINA_FALSE))) return NULL;
// Add radio buttons
if (!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.widgets.orientation.radio_val))) goto _orientation_widget_radio_add_fail;
//IMPROVABLE: use enum to determine objects via 'switch'-statement
e_config_runtime_info->gui.widgets.orientation.radio_normal = e_widget_radio_add(canvas, _("Normal"), ECORE_X_RANDR_OUTPUT_POLICY_ABOVE, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.orientation.radio_normal);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.orientation.radio_normal);
e_config_runtime_info->gui.widgets.orientation.radio_rot90 = e_widget_radio_add(canvas, _("Rotated, 90°"), ECORE_X_RANDR_OUTPUT_POLICY_RIGHT, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.orientation.radio_rot90);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.orientation.radio_rot90);
e_config_runtime_info->gui.widgets.orientation.radio_rot180 = e_widget_radio_add(canvas, _("Rotated, 180°"), ECORE_X_RANDR_OUTPUT_POLICY_BELOW, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.orientation.radio_rot180);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.orientation.radio_rot180);
e_config_runtime_info->gui.widgets.orientation.radio_rot270 = e_widget_radio_add(canvas, _("Rotated, 270°"), ECORE_X_RANDR_OUTPUT_POLICY_LEFT, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.orientation.radio_rot270);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.orientation.radio_rot270);
e_config_runtime_info->gui.widgets.orientation.radio_reflect_horizontal = e_widget_radio_add(canvas, _("Flipped, horizontally"), ECORE_X_RANDR_OUTPUT_POLICY_CLONE, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.orientation.radio_reflect_horizontal);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.orientation.radio_reflect_horizontal);
e_config_runtime_info->gui.widgets.orientation.radio_reflect_vertical = e_widget_radio_add(canvas, _("Flipped, vertically"), ECORE_X_RANDR_OUTPUT_POLICY_NONE, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.orientation.radio_reflect_vertical);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.orientation.radio_reflect_vertical);
//_orientation_widget_radio_add_callbacks();
@ -92,10 +92,10 @@ orientation_widget_basic_create_widgets(Evas *canvas)
// Add orientation demonstration edje
if (!(e_config_runtime_info->gui.widgets.orientation.swallowing_edje = edje_object_add(canvas)))
goto _orientation_widget_edje_add_fail;
if (!edje_object_file_set(e_config_runtime_info->gui.widgets.orientation.swallowing_edje, _theme_file_path, "e/conf/randr/dialog/subdialog/orientation"))
if (!edje_object_file_set(e_config_runtime_info->gui.widgets.orientation.swallowing_edje, _theme_file_path, "e/conf/randr/dialog/widget/orientation"))
goto _orientation_widget_edje_set_fail;
e_widget_table_object_align_append(subdialog, e_config_runtime_info->gui.widgets.orientation.swallowing_edje, 1, 0, 1, 1, 1, 1, 1, 1, 1.0, 1.0);
e_widget_table_object_align_append(widget, e_config_runtime_info->gui.widgets.orientation.swallowing_edje, 1, 0, 1, 1, 1, 1, 1, 1, 1.0, 1.0);
*/
//disable widgets, if no CRTC is selected
@ -103,19 +103,19 @@ orientation_widget_basic_create_widgets(Evas *canvas)
//evas_object_show(e_config_runtime_info->gui.widgets.orientation.swallowing_edje);
return subdialog;
return widget;
/*
_orientation_widget_edje_set_fail:
evas_object_del(ol);
evas_object_del(e_config_runtime_info->gui.widgets.orientation.swallowing_edje);
_orientation_widget_edje_add_fail:
fprintf(stderr, "CONF_RANDR: Couldn't set edj for orientation subdialog!\n");
evas_object_del(subdialog);
fprintf(stderr, "CONF_RANDR: Couldn't set edj for orientation widget!\n");
evas_object_del(widget);
return NULL;
*/
_orientation_widget_radio_add_fail:
evas_object_del(subdialog);
evas_object_del(widget);
fprintf(stderr, "CONF_RANDR: Could not add radio group!\n");
return NULL;
}
@ -277,7 +277,7 @@ orientation_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *
Ecore_X_Randr_Orientation orientation;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
if (!e_config_runtime_info->gui.widgets.orientation.dialog || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "rep_info")) || !output_dialog_data->crtc) return EINA_FALSE;
if (!e_config_runtime_info->gui.widgets.orientation.widget || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "rep_info")) || !output_dialog_data->crtc) return EINA_FALSE;
orientation = e_config_runtime_info->gui.widgets.orientation.radio_val;
@ -299,7 +299,7 @@ orientation_widget_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
if (!e_config_runtime_info->gui.widgets.orientation.dialog || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "rep_info"))) return EINA_FALSE;
if (!e_config_runtime_info->gui.widgets.orientation.widget || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "rep_info"))) return EINA_FALSE;
return (int)output_dialog_data->previous_orientation != (int)e_config_runtime_info->gui.widgets.orientation.radio_val;
}

32
src/modules/conf_randr/e_int_config_randr_policies.c
View File

@ -75,37 +75,37 @@ policy_widget_create_data(E_Config_Dialog_Data *e_config_runtime_info)
Evas_Object *
policy_widget_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
Evas_Object *widget;
E_Radio_Group *rg;
//char signal[29];
if (!canvas || !e_config_runtime_info) return NULL;
if (e_config_runtime_info->gui.widgets.policies.dialog) return e_config_runtime_info->gui.widgets.policies.dialog;
if (e_config_runtime_info->gui.widgets.policies.widget) return e_config_runtime_info->gui.widgets.policies.widget;
if (!(subdialog = e_widget_framelist_add(canvas, _("Screen attachement policy"), EINA_FALSE))) return NULL;
if (!(widget = e_widget_framelist_add(canvas, _("Screen attachement policy"), EINA_FALSE))) return NULL;
// Add radio buttons
if (!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.widgets.policies.radio_val))) goto _policy_widget_radio_add_fail;
//IMPROVABLE: use enum to determine objects via 'switch'-statement
e_config_runtime_info->gui.widgets.policies.radio_above = e_widget_radio_add(canvas, _("Above"), ECORE_X_RANDR_OUTPUT_POLICY_ABOVE, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.policies.radio_above);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.policies.radio_above);
e_config_runtime_info->gui.widgets.policies.radio_right = e_widget_radio_add(canvas, _("Right"), ECORE_X_RANDR_OUTPUT_POLICY_RIGHT, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.policies.radio_right);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.policies.radio_right);
e_config_runtime_info->gui.widgets.policies.radio_below = e_widget_radio_add(canvas, _("Below"), ECORE_X_RANDR_OUTPUT_POLICY_BELOW, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.policies.radio_below);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.policies.radio_below);
e_config_runtime_info->gui.widgets.policies.radio_left = e_widget_radio_add(canvas, _("Left"), ECORE_X_RANDR_OUTPUT_POLICY_LEFT, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.policies.radio_left);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.policies.radio_left);
e_config_runtime_info->gui.widgets.policies.radio_clone = e_widget_radio_add(canvas, _("Clone display content"), ECORE_X_RANDR_OUTPUT_POLICY_CLONE, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.policies.radio_clone);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.policies.radio_clone);
e_config_runtime_info->gui.widgets.policies.radio_none = e_widget_radio_add(canvas, _("No reaction"), ECORE_X_RANDR_OUTPUT_POLICY_NONE, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.widgets.policies.radio_none);
e_widget_framelist_object_append(widget, e_config_runtime_info->gui.widgets.policies.radio_none);
//_policy_widget_radio_add_callbacks();
@ -116,12 +116,12 @@ policy_widget_basic_create_widgets(Evas *canvas)
goto _policy_widget_edje_add_fail;
}
if (!edje_object_file_set(e_config_runtime_info->gui.widgets.policies.swallowing_edje, _theme_file_path, "e/conf/randr/dialog/subdialog/policies"))
if (!edje_object_file_set(e_config_runtime_info->gui.widgets.policies.swallowing_edje, _theme_file_path, "e/conf/randr/dialog/widget/policies"))
{
goto _policy_widget_edje_set_fail;
}
e_widget_table_object_align_append(subdialog, e_config_runtime_info->gui.widgets.policies.swallowing_edje, 1, 0, 1, 1, 1, 1, 1, 1, 1.0, 1.0);
e_widget_table_object_align_append(widget, e_config_runtime_info->gui.widgets.policies.swallowing_edje, 1, 0, 1, 1, 1, 1, 1, 1, 1.0, 1.0);
*/
/*
@ -151,20 +151,20 @@ policy_widget_basic_create_widgets(Evas *canvas)
edje_object_part_swallow(e_config_runtime_info->gui.widgets.policies.swallowing_edje, "current_displays_setup.swallow.content", e_config_runtime_info->gui.widgets.policies.current_displays_setup);
*/
evas_object_show(subdialog);
evas_object_show(widget);
return subdialog;
return widget;
/*
_policy_widget_edje_set_fail:
evas_object_del(e_config_runtime_info->gui.widgets.policies.swallowing_edje);
_policy_widget_edje_add_fail:
fprintf(stderr, "CONF_RANDR: Couldn't set edj for policies subdialog!\n");
evas_object_del(subdialog);
fprintf(stderr, "CONF_RANDR: Couldn't set edj for policies widget!\n");
evas_object_del(widget);
return NULL;
*/
_policy_widget_radio_add_fail:
evas_object_del(subdialog);
evas_object_del(widget);
return NULL;
}

32
src/modules/conf_randr/e_int_config_randr_resolutions.c
View File

@ -64,16 +64,16 @@ resolution_widget_create_data(E_Config_Dialog_Data *cfdata)
Evas_Object *
resolution_widget_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
Evas_Object *widget;
if (!canvas || !e_config_runtime_info || e_config_runtime_info->gui.widgets.resolutions.dialog || !(subdialog = e_widget_ilist_add(canvas, ICON_WIDTH * e_scale, ICON_HEIGHT * e_scale, NULL))) return NULL;
if (!canvas || !e_config_runtime_info || e_config_runtime_info->gui.widgets.resolutions.widget || !(widget = e_widget_ilist_add(canvas, ICON_WIDTH * e_scale, ICON_HEIGHT * e_scale, NULL))) return NULL;
e_widget_ilist_multi_select_set(subdialog, EINA_FALSE);
e_widget_disabled_set(subdialog, EINA_TRUE);
e_widget_ilist_multi_select_set(widget, EINA_FALSE);
e_widget_disabled_set(widget, EINA_TRUE);
evas_object_show(subdialog);
evas_object_show(widget);
return subdialog;
return widget;
}
Eina_Bool
@ -121,7 +121,7 @@ resolution_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *c
return EINA_FALSE;
}
//get selected mode
if ((selected_mode = (Ecore_X_Randr_Mode_Info *)e_widget_ilist_selected_data_get(e_config_runtime_info->gui.widgets.resolutions.dialog)))
if ((selected_mode = (Ecore_X_Randr_Mode_Info *)e_widget_ilist_selected_data_get(e_config_runtime_info->gui.widgets.resolutions.widget)))
{
mode = selected_mode->xid;
}
@ -154,7 +154,7 @@ resolution_widget_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_
Ecore_X_Randr_Mode_Info *selected_mode;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
if (!e_config_runtime_info->gui.selected_eo || !(selected_mode = (Ecore_X_Randr_Mode_Info *)e_widget_ilist_selected_data_get(e_config_runtime_info->gui.widgets.resolutions.dialog)) || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "rep_info"))) return EINA_FALSE;
if (!e_config_runtime_info->gui.selected_eo || !(selected_mode = (Ecore_X_Randr_Mode_Info *)e_widget_ilist_selected_data_get(e_config_runtime_info->gui.widgets.resolutions.widget)) || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "rep_info"))) return EINA_FALSE;
return selected_mode != output_dialog_data->previous_mode;
}
@ -170,8 +170,8 @@ resolution_widget_update_list(Evas_Object *rep)
Eina_Bool enable = EINA_FALSE;
int i = 0;
e_widget_ilist_freeze(e_config_runtime_info->gui.widgets.resolutions.dialog);
e_widget_ilist_clear(e_config_runtime_info->gui.widgets.resolutions.dialog);
e_widget_ilist_freeze(e_config_runtime_info->gui.widgets.resolutions.widget);
e_widget_ilist_clear(e_config_runtime_info->gui.widgets.resolutions.widget);
if (!rep || !(output_dialog_data = evas_object_data_get(rep, "rep_info")))
goto _go_and_return;
@ -202,24 +202,24 @@ resolution_widget_update_list(Evas_Object *rep)
rate = 0.0;
snprintf(resolution_text, (RESOLUTION_TXT_MAX_LENGTH - 1), "%dx%d@%.1fHz", mode_info->width, mode_info->height, rate);
e_widget_ilist_append(e_config_runtime_info->gui.widgets.resolutions.dialog, NULL, resolution_text, NULL, mode_info, NULL);
e_widget_ilist_append(e_config_runtime_info->gui.widgets.resolutions.widget, NULL, resolution_text, NULL, mode_info, NULL);
//select currently enabled mode
if (mode_info == current_mode)
e_widget_ilist_selected_set(e_config_runtime_info->gui.widgets.resolutions.dialog, i);
e_widget_ilist_selected_set(e_config_runtime_info->gui.widgets.resolutions.widget, i);
i++;
}
//append 'disabled' mode
e_widget_ilist_append(e_config_runtime_info->gui.widgets.resolutions.dialog, NULL, _("Disabled"), NULL, &disabled_mode, NULL);
e_widget_ilist_append(e_config_runtime_info->gui.widgets.resolutions.widget, NULL, _("Disabled"), NULL, &disabled_mode, NULL);
//reenable widget
enable = EINA_TRUE;
_go_and_return:
e_widget_disabled_set(e_config_runtime_info->gui.widgets.resolutions.dialog, enable);
e_widget_ilist_go(e_config_runtime_info->gui.widgets.resolutions.dialog);
e_widget_ilist_thaw(e_config_runtime_info->gui.widgets.resolutions.dialog);
e_widget_disabled_set(e_config_runtime_info->gui.widgets.resolutions.widget, enable);
e_widget_ilist_go(e_config_runtime_info->gui.widgets.resolutions.widget);
e_widget_ilist_thaw(e_config_runtime_info->gui.widgets.resolutions.widget);
}
void