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

add icons for randr rotation and flipping 

SVN revision: 23658
This commit is contained in:
Carsten Haitzler 2006-07-02 17:25:18 +00:00
parent 7d2f06f202
commit e2222e18c7
10 changed files with 168 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -36,6 +36,9 @@ Some of the things (in very short form) that need to be done to E17...
changing position)
* BUG: Doing an action to vertically maximize/minimize a window results in
in the window being horizontally maximized/minimized as well (& vice versa)
* BUG: in screen resolution change dialog the flip config is a pair of raidio
buttons. it should be a pair of checkboxes to turn that flip bit on or
off etc. etc. this means adding check icon widgets too liek radio icons too
]]]
[[[

134
data/themes/default_icons.edc
View File

@ -54,6 +54,13 @@ images {
image: "e17_shelf_menu_bar.png" COMP;
image: "e17_shelf_panel.png" COMP;
image: "e17_shelf_top_desk.png" COMP;
image: "e17_icon_screen_around.png" COMP;
image: "e17_icon_screen_hflip.png" COMP;
image: "e17_icon_screen_left.png" COMP;
image: "e17_icon_screen_normal.png" COMP;
image: "e17_icon_screen_right.png" COMP;
image: "e17_icon_screen_vflip.png" COMP;
}
group {
@ -581,6 +588,132 @@ group {
}
}
}
group {
name: "icons/enlightenment/screen_normal";
max: 24 24;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 24 24;
image {
normal: "e17_icon_screen_normal.png";
}
}
}
}
}
group {
name: "icons/enlightenment/screen_normal";
max: 24 24;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 24 24;
image {
normal: "e17_icon_screen_normal.png";
}
}
}
}
}
group {
name: "icons/enlightenment/screen_around";
max: 24 24;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 24 24;
image {
normal: "e17_icon_screen_around.png";
}
}
}
}
}
group {
name: "icons/enlightenment/screen_left";
max: 24 24;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 24 24;
image {
normal: "e17_icon_screen_left.png";
}
}
}
}
}
group {
name: "icons/enlightenment/screen_right";
max: 24 24;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 24 24;
image {
normal: "e17_icon_screen_right.png";
}
}
}
}
}
group {
name: "icons/enlightenment/screen_vflip";
max: 24 24;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 24 24;
image {
normal: "e17_icon_screen_vflip.png";
}
}
}
}
}
group {
name: "icons/enlightenment/screen_hflip";
max: 24 24;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 24 24;
image {
normal: "e17_icon_screen_hflip.png";
}
}
}
}
}
group {
name: "icons/enlightenment/shelf_position_bottom";
max: 24 24;
@ -599,7 +732,6 @@ group {
}
}
}
///
group {
name: "icons/enlightenment/shelf_position_bottom_left";
max: 24 24;

7
data/themes/images/Makefile.am
View File

@ -371,6 +371,12 @@ e17_icon_fileman_zip.png \
e17_icon_fileman_home.png \
e17_icon_fileman_desktop.png \
e17_icon_font.png \
e17_icon_screen_around.png \
e17_icon_screen_hflip.png \
e17_icon_screen_left.png \
e17_icon_screen_normal.png \
e17_icon_screen_right.png \
e17_icon_screen_vflip.png \
e17_button_detail_paste.png \
e17_button_detail_arrange_name.png \
e17_button_detail_properties.png \
@ -442,4 +448,3 @@ e17_shelf_dock.png \
e17_shelf_menu_bar.png \
e17_shelf_panel.png \
e17_shelf_top_desk.png

BIN
data/themes/images/e17_icon_screen_around.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 915 B

BIN
data/themes/images/e17_icon_screen_hflip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 910 B

BIN
data/themes/images/e17_icon_screen_left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 878 B

BIN
data/themes/images/e17_icon_screen_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 816 B

BIN
data/themes/images/e17_icon_screen_right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 925 B

BIN
data/themes/images/e17_icon_screen_vflip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 890 B

49
src/bin/e_int_config_display.c
View File

@ -46,8 +46,8 @@ struct _E_Config_Dialog_Data
int restore;
int can_rotate;
int can_flip;
Ecore_X_Randr_Rotation rotation;
Ecore_X_Randr_Rotation flip;
int rotation;
int flip;
SureBox *surebox;
};
@ -334,16 +334,23 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
o2 = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Resolution"), 0);
ol = e_widget_ilist_add(evas, 32, 32, NULL);
e_widget_min_size_set(ol, 140, 120);
ol = e_widget_ilist_add(evas, 24, 24, NULL);
e_widget_min_size_set(ol, 120, 240);
e_widget_framelist_object_append(of, ol);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
res_list = ol;
of = e_widget_framelist_add(evas, _("Refresh Rate"), 0);
rl = e_widget_ilist_add(evas, 8, 8, NULL);
e_widget_min_size_set(rl, 140, 90);
ob = e_widget_check_add(evas, _("Restore on login"), &(cfdata->restore));
e_widget_list_object_append(o2, ob, 1, 1, 0.5);
e_widget_list_object_append(o, o2, 1, 1, 0.5);
o2 = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Refresh"), 0);
rl = e_widget_ilist_add(evas, 24, 24, NULL);
e_widget_min_size_set(rl, 80, 80);
e_widget_framelist_object_append(of, rl);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
@ -422,16 +429,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
}
}
ob = e_widget_check_add(evas, _("Restore this resolution on login"), &(cfdata->restore));
e_widget_list_object_append(o2, ob, 1, 1, 0.5);
e_widget_ilist_go(ol);
e_widget_ilist_go(rl);
e_widget_list_object_append(o, o2, 1, 1, 0.5);
if ((cfdata->can_rotate) || (cfdata->can_flip))
o2 = e_widget_list_add(evas, 0, 0);
// if ((cfdata->can_rotate) || (cfdata->can_flip))
// o2 = e_widget_list_add(evas, 0, 0);
if (cfdata->can_rotate)
{
@ -439,40 +441,41 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
rg = e_widget_radio_group_new(&(cfdata->rotation));
ob = e_widget_radio_add(evas, _("Normal"), ECORE_X_RANDR_ROT_0, rg);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_normal", 24, 24, ECORE_X_RANDR_ROT_0, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_0)) e_widget_disabled_set(ob, 1);
ob = e_widget_radio_add(evas, _("To the left"), ECORE_X_RANDR_ROT_90, rg);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_left", 24, 24, ECORE_X_RANDR_ROT_90, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_90)) e_widget_disabled_set(ob, 1);
ob = e_widget_radio_add(evas, _("Turned around"), ECORE_X_RANDR_ROT_180, rg);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_around", 24, 24, ECORE_X_RANDR_ROT_180, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_180)) e_widget_disabled_set(ob, 1);
ob = e_widget_radio_add(evas, _("To the right"), ECORE_X_RANDR_ROT_270, rg);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_right", 24, 24, ECORE_X_RANDR_ROT_270, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_270)) e_widget_disabled_set(ob, 1);
e_widget_list_object_append(o2, of, 0, 0, 0.5);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
}
if (cfdata->can_flip)
{
/* FIXME: flipping is a checkbox - not radio group! */
of = e_widget_framelist_add(evas, _("Mirroring"), 0);
rg = e_widget_radio_group_new(&(cfdata->flip));
ob = e_widget_radio_add(evas, _("Horizontally"), ECORE_X_RANDR_FLIP_X, rg);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_hflip", 24, 24, ECORE_X_RANDR_FLIP_X, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_FLIP_X)) e_widget_disabled_set(ob, 1);
ob = e_widget_radio_add(evas, _("Vertically"), ECORE_X_RANDR_FLIP_Y, rg);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_vflip", 24, 24, ECORE_X_RANDR_FLIP_Y, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_FLIP_Y)) e_widget_disabled_set(ob, 1);
e_widget_list_object_append(o2, of, 0, 0, 0.5);
}
if ((cfdata->can_rotate) || (cfdata->can_flip))
e_widget_list_object_append(o, o2, 0, 0, 0.0);
// if ((cfdata->can_rotate) || (cfdata->can_flip))
e_widget_list_object_append(o, o2, 0, 0, 0.0);
return o;
}