summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2016-10-22 12:33:32 +0200
committerDave Andreoli <dave@gurumeditation.it>2016-10-22 12:33:32 +0200
commit810623dbe4b961dbf28d64171ca9f490fc21e929 (patch)
treeb0371180c59237b6d6dd18198a5eccc09f11aa92
parent01220931fc2a47eb1571a1b0b09bd054a8af282a (diff)
Tests: use correct FDO icon names
Hope I catched them all
-rwxr-xr-xexamples/elementary/test.py1
-rw-r--r--examples/elementary/test_combobox.py4
-rw-r--r--examples/elementary/test_ctxpopup.py32
-rw-r--r--examples/elementary/test_entry.py4
-rw-r--r--examples/elementary/test_focus.py8
-rw-r--r--examples/elementary/test_hoversel.py38
-rw-r--r--examples/elementary/test_list.py22
-rw-r--r--examples/elementary/test_main_menu.py8
-rw-r--r--examples/elementary/test_menu.py12
-rw-r--r--examples/elementary/test_panel.py6
-rw-r--r--examples/elementary/test_toolbar.py18
-rw-r--r--examples/elementary/test_tooltip.py4
12 files changed, 79 insertions, 78 deletions
diff --git a/examples/elementary/test.py b/examples/elementary/test.py
index f66f0d3..573dc57 100755
--- a/examples/elementary/test.py
+++ b/examples/elementary/test.py
@@ -117,6 +117,7 @@ items = [
117 ("Ext Scroller", "test_external", "edje_external_scroller_clicked"), 117 ("Ext Scroller", "test_external", "edje_external_scroller_clicked"),
118 ("Ext Slider", "test_external", "edje_external_slider_clicked"), 118 ("Ext Slider", "test_external", "edje_external_slider_clicked"),
119 ("Ext Video", "test_external", "edje_external_video_clicked"), 119 ("Ext Video", "test_external", "edje_external_video_clicked"),
120 ("Ext Icon", "test_external", "edje_external_icon_clicked"),
120 ]), 121 ]),
121 ("Effects", [ 122 ("Effects", [
122 ("Flip", "test_flip", "flip_clicked"), 123 ("Flip", "test_flip", "flip_clicked"),
diff --git a/examples/elementary/test_combobox.py b/examples/elementary/test_combobox.py
index c60ed32..75d691b 100644
--- a/examples/elementary/test_combobox.py
+++ b/examples/elementary/test_combobox.py
@@ -14,9 +14,9 @@ class ComboboxItemClass(GenlistItemClass):
14 14
15 def content_get(self, gl, part, item_data): 15 def content_get(self, gl, part, item_data):
16 if part == 'elm.swallow.end': 16 if part == 'elm.swallow.end':
17 return Icon(gl, standard='clock') 17 return Icon(gl, standard='folder')
18 else: 18 else:
19 return Icon(gl, standard='home') 19 return Icon(gl, standard='user-home')
20 20
21 def filter_get(self, gl, key, item_data): 21 def filter_get(self, gl, key, item_data):
22 if not key: 22 if not key:
diff --git a/examples/elementary/test_ctxpopup.py b/examples/elementary/test_ctxpopup.py
index e1b86f2..cb00e53 100644
--- a/examples/elementary/test_ctxpopup.py
+++ b/examples/elementary/test_ctxpopup.py
@@ -53,16 +53,16 @@ def cb_geometry_update(cp, geom):
53def cb_item1(li, item): 53def cb_item1(li, item):
54 cp = Ctxpopup(li) 54 cp = Ctxpopup(li)
55 cp.callback_geometry_update_add(cb_geometry_update) 55 cp.callback_geometry_update_add(cb_geometry_update)
56 it = item_new(cp, "Go to home folder", "home") 56 it = item_new(cp, "Go to home folder", "user-home")
57 it = item_new(cp, "Save file", "file") 57 it = item_new(cp, "Save file", "document-save")
58 it = item_new(cp, "Delete file", "delete") 58 it = item_new(cp, "Delete file", "user-trash")
59 it = item_new(cp, "Navigate to folder", "folder") 59 it = item_new(cp, "Navigate to folder", "folder")
60 it.disabled = True 60 it.disabled = True
61 it = item_new(cp, "Edit entry", "edit") 61 it = item_new(cp, "Edit entry", "list-add")
62 it = item_new(cp, "Sate date and time", "clock") 62 it = item_new(cp, "Sate date and time", "list-remove")
63 it.disabled = True 63 it.disabled = True
64 64
65 ic = Icon(cp, standard="home", resizable=(False,False)) 65 ic = Icon(cp, standard="user-home", resizable=(False,False))
66 cp.item_prepend("Prepended item", ic, cb_items) 66 cp.item_prepend("Prepended item", ic, cb_items)
67 67
68 (x, y) = li.evas.pointer_canvas_xy_get() 68 (x, y) = li.evas.pointer_canvas_xy_get()
@@ -91,13 +91,13 @@ def cb_item1(li, item):
91 91
92def cb_item2(li, item): 92def cb_item2(li, item):
93 cp = Ctxpopup(li) 93 cp = Ctxpopup(li)
94 it = item_new(cp, "", "home") 94 it = item_new(cp, "", "user-home")
95 it = item_new(cp, "", "file") 95 it = item_new(cp, "", "user-trash")
96 it = item_new(cp, "", "delete") 96 it = item_new(cp, "", "user-bookmarks")
97 it = item_new(cp, "", "folder") 97 it = item_new(cp, "", "folder")
98 it = item_new(cp, "", "edit") 98 it = item_new(cp, "", "document-save")
99 it.disabled = True 99 it.disabled = True
100 it = item_new(cp, "", "clock") 100 it = item_new(cp, "", "document-send")
101 101
102 (x, y) = li.evas.pointer_canvas_xy_get() 102 (x, y) = li.evas.pointer_canvas_xy_get()
103 cp.move(x, y) 103 cp.move(x, y)
@@ -120,12 +120,12 @@ def cb_item3(li, item):
120def cb_item4(li, item): 120def cb_item4(li, item):
121 cp = Ctxpopup(li) 121 cp = Ctxpopup(li)
122 cp.horizontal = True 122 cp.horizontal = True
123 it = item_new(cp, "", "home") 123 it = item_new(cp, "", "user-home")
124 it = item_new(cp, "", "file") 124 it = item_new(cp, "", "document-save")
125 it = item_new(cp, "", "delete") 125 it = item_new(cp, "", "user-trash")
126 it = item_new(cp, "", "folder") 126 it = item_new(cp, "", "folder")
127 it = item_new(cp, "", "edit") 127 it = item_new(cp, "", "user-bookmarks")
128 it = item_new(cp, "", "clock") 128 it = item_new(cp, "", "document-send")
129 129
130 (x, y) = li.evas.pointer_canvas_xy_get() 130 (x, y) = li.evas.pointer_canvas_xy_get()
131 cp.move(x, y) 131 cp.move(x, y)
diff --git a/examples/elementary/test_entry.py b/examples/elementary/test_entry.py
index 880f4fb..97a28b4 100644
--- a/examples/elementary/test_entry.py
+++ b/examples/elementary/test_entry.py
@@ -315,11 +315,11 @@ def entry_scrolled_clicked(obj, item = None):
315 single_line=True, size_hint_weight=EXPAND_BOTH, 315 single_line=True, size_hint_weight=EXPAND_BOTH,
316 size_hint_align=FILL_BOTH, 316 size_hint_align=FILL_BOTH,
317 text="entry with icon and end objects") 317 text="entry with icon and end objects")
318 bt = Icon(win, standard="home", size_hint_min=(48, 48), 318 bt = Icon(win, standard="user-home", size_hint_min=(48, 48),
319 color=(128, 0, 0, 128)) 319 color=(128, 0, 0, 128))
320 bt.show() 320 bt.show()
321 en.part_content_set("icon", bt) 321 en.part_content_set("icon", bt)
322 bt = Icon(win, standard="delete", size_hint_min=(48, 48), 322 bt = Icon(win, standard="user-trash", size_hint_min=(48, 48),
323 color=(128, 0, 0, 128)) 323 color=(128, 0, 0, 128))
324 bt.show() 324 bt.show()
325 en.part_content_set("end", bt) 325 en.part_content_set("end", bt)
diff --git a/examples/elementary/test_focus.py b/examples/elementary/test_focus.py
index 48272e0..82de857 100644
--- a/examples/elementary/test_focus.py
+++ b/examples/elementary/test_focus.py
@@ -60,10 +60,10 @@ def focus_clicked(obj, item=None):
60 tb_it.disabled = True 60 tb_it.disabled = True
61 tb_it = tbar.item_append("folder-new", "World", _tb_sel) 61 tb_it = tbar.item_append("folder-new", "World", _tb_sel)
62 tb_it = tbar.item_append("object-rotate-right", "H", _tb_sel) 62 tb_it = tbar.item_append("object-rotate-right", "H", _tb_sel)
63 tb_it = tbar.item_append("mail-send", "Comes", _tb_sel) 63 tb_it = tbar.item_append("object-rotate-left", "Comes", _tb_sel)
64 tb_it = tbar.item_append("clock", "Elementary", _tb_sel) 64 tb_it = tbar.item_append("folder", "Elementary", _tb_sel)
65 65
66 tb_it = tbar.item_append("refresh", "Menu", _tb_sel) 66 tb_it = tbar.item_append("view-refresh", "Menu", _tb_sel)
67 tb_it.menu = True 67 tb_it.menu = True
68 tbar.menu_parent = win 68 tbar.menu_parent = win
69 menu = tb_it.menu 69 menu = tb_it.menu
@@ -206,7 +206,7 @@ def focus_clicked(obj, item=None):
206 mainbx.pack_end(bx) 206 mainbx.pack_end(bx)
207 bx.show() 207 bx.show()
208 208
209 fr = Frame(win, text="Frame", ) 209 fr = Frame(win, text="Frame")
210 bx.pack_end(fr) 210 bx.pack_end(fr)
211 fr.show() 211 fr.show()
212 212
diff --git a/examples/elementary/test_hoversel.py b/examples/elementary/test_hoversel.py
index 2fae927..c381179 100644
--- a/examples/elementary/test_hoversel.py
+++ b/examples/elementary/test_hoversel.py
@@ -45,35 +45,35 @@ def hoversel_clicked(obj):
45 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER) 45 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER)
46 bt.item_add("Item 1") 46 bt.item_add("Item 1")
47 bt.item_add("Item 2") 47 bt.item_add("Item 2")
48 bt.item_add("Item 3", "home", ELM_ICON_STANDARD) 48 bt.item_add("Item 3", "user-home", ELM_ICON_STANDARD)
49 bt.item_add("Item 4", "close", ELM_ICON_STANDARD) 49 bt.item_add("Item 4", "view-close", ELM_ICON_STANDARD)
50 bx.pack_end(bt) 50 bx.pack_end(bt)
51 bt.show() 51 bt.show()
52 52
53 bt = Hoversel(win, hover_parent=win, text="All Icons", 53 bt = Hoversel(win, hover_parent=win, text="All Icons",
54 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER) 54 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER)
55 bt.item_add("Item 1", "apps", ELM_ICON_STANDARD) 55 bt.item_add("Item 1", "user-trash", ELM_ICON_STANDARD)
56 bt.item_add("Item 2", "arrow_down", ELM_ICON_STANDARD) 56 bt.item_add("Item 2", "go-down", ELM_ICON_STANDARD)
57 bt.item_add("Item 3", "home", ELM_ICON_STANDARD) 57 bt.item_add("Item 3", "user-home", ELM_ICON_STANDARD)
58 bt.item_add("Item 4", "close", ELM_ICON_STANDARD) 58 bt.item_add("Item 4", "view-close", ELM_ICON_STANDARD)
59 bx.pack_end(bt) 59 bx.pack_end(bt)
60 bt.show() 60 bt.show()
61 61
62 bt = Hoversel(win, hover_parent=win, text="All Icons", 62 bt = Hoversel(win, hover_parent=win, text="All Icons",
63 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER) 63 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER)
64 bt.item_add("Item 1", "apps", ELM_ICON_STANDARD) 64 bt.item_add("Item 1", "user-trash", ELM_ICON_STANDARD)
65 bt.item_add("Item 2", os.path.join(img_path, "logo_small.png"), 65 bt.item_add("Item 2", os.path.join(img_path, "logo_small.png"),
66 ELM_ICON_FILE) 66 ELM_ICON_FILE)
67 bt.item_add("Item 3", "home", ELM_ICON_STANDARD) 67 bt.item_add("Item 3", "user-home", ELM_ICON_STANDARD)
68 bt.item_add("Item 4", "close", ELM_ICON_STANDARD) 68 bt.item_add("Item 4", "view-close", ELM_ICON_STANDARD)
69 bx.pack_end(bt) 69 bx.pack_end(bt)
70 bt.show() 70 bt.show()
71 71
72 bt = Hoversel(win, hover_parent=win, text="Disabled Hoversel", 72 bt = Hoversel(win, hover_parent=win, text="Disabled Hoversel",
73 disabled=True, size_hint_weight=WEIGHT_ZERO, 73 disabled=True, size_hint_weight=WEIGHT_ZERO,
74 size_hint_align=ALIGN_CENTER) 74 size_hint_align=ALIGN_CENTER)
75 bt.item_add("Item 1", "apps", ELM_ICON_STANDARD) 75 bt.item_add("Item 1", "folder", ELM_ICON_STANDARD)
76 bt.item_add("Item 2", "close", ELM_ICON_STANDARD) 76 bt.item_add("Item 2", "view-close", ELM_ICON_STANDARD)
77 bx.pack_end(bt) 77 bx.pack_end(bt)
78 bt.show() 78 bt.show()
79 79
@@ -82,10 +82,10 @@ def hoversel_clicked(obj):
82 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER) 82 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER)
83 ic.show() 83 ic.show()
84 84
85 bt.item_add("Item 1", "apps", ELM_ICON_STANDARD) 85 bt.item_add("Item 1", "user-trash", ELM_ICON_STANDARD)
86 bt.item_add("Item 2", "arrow_down", ELM_ICON_STANDARD) 86 bt.item_add("Item 2", "go-down", ELM_ICON_STANDARD)
87 bt.item_add("Item 3", "home", ELM_ICON_STANDARD) 87 bt.item_add("Item 3", "user-home", ELM_ICON_STANDARD)
88 bt.item_add("Item 4", "close", ELM_ICON_STANDARD) 88 bt.item_add("Item 4", "view-close", ELM_ICON_STANDARD)
89 bx.pack_end(bt) 89 bx.pack_end(bt)
90 bt.show() 90 bt.show()
91 91
@@ -93,10 +93,10 @@ def hoversel_clicked(obj):
93 auto_update=True, 93 auto_update=True,
94 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER) 94 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER)
95 95
96 bt.item_add("Item 1", "apps", ELM_ICON_STANDARD) 96 bt.item_add("Item 1", "user-trash", ELM_ICON_STANDARD)
97 bt.item_add("Item 2", "arrow_down", ELM_ICON_STANDARD) 97 bt.item_add("Item 2", "go-down", ELM_ICON_STANDARD)
98 bt.item_add("Item 3", "home", ELM_ICON_STANDARD) 98 bt.item_add("Item 3", "user-home", ELM_ICON_STANDARD)
99 bt.item_add("Item 4", "close", ELM_ICON_STANDARD) 99 bt.item_add("Item 4", "view-close", ELM_ICON_STANDARD)
100 bx.pack_end(bt) 100 bx.pack_end(bt)
101 bt.show() 101 bt.show()
102 102
diff --git a/examples/elementary/test_list.py b/examples/elementary/test_list.py
index 3f0c89e..365e9e7 100644
--- a/examples/elementary/test_list.py
+++ b/examples/elementary/test_list.py
@@ -37,12 +37,12 @@ def list_clicked(obj, item=None):
37 ic = Icon(win, file=os.path.join(img_path, "logo_small.png"), 37 ic = Icon(win, file=os.path.join(img_path, "logo_small.png"),
38 resizable=(False, False)) 38 resizable=(False, False))
39 li.item_append("Hello", ic) 39 li.item_append("Hello", ic)
40 ic = Icon(win, standard="edit", resizable=(False, False)) 40 ic = Icon(win, standard="folder", resizable=(False, False))
41 ic2 = Icon(win, standard="clock", resizable=(False, False)) 41 ic2 = Icon(win, standard="user-home", resizable=(False, False))
42 li.item_append(".", ic, ic2) 42 li.item_append(".", ic, ic2)
43 43
44 ic = Icon(win, standard="delete", resizable=(False, False)) 44 ic = Icon(win, standard="user-trash", resizable=(False, False))
45 ic2 = Icon(win, standard="clock", resizable=(False, False)) 45 ic2 = Icon(win, standard="folder", resizable=(False, False))
46 it2 = li.item_append("How", ic, ic2) 46 it2 = li.item_append("How", ic, ic2)
47 47
48 bx = Box(win, horizontal=True) 48 bx = Box(win, horizontal=True)
@@ -149,11 +149,11 @@ def list2_clicked(obj, item=None):
149 ic = Icon(win, file=os.path.join(img_path, "logo_small.png"), 149 ic = Icon(win, file=os.path.join(img_path, "logo_small.png"),
150 resizable=(False, False)) 150 resizable=(False, False))
151 li.item_append("world", ic) 151 li.item_append("world", ic)
152 ic = Icon(win, standard="edit", resizable=(False, False)) 152 ic = Icon(win, standard="folder", resizable=(False, False))
153 li.item_append(".", ic) 153 li.item_append(".", ic)
154 154
155 ic = Icon(win, standard="delete", resizable=(False, False)) 155 ic = Icon(win, standard="user-trash", resizable=(False, False))
156 ic2 = Icon(win, standard="clock", resizable=(False, False)) 156 ic2 = Icon(win, standard="go-next", resizable=(False, False))
157 it2 = li.item_append("How", ic, ic2) 157 it2 = li.item_append("How", ic, ic2)
158 158
159 bx2 = Box(win, horizontal=True) 159 bx2 = Box(win, horizontal=True)
@@ -214,17 +214,17 @@ def list3_clicked(obj, item=None):
214 ic = Icon(win, file=os.path.join(img_path, "logo_small.png"), 214 ic = Icon(win, file=os.path.join(img_path, "logo_small.png"),
215 resizable=(False, False)) 215 resizable=(False, False))
216 li.item_append("world", ic) 216 li.item_append("world", ic)
217 ic = Icon(win, standard="edit", resizable=(False, False)) 217 ic = Icon(win, standard="folder", resizable=(False, False))
218 li.item_append(".", ic) 218 li.item_append(".", ic)
219 219
220 ic = Icon(win, standard="delete", resizable=(False, False)) 220 ic = Icon(win, standard="view-close", resizable=(False, False))
221 ic2 = Icon(win, standard="clock", resizable=(False, False)) 221 ic2 = Icon(win, standard="view-refresh", resizable=(False, False))
222 it2 = li.item_append("How", ic, ic2) 222 it2 = li.item_append("How", ic, ic2)
223 223
224 bx = Box(win, horizontal=True) 224 bx = Box(win, horizontal=True)
225 bx.horizontal_set(True) 225 bx.horizontal_set(True)
226 226
227 ic = Icon(win, standard="delete", resizable=(False, False), 227 ic = Icon(win, standard="user-trash", resizable=(False, False),
228 size_hint_align=ALIGN_CENTER) 228 size_hint_align=ALIGN_CENTER)
229 bx.pack_end(ic) 229 bx.pack_end(ic)
230 ic.show() 230 ic.show()
diff --git a/examples/elementary/test_main_menu.py b/examples/elementary/test_main_menu.py
index f9893ae..2401d0f 100644
--- a/examples/elementary/test_main_menu.py
+++ b/examples/elementary/test_main_menu.py
@@ -27,19 +27,19 @@ def main_menu_clicked(obj):
27 27
28 menu = win.main_menu_get() 28 menu = win.main_menu_get()
29 29
30 menu_it = menu.item_add(None, "first item", "home") 30 menu_it = menu.item_add(None, "first item", "user-home")
31 menu.item_add(menu_it, "first item", "elementary") 31 menu.item_add(menu_it, "first item", "user-trash")
32 menu_it1 = menu.item_add(menu_it, "submenu") 32 menu_it1 = menu.item_add(menu_it, "submenu")
33 menu.item_add(menu_it1, "first item") 33 menu.item_add(menu_it1, "first item")
34 menu.item_add(menu_it1, "second item", "gimp") 34 menu.item_add(menu_it1, "second item", "gimp")
35 35
36 menu_it = menu.item_add(None, "second item") 36 menu_it = menu.item_add(None, "second item", "folder")
37 menu_it1 = menu.item_add(menu_it, "disabled item") 37 menu_it1 = menu.item_add(menu_it, "disabled item")
38 menu_it1.disabled = True 38 menu_it1.disabled = True
39 39
40 menu.item_separator_add(menu_it) 40 menu.item_separator_add(menu_it)
41 menu.item_add(menu_it, "click me :-)", None, _click_me_cb, menu_it1) 41 menu.item_add(menu_it, "click me :-)", None, _click_me_cb, menu_it1)
42 menu.item_add(menu_it, "third item", "applications-email-panel", ) 42 menu.item_add(menu_it, "third item", "folder")
43 menu_it1 = menu.item_add(menu_it, "sub menu") 43 menu_it1 = menu.item_add(menu_it, "sub menu")
44 menu.item_add(menu_it1, "first sub item") 44 menu.item_add(menu_it1, "first sub item")
45 45
diff --git a/examples/elementary/test_menu.py b/examples/elementary/test_menu.py
index f2b1a78..3d2eed6 100644
--- a/examples/elementary/test_menu.py
+++ b/examples/elementary/test_menu.py
@@ -14,7 +14,7 @@ def menu_show(rect, evtinfo, menu):
14 menu.show() 14 menu.show()
15 15
16def menu_populate_4(menu, item): 16def menu_populate_4(menu, item):
17 menu.item_add(item, "menu 2", "clock") 17 menu.item_add(item, "menu 2", "folder")
18 18
19 item2 = menu.item_add(item, "menu 3", "folder-new") 19 item2 = menu.item_add(item, "menu 3", "folder-new")
20 20
@@ -26,7 +26,7 @@ def menu_populate_4(menu, item):
26 item3 = menu.item_add(item, "Disabled item", "mail-send") 26 item3 = menu.item_add(item, "Disabled item", "mail-send")
27 item3.disabled = True 27 item3.disabled = True
28 28
29 item3 = menu.item_add(item, "Disabled item", "refresh") 29 item3 = menu.item_add(item, "Disabled item", "view-refresh")
30 item3.disabled = True 30 item3.disabled = True
31 31
32def menu_populate_3(menu, item): 32def menu_populate_3(menu, item):
@@ -36,7 +36,7 @@ def menu_populate_3(menu, item):
36 36
37 menu.item_separator_add(item) 37 menu.item_separator_add(item)
38 38
39 item3 = menu.item_add(item, "Disabled item", "clock") 39 item3 = menu.item_add(item, "Disabled item", "folder")
40 item3.disabled = True 40 item3.disabled = True
41 41
42def menu_populate_2(menu, item): 42def menu_populate_2(menu, item):
@@ -48,7 +48,7 @@ def menu_populate_2(menu, item):
48 48
49 menu.item_separator_add(item) 49 menu.item_separator_add(item)
50 50
51 item2 = menu.item_add(item, "menu 2", "refresh") 51 item2 = menu.item_add(item, "menu 2", "view-refresh")
52 52
53 menu.item_separator_add(item) 53 menu.item_separator_add(item)
54 54
@@ -58,7 +58,7 @@ def menu_populate_2(menu, item):
58 menu_populate_4(menu, item2) 58 menu_populate_4(menu, item2)
59 59
60def menu_populate_1(menu, item): 60def menu_populate_1(menu, item):
61 item2 = menu.item_add(item, "menu 1", "refresh") 61 item2 = menu.item_add(item, "menu 1", "view-refresh")
62 62
63 menu_populate_2(menu, item2) 63 menu_populate_2(menu, item2)
64 64
@@ -73,7 +73,7 @@ def menu_clicked(obj):
73 rect.show() 73 rect.show()
74 74
75 menu = Menu(win) 75 menu = Menu(win)
76 item = menu.item_add(None, "first item", "clock") 76 item = menu.item_add(None, "first item", "folder")
77 item = menu.item_add(None, "second item", "mail-send") 77 item = menu.item_add(None, "second item", "mail-send")
78 menu_populate_1(menu, item) 78 menu_populate_1(menu, item)
79 79
diff --git a/examples/elementary/test_panel.py b/examples/elementary/test_panel.py
index ee5e656..cba098c 100644
--- a/examples/elementary/test_panel.py
+++ b/examples/elementary/test_panel.py
@@ -38,7 +38,7 @@ def panel_clicked(obj):
38 38
39 toolbar = Toolbar(panel1, homogeneous=False, 39 toolbar = Toolbar(panel1, homogeneous=False,
40 shrink_mode=ELM_TOOLBAR_SHRINK_NONE) 40 shrink_mode=ELM_TOOLBAR_SHRINK_NONE)
41 toolbar.item_append("home", "Hello Toolbar") 41 toolbar.item_append("user-home", "Hello Toolbar")
42 panel1.content = toolbar 42 panel1.content = toolbar
43 toolbar.show() 43 toolbar.show()
44 44
@@ -60,7 +60,7 @@ def panel_clicked(obj):
60 60
61 li = List(panel2, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH) 61 li = List(panel2, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH)
62 for i in range(1, 50): 62 for i in range(1, 50):
63 ic = Icon(win, standard="home") 63 ic = Icon(win, standard="user-home")
64 li.item_append("Item #%d" % i, ic) 64 li.item_append("Item #%d" % i, ic)
65 panel2.content = li 65 panel2.content = li
66 li.show() 66 li.show()
@@ -86,7 +86,7 @@ def panel_clicked(obj):
86 toolbar = Toolbar(panel4, homogeneous=False, 86 toolbar = Toolbar(panel4, homogeneous=False,
87 shrink_mode=ELM_TOOLBAR_SHRINK_NONE, 87 shrink_mode=ELM_TOOLBAR_SHRINK_NONE,
88 size_hint_weight=EXPAND_HORIZ, size_hint_align=FILL_BOTH) 88 size_hint_weight=EXPAND_HORIZ, size_hint_align=FILL_BOTH)
89 toolbar.item_append("home", "Hello Toolbar") 89 toolbar.item_append("user-home", "Hello Toolbar")
90 panel4.content = toolbar 90 panel4.content = toolbar
91 toolbar.show() 91 toolbar.show()
92 92
diff --git a/examples/elementary/test_toolbar.py b/examples/elementary/test_toolbar.py
index 932d8ad..5557efb 100644
--- a/examples/elementary/test_toolbar.py
+++ b/examples/elementary/test_toolbar.py
@@ -102,21 +102,21 @@ def toolbar_clicked(obj, item=None):
102 item = tb.item_append("document-print", "Hello", tb_1) 102 item = tb.item_append("document-print", "Hello", tb_1)
103 item.disabled = True 103 item.disabled = True
104 104
105 item = tb.item_append("clock", "World,", tb_2, ph2) 105 item = tb.item_append("document-open", "World,", tb_2, ph2)
106 item.selected = True 106 item.selected = True
107 107
108 tb.item_append("folder-new", "here", tb_3, ph4) 108 tb.item_append("folder-new", "here", tb_3, ph4)
109 tb.item_append("clock", "comes", tb_4, ph4) 109 tb.item_append("document-save", "comes", tb_4, ph4)
110 tb.item_append("folder-new", "python-elementary!", tb_5, ph4) 110 tb.item_append("document-send", "python-elementary!", tb_5, ph4)
111 111
112 item = tb.item_append("clock", "Menu", tb_5, ph4) 112 item = tb.item_append("go-down", "Menu", tb_5, ph4)
113 item.menu = True 113 item.menu = True
114 tb.menu_parent = win 114 tb.menu_parent = win
115 115
116 menu = item.menu 116 menu = item.menu
117 117
118 menu.item_add(None, "Here", "clock", tb_3, ph4) 118 menu.item_add(None, "Here", "folder", tb_3, ph4)
119 menu_item = menu.item_add(None, "Comes", "refresh", tb_4, ph4) 119 menu_item = menu.item_add(None, "Comes", "view-refresh", tb_4, ph4)
120 menu.item_add(menu_item, "hey ho", "folder-new", tb_4, ph4) 120 menu.item_add(menu_item, "hey ho", "folder-new", tb_4, ph4)
121 menu.item_add(None, "python-elementary", "document-print", tb_5, ph4) 121 menu.item_add(None, "python-elementary", "document-print", tb_5, ph4)
122 122
@@ -177,15 +177,15 @@ def toolbar5_clicked(obj, item=None):
177 tb_it.state_add("object-rotate-left", "H2", tb_3b, ph4) 177 tb_it.state_add("object-rotate-left", "H2", tb_3b, ph4)
178 tb_it.priority = 150 178 tb_it.priority = 150
179 179
180 tb_it = tb.item_append("mail-send", "Comes", tb_4a, ph4) 180 tb_it = tb.item_append("object-rotate-left", "Comes", tb_4a, ph4)
181 tb_it.state_add("emptytrash", "Comes2", tb_4a, ph4) 181 tb_it.state_add("emptytrash", "Comes2", tb_4a, ph4)
182 tb_it.state_add("trashcan_full", "Comes3", tb_4a, ph4) 182 tb_it.state_add("trashcan_full", "Comes3", tb_4a, ph4)
183 tb_it.priority = 0 183 tb_it.priority = 0
184 184
185 tb_it = tb.item_append("clock", "Elementary", tb_5, ph4) 185 tb_it = tb.item_append("user-trash", "Elementary", tb_5, ph4)
186 tb_it.priority = -200 186 tb_it.priority = -200
187 187
188 tb_it = tb.item_append("refresh", "Menu") 188 tb_it = tb.item_append("view-refresh", "Menu")
189 tb_it.menu = True 189 tb_it.menu = True
190 tb_it.priority = -9999 190 tb_it.priority = -9999
191 tb.menu_parent = win 191 tb.menu_parent = win
diff --git a/examples/elementary/test_tooltip.py b/examples/elementary/test_tooltip.py
index 43e00ec..2d2b391 100644
--- a/examples/elementary/test_tooltip.py
+++ b/examples/elementary/test_tooltip.py
@@ -53,10 +53,10 @@ def tooltip_clicked(obj):
53 bx.pack_end(tb) 53 bx.pack_end(tb)
54 tb.show() 54 tb.show()
55 55
56 ti = tb.item_append("folder-new", "Open", None, None) 56 ti = tb.item_append("document-open", "Open", None, None)
57 ti.tooltip_text_set("Opens a file") 57 ti.tooltip_text_set("Opens a file")
58 58
59 ti = tb.item_append("clock", "Icon", None, None) 59 ti = tb.item_append("view-close", "Icon", None, None)
60 ti.tooltip_content_cb_set(_tt_item_icon, None) 60 ti.tooltip_content_cb_set(_tt_item_icon, None)
61 ti.tooltip_style_set("transparent") 61 ti.tooltip_style_set("transparent")
62 62