From: Enlightenment S. <no-...@en...> - 2011-03-06 23:28:44
|
Log: Use prettier icons. Author: rui Date: 2011-03-06 15:28:37 -0800 (Sun, 06 Mar 2011) New Revision: 57545 Trac: http://trac.enlightenment.org/e/changeset/57545 Added: trunk/elmdentica/data/themes/Envelope_closed.png trunk/elmdentica/data/themes/Envelope_closed.svg trunk/elmdentica/data/themes/edit-clear.png trunk/elmdentica/data/themes/edit-clear.svg trunk/elmdentica/data/themes/edit-undo.png trunk/elmdentica/data/themes/edit-undo.svg trunk/elmdentica/data/themes/pitr_green_menu_icon_set_1.png trunk/elmdentica/data/themes/pitr_green_menu_icon_set_1.svg trunk/elmdentica/data/themes/pitr_green_menu_icon_set_3.png trunk/elmdentica/data/themes/pitr_green_menu_icon_set_3.svg trunk/elmdentica/data/themes/pitr_red_menu_icon_set_2.png trunk/elmdentica/data/themes/pitr_red_menu_icon_set_2.svg trunk/elmdentica/data/themes/pitr_red_menu_icon_set_3.png trunk/elmdentica/data/themes/pitr_red_menu_icon_set_3.svg Modified: trunk/elmdentica/data/themes/Makefile.am trunk/elmdentica/data/themes/default.edc trunk/elmdentica/src/elmdentica.c Property changes on: trunk/elmdentica/data/themes/Envelope_closed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/elmdentica/data/themes/Makefile.am =================================================================== --- trunk/elmdentica/data/themes/Makefile.am 2011-03-06 22:46:28 UTC (rev 57544) +++ trunk/elmdentica/data/themes/Makefile.am 2011-03-06 23:28:37 UTC (rev 57545) @@ -9,9 +9,23 @@ files_DATA = default.edj EXTRA_DIST = \ - default.edc \ - bubble_left.png \ - bubble_3.png + default.edc \ + bubble_left.png \ + bubble_3.png \ + pitr_green_menu_icon_set_1.png \ + pitr_green_menu_icon_set_1.svg \ + pitr_red_menu_icon_set_3.png \ + pitr_red_menu_icon_set_3.svg \ + pitr_green_menu_icon_set_3.png \ + pitr_green_menu_icon_set_3.svg \ + pitr_red_menu_icon_set_2.png \ + pitr_red_menu_icon_set_2.svg \ + edit-clear.png \ + edit-clear.svg \ + edit-undo.png \ + edit-undo.svg \ + Envelope_closed.png \ + Envelope_closed.svg default.edj: Makefile $(EXTRA_DIST) $(EDJE_CC) $(EDJE_FLAGS) \ Modified: trunk/elmdentica/data/themes/default.edc =================================================================== --- trunk/elmdentica/data/themes/default.edc 2011-03-06 22:46:28 UTC (rev 57544) +++ trunk/elmdentica/data/themes/default.edc 2011-03-06 23:28:37 UTC (rev 57545) @@ -14,6 +14,26 @@ } collections { + +#define STOCK_ICON(icon_file, icon_name) \ + images { image: icon_file COMP; } \ + group { name: icon_name; \ + parts { part { name: "icon"; \ + description { state: "default" 0.0; \ + image.normal: icon_file;\ + } \ + } \ + } \ + } + +STOCK_ICON("pitr_green_menu_icon_set_1.png", "icon/status/post/enabled") +STOCK_ICON("pitr_red_menu_icon_set_3.png", "icon/status/post/disabled") +STOCK_ICON("pitr_green_menu_icon_set_3.png", "icon/status/timeline/enabled") +STOCK_ICON("pitr_red_menu_icon_set_2.png", "icon/status/timeline/disabled") +STOCK_ICON("edit-clear.png", "icon/edit/clear") +STOCK_ICON("edit-undo.png", "icon/edit/hide") +STOCK_ICON("Envelope_closed.png", "icon/edit/dm") + group { name: "elmdentica/vertical_layout"; parts { part { name: "timeline"; @@ -106,14 +126,12 @@ source: "tb_event"; action: STATE_SET "default" 0.0; target: "toolbar"; - transition: LINEAR 0.1; } program { name: "show_toolbar"; signal: "mouse,clicked,1"; source: "tb_event"; action: STATE_SET "visible" 0.0; target: "toolbar"; - transition: LINEAR 0.1; } program { name: "hide_edit"; signal: "mouse,clicked,2"; @@ -121,7 +139,6 @@ action: STATE_SET "default" 0.0; target: "edit_bg"; target: "edit"; - transition: LINEAR 0.1; } program { name: "show_edit"; signal: "mouse,clicked,1"; @@ -129,7 +146,6 @@ action: STATE_SET "visible" 0.0; target: "edit_bg"; target: "edit"; - transition: LINEAR 0.1; } } } @@ -328,7 +344,6 @@ target: "name"; target: "date"; target: "text"; - transition: LINEAR 0.1; } } } Property changes on: trunk/elmdentica/data/themes/edit-clear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/elmdentica/data/themes/edit-undo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/elmdentica/data/themes/pitr_green_menu_icon_set_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/elmdentica/data/themes/pitr_green_menu_icon_set_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/elmdentica/data/themes/pitr_red_menu_icon_set_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/elmdentica/data/themes/pitr_red_menu_icon_set_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/elmdentica/src/elmdentica.c =================================================================== --- trunk/elmdentica/src/elmdentica.c 2011-03-06 22:46:28 UTC (rev 57544) +++ trunk/elmdentica/src/elmdentica.c 2011-03-06 23:28:37 UTC (rev 57545) @@ -2089,7 +2089,7 @@ evas_object_show(entry); icon = elm_icon_add(gui.win); - elm_icon_standard_set(icon, "delete"); + elm_icon_file_set(icon, theme, "icon/edit/clear"); evas_object_show(icon); bt = elm_button_add(gui.win); @@ -2110,7 +2110,7 @@ evas_object_size_hint_align_set(box2, -1, -1); icon = elm_icon_add(gui.win); - elm_icon_standard_set(icon, "edit"); + elm_icon_file_set(icon, theme, "icon/status/post/enabled"); evas_object_show(icon); gui.post = elm_button_add(gui.win); @@ -2122,8 +2122,8 @@ elm_box_pack_end(box2, gui.post); evas_object_show(gui.post); - icon = elm_photo_add(gui.win); - elm_photo_file_set(icon, "head.png"); + icon = elm_icon_add(gui.win); + elm_icon_file_set(icon, theme, "icon/edit/dm"); evas_object_show(icon); bt = elm_button_add(gui.win); @@ -2136,7 +2136,7 @@ evas_object_show(bt); icon = elm_icon_add(gui.win); - elm_icon_standard_set(icon, "delete"); + elm_icon_file_set(icon, theme, "icon/edit/hide"); evas_object_show(icon); bt = elm_button_add(gui.win); |