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

ecrustify 

SVN revision: 64991
This commit is contained in:
Mike Blumenkrantz 2011-11-09 15:42:00 +00:00
parent d447dfb63f
commit aa24d2f3b1
6 changed files with 320 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@
#define ECORE_X_RANDR_1_3 ((1 << 16) | 3)
#endif
#ifdef Ecore_X_Randr_None
#undef Ecore_X_Randr_None
#define Ecore_X_Randr_None 0
@ -109,7 +108,6 @@ _dialog_output_dialog_data_new(E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info
return NULL;
}
static void *
create_data(E_Config_Dialog *cfd)
{
@ -276,7 +274,6 @@ _e_conf_randr_confirmation_dialog_new(E_Config_Dialog *cfd)
e_dialog_show(cd->dialog);
e_object_ref(E_OBJECT(cfd));
}
}
static Evas_Object *
@ -414,9 +411,9 @@ basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (!cfdata) return EINA_FALSE;
else
return (dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata)
return dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata)
|| dialog_subdialog_policies_basic_check_changed(cfd, cfdata)
|| dialog_subdialog_orientation_basic_check_changed(cfd, cfdata)
|| dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata));
|| dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata);
}

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

@ -147,6 +147,7 @@ _dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Objec
fprintf(stderr, "CONF_RANDR: mouse button released. Emitted signal to orientation: %s\n", signal);
}
#endif
void
@ -219,18 +220,23 @@ dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc)
case ECORE_X_RANDR_ORIENTATION_ROT_90:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EINA_TRUE);
break;
case ECORE_X_RANDR_ORIENTATION_ROT_180:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EINA_TRUE);
break;
case ECORE_X_RANDR_ORIENTATION_ROT_270:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EINA_TRUE);
break;
case ECORE_X_RANDR_ORIENTATION_FLIP_X:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EINA_TRUE);
break;
case ECORE_X_RANDR_ORIENTATION_FLIP_Y:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EINA_TRUE);
break;
default: //== ECORE_X_RANDR_ORIENTATION_ROT_0:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EINA_TRUE);
}
@ -295,7 +301,7 @@ dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd __UNUSED__
if (!e_config_runtime_info->gui.subdialogs.orientation.dialog || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "output_info"))) return EINA_FALSE;
return ((int)output_dialog_data->previous_orientation != (int)e_config_runtime_info->gui.subdialogs.orientation.radio_val);
return (int)output_dialog_data->previous_orientation != (int)e_config_runtime_info->gui.subdialogs.orientation.radio_val;
}
void
@ -333,3 +339,4 @@ dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data *cfdata)
}
}
}

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

@ -199,7 +199,7 @@ dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E
{
if (!e_randr_screen_info || !cfdata || !cfdata->gui.selected_output_dd) return EINA_FALSE;
return ((int)cfdata->gui.selected_output_dd->previous_policy != (int)cfdata->gui.subdialogs.policies.radio_val);
return (int)cfdata->gui.selected_output_dd->previous_policy != (int)cfdata->gui.subdialogs.policies.radio_val;
}
void
@ -249,18 +249,23 @@ dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc)
case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_right, EINA_TRUE);
break;
case ECORE_X_RANDR_OUTPUT_POLICY_BELOW:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_below, EINA_TRUE);
break;
case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_left, EINA_TRUE);
break;
case ECORE_X_RANDR_OUTPUT_POLICY_CLONE:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_clone, EINA_TRUE);
break;
case ECORE_X_RANDR_OUTPUT_POLICY_NONE:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_none, EINA_TRUE);
break;
default: //== ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
e_widget_radio_toggle_set(e_config_runtime_info->gui.subdialogs.policies.radio_above, EINA_TRUE);
}
@ -297,3 +302,4 @@ dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata)
odd->previous_policy = Ecore_X_Randr_Unset;
}
}

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

@ -152,7 +152,7 @@ dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd __UNUSED__
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.subdialogs.resolutions.dialog)) || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "output_info"))) return EINA_FALSE;
return (selected_mode != output_dialog_data->previous_mode);
return selected_mode != output_dialog_data->previous_mode;
}
void
@ -222,7 +222,6 @@ dialog_subdialog_resolutions_update_list(Evas_Object *crtc)
e_widget_ilist_thaw(e_config_runtime_info->gui.subdialogs.resolutions.dialog);
}
void
dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata)
{
@ -262,3 +261,4 @@ dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata)
}
}
}

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

@ -28,7 +28,8 @@ EAPI int
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "screen/randr"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/randr")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/randr");
e_configure_registry_category_del("screen");
conf_randr_module = NULL;
@ -40,3 +41,4 @@ e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}