lp://staging/~dobey/ubuntuone-control-panel/update-from-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntuone-control-panel/stable-3-0 at revision 259

Roberto Alsina (community): Approve on 2012-04-11

Diff: 296 lines (+134/-8)

8 files modified

ubuntuone/controlpanel/gui/__init__.py (+4/-0)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+1/-0)
ubuntuone/controlpanel/gui/qt/gui.py (+26/-2)
ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+7/-0)
ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+2/-0)
ubuntuone/controlpanel/gui/qt/tests/test_gui.py (+76/-5)
ubuntuone/controlpanel/gui/qt/tests/test_start.py (+17/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

259. By dobey on 2012-04-11

Merge fixes from trunk for 3.0.0 release

258. By Natalia Bidart on 2012-04-03

- Release v2.99.92.

257. By Diego Sarmentero on 2012-04-03

- Updating from trunk up to revno 308:

[ Brian Curtin <email address hidden> ]
  - Match test behavior with updated functionality.

[ Diego Sarmentero <email address hidden> ]
  - Removing encoding to return unicode (LP: #966513).
  - Using limit_bandwidth attribute to properly process the info dict
    for preferences (LP: #944256).

[ Natalia B. Bidart <email address hidden> ]
  - When user rejects the License, also uninstall the application
    when in Windows (LP: #968327).
  - Remove custom path validation and use the one provided by syncdaemon
    (LP: #824252).
  - Make use of the new feature from syncdaemon where 'refresh_volumes'
    returns a deferred that gets fired when the server info is ready
    (LP: #851810).
  - Ensured that Folders' tree view has proper texts in the columns to
    have proper column widths (LP: #965175).

[ Roberto Alsina <email address hidden> ]
   - Fixed the combination of --minimized --with-icon options
    (LP: #968369).

256. By Roberto Alsina on 2012-03-27

[ Natalia B. Bidart <email address hidden> ]
  - Isolate linux specific styling hacks to avoid weird side effects
    on windows (LP: #961229).
  - Handle errors from backend on the signin wizard page (LP: #945078).
  - Avoid the 'show/hide details' button to grow when focused (LP: #961348).
  - Modified stylesheet to use the new colours from brand, and to also ease
    the reading of white text (LP: #956077).
  - Fixed the gap tab outlines (LP: #822629).

[ Brian Curtin <email address hidden> ]
  - Add Ubuntu One to the Windows auto-start registry key.
  - Made the creation of symlinks a separated test case so it can be
    skipped on Windows.
  - Better cleanup in tests -- allow the rest of the test suite to
    complete. Fix courtesy of Natalia Bidart.

[ Roberto Alsina <email address hidden> ]
  - Made the license page from the wizard be shown (only when called
    with --installer) (LP: #933697).
  - Forced white background (LP: #961346).

255. By Natalia Bidart on 2012-03-21

- Release v2.99.91.

254. By Roberto Alsina on 2012-03-21

- Updating from trunk up to revno 292:

[ Manuel de la Pena <email address hidden> ]
  - Added the app name from ubuntu one to be used in the webclient
    so that it is shown in the sso ui (LP: #952880).

[ Natalia B. Bidart <email address hidden> ]
  - Added the "License" page to the wizard (part of LP: #933697).
    So far is not visible from a regular run, will be enabled for
    windows only in another branch.
  - Added 'Computer to cloud' page to the wizard
    (part of LP: #933697).
  - Tweaked the title of the aforementioned page (LP: #888521).
  - Added 'Cloud to computer' page to the initial wizard
    (part of LP: #933697).
  - Added a confirmation dialog to quit the wizard
    (part of LP: #933697).
  - Implemented a method to list the user's default folders in
    every platform (part of LP: #933697).
  - Apply new specification for tabbing navigation and tabbing style
    (LP: #942020).
  - Make the "Explore" buttons for folders be disabled (style-wise)
    when the folder is not synched (LP: #949035).
  - Removed first line from the man page for the qt control panel
    so is detected as such and installed (LP: #948970).

[ Roberto Alsina <email address hidden> ]
  - Added several tweaks to the UI stylesheet to avoid 'movements'
    when focusing a button, and to remove the ugly border from the
    twitter and facebook buttons.
  - Enable platform-specific styling (LP: #953318).
  - Truncate the argument list at argv[0] before passing to argparse
    (LP: #956143).
  - Arranged Tab ordering in folders tab according to guidelines
    (LP: #950073).
  - Fixed tests so they work under non-english locales (LP: #951716).
  - Enabled Qt translation engine so standard dialogs are translated
    (LP: #951651).
  - Switched to the native file chooser on Linux (LP: #947711).
  - Fixed --alert and --switch-to tabname and updated --help and
    manpage accordingly (LP: #940465).

[ Rodney Dawes <email address hidden> ]
  - Don't hard-code the font sizes (LP: #942025, LP: #953062).

253. By Natalia Bidart on 2012-03-06

- Release v2.99.90.

252. By Roberto Alsina on 2012-03-06

- Updating from trunk up to revno 276:

[ Natalia B. Bidart <email address hidden> ]
  - Increasing timeout for webclient tests.
  - Changed the initial signin page so both login and register options
    are shown, and when clicked, the user is presented with either the Qt
    login dialog, or the Qt registration dialog (LP: #933576).
  - 'Apply these settings' button should be at the topmost right corner
    in the Settings tab (LP: #944120).
  - Handle properly default/non-default buttons (part of LP: #933576).
  - Avoid AlreadyInstalledError in windows (LP: #942655).
  - No more strings coming up from the Designer ui files (LP: #938626).
  - Make gettext return unicode so we can format strings
    with unicode variables (LP: #937809).

[ Roberto Alsina <email address hidden> ]
  - Added a barebones manpage for ubuntuone-control-panel-qt
    (LP: #933021).
  - Reset the signal handler so that ctrl+c works (LP: #944012).
  - Preserved the scrollbar position when clearing/filling the folder
    list (LP: #942355).
  - Added keyboard shortcuts for quitting the control panel
    (LP: #900753).
  - Cleanup the ubuntuone-control-panel-qt script moving all logic into
    the main module (LP: #938102).
  - Parse Qt options correctly (LP: #910834).
  - Migrated to argparse.

[ Rodney Dawes <email address hidden> ]
  - Remove the GTK+ 2.x control panel
    (LP: #934270).
  - Pass ubuntuone-installer as app name to QApplication to avoid
    duplication (LP: #939691).

251. By Natalia Bidart on 2012-02-22

- Release v2.99.5.

250. By Diego Sarmentero on 2012-02-22

- Updating from trunk up to revno 262:

[ Diego Sarmentero <email address hidden> ]
  - Control Panel shows quota in red with more accuracy depending on the
    free space (LP: #901314).
  - The QT UI will make a button inactive while a (re-) connection is
    in progress (LP: #878867).

[ Natalia B. Bidart <email address hidden> ]
  - Center the main window when openning it (LP: #934173).