← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to ubiquity/plugins/ubi-language.py

  • Committer: Colin Watson
  • Date: 2012-11-22 16:27:21 UTC
  • Revision ID: cjwatson@canonical.com-20121122162721-q1ykdeiuxy1dq38w
Huge pile of minor changes to make ubiquity compatible with pep8 1.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubiquity/plugins/ubi-language.py
124
124
                    self.try_ubuntu.set_sensitive(False)
125
125
                    self.controller.go_forward()
126
126
                self.install_ubuntu.connect('clicked', inst)
127
 
                self.try_ubuntu.connect('clicked',
128
 
                    self.on_try_ubuntu_clicked)
 
127
                self.try_ubuntu.connect('clicked', self.on_try_ubuntu_clicked)
129
128
            self.try_install_text_label = builder.get_object(
130
129
                'try_install_text_label')
131
130
            # We do not want to show the yet to be substituted strings
178
177
                column.set_sizing(Gtk.TreeViewColumnSizing.GROW_ONLY)
179
178
                self.treeview.append_column(column)
180
179
                selection = self.treeview.get_selection()
181
 
                selection.connect('changed',
182
 
                                    self.on_language_selection_changed)
 
180
                selection.connect(
 
181
                    'changed', self.on_language_selection_changed)
183
182
            self.treeview.set_model(list_store)
184
183
 
185
184
    def set_language(self, language):
574
573
                self.page.release_notes_label.show()
575
574
                QTimer.singleShot(300, self.check_returncode)
576
575
                self.timer = QTimer(self.page)
577
 
                self.timer.connect(self.timer, SIGNAL("timeout()"),
578
 
                    self.check_returncode)
 
576
                self.timer.connect(
 
577
                    self.timer, SIGNAL("timeout()"), self.check_returncode)
579
578
                self.timer.start(300)
580
579
            else:
581
580
                self.page.release_notes_label.hide()
596
595
            else:
597
596
                self.update_installer = False
598
597
            self.update_release_notes_label()
599
 
            self.timer.disconnect(self.timer, SIGNAL("timeout()"),
600
 
                self.check_returncode)
 
598
            self.timer.disconnect(
 
599
                self.timer, SIGNAL("timeout()"), self.check_returncode)
601
600
 
602
601
    def update_release_notes_label(self):
603
602
        lang = self.selected_language()
666
665
 
667
666
        localechooser_script = '/usr/lib/ubiquity/localechooser/localechooser'
668
667
        if ('UBIQUITY_FRONTEND' in os.environ and
669
 
            os.environ['UBIQUITY_FRONTEND'] == 'debconf_ui'):
 
668
                os.environ['UBIQUITY_FRONTEND'] == 'debconf_ui'):
670
669
            localechooser_script += '-debconf'
671
670
 
672
671
        questions = ['localechooser/languagelist']
673
672
        environ = {
674
673
            'PATH': '/usr/lib/ubiquity/localechooser:' + os.environ['PATH'],
675
 
            }
 
674
        }
676
675
        if ('UBIQUITY_FRONTEND' in os.environ and
677
 
            os.environ['UBIQUITY_FRONTEND'] == "debconf_ui"):
 
676
                os.environ['UBIQUITY_FRONTEND'] == "debconf_ui"):
678
677
            environ['TERM_FRAMEBUFFER'] = '1'
679
678
        else:
680
679
            environ['OVERRIDE_SHOW_ALL_LANGUAGES'] = '1'
710
709
            new_language = self.ui.get_language()
711
710
            self.preseed(self.language_question, new_language)
712
711
            if (self.initial_language is None or
713
 
                self.initial_language != new_language):
 
712
                    self.initial_language != new_language):
714
713
                self.db.reset('debian-installer/country')
715
714
        if self.ui.controller.oem_config:
716
715
            self.preseed('oem-config/id', self.ui.get_oem_id())
732
731
                'sh', '-c',
733
732
                '/usr/lib/ubiquity/localechooser/post-base-installer ' +
734
733
                '&& /usr/lib/ubiquity/localechooser/finish-install',
735
 
                ]
 
734
            ]
736
735
        return command, []
737
736
 
738
737
    def install(self, target, progress, *args, **kwargs):