Author: remi
Date: 2009-03-28 11:21:00 +0100 (Sat, 28 Mar 2009)
New Revision: 4231
Modified:
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/tuxisalive/api/attitunes/AttitunesContainer.py
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/tuxisalive/api/gadgets/GadgetsContainer.py
Log:
* updated "getGadget" and "getAttitune" methods. First argument can now be
element name or element index.
Modified:
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/tuxisalive/api/attitunes/AttitunesContainer.py
===================================================================
---
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/tuxisalive/api/attitunes/AttitunesContainer.py
2009-03-28 09:42:55 UTC (rev 4230)
+++
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/tuxisalive/api/attitunes/AttitunesContainer.py
2009-03-28 10:21:00 UTC (rev 4231)
@@ -82,18 +82,25 @@
self._showStringList("Attitune names :", result)
#
--------------------------------------------------------------------------
- # Get an attitune object by it name.
+ # Get an attitune object by it name or index.
#
--------------------------------------------------------------------------
- def getAttitune(self, attituneName):
- """Get an attitune object by it name.
- @param attituneName: The name of the attitune.
+ def getAttitune(self, attitune):
+ """Get an attitune object by it name or index.
+ @param attitune: The name or index of the attitune.
@return: An Attitune object or None.
"""
self.__mutex.acquire()
- for attitune in self.__attitunes:
- if attitune.getDescription().getName() == attituneName:
+ if str(type(attitune)) == "<type 'int'>":
+ if attitune in range(len(self.__attitunes)):
+ result = self.__attitunes[attitune]
self.__mutex.release()
- return attitune
+ return result
+ else:
+ for attObject in self.__attitunes:
+ if attObject.getDescription().getName() == attitune:
+ result = attObject
+ self.__mutex.release()
+ return result
self.__mutex.release()
return None
Modified:
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/tuxisalive/api/gadgets/GadgetsContainer.py
===================================================================
---
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/tuxisalive/api/gadgets/GadgetsContainer.py
2009-03-28 09:42:55 UTC (rev 4230)
+++
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/tuxisalive/api/gadgets/GadgetsContainer.py
2009-03-28 10:21:00 UTC (rev 4231)
@@ -188,14 +188,21 @@
return None
#
--------------------------------------------------------------------------
- # Get a gadget object by it name.
+ # Get a gadget object by it name or index.
#
--------------------------------------------------------------------------
- def getGadget(self, gadgetName):
- """Get a gadget object by it name.
- @param gadgetName: The name of the gadget.
+ def getGadget(self, gadget):
+ """Get a gadget object by it name or index.
+ @param gadget: The name or index of the gadget.
@return: A Gadget object or None.
"""
- return self.getGadgetByName(gadgetName)
+ if str(type(gadget)) == "<type 'int'>":
+ self.__mutex.acquire()
+ if gadget in range(len(self.__gadgets)):
+ result = self.__gadgets[gadget]
+ self.__mutex.release()
+ return result
+ self.__mutex.release()
+ return self.getGadgetByName(gadget)
#
--------------------------------------------------------------------------
# Stop all started gadgets.
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
