summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Lima Chaves <glima@profusion.mobi>2011-08-30 16:48:09 +0000
committerGustavo Lima Chaves <glima@profusion.mobi>2011-08-30 16:48:09 +0000
commitc93038f443a75c62ca48aa46ab8563eeadb0a2ad (patch)
tree4f50e3224bffc67a282919396f09b255c30eaf86
parenta7795759b591670868015f9e7ad3ec4764691557 (diff)
[editje] Remove warnings from deprecated func calls.
SVN revision: 62996
-rw-r--r--editje/about.py8
-rw-r--r--editje/actions_box.py2
-rw-r--r--editje/animations.py4
-rw-r--r--editje/details_part.py2
-rw-r--r--editje/details_widget_boolean.py4
-rw-r--r--editje/details_widget_button.py2
-rw-r--r--editje/details_widget_button_list.py4
-rw-r--r--editje/details_widget_combo.py4
-rw-r--r--editje/details_widget_states.py8
-rw-r--r--editje/editje.py8
-rw-r--r--editje/error_notify.py4
-rw-r--r--editje/fileselector.py12
-rw-r--r--editje/floater.py6
-rw-r--r--editje/groupselector.py6
-rw-r--r--editje/openfile.py6
-rw-r--r--editje/parts.py16
-rw-r--r--editje/popup_win.py2
-rw-r--r--editje/popups.py6
-rw-r--r--editje/signals.py4
19 files changed, 54 insertions, 54 deletions
diff --git a/editje/about.py b/editje/about.py
index 6b5de71..3788072 100644
--- a/editje/about.py
+++ b/editje/about.py
@@ -38,17 +38,17 @@ class About(Wizard):
38 self.content_add("default", ico) 38 self.content_add("default", ico)
39 39
40 name = elementary.Label(self) 40 name = elementary.Label(self)
41 name.label_set("<b>Editje " + str(sysconfig.VERSION) + "</b>") 41 name.text_set("<b>Editje " + str(sysconfig.VERSION) + "</b>")
42 name.show() 42 name.show()
43 self.content_add("default", name) 43 self.content_add("default", name)
44 44
45 name = elementary.Label(self) 45 name = elementary.Label(self)
46 name.label_set("Copyright (C) 2009-2010") 46 name.text_set("Copyright (C) 2009-2010")
47 name.show() 47 name.show()
48 self.content_add("default", name) 48 self.content_add("default", name)
49 49
50 name = elementary.Label(self) 50 name = elementary.Label(self)
51 name.label_set("Samsung Electronics.") 51 name.text_set("Samsung Electronics.")
52 name.show() 52 name.show()
53 self.content_add("default", name) 53 self.content_add("default", name)
54 54
@@ -68,7 +68,7 @@ class About(Wizard):
68 self.content_add("default", sc) 68 self.content_add("default", sc)
69 69
70 copyright = elementary.Label(self) 70 copyright = elementary.Label(self)
71 copyright.label_set( 71 copyright.text_set(
72"Editje is free software: you can redistribute it and/or modify it <br>" 72"Editje is free software: you can redistribute it and/or modify it <br>"
73"under the terms of the GNU Lesser General Public License as <br>" 73"under the terms of the GNU Lesser General Public License as <br>"
74"published by the Free Software Foundation, either version 3 of the<br>" 74"published by the Free Software Foundation, either version 3 of the<br>"
diff --git a/editje/actions_box.py b/editje/actions_box.py
index 03f2484..7cabf34 100644
--- a/editje/actions_box.py
+++ b/editje/actions_box.py
@@ -33,7 +33,7 @@ class ActionsBox(elementary.Box):
33 btn = elementary.Button(self) 33 btn = elementary.Button(self)
34 #btn.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 34 #btn.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
35 #btn.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) 35 #btn.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0)
36 btn.label_set(label) 36 btn.text_set(label)
37 37
38 if func_cb: 38 if func_cb:
39 btn.callback_clicked_add(func_cb, data) 39 btn.callback_clicked_add(func_cb, data)
diff --git a/editje/animations.py b/editje/animations.py
index 37c36cf..fcb12ee 100644
--- a/editje/animations.py
+++ b/editje/animations.py
@@ -244,7 +244,7 @@ class AnimationsPartsList(PartsList):
244 self, elementary.ELM_NOTIFY_ORIENT_CENTER) 244 self, elementary.ELM_NOTIFY_ORIENT_CENTER)
245 self._notification.title = "Part Removal" 245 self._notification.title = "Part Removal"
246 lb = elementary.Label(self._notification) 246 lb = elementary.Label(self._notification)
247 lb.label_set("Are you sure you want to remove<br>" 247 lb.text_set("Are you sure you want to remove<br>"
248 "this part from the animation?") 248 "this part from the animation?")
249 lb.show() 249 lb.show()
250 self._notification.pack_end(lb) 250 self._notification.pack_end(lb)
@@ -356,7 +356,7 @@ class NewAnimationWizard(Wizard):
356 self._anim_name_entry.show() 356 self._anim_name_entry.show()
357 357
358 lbl = elementary.Label(self) 358 lbl = elementary.Label(self)
359 lbl.label_set("Select the parts to use in the animation." 359 lbl.text_set("Select the parts to use in the animation."
360 " An empty selection will use all parts.") 360 " An empty selection will use all parts.")
361 self.content_add("default", lbl) 361 self.content_add("default", lbl)
362 lbl.show() 362 lbl.show()
diff --git a/editje/details_part.py b/editje/details_part.py
index 56b5304..d2e94ba 100644
--- a/editje/details_part.py
+++ b/editje/details_part.py
@@ -479,7 +479,7 @@ class PartDetails(EditjeDetails):
479 bx.show() 479 bx.show()
480 480
481 lb = Label(self) 481 lb = Label(self)
482 lb.label_set(message) 482 lb.text_set(message)
483 bx.pack_end(lb) 483 bx.pack_end(lb)
484 lb.show() 484 lb.show()
485 485
diff --git a/editje/details_widget_boolean.py b/editje/details_widget_boolean.py
index 8a59d75..c339699 100644
--- a/editje/details_widget_boolean.py
+++ b/editje/details_widget_boolean.py
@@ -44,6 +44,6 @@ class WidgetBoolean(WidgetButton):
44 44
45 def _update(self): 45 def _update(self):
46 if self.value: 46 if self.value:
47 self.obj.label_set(self._label_true) 47 self.obj.text_set(self._label_true)
48 else: 48 else:
49 self.obj.label_set(self._label_false) 49 self.obj.text_set(self._label_false)
diff --git a/editje/details_widget_button.py b/editje/details_widget_button.py
index 54cf46f..35f8364 100644
--- a/editje/details_widget_button.py
+++ b/editje/details_widget_button.py
@@ -35,7 +35,7 @@ class WidgetButton(Widget):
35 35
36 def _internal_value_set(self, value): 36 def _internal_value_set(self, value):
37 self._value = value or "" 37 self._value = value or ""
38 self.obj.label_set(self._value) 38 self.obj.text_set(self._value)
39 39
40 def _internal_value_get(self): 40 def _internal_value_get(self):
41 return self._value 41 return self._value
diff --git a/editje/details_widget_button_list.py b/editje/details_widget_button_list.py
index e843181..870319e 100644
--- a/editje/details_widget_button_list.py
+++ b/editje/details_widget_button_list.py
@@ -57,9 +57,9 @@ class WidgetButtonList(FloaterListOpener, WidgetButton):
57 return 57 return
58 58
59 if self._value: 59 if self._value:
60 self.obj.label_set(self._value) 60 self.obj.text_set(self._value)
61 else: 61 else:
62 self.obj.label_set("< None >") 62 self.obj.text_set("< None >")
63 63
64 def _floater_list_items_update(self): 64 def _floater_list_items_update(self):
65 items_list = [] 65 items_list = []
diff --git a/editje/details_widget_combo.py b/editje/details_widget_combo.py
index 4ec2924..b002bd8 100644
--- a/editje/details_widget_combo.py
+++ b/editje/details_widget_combo.py
@@ -35,7 +35,7 @@ class WidgetCombo(Widget):
35 def _internal_value_set(self, value): 35 def _internal_value_set(self, value):
36 for it in self.items: 36 for it in self.items:
37 if value == it.label_get(): 37 if value == it.label_get():
38 self.obj.label_set(value) 38 self.obj.text_set(value)
39 break 39 break
40 40
41 def _internal_value_get(self): 41 def _internal_value_get(self):
@@ -55,7 +55,7 @@ class WidgetCombo(Widget):
55 def _hover_item_selected_cb(self, obj, it, item, *args, **kwargs): 55 def _hover_item_selected_cb(self, obj, it, item, *args, **kwargs):
56 if self.obj.label_get() == item: 56 if self.obj.label_get() == item:
57 return 57 return
58 self.obj.label_set(item) 58 self.obj.text_set(item)
59 self._callback_call("changed") 59 self._callback_call("changed")
60 60
61 def tooltip_set(self, label): 61 def tooltip_set(self, label):
diff --git a/editje/details_widget_states.py b/editje/details_widget_states.py
index 60b0f94..af773ab 100644
--- a/editje/details_widget_states.py
+++ b/editje/details_widget_states.py
@@ -211,7 +211,7 @@ class WidgetStates(WidgetEntryButton):
211 211
212 def _action_button_add(self, label, callback, state): 212 def _action_button_add(self, label, callback, state):
213 btn = Button(self._pop) 213 btn = Button(self._pop)
214 btn.label_set(label) 214 btn.text_set(label)
215 btn.callback_clicked_add(callback, state) 215 btn.callback_clicked_add(callback, state)
216 btn.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) 216 btn.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
217 btn.size_hint_weight_set(0.0, 0.0) 217 btn.size_hint_weight_set(0.0, 0.0)
@@ -224,9 +224,9 @@ class WidgetStates(WidgetEntryButton):
224 self.actions_box = Box(self._pop) 224 self.actions_box = Box(self._pop)
225 name_box = Box(self._pop) 225 name_box = Box(self._pop)
226 lb_state = Label(self._pop) 226 lb_state = Label(self._pop)
227 lb_state.label_set("<b>State: ") 227 lb_state.text_set("<b>State: ")
228 lb_name = Label(self._pop) 228 lb_name = Label(self._pop)
229 lb_name.label_set(strstate) 229 lb_name.text_set(strstate)
230 name_box.horizontal_set(True) 230 name_box.horizontal_set(True)
231 name_box.pack_end(lb_state) 231 name_box.pack_end(lb_state)
232 lb_state.show() 232 lb_state.show()
@@ -235,7 +235,7 @@ class WidgetStates(WidgetEntryButton):
235 self.actions_box.pack_end(name_box) 235 self.actions_box.pack_end(name_box)
236 name_box.show() 236 name_box.show()
237 space = Label(self._pop) 237 space = Label(self._pop)
238 space.label_set(" ") 238 space.text_set(" ")
239 self.actions_box.pack_end(space) 239 self.actions_box.pack_end(space)
240 space.show() 240 space.show()
241 self._action_button_add("Change to", self._states_select_cb, state) 241 self._action_button_add("Change to", self._states_select_cb, state)
diff --git a/editje/editje.py b/editje/editje.py
index 54f93f2..3b46721 100644
--- a/editje/editje.py
+++ b/editje/editje.py
@@ -272,7 +272,7 @@ class Editje(elementary.Window, OpenFileManager):
272 nt.repeat_events_set(True) 272 nt.repeat_events_set(True)
273 273
274 lb = elementary.Label(nt) 274 lb = elementary.Label(nt)
275 lb.label_set("Save Error " + str(err)) 275 lb.text_set("Save Error " + str(err))
276 nt.content_set(lb) 276 nt.content_set(lb)
277 lb.show() 277 lb.show()
278 278
@@ -806,7 +806,7 @@ class Editje(elementary.Window, OpenFileManager):
806 self._modes_selector.tooltip_text_set("Change between the edition" 806 self._modes_selector.tooltip_text_set("Change between the edition"
807 " modes:<br>" 807 " modes:<br>"
808 "Parts, Animations and Signals") 808 "Parts, Animations and Signals")
809 self._modes_selector.label_set("Mode") 809 self._modes_selector.text_set("Mode")
810 self._modes_selector.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 810 self._modes_selector.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
811 self._modes_selector.size_hint_align_set( 811 self._modes_selector.size_hint_align_set(
812 evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) 812 evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
@@ -930,7 +930,7 @@ class Editje(elementary.Window, OpenFileManager):
930 930
931 self._context_restore(self.mode) 931 self._context_restore(self.mode)
932 932
933 self._modes_selector.label_set("Mode: " + self.mode) 933 self._modes_selector.text_set("Mode: " + self.mode)
934 934
935 theme_file, group, edje_type = item.icon_get() 935 theme_file, group, edje_type = item.icon_get()
936 ico = elementary.Icon(self) 936 ico = elementary.Icon(self)
@@ -1248,7 +1248,7 @@ class Editje(elementary.Window, OpenFileManager):
1248 bx.show() 1248 bx.show()
1249 1249
1250 lb = elementary.Label(self) 1250 lb = elementary.Label(self)
1251 lb.label_set(message) 1251 lb.text_set(message)
1252 bx.pack_end(lb) 1252 bx.pack_end(lb)
1253 lb.show() 1253 lb.show()
1254 1254
diff --git a/editje/error_notify.py b/editje/error_notify.py
index a7ee372..741c6b6 100644
--- a/editje/error_notify.py
+++ b/editje/error_notify.py
@@ -49,7 +49,7 @@ class ErrorNotify(elementary.Notify):
49 49
50 def _title_set(self, title): 50 def _title_set(self, title):
51 self._title_value = title 51 self._title_value = title
52 self._title.label_set("<b>" + title + "</b>") 52 self._title.text_set("<b>" + title + "</b>")
53 53
54 def _title_get(self): 54 def _title_get(self):
55 return self._title_value 55 return self._title_value
@@ -90,7 +90,7 @@ if __name__ == "__main__":
90 nt.action_add('WWW', None) 90 nt.action_add('WWW', None)
91 91
92 lb = elementary.Label(nt) 92 lb = elementary.Label(nt)
93 lb.label_set("XXXXXXXXXXXXXX<br>XXXXXXXXXXX<br>XXXXXXXXXXXXXX<br>") 93 lb.text_set("XXXXXXXXXXXXXX<br>XXXXXXXXXXX<br>XXXXXXXXXXXXXX<br>")
94 lb.show() 94 lb.show()
95 nt.pack_end(lb) 95 nt.pack_end(lb)
96 96
diff --git a/editje/fileselector.py b/editje/fileselector.py
index b9a2caa..8dcdb48 100644
--- a/editje/fileselector.py
+++ b/editje/fileselector.py
@@ -65,7 +65,7 @@ class FileSelector(Manager, elementary.Table):
65 self._nav_home = elementary.Button(self) 65 self._nav_home = elementary.Button(self)
66 self._nav_home.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 66 self._nav_home.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
67 self._nav_home.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) 67 self._nav_home.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0)
68 self._nav_home.label_set("Home") 68 self._nav_home.text_set("Home")
69 ic = elementary.Icon(self) 69 ic = elementary.Icon(self)
70 ic.standard_set("home") 70 ic.standard_set("home")
71 ic.scale_set(0, 0) 71 ic.scale_set(0, 0)
@@ -84,7 +84,7 @@ class FileSelector(Manager, elementary.Table):
84 self._nav_up = elementary.Button(self) 84 self._nav_up = elementary.Button(self)
85 self._nav_up.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 85 self._nav_up.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
86 self._nav_up.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) 86 self._nav_up.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0)
87 self._nav_up.label_set("Up") 87 self._nav_up.text_set("Up")
88 ic = elementary.Icon(self) 88 ic = elementary.Icon(self)
89 ic.standard_set("arrow_up") 89 ic.standard_set("arrow_up")
90 ic.scale_set(0, 0) 90 ic.scale_set(0, 0)
@@ -204,7 +204,7 @@ class FileSelector(Manager, elementary.Table):
204 self._hidden.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) 204 self._hidden.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
205 self._hidden.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 205 self._hidden.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
206 self._hidden.state_set(False) 206 self._hidden.state_set(False)
207 self._hidden.label_set("Show hidden files") 207 self._hidden.text_set("Show hidden files")
208 self._hidden.callback_changed_add(self._update) 208 self._hidden.callback_changed_add(self._update)
209 bx.pack_end(self._hidden) 209 bx.pack_end(self._hidden)
210 self._hidden.show() 210 self._hidden.show()
@@ -212,7 +212,7 @@ class FileSelector(Manager, elementary.Table):
212 self._filter = elementary.Check(self) 212 self._filter = elementary.Check(self)
213 self._filter.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) 213 self._filter.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
214 self._filter.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 214 self._filter.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
215 self._filter.label_set("Filter extensions") 215 self._filter.text_set("Filter extensions")
216 self._filter.state_set(False) 216 self._filter.state_set(False)
217 self._filter.callback_changed_add(self._update) 217 self._filter.callback_changed_add(self._update)
218 bx.pack_end(self._filter) 218 bx.pack_end(self._filter)
@@ -376,7 +376,7 @@ class FileSelector(Manager, elementary.Table):
376 btn = elementary.Button(self) 376 btn = elementary.Button(self)
377 btn.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 377 btn.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
378 btn.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) 378 btn.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0)
379 btn.label_set(label) 379 btn.text_set(label)
380 380
381 if func_cb: 381 if func_cb:
382 btn.callback_clicked_add(func_cb) 382 btn.callback_clicked_add(func_cb)
@@ -409,7 +409,7 @@ class FileSelector(Manager, elementary.Table):
409 self._notification.orient_set(elementary.ELM_NOTIFY_ORIENT_BOTTOM) 409 self._notification.orient_set(elementary.ELM_NOTIFY_ORIENT_BOTTOM)
410 410
411 lb = elementary.Label(self) 411 lb = elementary.Label(self)
412 lb.label_set(message) 412 lb.text_set(message)
413 self._notification.content_set(lb) 413 self._notification.content_set(lb)
414 lb.show() 414 lb.show()
415 415
diff --git a/editje/floater.py b/editje/floater.py
index b27f08b..5dbcc14 100644
--- a/editje/floater.py
+++ b/editje/floater.py
@@ -128,7 +128,7 @@ class Floater(Layout):
128 def action_add(self, label, func_cb, data=None): 128 def action_add(self, label, func_cb, data=None):
129 btn = Button(self._parent) 129 btn = Button(self._parent)
130 self._action_btns.append(btn) 130 self._action_btns.append(btn)
131 btn.label_set(label) 131 btn.text_set(label)
132 btn.callback_clicked_add(self._action_btn_clicked) 132 btn.callback_clicked_add(self._action_btn_clicked)
133 btn.size_hint_weight_set(1.0, 1.0) 133 btn.size_hint_weight_set(1.0, 1.0)
134 btn.size_hint_align_set(-1.0, -1.0) 134 btn.size_hint_align_set(-1.0, -1.0)
@@ -177,7 +177,7 @@ class Floater(Layout):
177class WizardAction(Button): 177class WizardAction(Button):
178 def __init__(self, parent, label, func, key=None, data=None): 178 def __init__(self, parent, label, func, key=None, data=None):
179 Button.__init__(self, parent) 179 Button.__init__(self, parent)
180 self.label_set(label) 180 self.text_set(label)
181 self.callback_clicked_add(self.__action_btn_clicked) 181 self.callback_clicked_add(self.__action_btn_clicked)
182 self.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 182 self.size_hint_weight_set(evas.EVAS_HINT_EXPAND,
183 evas.EVAS_HINT_EXPAND) 183 evas.EVAS_HINT_EXPAND)
@@ -351,7 +351,7 @@ class Wizard(InnerWindow):
351 bx.show() 351 bx.show()
352 352
353 lb = Label(self) 353 lb = Label(self)
354 lb.label_set(message) 354 lb.text_set(message)
355 bx.pack_end(lb) 355 bx.pack_end(lb)
356 lb.show() 356 lb.show()
357 357
diff --git a/editje/groupselector.py b/editje/groupselector.py
index faffcde..5dc0da9 100644
--- a/editje/groupselector.py
+++ b/editje/groupselector.py
@@ -128,12 +128,12 @@ class NameEntry(elementary.Box):
128 self._entry_bx.show() 128 self._entry_bx.show()
129 129
130 entry_lb = elementary.Label(parent) 130 entry_lb = elementary.Label(parent)
131 entry_lb.label_set("Name: ") 131 entry_lb.text_set("Name: ")
132 entry_lb.show() 132 entry_lb.show()
133 self._entry_bx.pack_end(entry_lb) 133 self._entry_bx.pack_end(entry_lb)
134 134
135 self._status_lb = elementary.Label(parent) 135 self._status_lb = elementary.Label(parent)
136 self._status_lb.label_set("") 136 self._status_lb.text_set("")
137 self._status_lb.show() 137 self._status_lb.show()
138 138
139 scroller = elementary.Scroller(parent) 139 scroller = elementary.Scroller(parent)
@@ -174,7 +174,7 @@ class NameEntry(elementary.Box):
174 entry = property(fset=_entry_set, fget=_entry_get) 174 entry = property(fset=_entry_set, fget=_entry_get)
175 175
176 def _status_label_set(self, value): 176 def _status_label_set(self, value):
177 self._status_lb.label_set(value) 177 self._status_lb.text_set(value)
178 178
179 def _status_label_get(self): 179 def _status_label_get(self):
180 status_label = self._status_lb.label_get() 180 status_label = self._status_lb.label_get()
diff --git a/editje/openfile.py b/editje/openfile.py
index bb7d9b5..9a8cf4c 100644
--- a/editje/openfile.py
+++ b/editje/openfile.py
@@ -150,7 +150,7 @@ class OpenFile(elementary.Window):
150 bx.show() 150 bx.show()
151 151
152 lb = elementary.Label(self) 152 lb = elementary.Label(self)
153 lb.label_set(message) 153 lb.text_set(message)
154 bx.pack_end(lb) 154 bx.pack_end(lb)
155 lb.show() 155 lb.show()
156 156
@@ -167,7 +167,7 @@ class OpenFile(elementary.Window):
167 if isinstance(err, IOError) and err.errno == errno.EEXIST: 167 if isinstance(err, IOError) and err.errno == errno.EEXIST:
168 self._notification.title = "Swap file already exists" 168 self._notification.title = "Swap file already exists"
169 lb = elementary.Label(self._notification) 169 lb = elementary.Label(self._notification)
170 lb.label_set( 170 lb.text_set(
171 "Another program may be editing the same file<br>" + 171 "Another program may be editing the same file<br>" +
172 "or a previous edition session for this file crashed.") 172 "or a previous edition session for this file crashed.")
173 self._notification.pack_end(lb) 173 self._notification.pack_end(lb)
@@ -178,7 +178,7 @@ class OpenFile(elementary.Window):
178 elif isinstance(err, swapfile.CompileError): 178 elif isinstance(err, swapfile.CompileError):
179 self._notification.title = "Compiler Error" 179 self._notification.title = "Compiler Error"
180 lb = elementary.Label(self._notification) 180 lb = elementary.Label(self._notification)
181 lb.label_set(str(err.message).replace('\n', '<br>')) 181 lb.text_set(str(err.message).replace('\n', '<br>'))
182 self._notification.pack_end(lb) 182 self._notification.pack_end(lb)
183 lb.show() 183 lb.show()
184 self._notification.action_add("Ok", self._notify_abort) 184 self._notification.action_add("Ok", self._notify_abort)
diff --git a/editje/parts.py b/editje/parts.py
index a01cecb..285f095 100644
--- a/editje/parts.py
+++ b/editje/parts.py
@@ -80,7 +80,7 @@ class PartsList(CList):
80 for s in self._selected.iterkeys(): 80 for s in self._selected.iterkeys():
81 item = self._items[s] 81 item = self._items[s]
82 if item.label_get() == data[0]: 82 if item.label_get() == data[0]:
83 item.label_set(data[1]) 83 item.text_set(data[1])
84 self._selected[data[1]] = self._selected[data[0]] 84 self._selected[data[1]] = self._selected[data[0]]
85 self._items[data[1]] = self._items[data[0]] 85 self._items[data[1]] = self._items[data[0]]
86 del self._selected[data[0]] 86 del self._selected[data[0]]
@@ -616,7 +616,7 @@ class PartSetup(elementary.Box):
616 616
617 def __reference_init(self): 617 def __reference_init(self):
618 fr = elementary.Frame(self) 618 fr = elementary.Frame(self)
619 fr.label_set("Reference") 619 fr.text_set("Reference")
620 fr.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 620 fr.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
621 fr.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) 621 fr.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
622 self.pack_end(fr) 622 self.pack_end(fr)
@@ -632,7 +632,7 @@ class PartSetup(elementary.Box):
632 rdg.state_value_set(0) 632 rdg.state_value_set(0)
633 rdg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) 633 rdg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
634 rdg.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) 634 rdg.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
635 rdg.label_set("Group") 635 rdg.text_set("Group")
636 fbx.pack_end(rdg) 636 fbx.pack_end(rdg)
637 rdg.show() 637 rdg.show()
638 self.__reference = rdg 638 self.__reference = rdg
@@ -648,7 +648,7 @@ class PartSetup(elementary.Box):
648 rd.state_value_set(1) 648 rd.state_value_set(1)
649 rd.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) 649 rd.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
650 rd.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) 650 rd.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
651 rd.label_set("Part") 651 rd.text_set("Part")
652 rd.group_add(rdg) 652 rd.group_add(rdg)
653 rd.disabled_set(True) 653 rd.disabled_set(True)
654 fbx2.pack_end(rd) 654 fbx2.pack_end(rd)
@@ -656,7 +656,7 @@ class PartSetup(elementary.Box):
656 656
657 def __position_init(self): 657 def __position_init(self):
658 fr = elementary.Frame(self) 658 fr = elementary.Frame(self)
659 fr.label_set("Position") 659 fr.text_set("Position")
660 fr.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) 660 fr.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
661 fr.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) 661 fr.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
662 self.pack_end(fr) 662 self.pack_end(fr)
@@ -773,7 +773,7 @@ class PartSetup(elementary.Box):
773 773
774 def __size_init(self): 774 def __size_init(self):
775 fr = elementary.Frame(self) 775 fr = elementary.Frame(self)
776 fr.label_set("Size") 776 fr.text_set("Size")
777 fr.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) 777 fr.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
778 fr.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) 778 fr.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
779 self.pack_end(fr) 779 self.pack_end(fr)
@@ -789,7 +789,7 @@ class PartSetup(elementary.Box):
789 rdg.state_value_set(0) 789 rdg.state_value_set(0)
790 rdg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) 790 rdg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
791 rdg.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) 791 rdg.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
792 rdg.label_set("Fill reference") 792 rdg.text_set("Fill reference")
793 fbx.pack_end(rdg) 793 fbx.pack_end(rdg)
794 rdg.show() 794 rdg.show()
795 self.__size = rdg 795 self.__size = rdg
@@ -805,7 +805,7 @@ class PartSetup(elementary.Box):
805 rd.state_value_set(1) 805 rd.state_value_set(1)
806 rd.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) 806 rd.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
807 rd.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) 807 rd.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
808 rd.label_set("Fixed size:") 808 rd.text_set("Fixed size:")
809 rd.group_add(rdg) 809 rd.group_add(rdg)
810 rd.disabled_set(True) 810 rd.disabled_set(True)
811 fbx2.pack_end(rd) 811 fbx2.pack_end(rd)
diff --git a/editje/popup_win.py b/editje/popup_win.py
index 43b0eff..5836f6c 100644
--- a/editje/popup_win.py
+++ b/editje/popup_win.py
@@ -73,7 +73,7 @@ if __name__ == "__main__":
73 pop.action_add('WWW', None) 73 pop.action_add('WWW', None)
74 74
75 lb = elementary.Label(pop) 75 lb = elementary.Label(pop)
76 lb.label_set("XXXXXXXXXXXXXX<br>XXXXXXXXXXX<br>XXXXXXXXXXXXXX<br>") 76 lb.text_set("XXXXXXXXXXXXXX<br>XXXXXXXXXXX<br>XXXXXXXXXXXXXX<br>")
77 lb.show() 77 lb.show()
78 pop.pack_end(lb) 78 pop.pack_end(lb)
79 79
diff --git a/editje/popups.py b/editje/popups.py
index e0e65b4..abf7466 100644
--- a/editje/popups.py
+++ b/editje/popups.py
@@ -61,16 +61,16 @@ class ConfirmPopUp(PopUp):
61 PopUp.__init__(self, parent, group or "editje/confirm") 61 PopUp.__init__(self, parent, group or "editje/confirm")
62 self.style_set("minimal") 62 self.style_set("minimal")
63 63
64 self.label_set("header.title", "Overwrite existing file ?") 64 self.text_set("header.title", "Overwrite existing file ?")
65 65
66 self._set_controls() 66 self._set_controls()
67 67
68 def set_message(self, message): 68 def set_message(self, message):
69 self.label_set("filename", message) 69 self.text_set("filename", message)
70 70
71 def action_add(self, label, func_cb, data=None): 71 def action_add(self, label, func_cb, data=None):
72 btn = Button(self) 72 btn = Button(self)
73 btn.label_set(label) 73 btn.text_set(label)
74 btn.data["clicked"] = (func_cb, data) 74 btn.data["clicked"] = (func_cb, data)
75 btn.callback_clicked_add(self._action_btn_clicked) 75 btn.callback_clicked_add(self._action_btn_clicked)
76 btn.size_hint_min_set(100, 30) 76 btn.size_hint_min_set(100, 30)
diff --git a/editje/signals.py b/editje/signals.py
index 5defaa1..dcc17ba 100644
--- a/editje/signals.py
+++ b/editje/signals.py
@@ -111,7 +111,7 @@ class SignalsList(CList):
111 for s in self._selected.iterkeys(): 111 for s in self._selected.iterkeys():
112 item = self._items[s] 112 item = self._items[s]
113 if item.label_get() == old_name: 113 if item.label_get() == old_name:
114 item.label_set(new_name) 114 item.text_set(new_name)
115 self._selected[new_name] = self._selected[old_name] 115 self._selected[new_name] = self._selected[old_name]
116 self._items[new_name] = self._items[old_name] 116 self._items[new_name] = self._items[old_name]
117 del self._selected[old_name] 117 del self._selected[old_name]
@@ -563,7 +563,7 @@ class SignalDetails(EditjeDetails):
563 bx.show() 563 bx.show()
564 564
565 lb = Label(self) 565 lb = Label(self)
566 lb.label_set(message) 566 lb.text_set(message)
567 bx.pack_end(lb) 567 bx.pack_end(lb)
568 lb.show() 568 lb.show()
569 569