Included as attachment.
--
Sebastian Krzyszkowiak
dos
Index: mkmenu.py
===================================================================
--- mkmenu.py (wersja 112)
+++ mkmenu.py (kopia robocza)
@@ -235,7 +235,7 @@
else:
self.config["obj_done_button"].show()
- def ProfileDeleteClicked(self,obj,event,*args,**kargs):
+ def ProfileDeleteClicked(self,obj,*args,**kargs):
print "ProfileDeleteClicked"
pfname = obj.name_get()
del self.config["profile_list"][pfname]
@@ -259,7 +259,7 @@
self.config["obj_log_entry"].entry_insert("Configuring %s...<br>" % next_dev.name)
next_dev.Apply(self.ProfileLogEntry)
- def ProfileApplyClicked(self,obj,event,*args,**kargs):
+ def ProfileApplyClicked(self,obj,*args,**kargs):
print "ProfileApplyClicked"
self.config["device_powerdown"] = False
if self.config["cfg_device_powerdown"].state_get() == 1:
@@ -292,11 +292,11 @@
# marking the start of the chain
self.ProfileLogEntry("__DONE__")
- def ProfileCancelClicked(self,obj,event,*args,**kargs):
+ def ProfileCancelClicked(self,obj,*args,**kargs):
print "ProfileCancelClicked"
self.pager.content_pop()
- def ProfileSaveClicked(self,obj,event,*args,**kargs):
+ def ProfileSaveClicked(self,obj,*args,**kargs):
print "ProfileSaveClicked"
# collect list of devices to save in profile
dev_names = []
@@ -320,7 +320,7 @@
self.config["profile_list"][nprofname] = nprof
self.pager.content_pop()
- def SelectProfileClicked(self,obj,event,*args,**kargs):
+ def SelectProfileClicked(self,obj,*args,**kargs):
print "SelectProfileClicked"
# update the profiles
self.gui_selectprofile["content"][0]["content"]["content"] = []
@@ -348,7 +348,7 @@
sbox = mkbase.EFLBuildObject(self.win,self.gui_selectprofile,self.config)
self.pager.content_push(sbox)
- def DeviceClicked(self,obj,event,*args,**kargs):
+ def DeviceClicked(self,obj,*args,**kargs):
print "DeviceClicked"
cdev = None
for dev in self.devices:
@@ -361,11 +361,11 @@
self.config["obj_device_content"].content_set(cdev.BuildDevice())
self.pager.content_push(dbox)
- def DeviceDiscardClicked(self,obj,event,*args,**kargs):
+ def DeviceDiscardClicked(self,obj,*args,**kargs):
print "DeviceDiscardClicked"
self.pager.content_pop()
- def DeviceApplyClicked(self,obj,event,*args,**kargs):
+ def DeviceApplyClicked(self,obj,*args,**kargs):
print "DeviceApplyClicked"
ibox = mkbase.EFLBuildObject(self.win,self.gui_infobox,self.config)
self.pager.content_pop()
@@ -373,20 +373,20 @@
self.current_device.UpdateConfig()
self.current_device.Apply(self.LogEntry)
- def InfoDoneClicked(self,obj,event,*args,**kargs):
+ def InfoDoneClicked(self,obj,*args,**kargs):
print "InfoDoneClicked"
self.pager.content_pop()
- def SaveProfileClicked(self,obj,event,*args,**kargs):
+ def SaveProfileClicked(self,obj,*args,**kargs):
print "SaveProfileClicked"
pbox = mkbase.EFLBuildObject(self.win,self.gui_saveprofile,self.config)
self.pager.content_push(pbox)
- def AboutClicked(self,obj,event,*args,**kargs):
+ def AboutClicked(self,obj,*args,**kargs):
print "AboutClicked"
self.about_hover.BuildHoverMessage()
- def ExitClicked(self,obj,event,*args,**kargs):
+ def ExitClicked(self,obj,*args,**kargs):
print "ExitClicked"
self.exit_func()
@@ -422,4 +422,4 @@
for dev in self.devices:
if dev.name in cfgmod.devices_config:
dev.ImportConfig(cfgmod.devices_config[dev.name])
-
\ No newline at end of file
+
Index: mokonnect.py
===================================================================
--- mokonnect.py (wersja 112)
+++ mokonnect.py (kopia robocza)
@@ -31,7 +31,7 @@
menu.SaveConfig()
elementary.exit()
-def shutdown(obj, event, *args, **kargs):
+def shutdown(obj, *args, **kargs):
exit_func()
def main():
@@ -59,7 +59,7 @@
win = elementary.Window("mokonnect", elementary.ELM_WIN_BASIC)
win.title_set("Mokonnect")
- win.destroy = shutdown
+ win.callback_destroy_add(shutdown)
win.show()
bg = elementary.Background(win)
Index: mkbase.py
===================================================================
--- mkbase.py (wersja 112)
+++ mkbase.py (kopia robocza)
@@ -27,7 +27,7 @@
def SetTimeout(interval,func,*args,**kargs):
return ecore.Timer(interval,func,*args,**kargs)
-def EFLPanelLinkChange(obj,event,*args,**kargs):
+def EFLPanelLinkChange(obj,*args,**kargs):
global EFLPanelDict
for pk in EFLPanelDict:
plink = EFLPanelDict[pk]
@@ -74,7 +74,7 @@
if "bounce" in obj_def:
robj.bounce_set(obj_def["bounce"][0],obj_def["bounce"][1])
if "clicked" in obj_def:
- robj.clicked = obj_def["clicked"]
+ robj._callback_add('clicked', obj_def["clicked"])
if "scale" in obj_def:
robj.scale_set(obj_def["scale"])
if "label" in obj_def:
@@ -165,7 +165,7 @@
def BuildHover(self):
hover = elementary.Hover(self.win)
self.win.resize_object_add(hover)
- hover.clicked = self.DestroyHover
+ hover._callback_add('clicked', self.DestroyHover)
hover.show()
box = elementary.Box(hover)
hover.parent_set(box)
@@ -204,7 +204,7 @@
{"type":"button","name":option,"label":option,"align":(-1,0),"clicked":self.OptionClicked}
)
- def OptionClicked(self,obj,event,*args,**kwargs):
+ def OptionClicked(self,obj,*args,**kwargs):
opt = obj.name_get()
self.label_dest.label_set(opt)
self.label_dest.name_set(opt)
@@ -318,4 +318,4 @@
def PowerOff(self,log):
self.powered = False
return True
-
\ No newline at end of file
+
Index: mkdev_wifi.py
===================================================================
--- mkdev_wifi.py (wersja 112)
+++ mkdev_wifi.py (kopia robocza)
@@ -245,7 +245,7 @@
if args[0] == "Services":
self.RefreshNetworks()
- def NetworkSelected(self,obj,event,*args,**kwargs):
+ def NetworkSelected(self,obj,*args,**kwargs):
self.scanning = False
# find button
netprop = None
@@ -569,4 +569,4 @@
break
except Exception,e:
print e
-
\ No newline at end of file
+
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
