← Back to branch summary

~mikemc/ubuntuone-control-panel/fix-1248326

« back to all changes in this revision

Viewing changes to ubuntuone/controlpanel/gui/qt/controlpanel.py

  • Committer: Michael McCracken
  • Date: 2013-11-27 19:39:04 UTC
  • Revision ID: mike.mccracken@canonical.com-20131127193904-kdb772t0qtm9ltmu
Simplify signaling between tabs and controlpanel widget.
Add tests for tabs raising signals on UnauthorizedError

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/controlpanel/gui/qt/controlpanel.py
97
97
        # account info
98
98
        self.ui.tab_widget.show_overlay = False
99
99
 
100
 
        handler = self.on_credentials_cleared
101
 
        self.credentialsNotifier.cleared.connect(handler)
 
100
        for tab in [self.ui.account_tab, self.ui.folders_tab,
 
101
                    self.ui.devices_tab]:
 
102
            tab.credentialsCleared.connect(self.on_credentials_cleared)
102
103
 
103
104
    @defer.inlineCallbacks
104
105
    def connect_file_sync(self):
130
131
    @defer.inlineCallbacks
131
132
    def on_credentials_cleared(self):
132
133
        """Prompt user to log back in after credentials have been deleted."""
133
 
        credentials = yield self.backend.login()
134
 
 
135
 
        if credentials is None:
136
 
            self.on_credentials_not_found()
137
 
        else:
138
 
            yield self.connect_file_sync()
139
 
 
140
 
        self.is_processing = False
 
134
        yield self.backend.login()
 
135
        # ignore returned credentials from login(), load() re-gets them.
 
136
        yield self.load()
141
137
 
142
138
    @defer.inlineCallbacks
143
139
    def show_management_ui(self):