~mandel/ubuntu-sso-client/appname-ssl

« back to all changes in this revision

Viewing changes to ubuntu_sso/qt/setup_account_page.py

- Fixed: The header in the pages is above the overlay (LP: #934523).

Show diffs side-by-side

added added

removed removed

Lines of Context:
135
135
            pass
136
136
        self.setButtonText(QtGui.QWizard.CustomButton3, SET_UP_ACCOUNT_BUTTON)
137
137
        self.set_up_button = self.wizard().button(QtGui.QWizard.CustomButton3)
138
 
        self.set_up_button.clicked.connect(self.overlay.show)
 
138
        self.set_up_button.clicked.connect(self.show_overlay)
139
139
        self.set_up_button.clicked.connect(self.set_next_validation)
140
140
        self.set_up_button.setEnabled(False)
141
141
 
277
277
          email == confirm_email and len(name) > 0
278
278
 
279
279
        self.set_up_button.setEnabled(enabled)
280
 
        self.set_up_button.setProperty("DisabledState", not enabled)
281
 
        self.set_up_button.style().unpolish(self.set_up_button)
282
 
        self.set_up_button.style().polish(self.set_up_button)
283
280
 
284
281
    def _refresh_captcha(self):
285
282
        """Refresh the captcha image shown in the ui."""
489
486
        if self.set_up_button is not None:
490
487
            self.set_up_button.setVisible(True)
491
488
            self.set_up_button.setDefault(True)
492
 
            if not self.set_up_button.isEnabled():
493
 
                self.set_up_button.setProperty("DisabledState", True)
494
 
                self.set_up_button.style().unpolish(self.set_up_button)
495
 
                self.set_up_button.style().polish(self.set_up_button)
496
489
        self.connect(QtGui.QApplication.instance(),
497
490
            QtCore.SIGNAL("focusChanged(QWidget*, QWidget*)"),
498
491
            self.focus_changed)
499
492
        super(SetupAccountPage, self).showEvent(event)
500
493
        if not self.captcha_received:
501
 
            self.overlay.show()
 
494
            self.show_overlay()
502
495
 
503
496
    def hideEvent(self, event):
504
497
        """Disconnect the focusChanged signal when the page change."""
517
510
    def on_captcha_refreshing(self):
518
511
        """Show overlay when captcha is refreshing."""
519
512
        if self.isVisible():
520
 
            self.overlay.show()
 
513
            self.show_overlay()
521
514
        self.captcha_received = False
522
515
 
523
516
    def on_captcha_refresh_complete(self):
524
517
        """Hide overlay when captcha finished refreshing."""
525
 
        self.overlay.hide()
 
518
        self.hide_overlay()
526
519
        self.captcha_received = True
527
520
 
528
521
    def get_captcha_image(self):