1
=== modified file 'bin/ubuntuone-installer-qt'
2
--- bin/ubuntuone-installer-qt	2011-07-13 20:21:48 +0000
3
+++ bin/ubuntuone-installer-qt	2011-08-02 20:49:39 +0000
4
@@ -27,8 +27,6 @@
5
27
27
6
28
from optparse import OptionParser
28
from optparse import OptionParser
7
29
29
8
30
from twisted.internet import reactor
9
31
10
32
from ubuntuone_installer import TRANSLATION_DOMAIN
30
from ubuntuone_installer import TRANSLATION_DOMAIN
11
33
31
12
34
gettext.textdomain(TRANSLATION_DOMAIN)
32
gettext.textdomain(TRANSLATION_DOMAIN)
13
@@ -48,4 +46,3 @@
14
48
    parser = parser_options()
46
    parser = parser_options()
15
49
    (options, args) = parser.parse_args(sys.argv)
47
    (options, args) = parser.parse_args(sys.argv)
16
50
    main.main()
48
    main.main()
17
51
    reactor.run()
18
52
49
19
=== modified file 'data/qt/local_folders.ui'
20
--- data/qt/local_folders.ui	2011-06-28 15:46:02 +0000
21
+++ data/qt/local_folders.ui	2011-08-02 20:49:39 +0000
22
@@ -17,11 +17,11 @@
23
17
   <item>
17
   <item>
24
18
    <widget class="QLabel" name="label">
18
    <widget class="QLabel" name="label">
25
19
     <property name="text">
19
     <property name="text">
28
20
      <string>Ok! Now it's time to choose wich folder sync to the cloud from this computer.
20
      <string>Let's get started! First choose which folder you want to sync to your Ubuntu One personal cloud from this computer.
29
21
We started by suggesting a few</string>
21
To help you get going we have suggested a few.</string>
30
22
     </property>
22
     </property>
31
23
     <property name="textFormat">
23
     <property name="textFormat">
33
24
      <enum>Qt::RichText</enum>
24
      <enum>Qt::PlainText</enum>
34
25
     </property>
25
     </property>
35
26
     <property name="wordWrap">
26
     <property name="wordWrap">
36
27
      <bool>true</bool>
27
      <bool>true</bool>
37
@@ -50,23 +50,28 @@
38
50
       </property>
50
       </property>
39
51
      </spacer>
51
      </spacer>
40
52
     </item>
52
     </item>
41
53
     <item>
42
54
      <widget class="QPushButton" name="pushButton_2">
43
55
       <property name="text">
44
56
        <string>Add a folder</string>
45
57
       </property>
46
58
      </widget>
47
59
     </item>
48
60
    </layout>
53
    </layout>
49
61
   </item>
54
   </item>
50
62
   <item>
55
   <item>
51
63
    <widget class="QTreeWidget" name="folder_list">
56
    <widget class="QTreeWidget" name="folder_list">
52
57
     <property name="indentation">
53
58
      <number>0</number>
54
59
     </property>
55
60
     <property name="rootIsDecorated">
56
61
      <bool>false</bool>
57
62
     </property>
58
63
     <property name="uniformRowHeights">
59
64
      <bool>true</bool>
60
65
     </property>
61
66
     <property name="allColumnsShowFocus">
62
67
      <bool>true</bool>
63
68
     </property>
64
64
     <attribute name="headerStretchLastSection">
69
     <attribute name="headerStretchLastSection">
65
65
      <bool>false</bool>
70
      <bool>false</bool>
66
66
     </attribute>
71
     </attribute>
67
67
     <column>
72
     <column>
68
68
      <property name="text">
73
      <property name="text">
70
69
       <string>My Folders</string>
74
       <string>Sync these folders on my computer</string>
71
70
      </property>
75
      </property>
72
71
     </column>
76
     </column>
73
72
     <column>
77
     <column>
74
@@ -74,26 +79,44 @@
75
74
       <string>Space (Total)</string>
79
       <string>Space (Total)</string>
76
75
      </property>
80
      </property>
77
76
     </column>
81
     </column>
98
77
     <column>
82
    </widget>
99
78
      <property name="text">
83
   </item>
100
79
       <string>Remove</string>
84
   <item>
101
80
      </property>
85
    <layout class="QHBoxLayout" name="horizontalLayout_3">
102
81
     </column>
86
     <item>
103
82
    </widget>
87
      <spacer name="horizontalSpacer_4">
104
83
   </item>
88
       <property name="orientation">
105
84
   <item>
89
        <enum>Qt::Horizontal</enum>
106
85
    <widget class="QCheckBox" name="checkBox">
90
       </property>
107
86
     <property name="text">
91
       <property name="sizeHint" stdset="0">
108
87
      <string>Connect automatically when computer starts</string>
92
        <size>
109
88
     </property>
93
         <width>40</width>
110
89
    </widget>
94
         <height>20</height>
111
90
   </item>
95
        </size>
112
91
   <item>
96
       </property>
113
92
    <widget class="QCheckBox" name="checkBox_2">
97
      </spacer>
114
93
     <property name="text">
98
     </item>
115
94
      <string>Automatically sync all selected folders from this computer to the cloud</string>
99
     <item>
116
95
     </property>
100
      <widget class="AddFolderButton" name="add_folder_button">
117
96
    </widget>
101
       <property name="text">
118
102
        <string>Add a folder</string>
119
103
       </property>
120
104
      </widget>
121
105
     </item>
122
106
     <item>
123
107
      <spacer name="horizontalSpacer_5">
124
108
       <property name="orientation">
125
109
        <enum>Qt::Horizontal</enum>
126
110
       </property>
127
111
       <property name="sizeHint" stdset="0">
128
112
        <size>
129
113
         <width>40</width>
130
114
         <height>20</height>
131
115
        </size>
132
116
       </property>
133
117
      </spacer>
134
118
     </item>
135
119
    </layout>
136
97
   </item>
120
   </item>
137
98
   <item>
121
   <item>
138
99
    <widget class="QFrame" name="offer_frame">
122
    <widget class="QFrame" name="offer_frame">
