Changeset 7620483

Timestamp:

05/14/12 00:31:27 (13 months ago)

Author:

Martin Kolman <martin.kolman@…>

Branches:

master

Children:

67f4304

Parents:

28a54b8

git-author:

Martin Kolman <martin.kolman@…> (05/14/12 00:31:27)

git-committer:

Martin Kolman <martin.kolman@…> (05/14/12 00:31:27)

Message:

support for calling simple getter functions on modRana modules directly from QML

Location:

modules/gui_modules/gui_qml

Files:

• gui_qml.py (modified) (3 diffs)
• qml/InfoPage.qml (modified) (1 diff)

modules/gui_modules/gui_qml/gui_qml.py

@@ -118 +118 @@
     platform = Platform(self.modrana)
     rc.setContextProperty("platform", platform)
+    # make the modules accessible from QML
+    modules = Modules(self.modrana)
+    rc.setContextProperty("modules", modules)
     # make tile loading accessible from QML
     tiles = MapTiles(self)
@@ -262 +265 @@
     """
     version = self.modrana.paths.getVersionString()
-    if version == None:
+    if version is None:
       return "unknown"
     else:
       return version
-
-  @QtCore.Slot(result=str)
-  def getPayPalUrl(self):
-    m = self.modrana.getModule("info")
-    if m:
-      return m.getPayPalUrl()
-    else:
-      # fallback to hardwired link
-      return "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=martin%2ekolman%40gmail%2ecom&lc=CZ&item_name=The%20modRana%20project&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted"
 
   #  @QtCore.Slot()
@@ -313 +307 @@
     return self.modrana.dmod.getDeviceIDString() == "n900"
 
+class Modules(QtCore.QObject):
+  """
+  modRana module access from QML
+  """
+  def __init__(self, modrana):
+    QtCore.QObject.__init__(self)
+    self.modrana = modrana
+
+  @QtCore.Slot(str, str, result=str)
+  def getS(self, moduleName, functionName):
+    return self._mCall(moduleName, functionName)
+
+  @QtCore.Slot(str, str, result=bool)
+  def getB(self, moduleName, functionName):
+    return self._mCall(moduleName, functionName)
+
+  @QtCore.Slot(str, str, result=int)
+  def getI(self, moduleName, functionName):
+    return self._mCall(moduleName, functionName)
+
+  @QtCore.Slot(str, str, result=float)
+  def getF(self, moduleName, functionName):
+    return self._mCall(moduleName, functionName)
+
+  def _mCall(self, moduleName, functionName):
+    """
+    call the getter function for a given module
+    """
+    m = self.modrana.getModule(moduleName, None)
+    if m:
+      try:
+        function = getattr(m, functionName)
+        result = function()
+        return result
+      except Exception, e:
+        print("QML GUI: calling function %s on module %s failed" % (functionName, moduleName))
+        print(e)
+        return None
+    else:
+      print("QML GUI: module %s not loaded" % moduleName)
+      return None
 
 class IconImageProvider(QDeclarativeImageProvider):

modules/gui_modules/gui_qml/qml/InfoPage.qml

@@ -47 +47 @@
             onClicked : {
                 console.log('donation button clicked')
-                Qt.openUrlExternally(platform.getPayPalUrl())
+                Qt.openUrlExternally(modules.getS("info", "getPayPalUrl"))
             }
         }