← Back to branch summary

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

« back to all changes in this revision

Viewing changes to data/qt/account.ui

https://launchpad.net/bugs/845105
https://launchpad.net/bugs/850142
https://launchpad.net/bugs/849494
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/835093
https://launchpad.net/bugs/819955
* New upstream release:
  [ Alejandro J. Cura <alecu@canonical.com>]
    - Do not throw a webclient error when closing
      (LP: #845105).
  [ Natalia B. Bidart <natalia.bidart@canonical.com> ]
    - Removed all code related to Bookmarks (LP: #850142).
    - Replaces references to "Evolution" by "Thunderbird" (LP: #849494).
  [ Rodney Dawes <rodney.dawes@canonical.com> ]
    - Don't install a .desktop file for control panel
      (part of LP: #838778).
    - Point the indicator/Unity API at the installer .desktop file
      (part of LP: #838778).
    - Set the WMCLASS so Unity will fall back properly
      (part of LP: #838778).
    - Fix a few grammar mistakes (LP: #835093).
    - Don't show the "Get NGB free!" label on "Join now" button at all
      (LP: #819955).
* debian/control:
  - ubuntuone-control-panel-gtk depends now on ubuntuone-installer >= 2.0.0.
  - require ubuntuone-client >= 2.0.0.
  - require ubuntu-sso-client >= 1.4.0.
  - no longer install a .desktop file (will be installed by ubuntuone-installer).

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/qt/account.ui
35
35
        <string>Your services</string>
36
36
       </property>
37
37
       <layout class="QVBoxLayout" name="verticalLayout_3">
38
 
        <property name="margin">
 
38
        <property name="leftMargin">
 
39
         <number>10</number>
 
40
        </property>
 
41
        <property name="topMargin">
 
42
         <number>0</number>
 
43
        </property>
 
44
        <property name="rightMargin">
 
45
         <number>0</number>
 
46
        </property>
 
47
        <property name="bottomMargin">
39
48
         <number>0</number>
40
49
        </property>
41
50
        <item>
61
70
        <string>Personal details</string>
62
71
       </property>
63
72
       <layout class="QVBoxLayout" name="verticalLayout_4">
64
 
        <property name="margin">
 
73
        <property name="leftMargin">
 
74
         <number>10</number>
 
75
        </property>
 
76
        <property name="topMargin">
 
77
         <number>0</number>
 
78
        </property>
 
79
        <property name="rightMargin">
 
80
         <number>0</number>
 
81
        </property>
 
82
        <property name="bottomMargin">
65
83
         <number>0</number>
66
84
        </property>
67
85
        <item>
68
86
         <layout class="QVBoxLayout" name="verticalLayout_2">
 
87
          <property name="leftMargin">
 
88
           <number>6</number>
 
89
          </property>
69
90
          <item>
70
91
           <widget class="QLabel" name="name_label">
71
92
            <property name="text">