139
@@ -113,7 +136,7 @@
140
113
      <item>
136
      <item>
141
114
       <widget class="QLabel" name="offer_label">
137
       <widget class="QLabel" name="offer_label">
142
115
        <property name="text">
138
        <property name="text">
144
116
         <string>The folders you have selected to sync take over your 2GB space. You can remove some folders or add some extra space</string>
139
         <string>The folders you have selected to sync take over your 5GB storage space by 6.5GB. You can remove some folders or add some extra storage now.</string>
145
117
        </property>
140
        </property>
146
118
        <property name="wordWrap">
141
        <property name="wordWrap">
147
119
         <bool>true</bool>
142
         <bool>true</bool>
148
@@ -138,7 +161,7 @@
149
138
        <item>
161
        <item>
150
139
         <widget class="QPushButton" name="pushButton">
162
         <widget class="QPushButton" name="pushButton">
151
140
          <property name="text">
163
          <property name="text">
153
141
           <string>add more space</string>
164
           <string>Add more storage</string>
154
142
          </property>
165
          </property>
155
143
         </widget>
166
         </widget>
156
144
        </item>
167
        </item>
157
@@ -162,6 +185,13 @@
158
162
   </item>
185
   </item>
159
163
  </layout>
186
  </layout>
160
164
 </widget>
187
 </widget>
161
188
 <customwidgets>
162
189
  <customwidget>
163
190
   <class>AddFolderButton</class>
164
191
   <extends>QPushButton</extends>
165
192
   <header>ubuntuone.controlpanel.gui.qt.addfolder</header>
166
193
  </customwidget>
167
194
 </customwidgets>
168
165
 <resources/>
195
 <resources/>
169
166
 <connections/>
196
 <connections/>
170
167
</ui>
197
</ui>
171
168
198
172
=== added file 'ubuntuone_installer/gui/qt/currentuser.py'
173
--- ubuntuone_installer/gui/qt/currentuser.py	1970-01-01 00:00:00 +0000
174
+++ ubuntuone_installer/gui/qt/currentuser.py	2011-08-02 20:49:39 +0000
175
@@ -0,0 +1,55 @@
176
1
# -*- coding: utf-8 -*-
177
2
178
3
# Authors: Roberto Alsina <roberto.alsina@canonical.com>
179
4
#
180
5
# Copyright 2011 Canonical Ltd.
181
6
#
182
7
# This program is free software: you can redistribute it and/or modify it
183
8
# under the terms of the GNU General Public License version 3, as published
184
9
# by the Free Software Foundation.
185
10
#
186
11
# This program is distributed in the hope that it will be useful, but
187
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
188
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
189
14
# PURPOSE.  See the GNU General Public License for more details.
190
15
#
191
16
# You should have received a copy of the GNU General Public License along
192
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
193
18
194
19
"""Custom controller for current user page."""
195
20
196
21
from twisted.internet.defer import inlineCallbacks
197
22
198
23
from ubuntu_sso.qt import controllers
199
24
200
25
from ubuntuone.platform.credentials import (
201
26
     CredentialsManagementTool,
202
27
     CredentialsError,
203
28
)
204
29
205
30
from ubuntuone_installer.logger import setup_logging
206
31
207
32
# Invalid name logger
208
33
# pylint: disable=C0103
209
34
logger = setup_logging('qt.currentuser')
210
35
# pylint: enable=C0103
211
36
212
37
213
38
class CurrentUserController(controllers.CurrentUserController):
214
39
    """Custom controller for current user page."""
215
40
216
41
    @inlineCallbacks
217
42
    def login(self, *args):
218
43
        """Perform the login using the self.backend."""
219
44
        email = unicode(self.view.ui.email_edit.text())
220
45
        password = unicode(self.view.ui.password_edit.text())
221
46
        credtool = CredentialsManagementTool()
222
47
        try:
223
48
            d = yield credtool.login_email_password(
224
49
                email=email,
225
50
                password=password,
226
51
            )
227
52
            self.on_logged_in(self.view.wizard().app_name, d)
228
53
        except CredentialsError, e:
229
54
            logger.exception("Error getting credentials:")
230
55
            self.on_login_error(e.args[0])
231
0
56
232
=== removed file 'ubuntuone_installer/gui/qt/embedded_sso.py'
233
--- ubuntuone_installer/gui/qt/embedded_sso.py	2011-07-27 14:53:56 +0000
234
+++ ubuntuone_installer/gui/qt/embedded_sso.py	1970-01-01 00:00:00 +0000
235
@@ -1,61 +0,0 @@
236
1
# -*- coding: utf-8 -*-
237
2
238
3
# Authors: Roberto Alsina <roberto.alsina@canonical.com>
239
4
#
240
5
# Copyright 2011 Canonical Ltd.
241
6
#
242
7
# This program is free software: you can redistribute it and/or modify it
243
8
# under the terms of the GNU General Public License version 3, as published
244
9
# by the Free Software Foundation.
245
10
#
246
11
# This program is distributed in the hope that it will be useful, but
247
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
248
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
249
14
# PURPOSE.  See the GNU General Public License for more details.
250
15
#
251
16
# You should have received a copy of the GNU General Public License along
252
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
253
18
254
19
"""The user interface for the Ubuntu One Installer's SSO client."""
255
20
256
21
import ubuntu_sso.qt.gui as sso_gui
257
22
258
23
from ubuntuone_installer.gui.qt.gui import MainWindow
259
24
260
25
261
26
class UbuntuSSOClientGUI(object):
262
27
    """A custom Client GUI for SSO."""
263
28
264
29
    def __init__(self, app_name, tc_url, help_text,
265
30
                 window_id=0, login_only=False):
266
31
        """Create a new instance."""
267
32
268
33
        # create the controller and the ui, then set the cb and call the show
269
34
        # method so that we can work
270
35
        self.controller = sso_gui.UbuntuSSOWizardController(
271
36
            app_name,
272
37
            user_cancellation_callback=self._user_cancellation_callback)
273
38
        self.view = MainWindow()
274
39
275
40
        self.login_success_callback = lambda x, y: None
