[pyatspi2] Update to correspond with dbus spec
- From: Mike Gorse <mgorse src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pyatspi2] Update to correspond with dbus spec
- Date: Mon, 16 Nov 2009 18:31:55 +0000 (UTC)
commit 5358ff631cf197b0caabeade0cffa7b07884fafd
Author: Mike Gorse <mgorse novell com>
Date: Fri Oct 30 14:58:40 2009 -0400
Update to correspond with dbus spec
Upper-cased method names per the recommendation in the dbus specification.
pyatspi/action.py | 12 ++++++------
pyatspi/application.py | 6 +++---
pyatspi/cache.py | 6 +++---
pyatspi/collection.py | 14 +++++++-------
pyatspi/component.py | 16 ++++++++--------
pyatspi/deviceevent.py | 16 ++++++++--------
pyatspi/document.py | 6 +++---
pyatspi/editabletext.py | 12 ++++++------
pyatspi/hyperlink.py | 10 +++++-----
pyatspi/hypertext.py | 4 ++--
pyatspi/image.py | 10 +++++-----
pyatspi/selection.py | 14 +++++++-------
pyatspi/table.py | 40 ++++++++++++++++++++--------------------
pyatspi/text.py | 36 ++++++++++++++++++------------------
pyatspi/value.py | 8 ++++----
15 files changed, 105 insertions(+), 105 deletions(-)
---
diff --git a/pyatspi/action.py b/pyatspi/action.py
index d52a13b..f0359df 100644
--- a/pyatspi/action.py
+++ b/pyatspi/action.py
@@ -42,7 +42,7 @@ class Action(Accessible):
@return : an array of an array of strings in the form
[[name, description, keybinding], ...]
"""
- func = self.get_dbus_method("getActions", dbus_interface=ATSPI_ACTION)
+ func = self.get_dbus_method("GetActions", dbus_interface=ATSPI_ACTION)
return func()
def doAction(self, index):
@@ -53,7 +53,7 @@ class Action(Accessible):
Causes the object to perform the specified action.
@return : a boolean indicating success or failure.
"""
- func = self.get_dbus_method("doAction", dbus_interface=ATSPI_ACTION)
+ func = self.get_dbus_method("DoAction", dbus_interface=ATSPI_ACTION)
return func(index)
def getDescription(self, index):
@@ -67,7 +67,7 @@ class Action(Accessible):
@return : a string containing the description of the specified
action.
"""
- func = self.get_dbus_method("getDescription", dbus_interface=ATSPI_ACTION)
+ func = self.get_dbus_method("GetDescription", dbus_interface=ATSPI_ACTION)
return func(index)
def getKeyBinding(self, index):
@@ -79,7 +79,7 @@ class Action(Accessible):
@return : a string containing the key binding for the specified
action, or an empty string ("") if none exists.
"""
- func = self.get_dbus_method("getKeyBinding", dbus_interface=ATSPI_ACTION)
+ func = self.get_dbus_method("GetKeyBinding", dbus_interface=ATSPI_ACTION)
return func(index)
def getName(self, index):
@@ -92,11 +92,11 @@ class Action(Accessible):
the result of invoking the action.
@return : a string containing the name of the specified action.
"""
- func = self.get_dbus_method("getName", dbus_interface=ATSPI_ACTION)
+ func = self.get_dbus_method("GetName", dbus_interface=ATSPI_ACTION)
return func(index)
def get_nActions(self):
- return dbus.Int32(self._pgetter(self._dbus_interface, "nActions"))
+ return dbus.Int32(self._pgetter(self._dbus_interface, "NActions"))
_nActionsDoc = \
"""
nActions: a long containing the number of actions this object
diff --git a/pyatspi/application.py b/pyatspi/application.py
index 791b1e7..ffa4b5b 100644
--- a/pyatspi/application.py
+++ b/pyatspi/application.py
@@ -40,11 +40,11 @@ class Application(Accessible):
@return a string compliant with the POSIX standard for locale
description.
"""
- func = self.get_dbus_method("getLocale", dbus_interface=ATSPI_APPLICATION)
+ func = self.get_dbus_method("GetLocale", dbus_interface=ATSPI_APPLICATION)
return func(local_type)
def get_toolkitName(self):
- return dbus.String(self._pgetter(self._dbus_interface, "toolkitName"))
+ return dbus.String(self._pgetter(self._dbus_interface, "ToolkitName"))
_toolkitNameDoc = \
"""
A string indicating the type of user interface toolkit which
@@ -53,7 +53,7 @@ class Application(Accessible):
toolkitName = property(fget=get_toolkitName, doc=_toolkitNameDoc)
def get_version(self):
- return dbus.String(self._pgetter(self._dbus_interface, "version"))
+ return dbus.String(self._pgetter(self._dbus_interface, "Version"))
_versionDoc = \
"""
A string indicating the version number of the application's accessibility
diff --git a/pyatspi/cache.py b/pyatspi/cache.py
index 3d8388e..395b248 100644
--- a/pyatspi/cache.py
+++ b/pyatspi/cache.py
@@ -102,7 +102,7 @@ class ApplicationCache(object):
introspect=False)
self._app_register = dbus.Interface(obj, ATSPI_REGISTRY_INTERFACE)
- apps = self._app_register.getApplications()
+ apps = self._app_register.GetApplications()
for app in apps:
that_pid = self._bus_object.GetConnectionUnixProcessID(app)
if this_pid != that_pid:
@@ -236,7 +236,7 @@ class AccessibleCache(object):
_PATH = '/org/freedesktop/atspi/tree'
_INTERFACE = 'org.freedesktop.atspi.Tree'
- _GET_METHOD = 'getTree'
+ _GET_METHOD = 'GetTree'
_UPDATE_SIGNAL = 'updateAccessible'
_REMOVE_SIGNAL = 'removeAccessible'
@@ -262,7 +262,7 @@ class AccessibleCache(object):
self._updateMatch = self._tree_itf.connect_to_signal(self._UPDATE_SIGNAL, self._update_single)
self._removeMatch = self._tree_itf.connect_to_signal(self._REMOVE_SIGNAL, self._remove_object)
- self._root = self._tree_itf.getRoot()
+ self._root = self._tree_itf.GetRoot()
def set_factory (self, factory):
pass
diff --git a/pyatspi/collection.py b/pyatspi/collection.py
index 7643453..d52b782 100644
--- a/pyatspi/collection.py
+++ b/pyatspi/collection.py
@@ -25,31 +25,31 @@ __all__ = [
class Collection(Accessible):
def createMatchRule(self, *args, **kwargs):
- func = self.get_dbus_method("createMatchRule", dbus_interface=ATSPI_COLLECTION)
+ func = self.get_dbus_method("CreateMatchRule", dbus_interface=ATSPI_COLLECTION)
return func(*args, **kwargs)
def freeMatchRule(self, *args, **kwargs):
- func = self.get_dbus_method("freeMatchRule", dbus_interface=ATSPI_COLLECTION)
+ func = self.get_dbus_method("FreeMatchRule", dbus_interface=ATSPI_COLLECTION)
return func(*args, **kwargs)
def getActiveDescendant(self, *args, **kwargs):
- func = self.get_dbus_method("getActiveDescendant", dbus_interface=ATSPI_COLLECTION)
+ func = self.get_dbus_method("GetActiveDescendant", dbus_interface=ATSPI_COLLECTION)
return func(*args, **kwargs)
def getMatches(self, *args, **kwargs):
- func = self.get_dbus_method("getMatches", dbus_interface=ATSPI_COLLECTION)
+ func = self.get_dbus_method("GetMatches", dbus_interface=ATSPI_COLLECTION)
return func(*args, **kwargs)
def getMatchesFrom(self, *args, **kwargs):
- func = self.get_dbus_method("getMatchesFrom", dbus_interface=ATSPI_COLLECTION)
+ func = self.get_dbus_method("GetMatchesFrom", dbus_interface=ATSPI_COLLECTION)
return func(*args, **kwargs)
def getMatchesTo(self, *args, **kwargs):
- func = self.get_dbus_method("getMatchesTo", dbus_interface=ATSPI_COLLECTION)
+ func = self.get_dbus_method("GetMatchesTo", dbus_interface=ATSPI_COLLECTION)
return func(*args, **kwargs)
def isAncestorOf(self, *args, **kwargs):
- func = self.get_dbus_method("isAncestorOf", dbus_interface=ATSPI_COLLECTION)
+ func = self.get_dbus_method("IsAncestorOf", dbus_interface=ATSPI_COLLECTION)
return func(*args, **kwargs)
class MatchType(Enum):
diff --git a/pyatspi/component.py b/pyatspi/component.py
index f2c88b7..daba989 100644
--- a/pyatspi/component.py
+++ b/pyatspi/component.py
@@ -91,7 +91,7 @@ class Component(Accessible):
@return True if the specified point lies within the Component's
bounding box, False otherwise.
"""
- func = self.get_dbus_method("contains", dbus_interface=ATSPI_COMPONENT)
+ func = self.get_dbus_method("Contains", dbus_interface=ATSPI_COMPONENT)
return func(x, y, UInt32(coord_type))
def getAccessibleAtPoint(self, x, y, coord_type):
@@ -111,7 +111,7 @@ class Component(Accessible):
alpha value of 0.0 indicates that the object is fully transparent.
Negative alpha values have no defined meaning at this time.
"""
- func = self.get_dbus_method("getAlpha", dbus_interface=ATSPI_COMPONENT)
+ func = self.get_dbus_method("GetAlpha", dbus_interface=ATSPI_COMPONENT)
return func()
def getExtents(self, coord_type):
@@ -122,7 +122,7 @@ class Component(Accessible):
@return a BoundingBox which entirely contains the object's onscreen
visual representation.
"""
- func = self.get_dbus_method("getExtents", dbus_interface=ATSPI_COMPONENT)
+ func = self.get_dbus_method("GetExtents", dbus_interface=ATSPI_COMPONENT)
extents = func(UInt32(coord_type))
return BoundingBox(*extents)
@@ -130,7 +130,7 @@ class Component(Accessible):
"""
@return the ComponentLayer in which this object resides.
"""
- func = self.get_dbus_method("getLayer", dbus_interface=ATSPI_COMPONENT)
+ func = self.get_dbus_method("GetLayer", dbus_interface=ATSPI_COMPONENT)
return ComponentLayer(func())
def getMDIZOrder(self):
@@ -142,7 +142,7 @@ class Component(Accessible):
@return an integer indicating the object's place in the stacking
order.
"""
- func = self.get_dbus_method("getMDIZOrder", dbus_interface=ATSPI_COMPONENT)
+ func = self.get_dbus_method("GetMDIZOrder", dbus_interface=ATSPI_COMPONENT)
return func()
def getPosition(self, coord_type):
@@ -157,7 +157,7 @@ class Component(Accessible):
an out parameter which will be back-filled with the returned
y coordinate.
"""
- func = self.get_dbus_method("getPosition", dbus_interface=ATSPI_COMPONENT)
+ func = self.get_dbus_method("GetPosition", dbus_interface=ATSPI_COMPONENT)
return func(UInt32(coord_type))
def getSize(self):
@@ -170,7 +170,7 @@ class Component(Accessible):
@param : height
the object's vertical extents in the specified coordinate system.
"""
- func = self.get_dbus_method("getSize", dbus_interface=ATSPI_COMPONENT)
+ func = self.get_dbus_method("GetSize", dbus_interface=ATSPI_COMPONENT)
return func()
def grabFocus(self):
@@ -179,7 +179,7 @@ class Component(Accessible):
@return True if keyboard focus was successfully transferred to
the Component.
"""
- func = self.get_dbus_method("grabFocus", dbus_interface=ATSPI_COMPONENT)
+ func = self.get_dbus_method("GrabFocus", dbus_interface=ATSPI_COMPONENT)
return func()
#END----------------------------------------------------------------------------
diff --git a/pyatspi/deviceevent.py b/pyatspi/deviceevent.py
index b1b233b..83ac949 100644
--- a/pyatspi/deviceevent.py
+++ b/pyatspi/deviceevent.py
@@ -281,7 +281,7 @@ class DeviceEventController(object):
for the requested KeySet, ControllerEventMask, event types, and
EventListenerMode; otherwise returns False.
"""
- func = self._dec.get_dbus_method("registerKeystrokeListener")
+ func = self._dec.get_dbus_method("RegisterKeystrokeListener")
return func(event_listener,
_dbus.Array(keys, signature="(iisi)"),
event_mask,
@@ -304,7 +304,7 @@ class DeviceEventController(object):
@param : type
A list of KeyEventType
"""
- func = self._dec.get_dbus_method("deregisterKeystrokeListener")
+ func = self._dec.get_dbus_method("DeregisterKeystrokeListener")
return func(event_listener,
keys,
event_mask,
@@ -323,7 +323,7 @@ class DeviceEventController(object):
A list of EventType indicating which event types to listen for.
@return True if successful, False if not
"""
- func = self._dec.get_dbus_method("registerDeviceEventListener")
+ func = self._dec.get_dbus_method("RegisterDeviceEventListener")
return func(event_listener, event_types)
def deregisterDeviceEventListener(self,
@@ -337,7 +337,7 @@ class DeviceEventController(object):
A List of EventType indicating which event types to stop listening
for.
"""
- func = self._dec.get_dbus_method("deregisterDeviceEventListener")
+ func = self._dec.get_dbus_method("DeregisterDeviceEventListener")
return func(event_listener, event_types)
def notifyListenersSync(self, event):
@@ -354,7 +354,7 @@ class DeviceEventController(object):
e.g. the currently active application in the case of mouse or
keyboard events).
"""
- func = self._dec.get_dbus_method("notifyListenersSync")
+ func = self._dec.get_dbus_method("NotifyListenersSync")
return func(event)
def notifyListenersAsync(self, event):
@@ -366,7 +366,7 @@ class DeviceEventController(object):
is potentially pre-emptible. notifyListenersSync should be used
instead.
"""
- func = self._dec.get_dbus_method("notifyListenersAsync")
+ func = self._dec.get_dbus_method("NotifyListenersAsync")
return func(event)
def generateKeyboardEvent(self, keycode, keystring, type):
@@ -383,7 +383,7 @@ class DeviceEventController(object):
string (for instance from an internationalized or complex text
input method, or a composed character).
"""
- func = self._dec.get_dbus_method("generateKeyboardEvent")
+ func = self._dec.get_dbus_method("GenerateKeyboardEvent")
return func(keycode, keystring, type)
def generateMouseEvent(self, x, y, name):
@@ -396,7 +396,7 @@ class DeviceEventController(object):
@param : name
A string indicating the type of mouse event, e.g. "button1up"
"""
- func = self._dec.get_dbus_method("generateMouseEvent")
+ func = self._dec.get_dbus_method("GenerateMouseEvent")
return func(x, y, name)
#------------------------------------------------------------------------------
diff --git a/pyatspi/document.py b/pyatspi/document.py
index bba8128..3bc35d8 100644
--- a/pyatspi/document.py
+++ b/pyatspi/document.py
@@ -43,7 +43,7 @@ class Document(Accessible):
attribute, or an empty string if the attribute is unspecified
for the object.
"""
- func = self.get_dbus_method("getAttributeValue", dbus_interface=ATSPI_DOCUMENT)
+ func = self.get_dbus_method("GetAttributeValue", dbus_interface=ATSPI_DOCUMENT)
return func(key)
def getAttributes(self):
@@ -54,7 +54,7 @@ class Document(Accessible):
@return an AttributeSet containing the attributes of the document,
as name-value pairs.
"""
- func = self.get_dbus_method("getAttributes", dbus_interface=ATSPI_DOCUMENT)
+ func = self.get_dbus_method("GetAttributes", dbus_interface=ATSPI_DOCUMENT)
return [key + ':' + value for key, value in func().values()]
def getLocale(self):
@@ -64,7 +64,7 @@ class Document(Accessible):
@return a string compliant with the POSIX standard for locale
description.
"""
- func = self.get_dbus_method("getLocale", dbus_interface=ATSPI_DOCUMENT)
+ func = self.get_dbus_method("GetLocale", dbus_interface=ATSPI_DOCUMENT)
return func()
#END----------------------------------------------------------------------------
diff --git a/pyatspi/editabletext.py b/pyatspi/editabletext.py
index 1374bce..77a0997 100644
--- a/pyatspi/editabletext.py
+++ b/pyatspi/editabletext.py
@@ -39,7 +39,7 @@ class EditableText(Text):
the offset of the first character past the end of the range of
text being copied.
"""
- func = self.get_dbus_method("copyText", dbus_interface=ATSPI_EDITABLE_TEXT)
+ func = self.get_dbus_method("CopyText", dbus_interface=ATSPI_EDITABLE_TEXT)
return func(start, end)
def cutText(self, start, end):
@@ -54,7 +54,7 @@ class EditableText(Text):
text being cut.
@return True if the text was successfully cut, False otherwise.
"""
- func = self.get_dbus_method("cutText", dbus_interface=ATSPI_EDITABLE_TEXT)
+ func = self.get_dbus_method("CutText", dbus_interface=ATSPI_EDITABLE_TEXT)
return func(start, end)
def deleteText(self, start, end):
@@ -69,7 +69,7 @@ class EditableText(Text):
text being deleted.
@return True if the text was successfully deleted, False otherwise.
"""
- func = self.get_dbus_method("deleteText", dbus_interface=ATSPI_EDITABLE_TEXT)
+ func = self.get_dbus_method("DeleteText", dbus_interface=ATSPI_EDITABLE_TEXT)
return func(start, end)
def insertText(self, position, text, length):
@@ -89,7 +89,7 @@ class EditableText(Text):
@return True if the text content was successfully inserted, False
otherwise.
"""
- func = self.get_dbus_method("insertText", dbus_interface=ATSPI_EDITABLE_TEXT)
+ func = self.get_dbus_method("InsertText", dbus_interface=ATSPI_EDITABLE_TEXT)
return func(position, text, length)
def pasteText(self, position):
@@ -101,7 +101,7 @@ class EditableText(Text):
@return True if the text was successfully pasted into the Text
object, False otherwise.
"""
- func = self.get_dbus_method("pasteText", dbus_interface=ATSPI_EDITABLE_TEXT)
+ func = self.get_dbus_method("PasteText", dbus_interface=ATSPI_EDITABLE_TEXT)
return func(position)
def setTextContents(self, contents):
@@ -114,7 +114,7 @@ class EditableText(Text):
@return True if the text content was successfully changed, False
otherwise.
"""
- func = self.get_dbus_method("setTextContents", dbus_interface=ATSPI_EDITABLE_TEXT)
+ func = self.get_dbus_method("SetTextContents", dbus_interface=ATSPI_EDITABLE_TEXT)
return func(contents)
#END----------------------------------------------------------------------------
diff --git a/pyatspi/hyperlink.py b/pyatspi/hyperlink.py
index 88920e6..a4151e2 100644
--- a/pyatspi/hyperlink.py
+++ b/pyatspi/hyperlink.py
@@ -60,7 +60,7 @@ class Hyperlink(Accessible):
@return a string corresponding to the URI of the Hyperlink's
'ith' anchor, if one exists, or a NIL string otherwise.
"""
- func = self.get_dbus_method("getURI", dbus_interface=ATSPI_HYPERLINK)
+ func = self.get_dbus_method("GetURI", dbus_interface=ATSPI_HYPERLINK)
return func(index)
def isValid(self):
@@ -71,11 +71,11 @@ class Hyperlink(Accessible):
the hyperlink's URI is invalid, or a connection to the resource
can not be established.
"""
- func = self.get_dbus_method("isValid", dbus_interface=ATSPI_HYPERLINK)
+ func = self.get_dbus_method("IsValid", dbus_interface=ATSPI_HYPERLINK)
return func()
def get_endIndex(self):
- return dbus.Int32(self._pgetter(self._dbus_interface, "endIndex"))
+ return dbus.Int32(self._pgetter(self._dbus_interface, "EndIndex"))
_endIndexDoc = \
"""
the ending offset within the containing Hypertext content with
@@ -86,7 +86,7 @@ class Hyperlink(Accessible):
endIndex = property(fget=get_endIndex, doc=_endIndexDoc)
def get_nAnchors(self):
- return dbus.Int16(self._pgetter(self._dbus_interface, "nAnchors"))
+ return dbus.Int16(self._pgetter(self._dbus_interface, "NAnchors"))
_nAnchorsDoc = \
"""
the number of separate anchors associated with this Hyperlink
@@ -94,7 +94,7 @@ class Hyperlink(Accessible):
nAnchors = property(fget=get_nAnchors, doc=_nAnchorsDoc)
def get_startIndex(self):
- return dbus.Int32(self._pgetter(self._dbus_interface, "startIndex"))
+ return dbus.Int32(self._pgetter(self._dbus_interface, "StartIndex"))
_startIndexDoc = \
"""
the starting offset within the containing Hypertext content with
diff --git a/pyatspi/hypertext.py b/pyatspi/hypertext.py
index 12f5efb..226f42d 100644
--- a/pyatspi/hypertext.py
+++ b/pyatspi/hypertext.py
@@ -52,7 +52,7 @@ class Hypertext(Accessible):
offset characterIndex, or -1 if no Hyperlink is associated with
that character offset.
"""
- func = self.get_dbus_method("getLinkIndex", dbus_interface=ATSPI_HYPERTEXT)
+ func = self.get_dbus_method("GetLinkIndex", dbus_interface=ATSPI_HYPERTEXT)
return func(character_index)
def getNLinks(self):
@@ -61,7 +61,7 @@ class Hypertext(Accessible):
@return the number of Hyperlinks associated with this Hypertext
object, as a long integer.
"""
- func = self.get_dbus_method("getNLinks", dbus_interface=ATSPI_HYPERTEXT)
+ func = self.get_dbus_method("GetNLinks", dbus_interface=ATSPI_HYPERTEXT)
return func()
#END----------------------------------------------------------------------------
diff --git a/pyatspi/image.py b/pyatspi/image.py
index 2c8d9cd..a4e417d 100644
--- a/pyatspi/image.py
+++ b/pyatspi/image.py
@@ -48,7 +48,7 @@ class Image(Accessible):
to the containing window.
@return a BoundingBox enclosing the image's onscreen representation.
"""
- func = self.get_dbus_method("getImageExtents", dbus_interface=ATSPI_IMAGE)
+ func = self.get_dbus_method("GetImageExtents", dbus_interface=ATSPI_IMAGE)
return BoundingBox(*func(UInt32(coordType)))
def getImagePosition(self, coord_type):
@@ -65,7 +65,7 @@ class Image(Accessible):
to the screen; if 1, they are returned relative to the containing
window.
"""
- func = self.get_dbus_method("getImagePosition", dbus_interface=ATSPI_IMAGE)
+ func = self.get_dbus_method("GetImagePosition", dbus_interface=ATSPI_IMAGE)
return func(UInt32(coord_type))
def getImageSize(self):
@@ -81,11 +81,11 @@ class Image(Accessible):
Back-filled with the y extents of the onscreen image (i.e. the
image height in pixels)
"""
- func = self.get_dbus_method("getImageSize", dbus_interface=ATSPI_IMAGE)
+ func = self.get_dbus_method("GetImageSize", dbus_interface=ATSPI_IMAGE)
return func()
def get_imageDescription(self):
- return dbus.String(self._pgetter(self._dbus_interface, "imageDescription"))
+ return dbus.String(self._pgetter(self._dbus_interface, "ImageDescription"))
_imageDescriptionDoc = \
"""
A UTF-8 string providing a textual description of what is visually
@@ -94,7 +94,7 @@ class Image(Accessible):
imageDescription = property(fget=get_imageDescription, doc=_imageDescriptionDoc)
def get_imageLocale(self):
- return dbus.String(self._pgetter(self._dbus_interface, "imageLocale"))
+ return dbus.String(self._pgetter(self._dbus_interface, "ImageLocale"))
_imageLocaleDoc = \
"""
A string corresponding to the POSIX LC_MESSAGES locale used by
diff --git a/pyatspi/selection.py b/pyatspi/selection.py
index 9c7bb56..e7720a7 100644
--- a/pyatspi/selection.py
+++ b/pyatspi/selection.py
@@ -42,7 +42,7 @@ class Selection(Accessible):
@return True if the selections were successfully cleared, False
otherwise.
"""
- func = self.get_dbus_method("clearSelection", dbus_interface=ATSPI_SELECTION)
+ func = self.get_dbus_method("ClearSelection", dbus_interface=ATSPI_SELECTION)
return func()
def deselectChild(self, childIndex):
@@ -55,7 +55,7 @@ class Selection(Accessible):
to be selected.
@return True if the child was successfully selected, False otherwise.
"""
- func = self.get_dbus_method("deselectChild", dbus_interface=ATSPI_SELECTION)
+ func = self.get_dbus_method("DeselectChild", dbus_interface=ATSPI_SELECTION)
return func(childIndex)
def deselectSelectedChild(self, index):
@@ -69,7 +69,7 @@ class Selection(Accessible):
@return True if the child was successfully deselected, False
otherwise.
"""
- func = self.get_dbus_method("deselectSelectedChild", dbus_interface=ATSPI_SELECTION)
+ func = self.get_dbus_method("DeselectSelectedChild", dbus_interface=ATSPI_SELECTION)
return func(index)
def getSelectedChild(self, index):
@@ -95,7 +95,7 @@ class Selection(Accessible):
@return True if the specified child is currently selected, False
otherwise.
"""
- func = self.get_dbus_method("isChildSelected", dbus_interface=ATSPI_SELECTION)
+ func = self.get_dbus_method("IsChildSelected", dbus_interface=ATSPI_SELECTION)
return func(index)
def selectAll(self):
@@ -106,7 +106,7 @@ class Selection(Accessible):
support this operation).
@return True if successful, False otherwise.
"""
- func = self.get_dbus_method("selectAll", dbus_interface=ATSPI_SELECTION)
+ func = self.get_dbus_method("SelectAll", dbus_interface=ATSPI_SELECTION)
return func()
def selectChild(self, index):
@@ -117,11 +117,11 @@ class Selection(Accessible):
be selected.
@return True if the child was successfully selected, False otherwise.
"""
- func = self.get_dbus_method("selectChild", dbus_interface=ATSPI_SELECTION)
+ func = self.get_dbus_method("SelectChild", dbus_interface=ATSPI_SELECTION)
return func(index)
def get_nSelectedChildren(self):
- return dbus.Int32(self._pgetter(self._dbus_interface, "nSelectedChildren"))
+ return dbus.Int32(self._pgetter(self._dbus_interface, "NSelectedChildren"))
_nSelectedChildrenDoc = \
"""
The number of children of a Selection implementor which are currently
diff --git a/pyatspi/table.py b/pyatspi/table.py
index 79d39ca..49c80e5 100644
--- a/pyatspi/table.py
+++ b/pyatspi/table.py
@@ -47,7 +47,7 @@ class Table(Accessible):
@return True if the specified column was successfully selected,
False if not.
"""
- func = self.get_dbus_method("addColumnSelection", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("AddColumnSelection", dbus_interface=ATSPI_TABLE)
return func(column)
def addRowSelection(self, row):
@@ -58,7 +58,7 @@ class Table(Accessible):
@return True if the specified row was successfully selected,
False if not.
"""
- func = self.get_dbus_method("addRowSelection", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("AddRowSelection", dbus_interface=ATSPI_TABLE)
return func(row)
def getAccessibleAt(self, row, column):
@@ -84,7 +84,7 @@ class Table(Accessible):
@return a long integer indicating the first column spanned by
the child of a table, at the specified 1-D (zero-offset) index.
"""
- func = self.get_dbus_method("getColumnAtIndex", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetColumnAtIndex", dbus_interface=ATSPI_TABLE)
return func(index)
def getColumnDescription(self, column):
@@ -96,7 +96,7 @@ class Table(Accessible):
@return a UTF-8 string describing the specified table column,
if available.
"""
- func = self.get_dbus_method("getColumnDescription", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetColumnDescription", dbus_interface=ATSPI_TABLE)
return func(column)
def getColumnExtentAt(self, row, column):
@@ -111,7 +111,7 @@ class Table(Accessible):
@return a long integer indicating the number of columns spanned
by the specified cell.
"""
- func = self.get_dbus_method("getColumnExtentAt", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetColumnExtentAt", dbus_interface=ATSPI_TABLE)
return func(row, column)
def getColumnHeader(self, index):
@@ -139,7 +139,7 @@ class Table(Accessible):
@return a long integer which serves as the index of a specified
cell in the table, in a form usable by Accessible::getChildAtIndex.
"""
- func = self.get_dbus_method("getIndexAt", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetIndexAt", dbus_interface=ATSPI_TABLE)
return func(row, column)
def getRowAtIndex(self, index):
@@ -151,7 +151,7 @@ class Table(Accessible):
@return a long integer indicating the first row spanned by the
child of a table, at the specified 1-D (zero-offset) index.
"""
- func = self.get_dbus_method("getRowAtIndex", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetRowAtIndex", dbus_interface=ATSPI_TABLE)
return func(index)
def getRowColumnExtentsAtIndex(self, index):
@@ -190,7 +190,7 @@ class Table(Accessible):
False if the index does not correspond to a cell. If False is
returned, the values of the out parameters are undefined.
"""
- func = self.get_dbus_method("getRowColumnExtentsAtIndex", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetRowColumnExtentsAtIndex", dbus_interface=ATSPI_TABLE)
return func(index)
def getRowDescription(self, index):
@@ -202,7 +202,7 @@ class Table(Accessible):
@return a UTF-8 string describing the specified table row, if
available.
"""
- func = self.get_dbus_method("getRowDescription", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetRowDescription", dbus_interface=ATSPI_TABLE)
return func(index)
def getRowExtentAt(self, row, column):
@@ -217,7 +217,7 @@ class Table(Accessible):
@return a long integer indicating the number of rows spanned
by the specified cell.
"""
- func = self.get_dbus_method("getRowExtentAt", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetRowExtentAt", dbus_interface=ATSPI_TABLE)
return func(row, column)
def getRowHeader(self, row):
@@ -239,7 +239,7 @@ class Table(Accessible):
@return a sequence of integers comprising the indices of columns
currently selected.
"""
- func = self.get_dbus_method("getSelectedColumns", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetSelectedColumns", dbus_interface=ATSPI_TABLE)
return func()
def getSelectedRows(self):
@@ -248,7 +248,7 @@ class Table(Accessible):
@return a sequence of integers comprising the indices of rows
currently selected.
"""
- func = self.get_dbus_method("getSelectedRows", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("GetSelectedRows", dbus_interface=ATSPI_TABLE)
return func()
def isColumnSelected(self, column):
@@ -259,7 +259,7 @@ class Table(Accessible):
@return True if the specified column is currently selected, False
if not.
"""
- func = self.get_dbus_method("isColumnSelected", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("IsColumnSelected", dbus_interface=ATSPI_TABLE)
return func(column)
def isRowSelected(self, row):
@@ -270,7 +270,7 @@ class Table(Accessible):
@return True if the specified row is currently selected, False
if not.
"""
- func = self.get_dbus_method("isRowSelected", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("IsRowSelected", dbus_interface=ATSPI_TABLE)
return func(row)
def isSelected(self, row, column):
@@ -283,7 +283,7 @@ class Table(Accessible):
@return True if the specified cell is currently selected, False
if not.
"""
- func = self.get_dbus_method("isSelected", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("IsSelected", dbus_interface=ATSPI_TABLE)
return func(row, column)
def removeColumnSelection(self, column):
@@ -294,7 +294,7 @@ class Table(Accessible):
@return True if the specified column was successfully de-selected,
False if not.
"""
- func = self.get_dbus_method("removeColumnSelection", dbus_interface=ATSPI_TABLE)
+ func = self.get_dbus_method("RemoveColumnSelection", dbus_interface=ATSPI_TABLE)
return func(column)
def removeRowSelection(self, row):
@@ -319,7 +319,7 @@ class Table(Accessible):
caption = property(fget=get_caption, doc=_captionDoc)
def get_nColumns(self):
- return dbus.Int32(self._pgetter(self._dbus_interface, "nColumns"))
+ return dbus.Int32(self._pgetter(self._dbus_interface, "NColumns"))
_nColumnsDoc = \
"""
The total number of columns in this table (including empty columns),
@@ -330,7 +330,7 @@ class Table(Accessible):
nColumns = property(fget=get_nColumns, doc=_nColumnsDoc)
def get_nRows(self):
- return dbus.Int32(self._pgetter(self._dbus_interface, "nRows"))
+ return dbus.Int32(self._pgetter(self._dbus_interface, "NRows"))
_nRowsDoc = \
"""
The total number of rows in this table (including empty rows),
@@ -340,7 +340,7 @@ class Table(Accessible):
nRows = property(fget=get_nRows, doc=_nRowsDoc)
def get_nSelectedColumns(self):
- return dbus.Int32(self._pgetter(self._dbus_interface, "nSelectedColumns"))
+ return dbus.Int32(self._pgetter(self._dbus_interface, "NSelectedColumns"))
_nSelectedColumnsDoc = \
"""
The number of columns currently selected. A selected column is
@@ -349,7 +349,7 @@ class Table(Accessible):
nSelectedColumns = property(fget=get_nSelectedColumns, doc=_nSelectedColumnsDoc)
def get_nSelectedRows(self):
- return dbus.Int32(self._pgetter(self._dbus_interface, "nSelectedRows"))
+ return dbus.Int32(self._pgetter(self._dbus_interface, "NSelectedRows"))
_nSelectedRowsDoc = \
"""
The number of rows currently selected. A selected row is one
diff --git a/pyatspi/text.py b/pyatspi/text.py
index c4647b9..f9a7b59 100644
--- a/pyatspi/text.py
+++ b/pyatspi/text.py
@@ -112,7 +112,7 @@ class Text(Accessible):
other reasons (for instance if the user does not have permission
to copy the text into the relevant selection buffer).
"""
- func = self.get_dbus_method("addSelection", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("AddSelection", dbus_interface=ATSPI_TEXT)
return func(index)
def getAttributeRun(self, offset):
@@ -164,7 +164,7 @@ class Text(Accessible):
@return the AttributeSet defined at offset, optionally including
the 'default' attributes.
"""
- func = self.get_dbus_method("getAttributeRun", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetAttributeRun", dbus_interface=ATSPI_TEXT)
[attrs, startOffset, endOffset] = func(offset, includeDefaults)
dict = [key + ':' + value for key, value in attrs.values()]
return [dict, startOffset, endOffset]
@@ -191,7 +191,7 @@ class Text(Accessible):
@return the value of attribute (name-value pair) corresponding
to "name", if defined.
"""
- func = self.get_dbus_method("getAttributeValue", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetAttributeValue", dbus_interface=ATSPI_TEXT)
return func(offset, attributeName)
def getAttributes(self, offset):
@@ -234,7 +234,7 @@ class Text(Accessible):
determines whether text which intersects the bounding box in
the y direction is included.
"""
- func = self.get_dbus_method("getBoundedRanges", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetBoundedRanges", dbus_interface=ATSPI_TEXT)
return func(x, y, width, height, UInt32(coordType), xClipType, yClipType)
def getCharacterAtOffset(self, offset):
@@ -245,7 +245,7 @@ class Text(Accessible):
UCS-4 representation of the character at the specified text offset,
or 0 if offset is out of range.
"""
- func = self.get_dbus_method("getCharacterAtOffset", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetCharacterAtOffset", dbus_interface=ATSPI_TEXT)
return func(offset)
def getCharacterExtents(self, offset, x, y, width, height, coordType):
@@ -279,7 +279,7 @@ class Text(Accessible):
window, with the x axis pointing right and the y axis pointing
down.
"""
- func = self.get_dbus_method("getCharacterExtents", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetCharacterExtents", dbus_interface=ATSPI_TEXT)
return func(offset, x, y, width, height, UInt32(coordType))
def getDefaultAttributeSet(self):
@@ -293,7 +293,7 @@ class Text(Accessible):
whereas an object whose text weight is inspecified may report
the default or implied text weight in the default AttributeSet.
"""
- func = self.get_dbus_method("getDefaultAttributeSet", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetDefaultAttributeSet", dbus_interface=ATSPI_TEXT)
return [key + ':' + value for key, value in func().values()]
def getDefaultAttributes(self):
@@ -302,7 +302,7 @@ class Text(Accessible):
@return the attributes which apply to the entire text content,
but which were not explicitly specified by the content creator.
"""
- func = self.get_dbus_method("getDefaultAttributes", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetDefaultAttributes", dbus_interface=ATSPI_TEXT)
return ';'.join([key + ':' + value for key, value in func().iteritems()])
def getNSelections(self):
@@ -317,7 +317,7 @@ class Text(Accessible):
@return the number of contiguous selections in the current Text
object.
"""
- func = self.get_dbus_method("getNSelections", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetNSelections", dbus_interface=ATSPI_TEXT)
return func()
def getOffsetAtPoint(self, x, y, coordType):
@@ -335,7 +335,7 @@ class Text(Accessible):
of the glyph whose onscreen bounds contain the point x,y, or
-1 if the point is outside the bounds of any glyph.
"""
- func = self.get_dbus_method("getOffsetAtPoint", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetOffsetAtPoint", dbus_interface=ATSPI_TEXT)
return func(x, y, UInt32(coordType))
def getRangeExtents(self, startOffset, endOffset, coordType):
@@ -366,7 +366,7 @@ class Text(Accessible):
corner of the screen; if 1, the coordinates are reported relative
to the corner of the containing toplevel window.
"""
- func = self.get_dbus_method("getRangeExtents", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetRangeExtents", dbus_interface=ATSPI_TEXT)
return func(startOffset, endOffset, UInt32(coordType))
def getSelection(self, selectionNum):
@@ -383,7 +383,7 @@ class Text(Accessible):
back-filled with the offset of the character immediately following
the resulting substring, if one exists.
"""
- func = self.get_dbus_method("getSelection", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetSelection", dbus_interface=ATSPI_TEXT)
return func(selectionNum)
def getText(self, startOffset, endOffset):
@@ -401,7 +401,7 @@ class Text(Accessible):
startOffset (inclusive) up to but not including the character
at endOffset.
"""
- func = self.get_dbus_method("getText", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetText", dbus_interface=ATSPI_TEXT)
if not endOffset:
endOffset = -1
return func(Int32(startOffset), Int32(endOffset))
@@ -431,7 +431,7 @@ class Text(Accessible):
@return a string which is a substring of the text content of
the object, delimited by the specified boundary condition.
"""
- func = self.get_dbus_method("getTextAfterOffset", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetTextAfterOffset", dbus_interface=ATSPI_TEXT)
return func(offset, type)
def getTextAtOffset(self, offset, type):
@@ -458,7 +458,7 @@ class Text(Accessible):
@return a string which is a substring of the text content of
the object, delimited by the specified boundary condition.
"""
- func = self.get_dbus_method("getTextAtOffset", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetTextAtOffset", dbus_interface=ATSPI_TEXT)
return func(offset, type)
def getTextBeforeOffset(self, offset, type):
@@ -485,7 +485,7 @@ class Text(Accessible):
@return a string which is a substring of the text content of
the object, delimited by the specified boundary condition.
"""
- func = self.get_dbus_method("getTextBeforeOffset", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("GetTextBeforeOffset", dbus_interface=ATSPI_TEXT)
return func(offset, type)
def removeSelection(self, selectionNum):
@@ -498,7 +498,7 @@ class Text(Accessible):
@return True if the selection was successfully removed, False
otherwise.
"""
- func = self.get_dbus_method("removeSelection", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("RemoveSelection", dbus_interface=ATSPI_TEXT)
return func(selectionNum)
def setCaretOffset(self, offset):
@@ -512,7 +512,7 @@ class Text(Accessible):
@return TRUE if the request was carried out, or FALSE if the
caret could not be moved to the requested position.
"""
- func = self.get_dbus_method("setCaretOffset", dbus_interface=ATSPI_TEXT)
+ func = self.get_dbus_method("SetCaretOffset", dbus_interface=ATSPI_TEXT)
return func(offset)
def setSelection(self, selectionNum, startOffset, endOffset):
diff --git a/pyatspi/value.py b/pyatspi/value.py
index 39d091f..34a6928 100644
--- a/pyatspi/value.py
+++ b/pyatspi/value.py
@@ -32,7 +32,7 @@ class Value(Accessible):
"""
def get_currentValue(self):
- return dbus.Double(self._pgetter(self._dbus_interface, "currentValue"))
+ return dbus.Double(self._pgetter(self._dbus_interface, "CurrentValue"))
def set_currentValue(self, value):
self._psetter(self._dbus_interface, "currentValue", dbus.Double(value, variant_level=1))
_currentValueDoc = \
@@ -42,7 +42,7 @@ class Value(Accessible):
currentValue = property(fget=get_currentValue, fset=set_currentValue, doc=_currentValueDoc)
def get_maximumValue(self):
- return dbus.Double(self._pgetter(self._dbus_interface, "maximumValue"))
+ return dbus.Double(self._pgetter(self._dbus_interface, "MaximumValue"))
_maximumValueDoc = \
"""
The maximum value allowed by this valuator.
@@ -50,7 +50,7 @@ class Value(Accessible):
maximumValue = property(fget=get_maximumValue, doc=_maximumValueDoc)
def get_minimumIncrement(self):
- return dbus.Double(self._pgetter(self._dbus_interface, "minimumIncrement"))
+ return dbus.Double(self._pgetter(self._dbus_interface, "MinimumIncrement"))
_minimumIncrementDoc = \
"""
The smallest incremental change which this valuator allows. If
@@ -60,7 +60,7 @@ class Value(Accessible):
minimumIncrement = property(fget=get_minimumIncrement, doc=_minimumIncrementDoc)
def get_minimumValue(self):
- return dbus.Double(self._pgetter(self._dbus_interface, "minimumValue"))
+ return dbus.Double(self._pgetter(self._dbus_interface, "MinimumValue"))
_minimumValueDoc = \
"""
The minimum value allowed by this valuator.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
