summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2011-10-24 02:27:04 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2011-10-24 02:27:04 +0000
commit23de0435b97633ea0105f6ffc13ca72d0a2f9fb6 (patch)
treec23700f93575a3c7b28009e34830653887f97f3d /legacy
parent2bb2b1f0ee2e98dff6e644f80d70118596bdbb94 (diff)
elm genlist/gengrid: Applied genlist/gengrid icons -> contents changes
to themes. Changed detour-elm and darkness theme as well. Tips) Change genlist/gengrid's "icons" to "contents" in edc. SVN revision: 64345
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/data/themes/widgets/gengrid.edc10
-rw-r--r--legacy/elementary/data/themes/widgets/genlist.edc50
-rw-r--r--legacy/elementary/src/lib/elm_gengrid.c2
-rw-r--r--legacy/elementary/src/lib/elm_genlist.c2
4 files changed, 32 insertions, 32 deletions
diff --git a/legacy/elementary/data/themes/widgets/gengrid.edc b/legacy/elementary/data/themes/widgets/gengrid.edc
index 04d6218503..adf40fa2bf 100644
--- a/legacy/elementary/data/themes/widgets/gengrid.edc
+++ b/legacy/elementary/data/themes/widgets/gengrid.edc
@@ -1,6 +1,6 @@
1group { name: "elm/gengrid/item/default/default"; 1group { name: "elm/gengrid/item/default/default";
2 data.item: "labels" "elm.text"; 2 data.item: "labels" "elm.text";
3 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 3 data.item: "contents" "elm.swallow.icon elm.swallow.end";
4 images { 4 images {
5 image: "bt_sm_base1.png" COMP; 5 image: "bt_sm_base1.png" COMP;
6 image: "bt_sm_shine.png" COMP; 6 image: "bt_sm_shine.png" COMP;
@@ -314,7 +314,7 @@ group { name: "elm/gengrid/item/default_style/default";
314 } 314 }
315 } 315 }
316 data.item: "labels" "elm.text"; 316 data.item: "labels" "elm.text";
317 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 317 data.item: "contents" "elm.swallow.icon elm.swallow.end";
318 images { 318 images {
319 image: "bt_sm_base1.png" COMP; 319 image: "bt_sm_base1.png" COMP;
320 image: "bt_sm_shine.png" COMP; 320 image: "bt_sm_shine.png" COMP;
@@ -742,7 +742,7 @@ group { name: "elm/gengrid/item/up/default";
742 742
743group { name: "elm/gengrid/item/album-preview/default"; 743group { name: "elm/gengrid/item/album-preview/default";
744 data.item: "labels" "elm.text"; 744 data.item: "labels" "elm.text";
745 data.item: "icons" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3 elm.swallow.icon.4"; 745 data.item: "contents" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3 elm.swallow.icon.4";
746 data.item: "states" "have_files"; 746 data.item: "states" "have_files";
747 images { 747 images {
748 image: "bt_sm_base1.png" COMP; 748 image: "bt_sm_base1.png" COMP;
@@ -1029,7 +1029,7 @@ group { name: "elm/gengrid/item/album-preview/default";
1029 1029
1030group { name: "elm/gengrid/item/thumb/default"; 1030group { name: "elm/gengrid/item/thumb/default";
1031 data { 1031 data {
1032 item: "icons" "elm.swallow.icon"; 1032 item: "contents" "elm.swallow.icon";
1033 item: "labels" "elm.text"; 1033 item: "labels" "elm.text";
1034 } 1034 }
1035 images { 1035 images {
@@ -1202,7 +1202,7 @@ group { name: "elm/gengrid/item/thumb/default";
1202group { name: "elm/gengrid/item/group_index/default"; 1202group { name: "elm/gengrid/item/group_index/default";
1203 data.item: "selectraise" "on"; 1203 data.item: "selectraise" "on";
1204 data.item: "labels" "elm.text"; 1204 data.item: "labels" "elm.text";
1205 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 1205 data.item: "contents" "elm.swallow.icon elm.swallow.end";
1206 // data.item: "states" ""; 1206 // data.item: "states" "";
1207 images { 1207 images {
1208 image: "bt_sm_base1.png" COMP; 1208 image: "bt_sm_base1.png" COMP;
diff --git a/legacy/elementary/data/themes/widgets/genlist.edc b/legacy/elementary/data/themes/widgets/genlist.edc
index 4ed04a4928..11b2d3fae8 100644
--- a/legacy/elementary/data/themes/widgets/genlist.edc
+++ b/legacy/elementary/data/themes/widgets/genlist.edc
@@ -1,7 +1,7 @@
1group { name: "elm/genlist/item/default/default"; 1group { name: "elm/genlist/item/default/default";
2 data.item: "selectraise" "on"; 2 data.item: "selectraise" "on";
3 data.item: "labels" "elm.text"; 3 data.item: "labels" "elm.text";
4 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 4 data.item: "contents" "elm.swallow.icon elm.swallow.end";
5 data.item: "treesize" "20"; 5 data.item: "treesize" "20";
6 // data.item: "states" ""; 6 // data.item: "states" "";
7 images { 7 images {
@@ -369,7 +369,7 @@ group { name: "elm/genlist/item/group_index/default";
369 alias: "elm/genlist/item_compress/group_index/default"; 369 alias: "elm/genlist/item_compress/group_index/default";
370 data.item: "selectraise" "on"; 370 data.item: "selectraise" "on";
371 data.item: "labels" "elm.text"; 371 data.item: "labels" "elm.text";
372 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 372 data.item: "contents" "elm.swallow.icon elm.swallow.end";
373 data.item: "treesize" "20"; 373 data.item: "treesize" "20";
374 // data.item: "states" ""; 374 // data.item: "states" "";
375 images { 375 images {
@@ -643,7 +643,7 @@ group { name: "elm/genlist/item/group_index/default";
643group { name: "elm/genlist/item_compress/message/default"; 643group { name: "elm/genlist/item_compress/message/default";
644 data.item: "selectraise" "on"; 644 data.item: "selectraise" "on";
645 data.item: "labels" "elm.title.1 elm.title.2 elm.text"; 645 data.item: "labels" "elm.title.1 elm.title.2 elm.text";
646 // data.item: "icons" "elm.swallow.icon elm.swallow.end"; 646 // data.item: "contents" "elm.swallow.icon elm.swallow.end";
647 data.item: "treesize" "20"; 647 data.item: "treesize" "20";
648 // data.item: "states" ""; 648 // data.item: "states" "";
649 images { 649 images {
@@ -997,7 +997,7 @@ group { name: "elm/genlist/item_compress/default/default";
997group { name: "elm/genlist/tree/default/default"; 997group { name: "elm/genlist/tree/default/default";
998 data.item: "selectraise" "on"; 998 data.item: "selectraise" "on";
999 data.item: "labels" "elm.text"; 999 data.item: "labels" "elm.text";
1000 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 1000 data.item: "contents" "elm.swallow.icon elm.swallow.end";
1001 data.item: "treesize" "20"; 1001 data.item: "treesize" "20";
1002 // data.item: "states" ""; 1002 // data.item: "states" "";
1003 images { 1003 images {
@@ -1426,7 +1426,7 @@ group { name: "elm/genlist/tree_compress/default/default";
1426 data.item: "stacking" "above"; 1426 data.item: "stacking" "above";
1427 data.item: "selectraise" "on"; 1427 data.item: "selectraise" "on";
1428 data.item: "labels" "elm.text"; 1428 data.item: "labels" "elm.text";
1429 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 1429 data.item: "contents" "elm.swallow.icon elm.swallow.end";
1430 data.item: "treesize" "20"; 1430 data.item: "treesize" "20";
1431 // data.item: "states" ""; 1431 // data.item: "states" "";
1432 images { 1432 images {
@@ -1833,7 +1833,7 @@ group { name: "elm/genlist/item/default_style/default";
1833 data.item: "stacking" "above"; 1833 data.item: "stacking" "above";
1834 data.item: "selectraise" "on"; 1834 data.item: "selectraise" "on";
1835 data.item: "labels" "elm.text"; 1835 data.item: "labels" "elm.text";
1836 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 1836 data.item: "contents" "elm.swallow.icon elm.swallow.end";
1837 data.item: "treesize" "20"; 1837 data.item: "treesize" "20";
1838 images { 1838 images {
1839 image: "bt_sm_base1.png" COMP; 1839 image: "bt_sm_base1.png" COMP;
@@ -2105,7 +2105,7 @@ group { name: "elm/genlist/item_odd/default_style/default";
2105 data.item: "stacking" "below"; 2105 data.item: "stacking" "below";
2106 data.item: "selectraise" "on"; 2106 data.item: "selectraise" "on";
2107 data.item: "labels" "elm.text"; 2107 data.item: "labels" "elm.text";
2108 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 2108 data.item: "contents" "elm.swallow.icon elm.swallow.end";
2109 data.item: "treesize" "20"; 2109 data.item: "treesize" "20";
2110 images { 2110 images {
2111 image: "bt_sm_base1.png" COMP; 2111 image: "bt_sm_base1.png" COMP;
@@ -2352,7 +2352,7 @@ group { name: "elm/genlist/tree/default_style/default";
2352 data.item: "stacking" "above"; 2352 data.item: "stacking" "above";
2353 data.item: "selectraise" "on"; 2353 data.item: "selectraise" "on";
2354 data.item: "labels" "elm.text"; 2354 data.item: "labels" "elm.text";
2355 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 2355 data.item: "contents" "elm.swallow.icon elm.swallow.end";
2356 data.item: "treesize" "20"; 2356 data.item: "treesize" "20";
2357 images { 2357 images {
2358 image: "bt_sm_base1.png" COMP; 2358 image: "bt_sm_base1.png" COMP;
@@ -2671,7 +2671,7 @@ group { name: "elm/genlist/tree_odd/default_style/default";
2671 data.item: "stacking" "below"; 2671 data.item: "stacking" "below";
2672 data.item: "selectraise" "on"; 2672 data.item: "selectraise" "on";
2673 data.item: "labels" "elm.text"; 2673 data.item: "labels" "elm.text";
2674 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 2674 data.item: "contents" "elm.swallow.icon elm.swallow.end";
2675 data.item: "treesize" "20"; 2675 data.item: "treesize" "20";
2676 images { 2676 images {
2677 image: "bt_sm_base1.png" COMP; 2677 image: "bt_sm_base1.png" COMP;
@@ -2967,7 +2967,7 @@ group { name: "elm/genlist/item/double_label/default";
2967 data.item: "stacking" "above"; 2967 data.item: "stacking" "above";
2968 data.item: "selectraise" "on"; 2968 data.item: "selectraise" "on";
2969 data.item: "labels" "elm.text elm.text.sub"; 2969 data.item: "labels" "elm.text elm.text.sub";
2970 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 2970 data.item: "contents" "elm.swallow.icon elm.swallow.end";
2971 data.item: "treesize" "20"; 2971 data.item: "treesize" "20";
2972 // data.item: "states" ""; 2972 // data.item: "states" "";
2973 images { 2973 images {
@@ -3279,7 +3279,7 @@ group { name: "elm/genlist/item_compress/double_label/default";
3279 data.item: "stacking" "above"; 3279 data.item: "stacking" "above";
3280 data.item: "selectraise" "on"; 3280 data.item: "selectraise" "on";
3281 data.item: "labels" "elm.text elm.text.sub"; 3281 data.item: "labels" "elm.text elm.text.sub";
3282 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 3282 data.item: "contents" "elm.swallow.icon elm.swallow.end";
3283 data.item: "treesize" "20"; 3283 data.item: "treesize" "20";
3284 // data.item: "states" ""; 3284 // data.item: "states" "";
3285 images { 3285 images {
@@ -3591,7 +3591,7 @@ group { name: "elm/genlist/item_odd/double_label/default";
3591 data.item: "stacking" "below"; 3591 data.item: "stacking" "below";
3592 data.item: "selectraise" "on"; 3592 data.item: "selectraise" "on";
3593 data.item: "labels" "elm.text elm.text.sub"; 3593 data.item: "labels" "elm.text elm.text.sub";
3594 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 3594 data.item: "contents" "elm.swallow.icon elm.swallow.end";
3595 data.item: "treesize" "20"; 3595 data.item: "treesize" "20";
3596 // data.item: "states" ""; 3596 // data.item: "states" "";
3597 images { 3597 images {
@@ -3877,7 +3877,7 @@ group { name: "elm/genlist/item_compress_odd/double_label/default";
3877 data.item: "stacking" "below"; 3877 data.item: "stacking" "below";
3878 data.item: "selectraise" "on"; 3878 data.item: "selectraise" "on";
3879 data.item: "labels" "elm.text elm.text.sub"; 3879 data.item: "labels" "elm.text elm.text.sub";
3880 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 3880 data.item: "contents" "elm.swallow.icon elm.swallow.end";
3881 data.item: "treesize" "20"; 3881 data.item: "treesize" "20";
3882 // data.item: "states" ""; 3882 // data.item: "states" "";
3883 images { 3883 images {
@@ -4164,7 +4164,7 @@ group { name: "elm/genlist/tree/double_label/default";
4164 data.item: "stacking" "above"; 4164 data.item: "stacking" "above";
4165 data.item: "selectraise" "on"; 4165 data.item: "selectraise" "on";
4166 data.item: "labels" "elm.text elm.text.sub"; 4166 data.item: "labels" "elm.text elm.text.sub";
4167 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 4167 data.item: "contents" "elm.swallow.icon elm.swallow.end";
4168 data.item: "treesize" "20"; 4168 data.item: "treesize" "20";
4169 // data.item: "states" ""; 4169 // data.item: "states" "";
4170 images { 4170 images {
@@ -4522,7 +4522,7 @@ group { name: "elm/genlist/tree_compress/double_label/default";
4522 data.item: "stacking" "above"; 4522 data.item: "stacking" "above";
4523 data.item: "selectraise" "on"; 4523 data.item: "selectraise" "on";
4524 data.item: "labels" "elm.text elm.text.sub"; 4524 data.item: "labels" "elm.text elm.text.sub";
4525 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 4525 data.item: "contents" "elm.swallow.icon elm.swallow.end";
4526 data.item: "treesize" "20"; 4526 data.item: "treesize" "20";
4527 // data.item: "states" ""; 4527 // data.item: "states" "";
4528 images { 4528 images {
@@ -4880,7 +4880,7 @@ group { name: "elm/genlist/tree_odd/double_label/default";
4880 data.item: "stacking" "below"; 4880 data.item: "stacking" "below";
4881 data.item: "selectraise" "on"; 4881 data.item: "selectraise" "on";
4882 data.item: "labels" "elm.text elm.text.sub"; 4882 data.item: "labels" "elm.text elm.text.sub";
4883 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 4883 data.item: "contents" "elm.swallow.icon elm.swallow.end";
4884 data.item: "treesize" "20"; 4884 data.item: "treesize" "20";
4885 // data.item: "states" ""; 4885 // data.item: "states" "";
4886 images { 4886 images {
@@ -5214,7 +5214,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
5214 data.item: "stacking" "above"; 5214 data.item: "stacking" "above";
5215 data.item: "selectraise" "on"; 5215 data.item: "selectraise" "on";
5216 data.item: "labels" "elm.text"; 5216 data.item: "labels" "elm.text";
5217 data.item: "icons" "elm.swallow.icon"; 5217 data.item: "contents" "elm.swallow.icon";
5218 data.item: "treesize" "20"; 5218 data.item: "treesize" "20";
5219 // data.item: "states" ""; 5219 // data.item: "states" "";
5220 images { 5220 images {
@@ -5470,7 +5470,7 @@ group { name: "elm/genlist/item_odd/icon_top_text_bottom/default";
5470 data.item: "stacking" "below"; 5470 data.item: "stacking" "below";
5471 data.item: "selectraise" "on"; 5471 data.item: "selectraise" "on";
5472 data.item: "labels" "elm.text"; 5472 data.item: "labels" "elm.text";
5473 data.item: "icons" "elm.swallow.icon"; 5473 data.item: "contents" "elm.swallow.icon";
5474 data.item: "treesize" "20"; 5474 data.item: "treesize" "20";
5475 // data.item: "states" ""; 5475 // data.item: "states" "";
5476 images { 5476 images {
@@ -5701,7 +5701,7 @@ group { name: "elm/genlist/tree/icon_top_text_bottom/default";
5701 data.item: "stacking" "above"; 5701 data.item: "stacking" "above";
5702 data.item: "selectraise" "on"; 5702 data.item: "selectraise" "on";
5703 data.item: "labels" "elm.text"; 5703 data.item: "labels" "elm.text";
5704 data.item: "icons" "elm.swallow.icon"; 5704 data.item: "contents" "elm.swallow.icon";
5705 data.item: "treesize" "20"; 5705 data.item: "treesize" "20";
5706 // data.item: "states" ""; 5706 // data.item: "states" "";
5707 images { 5707 images {
@@ -6002,7 +6002,7 @@ group { name: "elm/genlist/tree_odd/icon_top_text_bottom/default";
6002 data.item: "stacking" "below"; 6002 data.item: "stacking" "below";
6003 data.item: "selectraise" "on"; 6003 data.item: "selectraise" "on";
6004 data.item: "labels" "elm.text"; 6004 data.item: "labels" "elm.text";
6005 data.item: "icons" "elm.swallow.icon"; 6005 data.item: "contents" "elm.swallow.icon";
6006 data.item: "treesize" "20"; 6006 data.item: "treesize" "20";
6007 // data.item: "states" ""; 6007 // data.item: "states" "";
6008 images { 6008 images {
@@ -6281,7 +6281,7 @@ group { name: "elm/genlist/tree_compress_odd/double_label/default";
6281 data.item: "stacking" "below"; 6281 data.item: "stacking" "below";
6282 data.item: "selectraise" "on"; 6282 data.item: "selectraise" "on";
6283 data.item: "labels" "elm.text elm.text.sub"; 6283 data.item: "labels" "elm.text elm.text.sub";
6284 data.item: "icons" "elm.swallow.icon elm.swallow.end"; 6284 data.item: "contents" "elm.swallow.icon elm.swallow.end";
6285 data.item: "treesize" "20"; 6285 data.item: "treesize" "20";
6286 // data.item: "states" ""; 6286 // data.item: "states" "";
6287 images { 6287 images {
@@ -7849,7 +7849,7 @@ group { name: "elm/genlist/item_compress/media-preview/default";
7849 data.item: "stacking" "above"; 7849 data.item: "stacking" "above";
7850 data.item: "selectraise" "on"; 7850 data.item: "selectraise" "on";
7851 data.item: "labels" "elm.text.title elm.text.artist"; 7851 data.item: "labels" "elm.text.title elm.text.artist";
7852 data.item: "icons" "elm.swallow.preview"; 7852 data.item: "contents" "elm.swallow.preview";
7853 data.item: "treesize" "20"; 7853 data.item: "treesize" "20";
7854 images { 7854 images {
7855 image: "bt_sm_base1.png" COMP; 7855 image: "bt_sm_base1.png" COMP;
@@ -8136,7 +8136,7 @@ group { name: "elm/genlist/item_compress_odd/media-preview/default";
8136 data.item: "stacking" "below"; 8136 data.item: "stacking" "below";
8137 data.item: "selectraise" "on"; 8137 data.item: "selectraise" "on";
8138 data.item: "labels" "elm.text.title elm.text.artist"; 8138 data.item: "labels" "elm.text.title elm.text.artist";
8139 data.item: "icons" "elm.swallow.preview"; 8139 data.item: "contents" "elm.swallow.preview";
8140 data.item: "treesize" "20"; 8140 data.item: "treesize" "20";
8141 images { 8141 images {
8142 image: "bt_sm_base1.png" COMP; 8142 image: "bt_sm_base1.png" COMP;
@@ -8397,7 +8397,7 @@ group { name: "elm/genlist/item_compress_odd/media-preview/default";
8397group { name: "elm/genlist/item/mode/default"; 8397group { name: "elm/genlist/item/mode/default";
8398 data.item: "selectraise" "on"; 8398 data.item: "selectraise" "on";
8399 data.item: "labels" "elm.text.mode"; 8399 data.item: "labels" "elm.text.mode";
8400 data.item: "icons" "elm.swallow.mode"; 8400 data.item: "contents" "elm.swallow.mode";
8401 data.item: "mode_part" "elm.swallow.origin"; 8401 data.item: "mode_part" "elm.swallow.origin";
8402 data.item: "treesize" "20"; 8402 data.item: "treesize" "20";
8403 images { 8403 images {
@@ -8796,7 +8796,7 @@ group { name: "elm/genlist/item_odd/mode/default";
8796 data.item: "stacking" "below"; 8796 data.item: "stacking" "below";
8797 data.item: "selectraise" "on"; 8797 data.item: "selectraise" "on";
8798 data.item: "labels" "elm.text.mode"; 8798 data.item: "labels" "elm.text.mode";
8799 data.item: "icons" "elm.swallow.mode"; 8799 data.item: "contents" "elm.swallow.mode";
8800 data.item: "mode_part" "elm.swallow.origin"; 8800 data.item: "mode_part" "elm.swallow.origin";
8801 data.item: "treesize" "20"; 8801 data.item: "treesize" "20";
8802 images { 8802 images {
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 007bee1aa6..8ac7c1d4d1 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -965,7 +965,7 @@ _item_realize(Elm_Gen_Item *it)
965 965
966 it->contents = 966 it->contents =
967 elm_widget_stringlist_get(edje_object_data_get(VIEW(it), 967 elm_widget_stringlist_get(edje_object_data_get(VIEW(it),
968 "icons")); 968 "contents"));
969 EINA_LIST_FOREACH(it->contents, l, key) 969 EINA_LIST_FOREACH(it->contents, l, key)
970 { 970 {
971 if (it->itc->func.content_get) 971 if (it->itc->func.content_get)
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 2d9959fa51..ad13d92217 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -1702,7 +1702,7 @@ _item_content_realize(Elm_Gen_Item *it,
1702 const char *key; 1702 const char *key;
1703 Evas_Object *ic = NULL; 1703 Evas_Object *ic = NULL;
1704 1704
1705 *source = elm_widget_stringlist_get(edje_object_data_get(target, "icons")); 1705 *source = elm_widget_stringlist_get(edje_object_data_get(target, "contents"));
1706 EINA_LIST_FOREACH(*source, l, key) 1706 EINA_LIST_FOREACH(*source, l, key)
1707 { 1707 {
1708 if (it->itc->func.content_get) 1708 if (it->itc->func.content_get)