276
41
        self.registration_success_callback = lambda x, y: None
277
42
        self.user_cancellation_callback = lambda x: None
278
43
279
44
        self.view.loginSuccess.connect(self._login_success_callback)
280
45
        self.view.registrationSuccess.connect(
281
46
            self._registration_success_callback)
282
47
        self.view.userCancellation.connect(self._user_cancellation_callback)
283
48
284
49
        self.view.show()
285
50
286
51
    def _login_success_callback(self, app_name, email):
287
52
        """Call the real callback, set by the Credentials object"""
288
53
        self.login_success_callback(str(app_name), str(email))
289
54
290
55
    def _registration_success_callback(self, app_name, email):
291
56
        """Call the real callback, set by the Credentials object"""
292
57
        self.registration_success_callback(str(app_name), str(email))
293
58
294
59
    def _user_cancellation_callback(self, app_name):
295
60
        """Call the real callback, set by the Credentials object"""
296
61
        self.user_cancellation_callback(str(app_name))
297
62
0
298
=== modified file 'ubuntuone_installer/gui/qt/forgotten.py'
299
--- ubuntuone_installer/gui/qt/forgotten.py	2011-07-19 21:06:06 +0000
300
+++ ubuntuone_installer/gui/qt/forgotten.py	2011-08-02 20:49:39 +0000
301
@@ -1,34 +1,34 @@
336
1
# -*- coding: utf-8 -*-
1
# -*- coding: utf-8 -*-
337
2
2
338
3
# Authors: Roberto Alsina <roberto.alsina@canonical.com>
3
# Authors: Roberto Alsina <roberto.alsina@canonical.com>
339
4
#
4
#
340
5
# Copyright 2011 Canonical Ltd.
5
# Copyright 2011 Canonical Ltd.
341
6
#
6
#
342
7
# This program is free software: you can redistribute it and/or modify it
7
# This program is free software: you can redistribute it and/or modify it
343
8
# under the terms of the GNU General Public License version 3, as published
8
# under the terms of the GNU General Public License version 3, as published
344
9
# by the Free Software Foundation.
9
# by the Free Software Foundation.
345
10
#
10
#
346
11
# This program is distributed in the hope that it will be useful, but
11
# This program is distributed in the hope that it will be useful, but
347
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
348
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
349
14
# PURPOSE.  See the GNU General Public License for more details.
14
# PURPOSE.  See the GNU General Public License for more details.
350
15
#
15
#
351
16
# You should have received a copy of the GNU General Public License along
16
# You should have received a copy of the GNU General Public License along
352
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
353
18
18
354
19
"""Custom forgotten password controller."""
19
"""Custom forgotten password controller."""
355
20
20
356
21
from ubuntu_sso.qt import controllers
21
from ubuntu_sso.qt import controllers
357
22
22
358
23
23
359
24
class ForgottenPasswordController(controllers.ForgottenPasswordController):
24
class ForgottenPasswordController(controllers.ForgottenPasswordController):
360
25
    """A custom forgotten password controller.
25
    """A custom forgotten password controller.
361
26
26
362
27
    This controller hides the overlay as needed.
27
    This controller hides the overlay as needed.
363
28
    """
28
    """
364
29
29
365
30
    def on_password_reset_error(self, app_name, error):
30
    def on_password_reset_error(self, app_name, error):
366
31
        """Hide the overlay, then do as the default controller does."""
31
        """Hide the overlay, then do as the default controller does."""
367
32
        self.view.wizard().overlay.hide()
32
        self.view.wizard().overlay.hide()
368
33
        super(ForgottenPasswordController,
33
        super(ForgottenPasswordController,
369
34
            self).on_password_reset_error(app_name, error)
34
            self).on_password_reset_error(app_name, error)
