diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-23 15:10:42 +0000 |
---|---|---|
committer | Tarmac <> | 2012-11-23 15:10:42 +0000 |
commit | 7cfd1a4cececa6a44aaa3c7c6b35f1886808467e (patch) | |
tree | ce1737ac7431963279409530ca9f6fec7f812eae /tests/script/menuscript.py | |
parent | de8eea63b919b81132895dfe04ed676778c53f6f (diff) | |
parent | 5d755f40091afb5e1f2c4db1c7ba75c36e2d4a74 (diff) | |
download | qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.gz qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.bz2 qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.zip |
Removed QAction dependency from QStateAction.
Exported activate function on QStateAction.
Approved by Ugo Riboni, PS Jenkins bot.
Diffstat (limited to 'tests/script/menuscript.py')
-rw-r--r-- | tests/script/menuscript.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/script/menuscript.py b/tests/script/menuscript.py index 60cb33b..d30adc5 100644 --- a/tests/script/menuscript.py +++ b/tests/script/menuscript.py @@ -53,8 +53,9 @@ class Script(dbus.service.Object): self._list.walk() steps -= 1 + """ TODO: We only support string states for now """ @dbus.service.method(dbus_interface=INTERFACE_NAME, - in_signature='', out_signature='s') + in_signature='', out_signature='ss') def popActivatedAction(self): return self._list._activatedActions.pop(0) @@ -94,7 +95,7 @@ class Action(object): parent.append_item(item) # Action - act = Gio.SimpleAction.new(self._kargs['actionName'], None) + act = Gio.SimpleAction.new(self._kargs['actionName'], self._kargs['actionStateType']) act.connect('activate', self._list._onActionActivated) self._list._rootAction.insert(act) @@ -135,13 +136,14 @@ class ActionList(object): self._rootAction = None self._activatedActions = [] - def appendItem(self, label, actionName, link=None, parentId=None, properties=None): + def appendItem(self, label, actionName, link=None, parentId=None, properties=None, actionStateType=None): self._actions.append(Action(self, 'append', parentId=parentId, label=label, actionName=actionName, link=link, - properties=properties)) + properties=properties, + actionStateType=actionStateType)) def removeItem(self, menuId, actionName=None): self._actions.append(Action(self, 'remove', @@ -208,4 +210,4 @@ class ActionList(object): self._restore() def _onActionActivated(self, action, parameter): - self._activatedActions.append(action.get_name()) + self._activatedActions.append((action.get_name(), parameter.get_string())) |