Remove the spinner (it isn't needed)

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

diff --git a/wizard/BCreationPage.py b/wizard/BCreationPage.py
index f3e0a115ece1410ecbeca31bf2be4d01b2eb1561..86fae8380ef6620b1c6484186e58ae0bdb56256d 100644 (file)
--- a/wizard/BCreationPage.py
+++ b/wizard/BCreationPage.py
@@ -23,12 +23,15 @@ class BCreationPage(BWizardPage):
         self.setTitle(self.tr("Create the BeRTOS project"))
         self._setupUi()
         self._connectSignals()
+        self._completed = False
+    
+    def reloadData(self):
+        self._completed = False
+        self._setupUi()
     
     def _setupUi(self):
         self._confirmGroup = QWidgetGroup(self.pageContent.summaryTree,
                                             self.pageContent.createButton)
-        self._workingGroup = QWidgetGroup(self.pageContent.spinnerLabel)
-        self._workingGroup.setVisible(False)
         self._finalGroup = QWidgetGroup(self.pageContent.iconLabel,
                                             self.pageContent.textLabel)
         self._finalGroup.setVisible(False)
@@ -38,19 +41,13 @@ class BCreationPage(BWizardPage):
     
     def _createProject(self):
         self._confirmGroup.setVisible(False)
-        #self._workingGroup.setVisible(True)
-        #self._movie = QMovie("images/load_spinner.gif")
-        #print self._movie.isValid()
-        #self.pageContent.spinnerLabel.setMovie(self._movie)
-        #self._movie.start()
         bertos_utils.createBertosProject(self.wizard().project())
-        #del self._movie
-        #self._workingGroup.setVisible(False)
         self._finalGroup.setVisible(True)
+        self._completed = True
         self.emit(SIGNAL("completeChanged()"))
     
     def isComplete(self):
-        return self._finalGroup.isVisible()
+        return self._completed
 
 class QWidgetGroup(QObject):
     """

diff --git a/wizard/bertos.py b/wizard/bertos.py
index 78c34946b3ad093a1954764093b79c5c485ef703..96730e59d6ca65ea99abda65bab43a990a00dc1e 100755 (executable)
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -26,12 +26,7 @@ import bertos_utils
 def newProject():
     wizard = BWizard.BWizard()
     wizard.show()
-    if wizard.exec_():
-        prj = wizard.project()
-        output = prj.info("OUTPUT")
-        if output == "makefile":
-            ## Now only supports the BeRTOS build system
-            bertos_utils.createBertosProject(prj)
+    wizard.exec_()
     
 def editProject():
     print "editProject"

diff --git a/wizard/ui/project_creation.ui b/wizard/ui/project_creation.ui
index d3f31c817d0a68151571cffb83bdc79c2bf86b52..772d44a44f5fd81ca1e2a433e4ef2ae49ca099b8 100644 (file)
--- a/wizard/ui/project_creation.ui
+++ b/wizard/ui/project_creation.ui
@@ -46,43 +46,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
-     <item>
-      <spacer name="horizontalSpacer_2" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="spinnerLabel" >
-       <property name="text" >
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3" >
      <item>