370
35
35
371
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
372
--- ubuntuone_installer/gui/qt/gui.py	2011-08-02 14:12:22 +0000
373
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-02 20:49:39 +0000
374
@@ -45,7 +45,6 @@
375
45
from ubuntu_sso.qt.reset_password_ui import Ui_ResetPasswordPage
45
from ubuntu_sso.qt.reset_password_ui import Ui_ResetPasswordPage
376
46
from ubuntu_sso.qt.controllers import (
46
from ubuntu_sso.qt.controllers import (
377
47
    ChooseSignInController,
47
    ChooseSignInController,
378
48
    CurrentUserController,
379
49
    EmailVerificationController,
48
    EmailVerificationController,
380
50
    ErrorController,
49
    ErrorController,
381
51
    ResetPasswordController,
50
    ResetPasswordController,
382
@@ -58,6 +57,7 @@
383
58
57
384
59
from ubuntuone.platform.credentials import (
58
from ubuntuone.platform.credentials import (
385
60
    APP_NAME,
59
    APP_NAME,
386
60
    CredentialsManagementTool,
387
61
    TC_URL,
61
    TC_URL,
388
62
)
62
)
389
63
63
390
@@ -75,6 +75,7 @@
391
75
# pylint: enable=W0611
75
# pylint: enable=W0611
392
76
76
393
77
from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
77
from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
394
78
from ubuntuone_installer.gui.qt.currentuser import CurrentUserController
395
78
from ubuntuone_installer.gui.qt.forgotten import ForgottenPasswordController
79
from ubuntuone_installer.gui.qt.forgotten import ForgottenPasswordController
396
79
from ubuntuone_installer.gui.qt.local_folders import LocalFoldersPage
80
from ubuntuone_installer.gui.qt.local_folders import LocalFoldersPage
397
80
from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
81
from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
398
@@ -101,6 +102,7 @@
399
101
        super(LicensePage, self).__init__(parent)
102
        super(LicensePage, self).__init__(parent)
400
102
        self.ui = license_ui.Ui_Form()
103
        self.ui = license_ui.Ui_Form()
401
103
        self.ui.setupUi(self)
104
        self.ui.setupUi(self)
402
105
        self._next_id = None
403
104
106
404
105
    # Invalid names of Qt-inherited methods
107
    # Invalid names of Qt-inherited methods
405
106
    # pylint: disable=C0103
108
    # pylint: disable=C0103
406
@@ -146,6 +148,12 @@
407
146
            printer.setPageSize(QtGui.QPrinter.A4)
148
            printer.setPageSize(QtGui.QPrinter.A4)
408
147
            document.print_(printer)
149
            document.print_(printer)
409
148
150
410
151
    def nextId(self):
411
152
        """Return next page's ID."""
412
153
        if self._next_id is None:
413
154
            return super(LicensePage, self).nextId()
414
155
        return self._next_id
415
156
416
149
157
417
150
class SignInPage(QtGui.QWizardPage):
158
class SignInPage(QtGui.QWizardPage):
418
151
    """Wizard Page that lets the user Sign into Ubuntu One."""
159
    """Wizard Page that lets the user Sign into Ubuntu One."""
419
@@ -330,7 +338,9 @@
420
330
        # PyQt doesn't support the (int, page) version of addPage, so
338
        # PyQt doesn't support the (int, page) version of addPage, so
421
331
        # Add the pages in the right order
339
        # Add the pages in the right order
422
332
        # pylint: disable=C0103
340
        # pylint: disable=C0103
424
333
        self.LICENSE_PAGE = self.addPage(LicensePage())
341
425
342
        self.LICENSE_PAGE = LicensePage()
426
343
        self.LICENSE_PAGE_ID = self.addPage(self.LICENSE_PAGE)
427
334
344
428
335
        #SSO Pages
345
        #SSO Pages
429
336
        title_page = TITLE_STYLE % SIGN_IN
346
        title_page = TITLE_STYLE % SIGN_IN
430
@@ -424,10 +434,22 @@
431
424
        # Apply font to the entire application
434
        # Apply font to the entire application
432
425
        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
435
        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
433
426
        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
436
        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
434
437
        credtool = CredentialsManagementTool()
435
438
        d = credtool.find_credentials()
436
439
        d.addCallback(self.creds_cb)
437
440
        d.addErrback(lambda exc: logger.error(
438
441
            'Error while getting the credentials: %r', exc))
439
427
442
440
428
    # Invalid name "closeEvent"
443
    # Invalid name "closeEvent"
441
429
    # pylint: disable=C0103
444
    # pylint: disable=C0103
442
430
445
443
446
    def creds_cb(self, token):
444
447
        """Change wizard flow if we have credentials."""
445
448
        if not token:
446
449
            self.LICENSE_PAGE._next_id = self.SIGNIN_PAGE
447
450
        else:
448
451
            self.LICENSE_PAGE._next_id = self.local_folders_page_id
449
452
450
431
    def critical(self, *args, **kwargs):
453
    def critical(self, *args, **kwargs):
451
432
        """Wrapper for QMessageBox.critical that hides the overlay."""
454
        """Wrapper for QMessageBox.critical that hides the overlay."""
452
433
        self.overlay.hide()
455
        self.overlay.hide()
453
434
456
454
=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
455
--- ubuntuone_installer/gui/qt/local_folders.py	2011-07-22 16:32:35 +0000
456
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-08-02 20:49:39 +0000
457
@@ -103,8 +103,13 @@
458
103
            # Special Folder "My Documents"
103
            # Special Folder "My Documents"
459
104
            dll = ctypes.windll.shell32
104
            dll = ctypes.windll.shell32
460
105
            buf = ctypes.create_string_buffer(300)
105
            buf = ctypes.create_string_buffer(300)
463
106
            dll.SHGetSpecialFolderPathA(None, buf, 0x0005, False)
106
            dll.SHGetSpecialFolderPathA(None, buf, 5, False)
464
107
            result = [buf.value, ]
107
            docs = buf.value
465
108
            dll.SHGetSpecialFolderPathA(None, buf, 13, False)
466
109
            music = buf.value
467
110
            dll.SHGetSpecialFolderPathA(None, buf, 39, False)
468
111
            pictures = buf.value
469
112
            return [docs, music, pictures]
470
108
        else:
113
        else:
471
109
            result = ['To be implemented']
114
            result = ['To be implemented']
472
110
        return result
115
        return result
473
111
116
474
=== removed file 'ubuntuone_installer/gui/qt/main/tests/test_main.py'
475
--- ubuntuone_installer/gui/qt/main/tests/test_main.py	2011-07-27 15:09:28 +0000
476
+++ ubuntuone_installer/gui/qt/main/tests/test_main.py	1970-01-01 00:00:00 +0000
477
@@ -1,97 +0,0 @@
478
1
# -*- coding: utf-8 -*-
479
2
480
3
# Authors: Roberto Alsina <roberto.alsina@canonical.com>
481
4
#
482
5
# Copyright 2011 Canonical Ltd.
483
6
#
484
7
# This program is free software: you can redistribute it and/or modify it
485
8
# under the terms of the GNU General Public License version 3, as published
486
9
# by the Free Software Foundation.
487
10
#
488
11
# This program is distributed in the hope that it will be useful, but
489
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
490
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
491
14
# PURPOSE.  See the GNU General Public License for more details.
492
15
#
493
16
# You should have received a copy of the GNU General Public License along
494
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
495
18
496
19
"""The test suite for the Qt UI of the Ubuntu One Installer."""
497
20
498
21
from ubuntuone_installer.tests import TestCase
499
22
500
23
import ubuntuone_installer.gui.qt.main.windows as main_module
501
24
502
25
# pylint: disable=W0212
503
26
504
27
from ubuntuone.platform.credentials import (
505
28
    APP_NAME,
506
29
    DESCRIPTION,
507
30
    TC_URL,
508
31
)
509
32
510
33
511
34
class FakeSSOCred(object):
512
35
    """A fake sso_cred."""
513
36
514
37
    _registered_to_signal = False
515
38
    _login_args = ()
516
39
    on_credentials_found = None
517
40
518
41
    def register_to_signals(self):
519
42
        """Fake method."""
520
43
        self._registered_to_signal = True
521
44
522
45
    def login_or_register_to_get_credentials(self, *args, **kwargs):
523
46
        """Fake method."""
524
47
        self._login_args = (args, kwargs)
525
48
526
49
527
50
class FakeSSOClient(object):
528
51
529
52
    """Fake UbuntuSSOClient."""
530
53
531
54
    sso_cred = FakeSSOCred()
532
55
    testcase = None
533
56
534
57
    def connect(self):
535
58
        """Fake method."""
536
59
        self.testcase._connected = True
537
60
        return self
538
61
539
62
540
63
class MainTestCase(TestCase):
541
64
542
65
    """Tests for the main() function."""
543
66
544
67
    _connected = False
545
68
546
69
    def setUp(self):
547
70
        """Prepare tests."""
548
71
        self.patch(main_module, "UbuntuSSOClient", FakeSSOClient)
549
72
        main_module.UbuntuSSOClient.testcase = self
550
73
551
74
    def test_connect(self):
552
75
        """Test that we instantiate the SSO Client and connect."""
553
76
        main_module.main()
554
77
        self.assertEqual(FakeSSOClient.testcase._connected, True)
555
78
556
79
    def test_credentials_found_cb(self):
557
80
        """Test that the credentials found signal is connected."""
558
81
        main_module.main()
559
82
        self.assertEqual(
560
83
            FakeSSOClient.sso_cred.on_credentials_found_cb.__name__,
561
84
            "stop")
562
85
563
86
    def test_registered(self):
564
87
        """Test that the credentials registers to signals."""
565
88
        main_module.main()
566
89
        self.assertEqual(FakeSSOClient.sso_cred._registered_to_signal,
567
90
            True)
568
91
569
92
    def test_check_register_args(self):
570
93
        """Test that the credentials registers to signals."""
571
94
        main_module.main()
572
95
        self.assertEqual(FakeSSOClient.sso_cred._login_args,
573
96
            ((APP_NAME, TC_URL, DESCRIPTION, 0),
574
97
            {'ui_module': 'ubuntuone_installer.gui.qt.embedded_sso'}))
575
98
0
576
=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
577
--- ubuntuone_installer/gui/qt/main/windows.py	2011-07-27 14:53:56 +0000
578
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-08-02 20:49:39 +0000
579
@@ -19,34 +19,26 @@
580
19
19
581
20
# pylint: disable=E1101, F0401, W0404
20
# pylint: disable=E1101, F0401, W0404
582
21
21
594
22
from twisted.internet.defer import inlineCallbacks
22
import sys
595
23
from ubuntu_sso.main.windows import UbuntuSSOClient
23
596
24
24
from PyQt4 import QtGui
597
25
from ubuntuone.platform.credentials import (
25
598
26
    APP_NAME,
26
599
27
    DESCRIPTION,
27
def stop(*args):
600
28
    TC_URL,
28
    """End the process."""
601
29
)
29
    from twisted.internet import reactor
602
30
30
    reactor.stop()
603
31
31
604
32
@inlineCallbacks
32
605
33
def main():
33
def main():
606
34
    """Perform a client request to be logged in."""
34
    """Perform a client request to be logged in."""
625
35
    client = UbuntuSSOClient()
35
626
36
    client = yield client.connect()
36
    app = QtGui.QApplication(sys.argv)
627
37
37
    import qtreactor.qt4reactor
628
38
    @inlineCallbacks
38
    qtreactor.qt4reactor.install()
629
39
    def stop(*args):
39
    from ubuntuone_installer.gui.qt.gui import MainWindow
630
40
        """End the process."""
40
    from twisted.internet import reactor
631
41
        from twisted.internet import reactor
41
    window = MainWindow(close_callback=stop)
632
42
        yield client.sso_cred.unregister_to_signals()
42
    app.window = window
633
43
        reactor.stop()
43
    window.show()
634
44
44
    reactor.run()
617
45
    client.sso_cred.on_credentials_found_cb = stop
618
46
    client.sso_cred.on_authorization_denied_cb = stop
619
47
    client.sso_cred.on_credentials_error_cb = stop
620
48
    yield client.sso_cred.register_to_signals()
621
49
    yield client.sso_cred.login_or_register_to_get_credentials(APP_NAME,
622
50
        TC_URL,
623
51
        DESCRIPTION, 0,
624
52
        ui_module="ubuntuone_installer.gui.qt.embedded_sso")
635
53
45
636
=== modified file 'ubuntuone_installer/gui/qt/sync_now_or_later.py'
637
--- ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-06-29 11:44:23 +0000
638
+++ ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-08-02 20:49:39 +0000
639
@@ -1,44 +1,44 @@
684
1
# -*- coding: utf-8 -*-
1
# -*- coding: utf-8 -*-
685
2
2
686
3
# Authors: Roberto Alsina <roberto.alsina@canonical.com>
3
# Authors: Roberto Alsina <roberto.alsina@canonical.com>
687
4
#
4
#
688
5
# Copyright 2011 Canonical Ltd.
5
# Copyright 2011 Canonical Ltd.
689
6
#
6
#
690
7
# This program is free software: you can redistribute it and/or modify it
7
# This program is free software: you can redistribute it and/or modify it
691
8
# under the terms of the GNU General Public License version 3, as published
8
# under the terms of the GNU General Public License version 3, as published
692
9
# by the Free Software Foundation.
9
# by the Free Software Foundation.
693
10
#
10
#
694
11
# This program is distributed in the hope that it will be useful, but
11
# This program is distributed in the hope that it will be useful, but
695
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
696
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
697
14
# PURPOSE.  See the GNU General Public License for more details.
14
# PURPOSE.  See the GNU General Public License for more details.
698
15
#
15
#
699
16
# You should have received a copy of the GNU General Public License along
16
# You should have received a copy of the GNU General Public License along
700
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
701
18
18
702
19
"""The user interface for the Ubuntu One Installer."""
19
"""The user interface for the Ubuntu One Installer."""
703
20
20
704
21
from PyQt4 import QtGui
21
from PyQt4 import QtGui
705
22
22
706
23
from ubuntuone_installer.gui.qt.ui import sync_now_or_later_ui
23
from ubuntuone_installer.gui.qt.ui import sync_now_or_later_ui
707
24
24
708
25
25
709
26
class SyncNowOrLaterPage(QtGui.QWizardPage):
26
class SyncNowOrLaterPage(QtGui.QWizardPage):
710
27
    """User can choose whether to sync now, later, or selectively"""
27
    """User can choose whether to sync now, later, or selectively"""
711
28
28
712
29
    def __init__(self, parent=None):
29
    def __init__(self, parent=None):
713
30
        QtGui.QWizardPage.__init__(self, parent)
30
        QtGui.QWizardPage.__init__(self, parent)
714
31
        self.ui = sync_now_or_later_ui.Ui_Form()
31
        self.ui = sync_now_or_later_ui.Ui_Form()
715
32
        self.ui.setupUi(self)
32
        self.ui.setupUi(self)
716
33
        self.registerField("sync_now", self.ui.sync_now)
33
        self.registerField("sync_now", self.ui.sync_now)
717
34
        self.registerField("sync_later", self.ui.sync_later)
34
        self.registerField("sync_later", self.ui.sync_later)
718
35
        self.registerField("sync_custom", self.ui.sync_custom)
35
        self.registerField("sync_custom", self.ui.sync_custom)
719
36
36
720
37
    # Invalid names of Qt-inherited methods
37
    # Invalid names of Qt-inherited methods
721
38
    # pylint: disable=C0103
38
    # pylint: disable=C0103
722
39
39
723
40
    def initializePage(self):
40
    def initializePage(self):
724
41
        """Setup UI details"""
41
        """Setup UI details"""
725
42
        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
42
        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
726
43
        self.wizard().setOption(QtGui.QWizard.NoCancelButton, True)
43
        self.wizard().setOption(QtGui.QWizard.NoCancelButton, True)
727
44
        self.wizard()._next_id = None
44
        self.wizard()._next_id = None
728
45
45
729
=== added file 'ubuntuone_installer/gui/qt/tests/test_currentuser.py'
730
--- ubuntuone_installer/gui/qt/tests/test_currentuser.py	1970-01-01 00:00:00 +0000
731
+++ ubuntuone_installer/gui/qt/tests/test_currentuser.py	2011-08-02 20:49:39 +0000
732
@@ -0,0 +1,90 @@
733
1
# -*- coding: utf-8 -*-
734
2
735
3
# Authors: Roberto Alsina <roberto.alsina@canonical.com>
736
4
#
737
5
# Copyright 2011 Canonical Ltd.
738
6
#
739
7
# This program is free software: you can redistribute it and/or modify it
740
8
# under the terms of the GNU General Public License version 3, as published
741
9
# by the Free Software Foundation.
742
10
#
743
11
# This program is distributed in the hope that it will be useful, but
744
12
# WITHOUT ANY WARRANTY; without even the implied warranties of
745
13
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
746
14
# PURPOSE.  See the GNU General Public License for more details.
747
15
#
748
16
# You should have received a copy of the GNU General Public License along
749
17
# with this program.  If not, see <http://www.gnu.org/licenses/>.
750
18
751
19
"""Tests for the CurrentUserController."""
752
20
753
21
from ubuntuone_installer.gui.qt import currentuser
754
22
from ubuntuone_installer.gui.qt.tests import BaseTestCase
755
23
756
24
757
25
class FakeView(object):
758
26
759
27
    """A Fake view for the controller."""
760
28
761
29
    def __init__(self):
762
30
        """Setup."""
763
31
        self.view = self
764
32
        self.ui = self
765
33
        self.email_edit = self
766
34
        self.password_edit = self
767
35
        self.app_name = "APP"
768
36
769
37
    def text(self):
770
38
        """Return some text."""
771
39
        return "text"
772
40
773
41
    def wizard(self):
774
42
        """Fake the wizard() method of QWizardPage."""
775
43
        return self
776
44
777
45
778
46
class FakeCredentialsManagementToolSuccess(object):
779
47
780
48
    """A fake CredentialsManagementTool where login succeeds."""
781
49
782
50
    def login_email_password(self, *args, **kwargs):
783
51
        """Fake credentials."""
784
52
        return {"x": "y"}
785
53
786
54
787
55
class FakeCredentialsManagementToolFailure(object):
788
56
789
57
    """A fake CredentialsManagementTool where login fails."""
790
58
791
59
    def login_email_password(self, *args, **kwargs):
792
60
        """Raises a credentials exception."""
793
61
        raise currentuser.CredentialsError("Failure")
794
62
795
63
796
64
class CurrentUserTestCase(BaseTestCase):
797
65
798
66
    """Test the CurrentUserController."""
799
67
800
68
    class_ui = FakeView
801
69
802
70
    def setUp(self):
803
71
        """Initialize this test instance."""
804
72
        self.controller = currentuser.CurrentUserController()
805
73
        self.controller.view = FakeView()
806
74
        super(CurrentUserTestCase, self).setUp()
807
75
808
76
    def test_login_success(self):
809
77
        """Check that login works correctly."""
810
78
        self.patch(currentuser, 'CredentialsManagementTool',
811
79
            FakeCredentialsManagementToolSuccess)
812
80
        self.patch(self.controller, 'on_logged_in', self._set_called)
813
81
        self.controller.login()
814
82
        self.assertEqual(self._called, (('APP', {'x': 'y'}), {}))
815
83
816
84
    def test_login_failure(self):
817
85
        """Check that login fails correctly."""
818
86
        self.patch(currentuser, 'CredentialsManagementTool',
819
87
            FakeCredentialsManagementToolFailure)
820
88
        self.patch(self.controller, 'on_login_error', self._set_called)
821
89
        self.controller.login()
822
90
        self.assertEqual(self._called, (('Failure',), {}))
823
0
91
824
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
825
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-02 14:12:22 +0000
826
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-02 20:49:39 +0000
827
@@ -24,18 +24,14 @@
828
24
import shutil
24
import shutil
829
25
import tempfile
25
import tempfile
830
26
26
831
27
from twisted.internet import defer
832
28
833
27
from PyQt4 import QtCore
29
from PyQt4 import QtCore
834
28
30
841
29
from ubuntuone.platform.credentials import (
31
from ubuntuone.platform.credentials import APP_NAME
836
30
    APP_NAME,
837
31
    TC_URL,
838
32
)
839
33
840
34
import ubuntu_sso
842
35
32
843
36
from ubuntuone_installer.gui.qt import gui
33
from ubuntuone_installer.gui.qt import gui
844
37
from ubuntuone_installer.gui.qt.tests import BaseTestCase
34
from ubuntuone_installer.gui.qt.tests import BaseTestCase
845
38
from ubuntuone_installer.gui.qt import embedded_sso
846
39
from ubuntuone_installer.gui.qt import forgotten
35
from ubuntuone_installer.gui.qt import forgotten
847
40
from ubuntuone_installer.gui.qt import local_folders
36
from ubuntuone_installer.gui.qt import local_folders
848
41
from ubuntuone_installer.gui.qt import setup_account
37
from ubuntuone_installer.gui.qt import setup_account
849
@@ -51,6 +47,15 @@
850
51
         u'token_secret': u'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
47
         u'token_secret': u'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
851
52
48
852
53
49
853
50
class FakeFailureCredentialsManagementTool(object):
854
51
855
52
    """A fake CredentialsManagementTool that fails."""
856
53
857
54
    def find_credentials(self):
858
55
        """Return a deferred that never triggers callback."""
859
56
        return defer.succeed({})
860
57
861
58
862
54
class FakeController(object):
59
class FakeController(object):
863
55
60
864
56
    """A fake controller for the tests."""
61
    """A fake controller for the tests."""
865
@@ -99,6 +104,9 @@
866
99
        """Fake hide."""
104
        """Fake hide."""
867
100
        self.hide_counter += 1
105
        self.hide_counter += 1
868
101
106
869
107
    def resize(self, *args):
870
108
        """Fake resize."""
871
109
872
102
110
873
103
class MainWindowTestCase(BaseTestCase):
111
class MainWindowTestCase(BaseTestCase):
874
104
    """Test the qt main window."""
112
    """Test the qt main window."""
875
@@ -118,6 +126,8 @@
876
118
        self.patch(gui, "ResetPasswordController", FakeController)
126
        self.patch(gui, "ResetPasswordController", FakeController)
877
119
        self.patch(gui, "AreYouSure", FakeAreYouSure)
127
        self.patch(gui, "AreYouSure", FakeAreYouSure)
878
120
        self.patch(gui, "LoadingOverlay", FakeOverlay)
128
        self.patch(gui, "LoadingOverlay", FakeOverlay)
879
129
        self.patch(gui, "CredentialsManagementTool",
880
130
            FakeFailureCredentialsManagementTool)
881
121
        super(MainWindowTestCase, self).setUp()
131
        super(MainWindowTestCase, self).setUp()
882
122
132
883
123
    def test_critical(self):
133
    def test_critical(self):
884
@@ -291,7 +301,7 @@
885
291
301
886
292
    def test_stage_progression_1(self):
302
    def test_stage_progression_1(self):
887
293
        """Check that each page in the wizard sets the correct stage."""
303
        """Check that each page in the wizard sets the correct stage."""
889
294
        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE)
304
        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE_ID)
