~mvo/update-manager/not-automatic

« back to all changes in this revision

Viewing changes to DistUpgrade/DistUpgradeViewGtk.py

  • Committer: Michael Vogt
  • Date: 2008-05-21 16:01:17 UTC
  • mfrom: (952.1.10 hildon)
  • Revision ID: michael.vogt@ubuntu.com-20080521160117-lom591v3zpyk53yt
* UpdateManagerHildon/UpdateManagerHildon.py:
  - add hildon support (thanks to Tollef Fog Heen and
    Emmet Hikory)
  - make networkless upgrades more robust (LP: #227197)
* DistUpgrade/DistUpgradeViewGtk.py:
  - work around hang in svg loader (LP: #186465)

Show diffs side-by-side

added added

removed removed

Lines of Context:
177
177
        self.expander.set_sensitive(True)
178
178
        self.term.show()
179
179
        # if no libgnome2-perl is installed show the terminal
180
 
        frontend="gnome"
181
 
        if self._cache:
 
180
        frontend= os.environ.get("DEBIAN_FRONTEND") or "gnome"
 
181
        if frontend == "gnome" and self._cache:
182
182
          if (not self._cache.has_key("libgnome2-perl") or 
183
183
              not self._cache["libgnome2-perl"].isInstalled):
184
184
            frontend = "dialog"
363
363
        self.pngloader = gtk.gdk.PixbufLoader("png")
364
364
        try:
365
365
          self.svgloader = gtk.gdk.PixbufLoader("svg")
 
366
          self.svgloader.close()
366
367
        except gobject.GError, e:
367
 
          logging.warning("svg pixbuf loader failed (%s)" % e)
 
368
          logging.debug("svg pixbuf loader failed (%s)" % e)
368
369
          pass
369
370
        
370
371
        self.window_main.realize()
459
460
    def hideStep(self, step):
460
461
        image = getattr(self,"image_step%i" % step)
461
462
        label = getattr(self,"label_step%i" % step)
 
463
        arrow = getattr(self,"arrow_step%i" % step)
462
464
        image.hide()
463
465
        label.hide()
 
466
    def showStep(self, step):
 
467
        image = getattr(self,"image_step%i" % step)
 
468
        label = getattr(self,"label_step%i" % step)
 
469
        image.show()
 
470
        label.show()
464
471
    def abort(self):
465
472
        size = gtk.ICON_SIZE_MENU
466
473
        step = self.prev_step
489
496
        image = getattr(self,"image_step%i" % step)
490
497
        label = getattr(self,"label_step%i" % step)
491
498
        arrow = getattr(self,"arrow_step%i" % step)
 
499
        # check if that step was not hidden with hideStep()
 
500
        if not label.get_property("visible"):
 
501
          return
492
502
        arrow.show()
493
503
        image.hide()
494
504
        attr = pango.AttrWeight(pango.WEIGHT_BOLD, 0, -1)