← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ubuntuone-control-panel/utopic

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Rodney Dawes
  • Date: 2012-08-23 15:19:03 UTC
  • mfrom: (1.1.36)
  • Revision ID: package-import@ubuntu.com-20120823151903-3xm1f1477ut3tqxc
Tags: 3.99.4-0ubuntu1
https://launchpad.net/bugs/1033488
* New upstream release.
  - Show error for folder subscribe if local path already exists and is not
    a folder. (LP: #1033488)
* debian/copyright:
  - Update to be more in line with dep5.
* debian/patches:
  - Remove patches included upstream.
* debian/rules:
  - Update to allow building directly on older versions of Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/controlpanel/gui/qt/main/__init__.py
38
38
    source = dbus_main
39
39
# pylint: enable=C0103
40
40
 
 
41
from ubuntuone.controlpanel.utils import install_config_and_daemons
 
42
 
41
43
 
42
44
def parser_options():
43
45
    """Parse command line parameters."""
45
47
    result.add_argument("--switch-to", dest="switch_to",
46
48
                        metavar="PANEL_NAME", default="",
47
49
                        help="Start Ubuntu One in the "
48
 
                             "PANEL_NAME tab. Possible values are: "
49
 
                             "folders, devices, settings, account")
 
50
                            "PANEL_NAME tab. Possible values are: "
 
51
                            "folders, share_links, devices, settings, account")
50
52
    result.add_argument("--minimized", dest="minimized", action="store_true",
51
53
                        default=False,
52
54
                        help="Start Ubuntu One "
119
121
        data.append(unicode(qss.data()))
120
122
    app.setStyleSheet('\n'.join(data))
121
123
 
 
124
    install_config_and_daemons()
 
125
 
122
126
    # Unused variable 'window', 'icon', pylint: disable=W0612
123
127
    icon, window = start(lambda: source.main_quit(app),
124
128
                         minimized=minimized, with_icon=with_icon,