890
295
        self.assertEqual(self.ui.sideWidget().stage, 0)
305
        self.assertEqual(self.ui.sideWidget().stage, 0)
891
296
306
892
297
    def test_stage_progression_2(self):
307
    def test_stage_progression_2(self):
893
@@ -360,11 +370,25 @@
894
360
        QtCore.QCoreApplication.instance().processEvents()
370
        QtCore.QCoreApplication.instance().processEvents()
895
361
        self.assertEqual(self.ui.result(), self.ui.Rejected)
371
        self.assertEqual(self.ui.result(), self.ui.Rejected)
896
362
372
897
373
    def test_license_next(self):
898
374
        """Test what's the license page's nextID."""
899
375
        self.assertEqual(self.ui.LICENSE_PAGE.nextId(), self.ui.SIGNIN_PAGE)
900
376
901
377
    def test_license_next_with_creds(self):
902
378
        """Test what's the license page's nextID."""
903
379
        self.ui.creds_cb("fakecreds")
904
380
        self.assertEqual(self.ui.LICENSE_PAGE.nextId(),
905
381
            self.ui.local_folders_page_id)
906
382
907
363
383
908
364
class FakeSignal(object):
384
class FakeSignal(object):
909
365
385
910
366
    """A fake PyQt signal."""
386
    """A fake PyQt signal."""
