Merge lp:~tealeg/landscape-client/allow_LDS_credentials_in_ui into lp:~landscape/landscape-client/trunk
- allow_LDS_credentials_in_ui
- Merge into trunk
Proposed by
Geoff Teale
| Status: | Merged |
|---|---|
| Approved by: | Free Ekanayaka |
| Approved revision: | 429 |
| Merged at revision: | 428 |
| Proposed branch: | lp:~tealeg/landscape-client/allow_LDS_credentials_in_ui |
| Merge into: | lp:~landscape/landscape-client/trunk |
| Prerequisite: | lp:~tealeg/landscape-client/invoke-registration-from-settings-ui |
| Diff against target: |
835 lines (+336/-390) 3 files modified
landscape/ui/view/configuration.py (+3/-12) landscape/ui/view/tests/test_configuration.py (+4/-4) landscape/ui/view/ui/landscape-client-settings.glade (+329/-374) |
| To merge this branch: | bzr merge lp:~tealeg/landscape-client/allow_LDS_credentials_in_ui |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Free Ekanayaka (community) | Approve | ||
| Fernando Correa Neto (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
Fixes bug #912163.
Change the settings UI to allow the user to entry account-name and password for LDS instances as well as hosted. Change the title from "Landscape Client Settings" to "Management service settings". Add links to landscape.
Note this branch is dependent on the "invoke-
To post a comment you must log in.
- 429. By Geoff Teale
-
Merged forward changes from invoke-
registration- from-settings- ui
Revision history for this message
| Geoff Teale (tealeg) wrote : | # |
Well Fernando - Glade is like that :-)
I actually sometimes end up hand hacking the Glade XML as well, to get out of sticky situations the Glade designer puts you in.
Revision history for this message
| Free Ekanayaka (free.ekanayaka) wrote : | # |
Nice stuff, +1!
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'landscape/ui/view/configuration.py' |
| 2 | --- landscape/ui/view/configuration.py 2012-01-12 16:28:24 +0000 |
| 3 | +++ landscape/ui/view/configuration.py 2012-01-12 16:28:24 +0000 |
| 4 | @@ -27,7 +27,7 @@ |
| 5 | Configure the dialog window and pack content from the Glade UI file |
| 6 | into the main content area. |
| 7 | """ |
| 8 | - self.set_title("Client Settings") |
| 9 | + self.set_title("Management Service Settings") |
| 10 | content_area = self.get_content_area() |
| 11 | vbox = self._builder.get_object( |
| 12 | "landscape-client-settings-dialog-vbox") |
| 13 | @@ -62,11 +62,9 @@ |
| 14 | """ |
| 15 | self._account_entry = self._builder.get_object("account-name-entry") |
| 16 | self._password_entry = self._builder.get_object( |
| 17 | - "reigstered-password-entry") |
| 18 | + "password-entry") |
| 19 | self._server_host_name_entry = self._builder.get_object( |
| 20 | "server-host-name-entry") |
| 21 | - self._account_entry.set_sensitive(False) |
| 22 | - self._password_entry.set_sensitive(False) |
| 23 | self._server_host_name_entry.set_sensitive(False) |
| 24 | self._account_entry.connect("changed", self._update_account) |
| 25 | self._password_entry.connect("changed", self._update_password) |
| 26 | @@ -121,14 +119,7 @@ |
| 27 | self._server_host_name_entry.get_text() |
| 28 | |
| 29 | def _set_entry_sensitivity(self, hosted): |
| 30 | - if hosted: |
| 31 | - self._account_entry.set_sensitive(True) |
| 32 | - self._password_entry.set_sensitive(True) |
| 33 | - self._server_host_name_entry.set_sensitive(False) |
| 34 | - else: |
| 35 | - self._account_entry.set_sensitive(False) |
| 36 | - self._password_entry.set_sensitive(False) |
| 37 | - self._server_host_name_entry.set_sensitive(True) |
| 38 | + self._server_host_name_entry.set_sensitive(not hosted) |
| 39 | |
| 40 | def select_landscape_hosting(self): |
| 41 | hosted = self._hosted_radiobutton.get_active() |
| 42 | |
| 43 | === modified file 'landscape/ui/view/tests/test_configuration.py' |
| 44 | --- landscape/ui/view/tests/test_configuration.py 2012-01-12 16:28:24 +0000 |
| 45 | +++ landscape/ui/view/tests/test_configuration.py 2012-01-12 16:28:24 +0000 |
| 46 | @@ -74,8 +74,8 @@ |
| 47 | dialog._dedicated_radiobutton.set_active(True) |
| 48 | self.assertFalse(dialog._hosted_radiobutton.get_active()) |
| 49 | self.assertTrue(dialog._dedicated_radiobutton.get_active()) |
| 50 | - self.assertFalse(dialog._account_entry.get_sensitive()) |
| 51 | - self.assertFalse(dialog._password_entry.get_sensitive()) |
| 52 | + self.assertTrue(dialog._account_entry.get_sensitive()) |
| 53 | + self.assertTrue(dialog._password_entry.get_sensitive()) |
| 54 | self.assertTrue(dialog._server_host_name_entry.get_sensitive()) |
| 55 | dialog._hosted_radiobutton.set_active(True) |
| 56 | self.assertTrue(dialog._hosted_radiobutton.get_active()) |
| 57 | @@ -276,8 +276,8 @@ |
| 58 | self.assertIsInstance(box, Gtk.Box) |
| 59 | self.assertFalse(dialog._hosted_radiobutton.get_active()) |
| 60 | self.assertTrue(dialog._dedicated_radiobutton.get_active()) |
| 61 | - self.assertFalse(dialog._account_entry.get_sensitive()) |
| 62 | - self.assertFalse(dialog._password_entry.get_sensitive()) |
| 63 | + self.assertTrue(dialog._account_entry.get_sensitive()) |
| 64 | + self.assertTrue(dialog._password_entry.get_sensitive()) |
| 65 | self.assertTrue(dialog._server_host_name_entry.get_sensitive()) |
| 66 | |
| 67 | def test_load_data_from_config(self): |
| 68 | |
| 69 | === modified file 'landscape/ui/view/ui/landscape-client-settings.glade' |
| 70 | --- landscape/ui/view/ui/landscape-client-settings.glade 2012-01-12 16:28:24 +0000 |
| 71 | +++ landscape/ui/view/ui/landscape-client-settings.glade 2012-01-12 16:28:24 +0000 |
| 72 | @@ -4,7 +4,7 @@ |
| 73 | <object class="GtkDialog" id="landscape-client-settings-dialog"> |
| 74 | <property name="can_focus">False</property> |
| 75 | <property name="border_width">5</property> |
| 76 | - <property name="title" translatable="yes">Landscape Client Settings</property> |
| 77 | + <property name="title" translatable="yes">Management Service Settings</property> |
| 78 | <property name="resizable">False</property> |
| 79 | <property name="modal">True</property> |
| 80 | <property name="window_position">center</property> |
| 81 | @@ -67,303 +67,338 @@ |
| 82 | <property name="orientation">vertical</property> |
| 83 | <property name="spacing">6</property> |
| 84 | <child> |
| 85 | - <object class="GtkFrame" id="landscape-server-type-frame"> |
| 86 | + <object class="GtkFrame" id="server-type-frame"> |
| 87 | <property name="visible">True</property> |
| 88 | <property name="can_focus">False</property> |
| 89 | + <property name="hexpand">True</property> |
| 90 | <property name="label_xalign">0</property> |
| 91 | <property name="shadow_type">none</property> |
| 92 | <child> |
| 93 | - <object class="GtkAlignment" id="landscape-server-type-frame-alignment"> |
| 94 | + <object class="GtkAlignment" id="server-type-alignment"> |
| 95 | <property name="visible">True</property> |
| 96 | <property name="can_focus">False</property> |
| 97 | - <property name="hexpand">True</property> |
| 98 | - <property name="vexpand">True</property> |
| 99 | <property name="top_padding">6</property> |
| 100 | + <property name="bottom_padding">6</property> |
| 101 | <property name="left_padding">12</property> |
| 102 | + <property name="right_padding">6</property> |
| 103 | <child> |
| 104 | - <object class="GtkBox" id="server-type-options-vbox"> |
| 105 | + <object class="GtkBox" id="service-type-vbox"> |
| 106 | <property name="visible">True</property> |
| 107 | <property name="can_focus">False</property> |
| 108 | - <property name="hexpand">True</property> |
| 109 | - <property name="vexpand">True</property> |
| 110 | <property name="orientation">vertical</property> |
| 111 | - <property name="spacing">12</property> |
| 112 | + <property name="spacing">6</property> |
| 113 | <child> |
| 114 | <object class="GtkBox" id="hosted-hbox"> |
| 115 | <property name="visible">True</property> |
| 116 | <property name="can_focus">False</property> |
| 117 | + <property name="spacing">6</property> |
| 118 | + <child> |
| 119 | + <object class="GtkRadioButton" id="hosted-radiobutton"> |
| 120 | + <property name="label" translatable="yes">Hosted by Canonical at:</property> |
| 121 | + <property name="visible">True</property> |
| 122 | + <property name="can_focus">True</property> |
| 123 | + <property name="receives_default">False</property> |
| 124 | + <property name="use_action_appearance">False</property> |
| 125 | + <property name="xalign">0</property> |
| 126 | + <property name="active">True</property> |
| 127 | + <property name="draw_indicator">True</property> |
| 128 | + </object> |
| 129 | + <packing> |
| 130 | + <property name="expand">False</property> |
| 131 | + <property name="fill">True</property> |
| 132 | + <property name="position">0</property> |
| 133 | + </packing> |
| 134 | + </child> |
| 135 | + <child> |
| 136 | + <object class="GtkLinkButton" id="hosted-linkbutton"> |
| 137 | + <property name="label" translatable="yes">landscape.canonical.com</property> |
| 138 | + <property name="visible">True</property> |
| 139 | + <property name="can_focus">True</property> |
| 140 | + <property name="receives_default">True</property> |
| 141 | + <property name="has_tooltip">True</property> |
| 142 | + <property name="use_action_appearance">False</property> |
| 143 | + <property name="relief">none</property> |
| 144 | + <property name="uri">http://landscape.canonical.com</property> |
| 145 | + </object> |
| 146 | + <packing> |
| 147 | + <property name="expand">False</property> |
| 148 | + <property name="fill">True</property> |
| 149 | + <property name="position">1</property> |
| 150 | + </packing> |
| 151 | + </child> |
| 152 | + </object> |
| 153 | + <packing> |
| 154 | + <property name="expand">False</property> |
| 155 | + <property name="fill">True</property> |
| 156 | + <property name="position">0</property> |
| 157 | + </packing> |
| 158 | + </child> |
| 159 | + <child> |
| 160 | + <object class="GtkBox" id="dedicated-hbox"> |
| 161 | + <property name="visible">True</property> |
| 162 | + <property name="can_focus">False</property> |
| 163 | + <property name="spacing">6</property> |
| 164 | + <child> |
| 165 | + <object class="GtkRadioButton" id="dedicated-radiobutton"> |
| 166 | + <property name="label" translatable="yes">Dedicated management service at:</property> |
| 167 | + <property name="visible">True</property> |
| 168 | + <property name="can_focus">True</property> |
| 169 | + <property name="receives_default">False</property> |
| 170 | + <property name="use_action_appearance">False</property> |
| 171 | + <property name="xalign">0</property> |
| 172 | + <property name="active">True</property> |
| 173 | + <property name="draw_indicator">True</property> |
| 174 | + <property name="group">hosted-radiobutton</property> |
| 175 | + </object> |
| 176 | + <packing> |
| 177 | + <property name="expand">False</property> |
| 178 | + <property name="fill">True</property> |
| 179 | + <property name="position">0</property> |
| 180 | + </packing> |
| 181 | + </child> |
| 182 | + <child> |
| 183 | + <object class="GtkEntry" id="server-host-name-entry"> |
| 184 | + <property name="visible">True</property> |
| 185 | + <property name="can_focus">True</property> |
| 186 | + <property name="hexpand">True</property> |
| 187 | + <property name="invisible_char">•</property> |
| 188 | + </object> |
| 189 | + <packing> |
| 190 | + <property name="expand">False</property> |
| 191 | + <property name="fill">True</property> |
| 192 | + <property name="position">1</property> |
| 193 | + </packing> |
| 194 | + </child> |
| 195 | + </object> |
| 196 | + <packing> |
| 197 | + <property name="expand">False</property> |
| 198 | + <property name="fill">True</property> |
| 199 | + <property name="position">1</property> |
| 200 | + </packing> |
| 201 | + </child> |
| 202 | + </object> |
| 203 | + </child> |
| 204 | + </object> |
| 205 | + </child> |
| 206 | + <child type="label"> |
| 207 | + <object class="GtkLabel" id="server-type-label"> |
| 208 | + <property name="visible">True</property> |
| 209 | + <property name="can_focus">False</property> |
| 210 | + <property name="label" translatable="yes"><b>Management service type:</b></property> |
| 211 | + <property name="use_markup">True</property> |
| 212 | + </object> |
| 213 | + </child> |
| 214 | + </object> |
| 215 | + <packing> |
| 216 | + <property name="expand">False</property> |
| 217 | + <property name="fill">True</property> |
| 218 | + <property name="position">0</property> |
| 219 | + </packing> |
| 220 | + </child> |
| 221 | + <child> |
| 222 | + <object class="GtkFrame" id="credentials-frame"> |
| 223 | + <property name="visible">True</property> |
| 224 | + <property name="can_focus">False</property> |
| 225 | + <property name="hexpand">True</property> |
| 226 | + <property name="vexpand">True</property> |
| 227 | + <property name="label_xalign">0</property> |
| 228 | + <property name="shadow_type">none</property> |
| 229 | + <child> |
| 230 | + <object class="GtkAlignment" id="credentials-alignment"> |
| 231 | + <property name="visible">True</property> |
| 232 | + <property name="can_focus">False</property> |
| 233 | + <property name="top_padding">6</property> |
| 234 | + <property name="bottom_padding">6</property> |
| 235 | + <property name="left_padding">12</property> |
| 236 | + <property name="right_padding">6</property> |
| 237 | + <child> |
| 238 | + <object class="GtkBox" id="credentials-vbox"> |
| 239 | + <property name="visible">True</property> |
| 240 | + <property name="can_focus">False</property> |
| 241 | + <property name="orientation">vertical</property> |
| 242 | + <property name="spacing">6</property> |
| 243 | + <child> |
| 244 | + <object class="GtkBox" id="account-name-hbox"> |
| 245 | + <property name="visible">True</property> |
| 246 | + <property name="can_focus">False</property> |
| 247 | + <property name="spacing">6</property> |
| 248 | + <child> |
| 249 | + <object class="GtkLabel" id="account-name-label"> |
| 250 | + <property name="visible">True</property> |
| 251 | + <property name="can_focus">False</property> |
| 252 | + <property name="xalign">0</property> |
| 253 | + <property name="label" translatable="yes">Account name:</property> |
| 254 | + </object> |
| 255 | + <packing> |
| 256 | + <property name="expand">False</property> |
| 257 | + <property name="fill">True</property> |
| 258 | + <property name="position">0</property> |
| 259 | + </packing> |
| 260 | + </child> |
| 261 | + <child> |
| 262 | + <object class="GtkEntry" id="account-name-entry"> |
| 263 | + <property name="visible">True</property> |
| 264 | + <property name="can_focus">True</property> |
| 265 | + <property name="hexpand">True</property> |
| 266 | + <property name="invisible_char">•</property> |
| 267 | + </object> |
| 268 | + <packing> |
| 269 | + <property name="expand">False</property> |
| 270 | + <property name="fill">True</property> |
| 271 | + <property name="position">1</property> |
| 272 | + </packing> |
| 273 | + </child> |
| 274 | + <child> |
| 275 | + <object class="GtkLinkButton" id="create-account-linkbutton"> |
| 276 | + <property name="label" translatable="yes">Create account</property> |
| 277 | + <property name="visible">True</property> |
| 278 | + <property name="can_focus">True</property> |
| 279 | + <property name="receives_default">True</property> |
| 280 | + <property name="has_tooltip">True</property> |
| 281 | + <property name="use_action_appearance">False</property> |
| 282 | + <property name="relief">none</property> |
| 283 | + <property name="uri">http://landscape.canonical.com</property> |
| 284 | + </object> |
| 285 | + <packing> |
| 286 | + <property name="expand">False</property> |
| 287 | + <property name="fill">True</property> |
| 288 | + <property name="position">2</property> |
| 289 | + </packing> |
| 290 | + </child> |
| 291 | + </object> |
| 292 | + <packing> |
| 293 | + <property name="expand">False</property> |
| 294 | + <property name="fill">True</property> |
| 295 | + <property name="position">0</property> |
| 296 | + </packing> |
| 297 | + </child> |
| 298 | + <child> |
| 299 | + <object class="GtkBox" id="password-hbox"> |
| 300 | + <property name="visible">True</property> |
| 301 | + <property name="can_focus">False</property> |
| 302 | + <property name="spacing">6</property> |
| 303 | + <child> |
| 304 | + <object class="GtkLabel" id="password-label"> |
| 305 | + <property name="visible">True</property> |
| 306 | + <property name="can_focus">False</property> |
| 307 | + <property name="xalign">0</property> |
| 308 | + <property name="label" translatable="yes">Password:</property> |
| 309 | + </object> |
| 310 | + <packing> |
| 311 | + <property name="expand">False</property> |
| 312 | + <property name="fill">True</property> |
| 313 | + <property name="position">0</property> |
| 314 | + </packing> |
| 315 | + </child> |
| 316 | + <child> |
| 317 | + <object class="GtkEntry" id="password-entry"> |
| 318 | + <property name="visible">True</property> |
| 319 | + <property name="can_focus">True</property> |
| 320 | + <property name="hexpand">True</property> |
| 321 | + <property name="visibility">False</property> |
| 322 | + <property name="invisible_char">•</property> |
| 323 | + </object> |
| 324 | + <packing> |
| 325 | + <property name="expand">False</property> |
| 326 | + <property name="fill">True</property> |
| 327 | + <property name="position">1</property> |
| 328 | + </packing> |
| 329 | + </child> |
| 330 | + </object> |
| 331 | + <packing> |
| 332 | + <property name="expand">False</property> |
| 333 | + <property name="fill">True</property> |
| 334 | + <property name="position">1</property> |
| 335 | + </packing> |
| 336 | + </child> |
| 337 | + <child> |
| 338 | + <object class="GtkBox" id="registration-hbox"> |
| 339 | + <property name="visible">True</property> |
| 340 | + <property name="can_focus">False</property> |
| 341 | <property name="hexpand">True</property> |
| 342 | <property name="vexpand">True</property> |
| 343 | - <child> |
| 344 | - <object class="GtkAlignment" id="hosted-radiobutton-alignment"> |
| 345 | - <property name="visible">True</property> |
| 346 | - <property name="can_focus">False</property> |
| 347 | - <property name="yalign">0</property> |
| 348 | - <child> |
| 349 | - <object class="GtkRadioButton" id="hosted-radiobutton"> |
| 350 | + <property name="spacing">6</property> |
| 351 | + <child> |
| 352 | + <object class="GtkButton" id="registration-button"> |
| 353 | + <property name="visible">True</property> |
| 354 | + <property name="can_focus">True</property> |
| 355 | + <property name="receives_default">True</property> |
| 356 | + <property name="valign">start</property> |
| 357 | + <property name="use_action_appearance">False</property> |
| 358 | + <child> |
| 359 | + <object class="GtkBox" id="registration-button-hbox"> |
| 360 | + <property name="visible">True</property> |
| 361 | + <property name="can_focus">False</property> |
| 362 | + <property name="margin_left">6</property> |
| 363 | + <property name="margin_right">6</property> |
| 364 | + <property name="margin_top">6</property> |
| 365 | + <property name="margin_bottom">6</property> |
| 366 | + <property name="orientation">vertical</property> |
| 367 | + <property name="spacing">6</property> |
| 368 | + <property name="homogeneous">True</property> |
| 369 | + <child> |
| 370 | + <object class="GtkLabel" id="reigstration-button-label"> |
| 371 | + <property name="visible">True</property> |
| 372 | + <property name="can_focus">False</property> |
| 373 | + <property name="label" translatable="yes">Connect</property> |
| 374 | + </object> |
| 375 | + <packing> |
| 376 | + <property name="expand">False</property> |
| 377 | + <property name="fill">True</property> |
| 378 | + <property name="position">0</property> |
| 379 | + </packing> |
| 380 | + </child> |
| 381 | + <child> |
| 382 | + <object class="GtkImage" id="registration-image"> |
| 383 | + <property name="visible">True</property> |
| 384 | + <property name="can_focus">False</property> |
| 385 | + <property name="stock">gtk-disconnect</property> |
| 386 | + </object> |
| 387 | + <packing> |
| 388 | + <property name="expand">False</property> |
| 389 | + <property name="fill">True</property> |
| 390 | + <property name="position">1</property> |
| 391 | + </packing> |
| 392 | + </child> |
| 393 | + </object> |
| 394 | + </child> |
| 395 | + </object> |
| 396 | + <packing> |
| 397 | + <property name="expand">False</property> |
| 398 | + <property name="fill">True</property> |
| 399 | + <property name="position">0</property> |
| 400 | + </packing> |
| 401 | + </child> |
| 402 | + <child> |
| 403 | + <object class="GtkScrolledWindow" id="registration-scrolledwindow"> |
| 404 | + <property name="visible">True</property> |
| 405 | + <property name="can_focus">True</property> |
| 406 | + <property name="hexpand">True</property> |
| 407 | + <property name="vscrollbar_policy">always</property> |
| 408 | + <property name="shadow_type">in</property> |
| 409 | + <child> |
| 410 | + <object class="GtkTextView" id="registration-textview"> |
| 411 | <property name="visible">True</property> |
| 412 | <property name="can_focus">True</property> |
| 413 | - <property name="receives_default">False</property> |
| 414 | - <property name="halign">start</property> |
| 415 | - <property name="valign">start</property> |
| 416 | - <property name="use_action_appearance">False</property> |
| 417 | - <property name="xalign">0</property> |
| 418 | - <property name="active">True</property> |
| 419 | - <property name="draw_indicator">True</property> |
| 420 | - <property name="group">dedicated-radiobutton</property> |
| 421 | - <child> |
| 422 | - <object class="GtkLabel" id="hosted-radiobutton-label"> |
| 423 | - <property name="visible">True</property> |
| 424 | - <property name="can_focus">False</property> |
| 425 | - <property name="xalign">0</property> |
| 426 | - <attributes> |
| 427 | - <attribute name="weight" value="bold"/> |
| 428 | - </attributes> |
| 429 | - </object> |
| 430 | - </child> |
| 431 | - </object> |
| 432 | - </child> |
| 433 | - </object> |
| 434 | - <packing> |
| 435 | - <property name="expand">False</property> |
| 436 | - <property name="fill">True</property> |
| 437 | - <property name="position">0</property> |
| 438 | - </packing> |
| 439 | - </child> |
| 440 | - <child> |
| 441 | - <object class="GtkFrame" id="hosted-frame"> |
| 442 | - <property name="visible">True</property> |
| 443 | - <property name="can_focus">False</property> |
| 444 | - <property name="hexpand">True</property> |
| 445 | - <property name="label_xalign">0</property> |
| 446 | - <property name="shadow_type">none</property> |
| 447 | - <child> |
| 448 | - <object class="GtkAlignment" id="hosted-frame-alignment"> |
| 449 | - <property name="visible">True</property> |
| 450 | - <property name="can_focus">False</property> |
| 451 | - <property name="left_padding">12</property> |
| 452 | - <child> |
| 453 | - <object class="GtkBox" id="hosted-vbox"> |
| 454 | - <property name="visible">True</property> |
| 455 | - <property name="can_focus">False</property> |
| 456 | - <property name="hexpand">True</property> |
| 457 | - <property name="vexpand">True</property> |
| 458 | - <property name="orientation">vertical</property> |
| 459 | - <property name="spacing">6</property> |
| 460 | - <child> |
| 461 | - <object class="GtkBox" id="account-hbox"> |
| 462 | - <property name="visible">True</property> |
| 463 | - <property name="can_focus">False</property> |
| 464 | - <property name="hexpand">True</property> |
| 465 | - <property name="spacing">12</property> |
| 466 | - <child> |
| 467 | - <object class="GtkLabel" id="account-label"> |
| 468 | - <property name="visible">True</property> |
| 469 | - <property name="can_focus">False</property> |
| 470 | - <property name="xalign">0</property> |
| 471 | - <property name="label" translatable="yes">Account name: </property> |
| 472 | - </object> |
| 473 | - <packing> |
| 474 | - <property name="expand">False</property> |
| 475 | - <property name="fill">True</property> |
| 476 | - <property name="position">0</property> |
| 477 | - </packing> |
| 478 | - </child> |
| 479 | - <child> |
| 480 | - <object class="GtkEntry" id="account-name-entry"> |
| 481 | - <property name="visible">True</property> |
| 482 | - <property name="can_focus">True</property> |
| 483 | - <property name="hexpand">True</property> |
| 484 | - <property name="invisible_char">•</property> |
| 485 | - <property name="invisible_char_set">True</property> |
| 486 | - </object> |
| 487 | - <packing> |
| 488 | - <property name="expand">True</property> |
| 489 | - <property name="fill">True</property> |
| 490 | - <property name="position">1</property> |
| 491 | - </packing> |
| 492 | - </child> |
| 493 | - </object> |
| 494 | - <packing> |
| 495 | - <property name="expand">True</property> |
| 496 | - <property name="fill">True</property> |
| 497 | - <property name="position">0</property> |
| 498 | - </packing> |
| 499 | - </child> |
| 500 | - <child> |
| 501 | - <object class="GtkBox" id="password-hbox"> |
| 502 | - <property name="visible">True</property> |
| 503 | - <property name="can_focus">False</property> |
| 504 | - <property name="spacing">12</property> |
| 505 | - <child> |
| 506 | - <object class="GtkLabel" id="password-label"> |
| 507 | - <property name="visible">True</property> |
| 508 | - <property name="can_focus">False</property> |
| 509 | - <property name="xalign">0</property> |
| 510 | - <property name="label" translatable="yes">Password:</property> |
| 511 | - </object> |
| 512 | - <packing> |
| 513 | - <property name="expand">False</property> |
| 514 | - <property name="fill">True</property> |
| 515 | - <property name="position">0</property> |
| 516 | - </packing> |
| 517 | - </child> |
| 518 | - <child> |
| 519 | - <object class="GtkEntry" id="reigstered-password-entry"> |
| 520 | - <property name="visible">True</property> |
| 521 | - <property name="can_focus">True</property> |
| 522 | - <property name="hexpand">True</property> |
| 523 | - <property name="visibility">False</property> |
| 524 | - <property name="invisible_char">•</property> |
| 525 | - <property name="invisible_char_set">True</property> |
| 526 | - </object> |
| 527 | - <packing> |
| 528 | - <property name="expand">True</property> |
| 529 | - <property name="fill">True</property> |
| 530 | - <property name="position">1</property> |
| 531 | - </packing> |
| 532 | - </child> |
| 533 | - </object> |
| 534 | - <packing> |
| 535 | - <property name="expand">True</property> |
| 536 | - <property name="fill">True</property> |
| 537 | - <property name="position">1</property> |
| 538 | - </packing> |
| 539 | - </child> |
| 540 | - </object> |
| 541 | - </child> |
| 542 | - </object> |
| 543 | - </child> |
| 544 | - <child type="label"> |
| 545 | - <object class="GtkLabel" id="hosted-frame-label"> |
| 546 | - <property name="visible">True</property> |
| 547 | - <property name="can_focus">False</property> |
| 548 | - <property name="margin_top">4</property> |
| 549 | - <property name="label" translatable="yes"><b>Hosted</b></property> |
| 550 | - <property name="use_markup">True</property> |
| 551 | - </object> |
| 552 | - </child> |
| 553 | - </object> |
| 554 | - <packing> |
| 555 | - <property name="expand">False</property> |
| 556 | - <property name="fill">True</property> |
| 557 | - <property name="position">1</property> |
| 558 | - </packing> |
| 559 | - </child> |
| 560 | - </object> |
| 561 | - <packing> |
| 562 | - <property name="expand">True</property> |
| 563 | - <property name="fill">True</property> |
| 564 | - <property name="position">0</property> |
| 565 | - </packing> |
| 566 | - </child> |
| 567 | - <child> |
| 568 | - <object class="GtkBox" id="dedicated-hbox"> |
| 569 | - <property name="visible">True</property> |
| 570 | - <property name="can_focus">False</property> |
| 571 | - <child> |
| 572 | - <object class="GtkRadioButton" id="dedicated-radiobutton"> |
| 573 | - <property name="visible">True</property> |
| 574 | - <property name="can_focus">True</property> |
| 575 | - <property name="receives_default">False</property> |
| 576 | - <property name="valign">start</property> |
| 577 | - <property name="use_action_appearance">False</property> |
| 578 | - <property name="xalign">0</property> |
| 579 | - <property name="active">True</property> |
| 580 | - <property name="draw_indicator">True</property> |
| 581 | - <child> |
| 582 | - <object class="GtkAlignment" id="alignment3"> |
| 583 | - <property name="visible">True</property> |
| 584 | - <property name="can_focus">False</property> |
| 585 | - <child> |
| 586 | - <object class="GtkLabel" id="dedicated-radiobutton-label"> |
| 587 | - <property name="visible">True</property> |
| 588 | - <property name="can_focus">False</property> |
| 589 | - <property name="xalign">0</property> |
| 590 | - <attributes> |
| 591 | - <attribute name="weight" value="bold"/> |
| 592 | - </attributes> |
| 593 | - </object> |
| 594 | - </child> |
| 595 | - </object> |
| 596 | - </child> |
| 597 | - </object> |
| 598 | - <packing> |
| 599 | - <property name="expand">False</property> |
| 600 | - <property name="fill">True</property> |
| 601 | - <property name="position">0</property> |
| 602 | - </packing> |
| 603 | - </child> |
| 604 | - <child> |
| 605 | - <object class="GtkFrame" id="dedicated-frame"> |
| 606 | - <property name="visible">True</property> |
| 607 | - <property name="can_focus">False</property> |
| 608 | - <property name="margin_top">4</property> |
| 609 | - <property name="hexpand">True</property> |
| 610 | - <property name="label_xalign">0</property> |
| 611 | - <property name="shadow_type">none</property> |
| 612 | - <child> |
| 613 | - <object class="GtkAlignment" id="dedicated-frame-alignment"> |
| 614 | - <property name="visible">True</property> |
| 615 | - <property name="can_focus">False</property> |
| 616 | - <property name="left_padding">12</property> |
| 617 | - <child> |
| 618 | - <object class="GtkBox" id="host-name-hbox"> |
| 619 | - <property name="visible">True</property> |
| 620 | - <property name="can_focus">False</property> |
| 621 | - <property name="hexpand">True</property> |
| 622 | - <property name="spacing">12</property> |
| 623 | - <child> |
| 624 | - <object class="GtkLabel" id="server-host-name-label"> |
| 625 | - <property name="visible">True</property> |
| 626 | - <property name="can_focus">False</property> |
| 627 | - <property name="xalign">0</property> |
| 628 | - <property name="label" translatable="yes">Server host name:</property> |
| 629 | - </object> |
| 630 | - <packing> |
| 631 | - <property name="expand">False</property> |
| 632 | - <property name="fill">True</property> |
| 633 | - <property name="position">0</property> |
| 634 | - </packing> |
| 635 | - </child> |
| 636 | - <child> |
| 637 | - <object class="GtkEntry" id="server-host-name-entry"> |
| 638 | - <property name="visible">True</property> |
| 639 | - <property name="can_focus">True</property> |
| 640 | - <property name="hexpand">True</property> |
| 641 | - <property name="invisible_char">•</property> |
| 642 | - <property name="invisible_char_set">True</property> |
| 643 | - </object> |
| 644 | - <packing> |
| 645 | - <property name="expand">True</property> |
| 646 | - <property name="fill">True</property> |
| 647 | - <property name="position">1</property> |
| 648 | - </packing> |
| 649 | - </child> |
| 650 | - </object> |
| 651 | - </child> |
| 652 | - </object> |
| 653 | - </child> |
| 654 | - <child type="label"> |
| 655 | - <object class="GtkLabel" id="dedicated-frame-label"> |
| 656 | - <property name="visible">True</property> |
| 657 | - <property name="can_focus">False</property> |
| 658 | - <property name="label" translatable="yes"><b>Dedicated server</b></property> |
| 659 | - <property name="use_markup">True</property> |
| 660 | - </object> |
| 661 | - </child> |
| 662 | - </object> |
| 663 | - <packing> |
| 664 | - <property name="expand">False</property> |
| 665 | - <property name="fill">True</property> |
| 666 | - <property name="position">1</property> |
| 667 | - </packing> |
| 668 | - </child> |
| 669 | - </object> |
| 670 | - <packing> |
| 671 | - <property name="expand">True</property> |
| 672 | - <property name="fill">True</property> |
| 673 | - <property name="position">1</property> |
| 674 | + <property name="vexpand">True</property> |
| 675 | + <property name="editable">False</property> |
| 676 | + <property name="wrap_mode">word-char</property> |
| 677 | + <property name="cursor_visible">False</property> |
| 678 | + <property name="buffer">registration-textbuffer</property> |
| 679 | + </object> |
| 680 | + </child> |
| 681 | + </object> |
| 682 | + <packing> |
| 683 | + <property name="expand">False</property> |
| 684 | + <property name="fill">True</property> |
| 685 | + <property name="position">1</property> |
| 686 | + </packing> |
| 687 | + </child> |
| 688 | + </object> |
| 689 | + <packing> |
| 690 | + <property name="expand">False</property> |
| 691 | + <property name="fill">True</property> |
| 692 | + <property name="position">2</property> |
| 693 | </packing> |
| 694 | </child> |
| 695 | </object> |
| 696 | @@ -371,10 +406,10 @@ |
| 697 | </object> |
| 698 | </child> |
| 699 | <child type="label"> |
| 700 | - <object class="GtkLabel" id="landscape-server-type-label"> |
| 701 | + <object class="GtkLabel" id="credentials-label"> |
| 702 | <property name="visible">True</property> |
| 703 | <property name="can_focus">False</property> |
| 704 | - <property name="label" translatable="yes"><b>Landscape Server Type:</b></property> |
| 705 | + <property name="label" translatable="yes"><b>Credentials:</b></property> |
| 706 | <property name="use_markup">True</property> |
| 707 | </object> |
| 708 | </child> |
| 709 | @@ -382,99 +417,6 @@ |
| 710 | <packing> |
| 711 | <property name="expand">False</property> |
| 712 | <property name="fill">True</property> |
| 713 | - <property name="position">0</property> |
| 714 | - </packing> |
| 715 | - </child> |
| 716 | - <child> |
| 717 | - <object class="GtkBox" id="registration-hbox"> |
| 718 | - <property name="visible">True</property> |
| 719 | - <property name="can_focus">False</property> |
| 720 | - <property name="margin_left">12</property> |
| 721 | - <property name="margin_right">6</property> |
| 722 | - <property name="hexpand">True</property> |
| 723 | - <property name="vexpand">True</property> |
| 724 | - <property name="spacing">12</property> |
| 725 | - <child> |
| 726 | - <object class="GtkButton" id="registration-button"> |
| 727 | - <property name="visible">True</property> |
| 728 | - <property name="can_focus">True</property> |
| 729 | - <property name="receives_default">True</property> |
| 730 | - <property name="valign">start</property> |
| 731 | - <property name="use_action_appearance">False</property> |
| 732 | - <child> |
| 733 | - <object class="GtkBox" id="registration-button-hbox"> |
| 734 | - <property name="visible">True</property> |
| 735 | - <property name="can_focus">False</property> |
| 736 | - <property name="margin_left">6</property> |
| 737 | - <property name="margin_right">6</property> |
| 738 | - <property name="margin_top">6</property> |
| 739 | - <property name="margin_bottom">6</property> |
| 740 | - <property name="orientation">vertical</property> |
| 741 | - <property name="spacing">6</property> |
| 742 | - <property name="homogeneous">True</property> |
| 743 | - <child> |
| 744 | - <object class="GtkLabel" id="label1"> |
| 745 | - <property name="visible">True</property> |
| 746 | - <property name="can_focus">False</property> |
| 747 | - <property name="label" translatable="yes">Connect</property> |
| 748 | - </object> |
| 749 | - <packing> |
| 750 | - <property name="expand">False</property> |
| 751 | - <property name="fill">True</property> |
| 752 | - <property name="position">0</property> |
| 753 | - </packing> |
| 754 | - </child> |
| 755 | - <child> |
| 756 | - <object class="GtkImage" id="registration-image"> |
| 757 | - <property name="visible">True</property> |
| 758 | - <property name="can_focus">False</property> |
| 759 | - <property name="stock">gtk-disconnect</property> |
| 760 | - </object> |
| 761 | - <packing> |
| 762 | - <property name="expand">False</property> |
| 763 | - <property name="fill">True</property> |
| 764 | - <property name="position">1</property> |
| 765 | - </packing> |
| 766 | - </child> |
| 767 | - </object> |
| 768 | - </child> |
| 769 | - </object> |
| 770 | - <packing> |
| 771 | - <property name="expand">False</property> |
| 772 | - <property name="fill">True</property> |
| 773 | - <property name="position">0</property> |
| 774 | - </packing> |
| 775 | - </child> |
| 776 | - <child> |
| 777 | - <object class="GtkScrolledWindow" id="registration-scrolledwindow"> |
| 778 | - <property name="visible">True</property> |
| 779 | - <property name="can_focus">True</property> |
| 780 | - <property name="hexpand">True</property> |
| 781 | - <property name="vscrollbar_policy">always</property> |
| 782 | - <property name="shadow_type">in</property> |
| 783 | - <child> |
| 784 | - <object class="GtkTextView" id="registration-textview"> |
| 785 | - <property name="visible">True</property> |
| 786 | - <property name="can_focus">True</property> |
| 787 | - <property name="hexpand">True</property> |
| 788 | - <property name="vexpand">True</property> |
| 789 | - <property name="editable">False</property> |
| 790 | - <property name="wrap_mode">word-char</property> |
| 791 | - <property name="cursor_visible">False</property> |
| 792 | - <property name="buffer">registration-textbuffer</property> |
| 793 | - </object> |
| 794 | - </child> |
| 795 | - </object> |
| 796 | - <packing> |
| 797 | - <property name="expand">False</property> |
| 798 | - <property name="fill">True</property> |
| 799 | - <property name="position">1</property> |
| 800 | - </packing> |
| 801 | - </child> |
| 802 | - </object> |
| 803 | - <packing> |
| 804 | - <property name="expand">False</property> |
| 805 | - <property name="fill">True</property> |
| 806 | <property name="position">1</property> |
| 807 | </packing> |
| 808 | </child> |
| 809 | @@ -492,11 +434,24 @@ |
| 810 | <action-widget response="0">close-button</action-widget> |
| 811 | </action-widgets> |
| 812 | </object> |
| 813 | + <object class="GtkSizeGroup" id="credentials-entry-sizegroup"> |
| 814 | + <widgets> |
| 815 | + <widget name="account-name-entry"/> |
| 816 | + <widget name="password-entry"/> |
| 817 | + <widget name="registration-textview"/> |
| 818 | + </widgets> |
| 819 | + </object> |
| 820 | <object class="GtkSizeGroup" id="property-label-sizegroup"> |
| 821 | <widgets> |
| 822 | - <widget name="server-host-name-label"/> |
| 823 | + <widget name="registration-button"/> |
| 824 | <widget name="password-label"/> |
| 825 | - <widget name="account-label"/> |
| 826 | + <widget name="account-name-label"/> |
| 827 | + </widgets> |
| 828 | + </object> |
| 829 | + <object class="GtkSizeGroup" id="radiobutton-sizegroup"> |
| 830 | + <widgets> |
| 831 | + <widget name="dedicated-radiobutton"/> |
| 832 | + <widget name="hosted-radiobutton"/> |
| 833 | </widgets> |
| 834 | </object> |
| 835 | <object class="GtkTextBuffer" id="registration-textbuffer"/> |
Incredible! 800+ lines to change the title! +1