X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBEditingDialog.py;h=1a9c34de830ecd0072856099a4866e6c0832a04c;hb=be47a5d85bf0bb7903e47423f6da0007f24060ed;hp=b2007fc647020fd54a2090882f1bdbae800289ed;hpb=eab2db56e117f2989b1ad70a44a6ccb025d55cd9;p=bertos.git

diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py
index b2007fc6..1a9c34de 100644
--- a/wizard/BEditingDialog.py
+++ b/wizard/BEditingDialog.py
@@ -39,7 +39,7 @@ import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from bertos_utils import loadBertosProject, bertosVersion, getToolchainName
+from bertos_utils import loadBertosProject, bertosVersion, getToolchainName, createBertosProject
 from toolchain_validation import validateToolchain
 import qvariant_converter
 import BModulePage
@@ -80,6 +80,7 @@ class BEditingDialog(QDialog):
 
     def setupToolchainMenu(self):
         self.toolchain_menu = QMenu(self.tr("select toolchain"))
+        self.toolchain_actions = []
         action_group = QActionGroup(self.toolchain_menu)
         for toolchain in sorted(self.toolchains()):
             info = validateToolchain(toolchain)
@@ -92,9 +93,11 @@ class BEditingDialog(QDialog):
             action.setCheckable(True)
             action.setChecked(True if toolchain == self.currentToolchain()["path"] else False)
             action.setData(qvariant_converter.convertString(toolchain))
+            self.toolchain_actions.append(action)
 
     def setupVersionMenu(self):
         self.version_menu = QMenu(self.tr("select BeRTOS version"))
+        self.version_actions = []
         action_group = QActionGroup(self.version_menu)
         versions = [(path, bertosVersion(path)) for path in self.versions()]
         for path, version in versions: 
@@ -103,13 +106,33 @@ class BEditingDialog(QDialog):
             action.setCheckable(True)
             action.setChecked(True if path == self.currentVersion() else False)
             action.setData(qvariant_converter.convertString(path))
-            self.connect(action, SIGNAL("triggered(bool)"), lambda: self.versionChanged(path))
-
-    def toolchainChanged(self, toolchain):
-        print toolchain
-
-    def versionChanged(self, version):
-        print version
+            self.version_actions.append(action)
+
+    def connectSignals(self):
+        for toolchain_action in self.toolchain_actions:
+            self.connect(toolchain_action, SIGNAL("toggled(bool)"), lambda x, toolchain_action=toolchain_action: self.toolchainChanged(
+                qvariant_converter.getString(toolchain_action.data()),
+                x
+            ))
+        for version_action in self.version_actions:
+            self.connect(version_action, SIGNAL("toggled(bool)"), lambda x, version_action=version_action: self.versionChanged(
+                qvariant_converter.getString(version_action.data()),
+                x
+            ))
+        self.connect(self.apply_button, SIGNAL("clicked()"), self.apply)
+        self.connect(self.cancel_button, SIGNAL("clicked()"), self.reject)
+
+    def toolchainChanged(self, toolchain, activated):
+        if activated:
+            self.setCurrentToolchain(toolchain)
+
+    def versionChanged(self, version, activated):
+        if activated:
+            self.setCurrentVersion(version)
+
+    def apply(self):
+        createBertosProject(self.module_page.project(), edit=True)
+        self.accept()
 
     def toolchains(self):
         return self.module_page.toolchains()