911
367
387
912
388
    def __init__(self, *args, **kwargs):
913
389
        """Initialize."""
914
390
        self.target = lambda *args: None
915
391
916
368
    def connect(self, target):
392
    def connect(self, target):
917
369
        """Fake connect."""
393
        """Fake connect."""
918
370
        self.target = target
394
        self.target = target
919
@@ -388,51 +412,6 @@
920
388
        self.shown = True
412
        self.shown = True
921
389
413
922
390
414
923
391
class SSOGuiTestCase(BaseTestCase):
924
392
    """Test the custom SSO GUI."""
925
393
926
394
    class_ui = embedded_sso.UbuntuSSOClientGUI
927
395
928
396
    def setUp(self):
929
397
        """Initialize this test instance."""
930
398
        self.kwargs = {
931
399
            'app_name': APP_NAME,
932
400
            'tc_url': TC_URL,
933
401
            'help_text': '',
934
402
        }
935
403
        self.patch(embedded_sso, "MainWindow", FakeMainWindow)
936
404
        super(SSOGuiTestCase, self).setUp()
937
405
938
406
    def test_sso_client_gui(self):
939
407
        """Ensure the class instantiates correctly."""
940
408
        self.assertIsInstance(
941
409
            self.ui.controller,
942
410
            ubuntu_sso.qt.controllers.UbuntuSSOWizardController)
