From e2222e18c7b30e82a5886c13a441c3c953c518b1 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 2 Jul 2006 17:25:18 +0000 Subject: [PATCH] add icons for randr rotation and flipping SVN revision: 23658 --- TODO | 3 + data/themes/default_icons.edc | 134 +++++++++++++++++- data/themes/images/Makefile.am | 7 +- data/themes/images/e17_icon_screen_around.png | Bin 0 -> 915 bytes data/themes/images/e17_icon_screen_hflip.png | Bin 0 -> 910 bytes data/themes/images/e17_icon_screen_left.png | Bin 0 -> 878 bytes data/themes/images/e17_icon_screen_normal.png | Bin 0 -> 816 bytes data/themes/images/e17_icon_screen_right.png | Bin 0 -> 925 bytes data/themes/images/e17_icon_screen_vflip.png | Bin 0 -> 890 bytes src/bin/e_int_config_display.c | 49 ++++--- 10 files changed, 168 insertions(+), 25 deletions(-) create mode 100644 data/themes/images/e17_icon_screen_around.png create mode 100644 data/themes/images/e17_icon_screen_hflip.png create mode 100644 data/themes/images/e17_icon_screen_left.png create mode 100644 data/themes/images/e17_icon_screen_normal.png create mode 100644 data/themes/images/e17_icon_screen_right.png create mode 100644 data/themes/images/e17_icon_screen_vflip.png diff --git a/TODO b/TODO index 24543cd7e..415118cd8 100644 --- a/TODO +++ b/TODO @@ -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 ]]] [[[ diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc index 445b5478c..a109d4914 100644 --- a/data/themes/default_icons.edc +++ b/data/themes/default_icons.edc @@ -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; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index df374e6a3..8ec33bac7 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -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 - diff --git a/data/themes/images/e17_icon_screen_around.png b/data/themes/images/e17_icon_screen_around.png new file mode 100644 index 0000000000000000000000000000000000000000..5885668f87625dc86f3efd9b6ff9ec218b9e35b6 GIT binary patch literal 915 zcmV;E18n?>P)Fp zj>*~auJ^~xPxocg{fAnr5cTf0tkYDBuPZESX9+&wEz%B5pf*bqoboR2m-X$4&eO!Jl)#b>H-EZ zIcNlEx7+V;Zf-V@kB?DGA*G~Jt@7}}18z^hht|VnwFD(03`3gDCI<%xc%DbCRy$Z- zUHuH`0s)XX=bX&T(rUHT;o%{bN`+#vNV#&GPrvwzw`+G9Sf8hn=4qt43KK5+j?j42 zYBlEO=GfWU!CG4a?f?~_07&u|K(E(RLI~0{B~4R4`nXP^P{1OQQlXSW2!V4Bhs2_A z&M`AH!{Xv1Ns<(RXvqPA3 z%+AhYtyMrVi(cg)jdhWfk~B^6eIKPHcs^2Sq||(~^%Ey&ZLZqC@yY#p9)9r72vRDQ zxV*d+*Bw9Crg0pTmq;lE&Z4zK=>iCWxm9AaY=;feixI+&GPv;^~*;pZd3%OGPJXswx;n85e_;X#|=(ik27&AoC5TZ;Ma_>{j+ zL(b05aL!?jq1|rddETo50Q2+nEG;cztsO--H95)sFTdvT58qStPG~e5tgWq)Bne59 zP%f8QUtfQ9iIh_8?d=go5%qd~1i0u1G=F@=FF!Xqxfo!K8MSkorY|kiSO$3)?e6X} z7z|imUZ&sgv$3&3>!e99jER$>)BInhX^OR$f0M8gAP9m%y4{M z??Bf%XLK&HLWmUT0Z)K11IquP)G5#h+8JzIO|vX?HtPNjqrYx8gTxuYI_KQjjg~>g p3nCXcC{ez**Ds#eer3M-_7AM@zz>NzR{slt3s);8(!Nr3&4@Nd78>1m%i5g%f zO9p0=?ad0k(>>i))#btN&I}^EiP^)xNu|5K-sk;%3Z8Wl&bg-w;Qb3x2=RXux^otn z9&B!Is>#X8;bya`_V)G^Komu2tpz|F#}sRYL{Wt2c@Ci6ZkvsbjWfUkwg4&tf*`oQ zzP^62zrT-C3MnN@DTEMso>$I`y-KBmloHSLsMTtWkB|SdxVZQ+5CR>*IOm*Kgk^hs zTkY=d(r7f$T9+eDQ?%Ax8}VtjPq}{@_3dk|saC5jEiGLEt^%#xiwLk~4#F^0LI{j8 zePeohn&;B{eDuK#LF<_B54!yD<1K<9D9h63-!IQ)Sw@y+3aA4$KoxprZ^osR7-O*3GBY#7{QNus zH{Sh_fst#By!{^IH*PXII?Bq*N(qu>8Gy+36;&wu0Maz22+`Ek6mxTP;Q7eG7l_sK zG(*WzC~*TrxXKk?8Ede*y2{|-AkI08qPesWiVz(h9`Y#aGTfNJt5gtDVT~r!8mBc* zrx+(VIXNK=L+bVVfA&S62TCc7F|=AOKL6@#9winXhlEj=v)B+unr`P5=Nv!Zxy#zx z8cC9H85?*Pg~%8~^SH$q-~GX-@7MX}R-1P0(+SU*d;I~`;a6Gv@>`N5!CH&87AfW9 zsX{4LUeH$a`~DH1{dNaC^d=8dpE!!R9qe%XaEET(#pcHJQD6dS97J4Txp;yQ k75`c9!}HXi%x7Qz25VT;?$GC$H~;_u07*qoM6N<$f|<*s=l}o! literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_icon_screen_left.png b/data/themes/images/e17_icon_screen_left.png new file mode 100644 index 0000000000000000000000000000000000000000..2debe427cddc4382712973b374aef41f97488971 GIT binary patch literal 878 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 literal 0 HcmV?d00001 diff --git a/src/bin/e_int_config_display.c b/src/bin/e_int_config_display.c index 4a027a08e..b63e8e0aa 100644 --- a/src/bin/e_int_config_display.c +++ b/src/bin/e_int_config_display.c @@ -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; }