← Back to branch summary

~gilir/+junk/ubiquity-lxdm-autologin

« back to all changes in this revision

Viewing changes to ubiquity/frontend/gtk_ui.py

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2010-03-26 16:45:50 UTC
  • Revision ID: james.westby@ubuntu.com-20100326164550-11lo9p7i7e1cr8aa
Tags: 2.2.10
https://launchpad.net/bugs/549478
* Fix the default language selection for when only-show-installable-languages
  is set to true.
* Use the file object's close function rather than os.close in
  DebconfInstallProgress. (LP: #549478)
* Hide the currently active progress window when switching to the new progress
  window.
* Sync the title of the install progress window in automatic mode.
* In both of the gtk progress windows, don't show minimize or close buttons in
  only mode.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubiquity/frontend/gtk_ui.py
466
466
                self.get_string('ubiquity/install/checking'))
467
467
            self.debconf_progress_window.set_title(
468
468
                self.get_string('ubiquity/install/title'))
 
469
            self.install_progress_window.set_title(
 
470
                self.get_string('ubiquity/install/title'))
469
471
            self.refresh()
470
472
 
471
473
        self.set_current_page(0)
632
634
            'UBIQUITY_ONLY' in os.environ or
633
635
            'UBIQUITY_GREETER' in os.environ):
634
636
            f = gtk.gdk.FUNC_RESIZE | gtk.gdk.FUNC_MAXIMIZE | gtk.gdk.FUNC_MOVE
635
 
            if not self.oem_user_config:
 
637
            if not self.oem_user_config and not 'progress' in widget.get_name():
636
638
                f |= gtk.gdk.FUNC_CLOSE
637
639
            widget.window.set_functions(f)
638
640
 
918
920
    # Methods
919
921
 
920
922
    def switch_progress_windows(self, use_install_window=True):
 
923
        self.debconf_progress_window.hide()
921
924
        if use_install_window:
922
925
            self.old_progress_window = self.debconf_progress_window
923
926
            self.old_progress_info = self.progress_info