943
411
        self.assertIsInstance(self.ui.view, FakeMainWindow)
944
412
945
413
    def test_login_callback(self):
946
414
        """Test that the login success callback is correctly handled."""
947
415
        self.ui.login_success_callback = self._set_called
948
416
        self.ui.view.loginSuccess.emit("app", "email")
949
417
        self.assertEqual(self._called, (('app', 'email'), {}))
950
418
951
419
    def test_registration_callback(self):
952
420
        """Test that the registration success callback is correctly handled."""
953
421
        self.ui.registration_success_callback = self._set_called
954
422
        self.ui.view.registrationSuccess.emit("app", "email")
955
423
        self.assertEqual(self._called, (('app', 'email'), {}))
956
424
957
425
    def test_cancellation_callback(self):
958
426
        """Test that the cancellation callback is called right."""
959
427
        self.ui.user_cancellation_callback = self._set_called
960
428
        self.ui.view.userCancellation.emit("app")
961
429
        self.assertEqual(self._called, (('app',), {}))
962
430
963
431
    def test_view_is_shown(self):
964
432
        """Test that the view is actually shown."""
965
433
        self.assertTrue(self.ui.view.shown)
966
434
967
435
968
436
class LocalFoldersTestCase(BaseTestCase):
415
class LocalFoldersTestCase(BaseTestCase):
969
437
    """Test the LocalFoldersPage code."""
