Use the new bertos_utils module

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2018 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/BStartPage.py b/wizard/BStartPage.py
index ea39f19fa11f4324a3ff269972a51d54045dc3e3..3f094f34dfea3766c651a3684fe5305a75e5f2b4 100644 (file)
--- a/wizard/BStartPage.py
+++ b/wizard/BStartPage.py
@@ -10,7 +10,7 @@
 #
 
 from BWizardPage import *
-from libbertos import *
+import bertos_utils
 
 class BStartPage(BWizardPage):
     
@@ -41,7 +41,7 @@ class BStartPage(BWizardPage):
             self.pageContent.newDescription.setText("(\"" + filename + "\")")
             self.pageContent.newDescription.setVisible(True)
             # TODO: It's better to create it at the end of the wizard...
-            createBertosProject(filename)
+            bertos_utils.createBertosProject(filename)
         else:
             self.pageContent.newDescription.setText("")
             self.pageContent.newDescription.setVisible(False)

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index 4259d450f6408162e3b8b8140dfbba034f7f3d99..48bc75bbd5dc619eebfc981b2049b146f6109184 100644 (file)
--- a/wizard/BVersionPage.py
+++ b/wizard/BVersionPage.py
@@ -11,7 +11,7 @@
 
 from PyQt4.QtGui import *
 from BWizardPage import *
-from libbertos import *
+import bertos_utils
 
 class BVersionPage(BWizardPage):
     
@@ -33,8 +33,8 @@ class BVersionPage(BWizardPage):
     
     def addVersion(self):
         directory = QFileDialog.getExistingDirectory(self, self.tr("Choose a directory"), QString(), QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks)
-        if isBertosDir(directory):
-            version = bertosVersion(directory)
+        if bertos_utils.isBertosDir(directory):
+            version = bertos_utils.bertosVersion(directory)
             self.pageContent.versionList.addItem(QListWidgetItem(QIcon(":/images/ok.png"), version + " (\"" + directory + "\")"))
         elif not directory.isEmpty():
             version = "UNCHECKED"