Commits

Moises Henriquez  committed a383cb6

Removed unused classes

  • Participants
  • Parent commits c520a56

Comments (0)

Files changed (2)

File vpackager/buildutils.py

         # call the sbbuilder binary
         proc = bottools.Execute(
             'sbbuilder --package=%s --version=%s --type=%s --build=%s --user=%s' %(
-                self.app, self.ver, self.builder.type,
-                buildno, packager))
+                self.app, self.ver, self.builder, buildno, packager))
         proc.run()
         if proc.popen.returncode > 0:
             # the process failed
         proc.run()
 
         if 'configure' in self.__dump:
-            self.builder = AutoTools(self)
+            self.builder = 'default'
         elif 'autogen.sh' in self.__dump:
-            self.builder = AutoConf(self)
+            self.builder = 'default'
         elif 'Makefile' in self.__dump:
-            self.builder = AutoMake(self)
+            self.builder = 'default'
         elif 'CMakeLists.txt' in self.__dump:
-            self.builder = CMake(self)
+            self.builder = 'cmake'
         elif 'setup.py' in self.__dump:
-            self.builder = Python()
+            self.builder = 'python'
         self.__dump = None
         return self.builder
 

File vpackager/vpackager.py

         self.title = _('Verify Build Details')
         self.type = gtk.ASSISTANT_PAGE_CONTENT
         self.complete = True
+        self.status = gtk.Label()
+        self.status.set_property('use-markup', True)
+        self.status.set_property('xalign', 0.0)
 
         self.pack_start(self.get_content(), True, True, 8)
+        self.pack_start(self.status, False, False, 12)
+
+    def _update_status(self, status):
+        return self.status.set_markup(status)
 
     def get_content(self):
         '''Returns the content of this page'''
 
         txt = [
             _('Please verify that all the information about the package is correct.'),
-            _('You may still go back and make any adjustments as necessary.'),
-            _('This is just dump. I dont know why this does not fill up the'),
-            _('entire label')
+            _('You may still go back and make any adjustments as necessary.')
         ]
         lbl = gtk.Label()
         lbl.set_property('justify', gtk.JUSTIFY_FILL)
         lbl.set_text(' '.join(txt).strip())
 
         l.pack_start(lb, False, False, 4)
-        l.pack_start(lbl, False, False, 4)
+        l.pack_start(lbl, False, False, 12)
+
+#        appline = gtk.HBox()
+#        applbl = gtk.Label(_('Application'))
+#        self.roAppNameBox = gtk.Entry()
+#        appline.pack_start(applbl, False, False, 2)
+#        appline.pack_start(self.roAppNameBox, False, False, 2)
+
+#        appverlbl = gtk.Label(_('Version'))
+#        self.roAppVerBox = gtk.Entry()
+#        appline.pack_start(appverlbl, False, False, 2)
+#        appline.pack_start(self.roAppVerBox, False, False, 2)
+
+#        l.pack_start(appline, False, False, 2)
+
 
         lbr = gtk.Label()
         lbr.set_use_markup(True)
             self._parent.project.source = srcob
             self.eName.set_text(srcob.app)
             self.eVer.set_text(srcob.ver)
+
+        # update the text on the next page
+        self._parent.pages[1]._update_status(
+                _('Readyto build <b>%s</b> version <b>%s</b>')%
+                    (srcob.app, srcob.ver))
         return
 
     def _license_change(self, widget):
         pass
         #print 'Processing data for intro page'
 
+
 class Wizard(gtk.Assistant):
     """ Main application class"""
     def __init__(self):
         self.project = Build()
 
         self.task = None
+        self.pages = [
+                PageIntro(self),
+                PageVerify(self),
+                PageDoBuild(self)]
 
-
-        for page in (PageIntro(self),
-                     PageVerify(self),
-                     PageDoBuild(self)):
+        for page in self.pages:
             self.append_page(page)
             self.set_page_title(page, page.title)
             self.set_page_complete(page, page.complete)
         except:
             pass
         return False
+
     def _exit(self, Widget = None, ud=None):
         if self._terminate() is True:
             return