416
    """Test the LocalFoldersPage code."""
970
438
417
971
@@ -465,16 +444,10 @@
972
465
        self.assertEqual(path, self.tmpdir)
444
        self.assertEqual(path, self.tmpdir)
973
466
        self.assertEqual(size, 1337)
445
        self.assertEqual(size, 1337)
974
467
446
976
468
    def test_item_addition_removal(self):
447
    def test_item_addition(self):
977
469
        """Add an item (plus the default one), then remove them."""
448
        """Add an item (plus the default one), then remove them."""
978
470
        self.ui.add_folder(self.tmpdir)
449
        self.ui.add_folder(self.tmpdir)
986
471
        self.assertEqual(2, self.ui.ui.folder_list.topLevelItemCount())
450
        self.assertEqual(4, self.ui.ui.folder_list.topLevelItemCount())
980
472
        self.ui.on_folder_list_itemClicked(
981
473
            self.ui.ui.folder_list.topLevelItem(0), 2)
982
474
        self.ui.on_folder_list_itemClicked(
983
475
            self.ui.ui.folder_list.topLevelItem(0), 2)
984
476
        self.assertEqual(0, self.ui.ui.folder_list.topLevelItemCount())
985
477
        self.assertEqual({}, self.ui.items)
987
478
451
988
479
    def test_total_size(self):
452
    def test_total_size(self):
989
480
        """Test that the header reflects the change in item sizes."""
453
        """Test that the header reflects the change in item sizes."""
990
@@ -484,6 +457,8 @@
991
484
        self.assertEqual(0, self.ui.ui.folder_list.topLevelItemCount())
457
        self.assertEqual(0, self.ui.ui.folder_list.topLevelItemCount())
992
485
        item = self.ui.add_folder(self.tmpdir)
458
        item = self.ui.add_folder(self.tmpdir)
993
486
        item.size = 1337
459
        item.size = 1337
994
460
        item.thread.run()
995
461
        item.thread.join()
996
487
        self.ui.update_sizes()
462
        self.ui.update_sizes()
997
488
        self.assertEqual(unicode(self.ui.ui.folder_list.headerItem().text(1)),
463
        self.assertEqual(unicode(self.ui.ui.folder_list.headerItem().text(1)),
998
489
            u"Space (1337)")
464
            u"Space (1337)")
999
@@ -515,6 +490,7 @@
1000
515
        item = self.ui.add_folder(os.path.join("xyzzy", "xyzzy", "xyzzy"))
490
        item = self.ui.add_folder(os.path.join("xyzzy", "xyzzy", "xyzzy"))
1001
516
        self.assertEqual(1, self.ui.ui.folder_list.topLevelItemCount())
491
        self.assertEqual(1, self.ui.ui.folder_list.topLevelItemCount())
1002
517
        item.thread.run()
492
        item.thread.run()
1003
493
        item.thread.join()
1004
518
        self.ui.update_sizes()
494
        self.ui.update_sizes()
1005
519
        self.assertEqual(0, item.size)
495
        self.assertEqual(0, item.size)
1006
520
        # world did not explode
496
        # world did not explode
1007
@@ -758,16 +734,16 @@
1008
758
        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE)
734
        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE)
1009
759
        self.assertEqual(
735
        self.assertEqual(
1010
760
            True,
736
            True,
1012
761
            sideWidget().ui.states_frame.isVisible())
737
            self.ui.sideWidget().ui.states_frame.isVisible())
1013
762
        self.ui.on_currentIdChanged(self.ui.SIGNIN_PAGE)
738
        self.ui.on_currentIdChanged(self.ui.SIGNIN_PAGE)
1014
763
        self.assertEqual(
739
        self.assertEqual(
1015
764
            True,
740
            True,
1017
765
            sideWidget().ui.states_frame.isVisible())
741
            self.ui.sideWidget().ui.states_frame.isVisible())
1018
766
        self.ui.on_currentIdChanged(self.ui.local_folders_page_id)
742
        self.ui.on_currentIdChanged(self.ui.local_folders_page_id)
1019
767
        self.assertEqual(
743
        self.assertEqual(
1020
768
            True,
744
            True,
1022
769
            sideWidget().ui.states_frame.isVisible())
745
            self.ui.sideWidget().ui.states_frame.isVisible())
1023
770
        self.ui.on_currentIdChanged(self.ui.CONGRATULATIONS_PAGE)
746
        self.ui.on_currentIdChanged(self.ui.CONGRATULATIONS_PAGE)
1024
771
        self.assertEqual(
747
        self.assertEqual(
1025
772
            True,
748
            True,
1027
773
            sideWidget().ui.states_frame.isVisible())
749
            self.ui.sideWidget().ui.states_frame.isVisible())
Reviewer	Date Requested	Status
Natalia Bidart (community)	2011-08-01	Approve on 2011-08-02
Diego Sarmentero (community)		Approve on 2011-08-01
Review via email: mp+70015@code.launchpad.net