org.handhelds.familiar/packages/gkdial/gkdial/gkdial-gpepda.patch

   1 diff -ru gkdial-1.8.1-psi/gkdial.glade gkdial-1.8.1/gkdial.glade
   2 --- gkdial-1.8.1-psi/gkdial.glade       2005-01-25 17:38:01.000000000 +0100
   3 +++ gkdial-1.8.1/gkdial.glade   2005-01-25 17:25:07.000000000 +0100
   4 @@ -5,7 +5,7 @@
   5
   6  <widget class="GtkWindow" id="gk_main_window">
   7    <property name="border_width">1</property>
   8 -  <property name="title" translatable="yes">Internet Dialler</property>
   9 +  <property name="title" translatable="yes">Modem Dialler</property>
  10    <property name="type">GTK_WINDOW_TOPLEVEL</property>
  11    <property name="window_position">GTK_WIN_POS_CENTER</property>
  12    <property name="modal">False</property>
  13 @@ -22,7 +22,7 @@
  14        <property name="border_width">2</property>
  15        <property name="visible">True</property>
  16        <property name="homogeneous">False</property>
  17 -      <property name="spacing">6</property>
  18 +      <property name="spacing">0</property>
  19
  20        <child>
  21         <widget class="GtkMenuBar" id="menubar1">
  22 @@ -174,7 +174,7 @@
  23         <widget class="GtkToolbar" id="toolbar1">
  24           <property name="visible">True</property>
  25           <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
  26 -         <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
  27 +         <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
  28           <property name="tooltips">True</property>
  29           <property name="show_arrow">True</property>
  30
  31 @@ -217,7 +217,7 @@
  32               <property name="visible_vertical">True</property>
  33             </widget>
  34             <packing>
  35 -             <property name="expand">False</property>
  36 +             <property name="expand">True</property>
  37               <property name="homogeneous">False</property>
  38             </packing>
  39           </child>
  40 @@ -245,29 +245,15 @@
  41
  42        <child>
  43         <widget class="GtkTable" id="main_table">
  44 +         <property name="border_width">3</property>
  45           <property name="visible">True</property>
  46 -         <property name="n_rows">5</property>
  47 +         <property name="n_rows">3</property>
  48           <property name="n_columns">5</property>
  49           <property name="homogeneous">False</property>
  50 -         <property name="row_spacing">0</property>
  51 +         <property name="row_spacing">3</property>
  52           <property name="column_spacing">5</property>
  53
  54           <child>
  55 -           <widget class="GtkHButtonBox" id="hbuttonbox2">
  56 -             <property name="visible">True</property>
  57 -             <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
  58 -             <property name="spacing">0</property>
  59 -           </widget>
  60 -           <packing>
  61 -             <property name="left_attach">0</property>
  62 -             <property name="right_attach">5</property>
  63 -             <property name="top_attach">4</property>
  64 -             <property name="bottom_attach">5</property>
  65 -             <property name="x_options">fill</property>
  66 -           </packing>
  67 -         </child>
  68 -
  69 -         <child>
  70             <widget class="GtkImage" id="main_image">
  71               <property name="visible">True</property>
  72               <property name="xalign">0</property>
  73 @@ -288,7 +274,7 @@
  74
  75           <child>
  76             <widget class="GtkCombo" id="main_combo">
  77 -             <property name="width_request">240</property>
  78 +             <property name="width_request">120</property>
  79               <property name="visible">True</property>
  80               <property name="can_default">True</property>
  81               <property name="has_default">True</property>
  82 @@ -307,7 +293,7 @@
  83                   <property name="max_length">0</property>
  84                   <property name="text" translatable="yes"></property>
  85                   <property name="has_frame">True</property>
  86 -                 <property name="invisible_char" translatable="yes">*</property>
  87 +                 <property name="invisible_char">*</property>
  88                   <property name="activates_default">False</property>
  89                 </widget>
  90               </child>
  91 @@ -364,7 +350,7 @@
  92  </widget>
  93
  94  <widget class="GtkWindow" id="details_window">
  95 -  <property name="title" translatable="yes">Dialler: Details</property>
  96 +  <property name="title" translatable="yes">Details</property>
  97    <property name="type">GTK_WINDOW_TOPLEVEL</property>
  98    <property name="window_position">GTK_WIN_POS_CENTER</property>
  99    <property name="modal">False</property>
 100 @@ -671,10 +657,12 @@
 101  </widget>
 102
 103  <widget class="GtkWindow" id="prefs_window">
 104 -  <property name="title" translatable="yes">Dialler: Preferences</property>
 105 +  <property name="title" translatable="yes">Preferences</property>
 106    <property name="type">GTK_WINDOW_TOPLEVEL</property>
 107    <property name="window_position">GTK_WIN_POS_CENTER</property>
 108    <property name="modal">True</property>
 109 +  <property name="default_width">240</property>
 110 +  <property name="default_height">320</property>
 111    <property name="resizable">True</property>
 112    <property name="destroy_with_parent">False</property>
 113    <property name="decorated">True</property>
 114 @@ -691,7 +679,7 @@
 115
 116        <child>
 117         <widget class="GtkNotebook" id="notebook1">
 118 -         <property name="border_width">6</property>
 119 +         <property name="border_width">3</property>
 120           <property name="visible">True</property>
 121           <property name="can_focus">True</property>
 122           <property name="show_tabs">True</property>
 123 @@ -764,8 +752,6 @@
 124
 125               <child>
 126                 <widget class="GtkScrolledWindow" id="scrolledwindow1">
 127 -                 <property name="width_request">209</property>
 128 -                 <property name="height_request">243</property>
 129                   <property name="visible">True</property>
 130                   <property name="can_focus">True</property>
 131                   <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 132 @@ -824,144 +810,162 @@
 133               <property name="spacing">0</property>
 134
 135               <child>
 136 -               <widget class="GtkFrame" id="frame7">
 137 +               <widget class="GtkScrolledWindow" id="scrolledwindow2">
 138                   <property name="visible">True</property>
 139 -                 <property name="label_xalign">0</property>
 140 -                 <property name="label_yalign">0.5</property>
 141 -                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 142 +                 <property name="can_focus">True</property>
 143 +                 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 144 +                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 145 +                 <property name="shadow_type">GTK_SHADOW_NONE</property>
 146 +                 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 147
 148                   <child>
 149 -                   <widget class="GtkTable" id="table3">
 150 -                     <property name="border_width">5</property>
 151 +                   <widget class="GtkViewport" id="viewport2">
 152                       <property name="visible">True</property>
 153 -                     <property name="n_rows">2</property>
 154 -                     <property name="n_columns">2</property>
 155 -                     <property name="homogeneous">False</property>
 156 -                     <property name="row_spacing">11</property>
 157 -                     <property name="column_spacing">0</property>
 158 -
 159 -                     <child>
 160 -                       <widget class="GtkCheckButton" id="check_retry_when_dialing">
 161 -                         <property name="visible">True</property>
 162 -                         <property name="can_focus">True</property>
 163 -                         <property name="label" translatable="yes">_Retry if connection quits when dialing</property>
 164 -                         <property name="use_underline">True</property>
 165 -                         <property name="relief">GTK_RELIEF_NORMAL</property>
 166 -                         <property name="focus_on_click">True</property>
 167 -                         <property name="active">False</property>
 168 -                         <property name="inconsistent">False</property>
 169 -                         <property name="draw_indicator">True</property>
 170 -                       </widget>
 171 -                       <packing>
 172 -                         <property name="left_attach">0</property>
 173 -                         <property name="right_attach">1</property>
 174 -                         <property name="top_attach">0</property>
 175 -                         <property name="bottom_attach">1</property>
 176 -                         <property name="x_options">expand|shrink|fill</property>
 177 -                         <property name="y_options">shrink</property>
 178 -                       </packing>
 179 -                     </child>
 180 +                     <property name="shadow_type">GTK_SHADOW_NONE</property>
 181
 182                       <child>
 183 -                       <widget class="GtkCheckButton" id="check_reconn_if_lost">
 184 +                       <widget class="GtkFrame" id="frame7">
 185                           <property name="visible">True</property>
 186 -                         <property name="can_focus">True</property>
 187 -                         <property name="label" translatable="yes">Reconnect if connection is lost</property>
 188 -                         <property name="use_underline">True</property>
 189 -                         <property name="relief">GTK_RELIEF_NORMAL</property>
 190 -                         <property name="focus_on_click">True</property>
 191 -                         <property name="active">False</property>
 192 -                         <property name="inconsistent">False</property>
 193 -                         <property name="draw_indicator">True</property>
 194 -                       </widget>
 195 -                       <packing>
 196 -                         <property name="left_attach">0</property>
 197 -                         <property name="right_attach">1</property>
 198 -                         <property name="top_attach">1</property>
 199 -                         <property name="bottom_attach">2</property>
 200 -                         <property name="x_options">expand|shrink|fill</property>
 201 -                         <property name="y_options">shrink</property>
 202 -                       </packing>
 203 -                     </child>
 204 +                         <property name="label_xalign">0</property>
 205 +                         <property name="label_yalign">0.5</property>
 206 +                         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 207
 208 -                     <child>
 209 -                       <widget class="GtkHBox" id="hbox11">
 210 -                         <property name="visible">True</property>
 211 -                         <property name="homogeneous">False</property>
 212 -                         <property name="spacing">5</property>
 213 +                         <child>
 214 +                           <widget class="GtkTable" id="table3">
 215 +                             <property name="border_width">5</property>
 216 +                             <property name="visible">True</property>
 217 +                             <property name="n_rows">4</property>
 218 +                             <property name="n_columns">2</property>
 219 +                             <property name="homogeneous">False</property>
 220 +                             <property name="row_spacing">11</property>
 221 +                             <property name="column_spacing">0</property>
 222 +
 223 +                             <child>
 224 +                               <widget class="GtkCheckButton" id="check_retry_when_dialing">
 225 +                                 <property name="visible">True</property>
 226 +                                 <property name="can_focus">True</property>
 227 +                                 <property name="label" translatable="yes">_Retry if connection quits when dialing</property>
 228 +                                 <property name="use_underline">True</property>
 229 +                                 <property name="relief">GTK_RELIEF_NORMAL</property>
 230 +                                 <property name="focus_on_click">True</property>
 231 +                                 <property name="active">False</property>
 232 +                                 <property name="inconsistent">False</property>
 233 +                                 <property name="draw_indicator">True</property>
 234 +                               </widget>
 235 +                               <packing>
 236 +                                 <property name="left_attach">0</property>
 237 +                                 <property name="right_attach">2</property>
 238 +                                 <property name="top_attach">0</property>
 239 +                                 <property name="bottom_attach">1</property>
 240 +                                 <property name="x_options">expand|shrink|fill</property>
 241 +                                 <property name="y_options">shrink</property>
 242 +                               </packing>
 243 +                             </child>
 244 +
 245 +                             <child>
 246 +                               <widget class="GtkCheckButton" id="check_reconn_if_lost">
 247 +                                 <property name="visible">True</property>
 248 +                                 <property name="can_focus">True</property>
 249 +                                 <property name="label" translatable="yes">Reconnect if connection is lost</property>
 250 +                                 <property name="use_underline">True</property>
 251 +                                 <property name="relief">GTK_RELIEF_NORMAL</property>
 252 +                                 <property name="focus_on_click">True</property>
 253 +                                 <property name="active">False</property>
 254 +                                 <property name="inconsistent">False</property>
 255 +                                 <property name="draw_indicator">True</property>
 256 +                               </widget>
 257 +                               <packing>
 258 +                                 <property name="left_attach">0</property>
 259 +                                 <property name="right_attach">2</property>
 260 +                                 <property name="top_attach">3</property>
 261 +                                 <property name="bottom_attach">4</property>
 262 +                                 <property name="x_options">expand|shrink|fill</property>
 263 +                                 <property name="y_options">shrink</property>
 264 +                               </packing>
 265 +                             </child>
 266 +
 267 +                             <child>
 268 +                               <widget class="GtkHBox" id="hbox11">
 269 +                                 <property name="visible">True</property>
 270 +                                 <property name="homogeneous">False</property>
 271 +                                 <property name="spacing">5</property>
 272 +
 273 +                                 <child>
 274 +                                   <widget class="GtkLabel" id="label24">
 275 +                                     <property name="visible">True</property>
 276 +                                     <property name="label" translatable="yes">Times to retry: </property>
 277 +                                     <property name="use_underline">False</property>
 278 +                                     <property name="use_markup">False</property>
 279 +                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
 280 +                                     <property name="wrap">False</property>
 281 +                                     <property name="selectable">False</property>
 282 +                                     <property name="xalign">0</property>
 283 +                                     <property name="yalign">0.5</property>
 284 +                                     <property name="xpad">0</property>
 285 +                                     <property name="ypad">0</property>
 286 +                                   </widget>
 287 +                                   <packing>
 288 +                                     <property name="padding">0</property>
 289 +                                     <property name="expand">False</property>
 290 +                                     <property name="fill">False</property>
 291 +                                   </packing>
 292 +                                 </child>
 293 +
 294 +                                 <child>
 295 +                                   <widget class="GtkSpinButton" id="spinb_times_to_retry">
 296 +                                     <property name="visible">True</property>
 297 +                                     <property name="tooltip" translatable="yes">The number of tries GkDial should perform. Use '0' for infinite.</property>
 298 +                                     <property name="can_focus">True</property>
 299 +                                     <property name="climb_rate">1</property>
 300 +                                     <property name="digits">0</property>
 301 +                                     <property name="numeric">False</property>
 302 +                                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 303 +                                     <property name="snap_to_ticks">False</property>
 304 +                                     <property name="wrap">False</property>
 305 +                                     <property name="adjustment">0 0 100 1 10 10</property>
 306 +                                   </widget>
 307 +                                   <packing>
 308 +                                     <property name="padding">0</property>
 309 +                                     <property name="expand">True</property>
 310 +                                     <property name="fill">True</property>
 311 +                                   </packing>
 312 +                                 </child>
 313 +                               </widget>
 314 +                               <packing>
 315 +                                 <property name="left_attach">0</property>
 316 +                                 <property name="right_attach">1</property>
 317 +                                 <property name="top_attach">1</property>
 318 +                                 <property name="bottom_attach">2</property>
 319 +                                 <property name="x_padding">10</property>
 320 +                                 <property name="x_options">shrink|fill</property>
 321 +                                 <property name="y_options">shrink|fill</property>
 322 +                               </packing>
 323 +                             </child>
 324 +                           </widget>
 325 +                         </child>
 326
 327                           <child>
 328 -                           <widget class="GtkLabel" id="label24">
 329 +                           <widget class="GtkLabel" id="nb_conn_label_dialing">
 330                               <property name="visible">True</property>
 331 -                             <property name="label" translatable="yes">Times to retry: </property>
 332 +                             <property name="label" translatable="yes">Dialing</property>
 333                               <property name="use_underline">False</property>
 334                               <property name="use_markup">False</property>
 335                               <property name="justify">GTK_JUSTIFY_LEFT</property>
 336                               <property name="wrap">False</property>
 337                               <property name="selectable">False</property>
 338 -                             <property name="xalign">0</property>
 339 +                             <property name="xalign">0.5</property>
 340                               <property name="yalign">0.5</property>
 341                               <property name="xpad">0</property>
 342                               <property name="ypad">0</property>
 343                             </widget>
 344                             <packing>
 345 -                             <property name="padding">0</property>
 346 -                             <property name="expand">False</property>
 347 -                             <property name="fill">False</property>
 348 -                           </packing>
 349 -                         </child>
 350 -
 351 -                         <child>
 352 -                           <widget class="GtkSpinButton" id="spinb_times_to_retry">
 353 -                             <property name="visible">True</property>
 354 -                             <property name="tooltip" translatable="yes">The number of tries GkDial should perform. Use '0' for infinite.</property>
 355 -                             <property name="can_focus">True</property>
 356 -                             <property name="climb_rate">1</property>
 357 -                             <property name="digits">0</property>
 358 -                             <property name="numeric">False</property>
 359 -                             <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 360 -                             <property name="snap_to_ticks">False</property>
 361 -                             <property name="wrap">False</property>
 362 -                             <property name="adjustment">0 0 100 1 10 10</property>
 363 -                           </widget>
 364 -                           <packing>
 365 -                             <property name="padding">0</property>
 366 -                             <property name="expand">True</property>
 367 -                             <property name="fill">True</property>
 368 +                             <property name="type">label_item</property>
 369                             </packing>
 370                           </child>
 371                         </widget>
 372 -                       <packing>
 373 -                         <property name="left_attach">1</property>
 374 -                         <property name="right_attach">2</property>
 375 -                         <property name="top_attach">0</property>
 376 -                         <property name="bottom_attach">1</property>
 377 -                         <property name="x_padding">10</property>
 378 -                         <property name="x_options">shrink|fill</property>
 379 -                         <property name="y_options">shrink|fill</property>
 380 -                       </packing>
 381                       </child>
 382                     </widget>
 383                   </child>
 384 -
 385 -                 <child>
 386 -                   <widget class="GtkLabel" id="nb_conn_label_dialing">
 387 -                     <property name="visible">True</property>
 388 -                     <property name="label" translatable="yes">Dialing</property>
 389 -                     <property name="use_underline">False</property>
 390 -                     <property name="use_markup">False</property>
 391 -                     <property name="justify">GTK_JUSTIFY_LEFT</property>
 392 -                     <property name="wrap">False</property>
 393 -                     <property name="selectable">False</property>
 394 -                     <property name="xalign">0.5</property>
 395 -                     <property name="yalign">0.5</property>
 396 -                     <property name="xpad">0</property>
 397 -                     <property name="ypad">0</property>
 398 -                   </widget>
 399 -                   <packing>
 400 -                     <property name="type">label_item</property>
 401 -                   </packing>
 402 -                 </child>
 403                 </widget>
 404                 <packing>
 405                   <property name="padding">0</property>
 406 @@ -971,7 +975,7 @@
 407               </child>
 408             </widget>
 409             <packing>
 410 -             <property name="tab_expand">False</property>
 411 +             <property name="tab_expand">True</property>
 412               <property name="tab_fill">True</property>
 413             </packing>
 414           </child>
 415 @@ -996,216 +1000,234 @@
 416           </child>
 417
 418           <child>
 419 -           <widget class="GtkVBox" id="vbox6">
 420 +           <widget class="GtkScrolledWindow" id="scrolledwindow3">
 421               <property name="visible">True</property>
 422 -             <property name="homogeneous">False</property>
 423 -             <property name="spacing">0</property>
 424 +             <property name="can_focus">True</property>
 425 +             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 426 +             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 427 +             <property name="shadow_type">GTK_SHADOW_NONE</property>
 428 +             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 429
 430               <child>
 431 -               <widget class="GtkFrame" id="frame8">
 432 +               <widget class="GtkViewport" id="viewport3">
 433                   <property name="visible">True</property>
 434 -                 <property name="label_xalign">0</property>
 435 -                 <property name="label_yalign">0.5</property>
 436 -                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 437 +                 <property name="shadow_type">GTK_SHADOW_NONE</property>
 438
 439                   <child>
 440 -                   <widget class="GtkTable" id="table4">
 441 -                     <property name="border_width">5</property>
 442 +                   <widget class="GtkVBox" id="vbox6">
 443                       <property name="visible">True</property>
 444 -                     <property name="n_rows">2</property>
 445 -                     <property name="n_columns">3</property>
 446                       <property name="homogeneous">False</property>
 447 -                     <property name="row_spacing">13</property>
 448 -                     <property name="column_spacing">0</property>
 449 +                     <property name="spacing">0</property>
 450
 451                       <child>
 452 -                       <widget class="GtkCheckButton" id="check_mw_starts_hiden">
 453 +                       <widget class="GtkFrame" id="frame8">
 454                           <property name="visible">True</property>
 455 -                         <property name="tooltip" translatable="yes">Hides main window when starting up (implies on Always show tray icon)</property>
 456 -                         <property name="can_focus">True</property>
 457 -                         <property name="label" translatable="yes">Main window is hidden when the program starts</property>
 458 -                         <property name="use_underline">True</property>
 459 -                         <property name="relief">GTK_RELIEF_NORMAL</property>
 460 -                         <property name="focus_on_click">True</property>
 461 -                         <property name="active">False</property>
 462 -                         <property name="inconsistent">False</property>
 463 -                         <property name="draw_indicator">True</property>
 464 +                         <property name="label_xalign">0</property>
 465 +                         <property name="label_yalign">0.5</property>
 466 +                         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 467 +
 468 +                         <child>
 469 +                           <widget class="GtkTable" id="table4">
 470 +                             <property name="border_width">5</property>
 471 +                             <property name="visible">True</property>
 472 +                             <property name="n_rows">2</property>
 473 +                             <property name="n_columns">3</property>
 474 +                             <property name="homogeneous">False</property>
 475 +                             <property name="row_spacing">7</property>
 476 +                             <property name="column_spacing">0</property>
 477 +
 478 +                             <child>
 479 +                               <widget class="GtkCheckButton" id="check_mw_starts_hiden">
 480 +                                 <property name="visible">True</property>
 481 +                                 <property name="tooltip" translatable="yes">Hides main window when starting up (implies on Always show tray icon)</property>
 482 +                                 <property name="can_focus">True</property>
 483 +                                 <property name="label" translatable="yes">Hide main window on startup</property>
 484 +                                 <property name="use_underline">True</property>
 485 +                                 <property name="relief">GTK_RELIEF_NORMAL</property>
 486 +                                 <property name="focus_on_click">True</property>
 487 +                                 <property name="active">False</property>
 488 +                                 <property name="inconsistent">False</property>
 489 +                                 <property name="draw_indicator">True</property>
 490 +                               </widget>
 491 +                               <packing>
 492 +                                 <property name="left_attach">0</property>
 493 +                                 <property name="right_attach">2</property>
 494 +                                 <property name="top_attach">0</property>
 495 +                                 <property name="bottom_attach">1</property>
 496 +                                 <property name="y_options">expand</property>
 497 +                               </packing>
 498 +                             </child>
 499 +
 500 +                             <child>
 501 +                               <widget class="GtkCheckButton" id="check_quit_on_off">
 502 +                                 <property name="visible">True</property>
 503 +                                 <property name="tooltip" translatable="yes">Exit application after connection is terminated.</property>
 504 +                                 <property name="can_focus">True</property>
 505 +                                 <property name="label" translatable="yes">Exit Dialler when connection is closed</property>
 506 +                                 <property name="use_underline">True</property>
 507 +                                 <property name="relief">GTK_RELIEF_NORMAL</property>
 508 +                                 <property name="focus_on_click">True</property>
 509 +                                 <property name="active">False</property>
 510 +                                 <property name="inconsistent">False</property>
 511 +                                 <property name="draw_indicator">True</property>
 512 +                               </widget>
 513 +                               <packing>
 514 +                                 <property name="left_attach">0</property>
 515 +                                 <property name="right_attach">2</property>
 516 +                                 <property name="top_attach">1</property>
 517 +                                 <property name="bottom_attach">2</property>
 518 +                                 <property name="y_options">expand</property>
 519 +                               </packing>
 520 +                             </child>
 521 +                           </widget>
 522 +                         </child>
 523 +
 524 +                         <child>
 525 +                           <widget class="GtkLabel" id="label25">
 526 +                             <property name="visible">True</property>
 527 +                             <property name="label" translatable="yes">Main Window</property>
 528 +                             <property name="use_underline">False</property>
 529 +                             <property name="use_markup">False</property>
 530 +                             <property name="justify">GTK_JUSTIFY_LEFT</property>
 531 +                             <property name="wrap">False</property>
 532 +                             <property name="selectable">False</property>
 533 +                             <property name="xalign">0.5</property>
 534 +                             <property name="yalign">0.5</property>
 535 +                             <property name="xpad">0</property>
 536 +                             <property name="ypad">0</property>
 537 +                           </widget>
 538 +                           <packing>
 539 +                             <property name="type">label_item</property>
 540 +                           </packing>
 541 +                         </child>
 542                         </widget>
 543                         <packing>
 544 -                         <property name="left_attach">0</property>
 545 -                         <property name="right_attach">2</property>
 546 -                         <property name="top_attach">0</property>
 547 -                         <property name="bottom_attach">1</property>
 548 -                         <property name="y_options">expand</property>
 549 +                         <property name="padding">0</property>
 550 +                         <property name="expand">True</property>
 551 +                         <property name="fill">True</property>
 552                         </packing>
 553                       </child>
 554
 555                       <child>
 556 -                       <widget class="GtkCheckButton" id="check_quit_on_off">
 557 +                       <widget class="GtkFrame" id="details_frame">
 558                           <property name="visible">True</property>
 559 -                         <property name="tooltip" translatable="yes">Hides main window when starting up (implies on Always show tray icon)</property>
 560 -                         <property name="can_focus">True</property>
 561 -                         <property name="label" translatable="yes">Exit Dialler when connection is closed</property>
 562 -                         <property name="use_underline">True</property>
 563 -                         <property name="relief">GTK_RELIEF_NORMAL</property>
 564 -                         <property name="focus_on_click">True</property>
 565 -                         <property name="active">False</property>
 566 -                         <property name="inconsistent">False</property>
 567 -                         <property name="draw_indicator">True</property>
 568 +                         <property name="label_xalign">0</property>
 569 +                         <property name="label_yalign">0.5</property>
 570 +                         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 571 +
 572 +                         <child>
 573 +                           <widget class="GtkCheckButton" id="check_hide_dw_on_conn">
 574 +                             <property name="visible">True</property>
 575 +                             <property name="can_focus">True</property>
 576 +                             <property name="label" translatable="yes">Hide details window when connection is accomplished</property>
 577 +                             <property name="use_underline">True</property>
 578 +                             <property name="relief">GTK_RELIEF_NORMAL</property>
 579 +                             <property name="focus_on_click">True</property>
 580 +                             <property name="active">False</property>
 581 +                             <property name="inconsistent">False</property>
 582 +                             <property name="draw_indicator">True</property>
 583 +                           </widget>
 584 +                         </child>
 585 +
 586 +                         <child>
 587 +                           <widget class="GtkLabel" id="frame_details_label">
 588 +                             <property name="visible">True</property>
 589 +                             <property name="label" translatable="yes">Details Window</property>
 590 +                             <property name="use_underline">False</property>
 591 +                             <property name="use_markup">False</property>
 592 +                             <property name="justify">GTK_JUSTIFY_LEFT</property>
 593 +                             <property name="wrap">False</property>
 594 +                             <property name="selectable">False</property>
 595 +                             <property name="xalign">0.5</property>
 596 +                             <property name="yalign">0.5</property>
 597 +                             <property name="xpad">0</property>
 598 +                             <property name="ypad">0</property>
 599 +                           </widget>
 600 +                           <packing>
 601 +                             <property name="type">label_item</property>
 602 +                           </packing>
 603 +                         </child>
 604                         </widget>
 605                         <packing>
 606 -                         <property name="left_attach">0</property>
 607 -                         <property name="right_attach">2</property>
 608 -                         <property name="top_attach">1</property>
 609 -                         <property name="bottom_attach">2</property>
 610 -                         <property name="y_options">expand</property>
 611 +                         <property name="padding">0</property>
 612 +                         <property name="expand">True</property>
 613 +                         <property name="fill">True</property>
 614                         </packing>
 615                       </child>
 616 -                   </widget>
 617 -                 </child>
 618 -
 619 -                 <child>
 620 -                   <widget class="GtkLabel" id="label25">
 621 -                     <property name="visible">True</property>
 622 -                     <property name="label" translatable="yes">Main Window</property>
 623 -                     <property name="use_underline">False</property>
 624 -                     <property name="use_markup">False</property>
 625 -                     <property name="justify">GTK_JUSTIFY_LEFT</property>
 626 -                     <property name="wrap">False</property>
 627 -                     <property name="selectable">False</property>
 628 -                     <property name="xalign">0.5</property>
 629 -                     <property name="yalign">0.5</property>
 630 -                     <property name="xpad">0</property>
 631 -                     <property name="ypad">0</property>
 632 -                   </widget>
 633 -                   <packing>
 634 -                     <property name="type">label_item</property>
 635 -                   </packing>
 636 -                 </child>
 637 -               </widget>
 638 -               <packing>
 639 -                 <property name="padding">0</property>
 640 -                 <property name="expand">True</property>
 641 -                 <property name="fill">True</property>
 642 -               </packing>
 643 -             </child>
 644 -
 645 -             <child>
 646 -               <widget class="GtkFrame" id="details_frame">
 647 -                 <property name="visible">True</property>
 648 -                 <property name="label_xalign">0</property>
 649 -                 <property name="label_yalign">0.5</property>
 650 -                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 651 -
 652 -                 <child>
 653 -                   <widget class="GtkCheckButton" id="check_hide_dw_on_conn">
 654 -                     <property name="visible">True</property>
 655 -                     <property name="can_focus">True</property>
 656 -                     <property name="label" translatable="yes">Hide details window when connection is accomplished</property>
 657 -                     <property name="use_underline">True</property>
 658 -                     <property name="relief">GTK_RELIEF_NORMAL</property>
 659 -                     <property name="focus_on_click">True</property>
 660 -                     <property name="active">False</property>
 661 -                     <property name="inconsistent">False</property>
 662 -                     <property name="draw_indicator">True</property>
 663 -                   </widget>
 664 -                 </child>
 665 -
 666 -                 <child>
 667 -                   <widget class="GtkLabel" id="frame_details_label">
 668 -                     <property name="visible">True</property>
 669 -                     <property name="label" translatable="yes">Details Window</property>
 670 -                     <property name="use_underline">False</property>
 671 -                     <property name="use_markup">False</property>
 672 -                     <property name="justify">GTK_JUSTIFY_LEFT</property>
 673 -                     <property name="wrap">False</property>
 674 -                     <property name="selectable">False</property>
 675 -                     <property name="xalign">0.5</property>
 676 -                     <property name="yalign">0.5</property>
 677 -                     <property name="xpad">0</property>
 678 -                     <property name="ypad">0</property>
 679 -                   </widget>
 680 -                   <packing>
 681 -                     <property name="type">label_item</property>
 682 -                   </packing>
 683 -                 </child>
 684 -               </widget>
 685 -               <packing>
 686 -                 <property name="padding">0</property>
 687 -                 <property name="expand">True</property>
 688 -                 <property name="fill">True</property>
 689 -               </packing>
 690 -             </child>
 691 -
 692 -             <child>
 693 -               <widget class="GtkFrame" id="frame9">
 694 -                 <property name="visible">True</property>
 695 -                 <property name="label_xalign">0</property>
 696 -                 <property name="label_yalign">0.5</property>
 697 -                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 698 -
 699 -                 <child>
 700 -                   <widget class="GtkTable" id="table6">
 701 -                     <property name="border_width">5</property>
 702 -                     <property name="visible">True</property>
 703 -                     <property name="n_rows">1</property>
 704 -                     <property name="n_columns">3</property>
 705 -                     <property name="homogeneous">False</property>
 706 -                     <property name="row_spacing">14</property>
 707 -                     <property name="column_spacing">0</property>
 708
 709                       <child>
 710 -                       <widget class="GtkCheckButton" id="check_always_tray">
 711 +                       <widget class="GtkFrame" id="frame9">
 712                           <property name="visible">True</property>
 713 -                         <property name="tooltip" translatable="yes">Always shows tray icon, despite the connection state</property>
 714 -                         <property name="can_focus">True</property>
 715 -                         <property name="label" translatable="yes">Always show tray icon</property>
 716 -                         <property name="use_underline">True</property>
 717 -                         <property name="relief">GTK_RELIEF_NORMAL</property>
 718 -                         <property name="focus_on_click">True</property>
 719 -                         <property name="active">False</property>
 720 -                         <property name="inconsistent">False</property>
 721 -                         <property name="draw_indicator">True</property>
 722 +                         <property name="label_xalign">0</property>
 723 +                         <property name="label_yalign">0.5</property>
 724 +                         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 725 +
 726 +                         <child>
 727 +                           <widget class="GtkTable" id="table6">
 728 +                             <property name="border_width">5</property>
 729 +                             <property name="visible">True</property>
 730 +                             <property name="n_rows">1</property>
 731 +                             <property name="n_columns">3</property>
 732 +                             <property name="homogeneous">False</property>
 733 +                             <property name="row_spacing">14</property>
 734 +                             <property name="column_spacing">0</property>
 735 +
 736 +                             <child>
 737 +                               <widget class="GtkCheckButton" id="check_always_tray">
 738 +                                 <property name="visible">True</property>
 739 +                                 <property name="tooltip" translatable="yes">Always shows tray icon, despite the connection state</property>
 740 +                                 <property name="can_focus">True</property>
 741 +                                 <property name="label" translatable="yes">Always show tray icon</property>
 742 +                                 <property name="use_underline">True</property>
 743 +                                 <property name="relief">GTK_RELIEF_NORMAL</property>
 744 +                                 <property name="focus_on_click">True</property>
 745 +                                 <property name="active">False</property>
 746 +                                 <property name="inconsistent">False</property>
 747 +                                 <property name="draw_indicator">True</property>
 748 +                               </widget>
 749 +                               <packing>
 750 +                                 <property name="left_attach">0</property>
 751 +                                 <property name="right_attach">2</property>
 752 +                                 <property name="top_attach">0</property>
 753 +                                 <property name="bottom_attach">1</property>
 754 +                                 <property name="y_options">expand</property>
 755 +                               </packing>
 756 +                             </child>
 757 +                           </widget>
 758 +                         </child>
 759 +
 760 +                         <child>
 761 +                           <widget class="GtkLabel" id="label36">
 762 +                             <property name="visible">True</property>
 763 +                             <property name="label" translatable="yes">Tray Icon</property>
 764 +                             <property name="use_underline">False</property>
 765 +                             <property name="use_markup">False</property>
 766 +                             <property name="justify">GTK_JUSTIFY_LEFT</property>
 767 +                             <property name="wrap">False</property>
 768 +                             <property name="selectable">False</property>
 769 +                             <property name="xalign">0.5</property>
 770 +                             <property name="yalign">0.5</property>
 771 +                             <property name="xpad">0</property>
 772 +                             <property name="ypad">0</property>
 773 +                           </widget>
 774 +                           <packing>
 775 +                             <property name="type">label_item</property>
 776 +                           </packing>
 777 +                         </child>
 778                         </widget>
 779                         <packing>
 780 -                         <property name="left_attach">0</property>
 781 -                         <property name="right_attach">2</property>
 782 -                         <property name="top_attach">0</property>
 783 -                         <property name="bottom_attach">1</property>
 784 -                         <property name="y_options">expand</property>
 785 +                         <property name="padding">0</property>
 786 +                         <property name="expand">True</property>
 787 +                         <property name="fill">True</property>
 788                         </packing>
 789                       </child>
 790                     </widget>
 791                   </child>
 792 -
 793 -                 <child>
 794 -                   <widget class="GtkLabel" id="label36">
 795 -                     <property name="visible">True</property>
 796 -                     <property name="label" translatable="yes">Tray Icon</property>
 797 -                     <property name="use_underline">False</property>
 798 -                     <property name="use_markup">False</property>
 799 -                     <property name="justify">GTK_JUSTIFY_LEFT</property>
 800 -                     <property name="wrap">False</property>
 801 -                     <property name="selectable">False</property>
 802 -                     <property name="xalign">0.5</property>
 803 -                     <property name="yalign">0.5</property>
 804 -                     <property name="xpad">0</property>
 805 -                     <property name="ypad">0</property>
 806 -                   </widget>
 807 -                   <packing>
 808 -                     <property name="type">label_item</property>
 809 -                   </packing>
 810 -                 </child>
 811                 </widget>
 812 -               <packing>
 813 -                 <property name="padding">0</property>
 814 -                 <property name="expand">True</property>
 815 -                 <property name="fill">True</property>
 816 -               </packing>
 817               </child>
 818             </widget>
 819             <packing>
 820 -             <property name="tab_expand">False</property>
 821 +             <property name="tab_expand">True</property>
 822               <property name="tab_fill">True</property>
 823             </packing>
 824           </child>
 825 @@ -1252,7 +1274,7 @@
 826           <property name="visible">True</property>
 827           <property name="xalign">1</property>
 828           <property name="yalign">0.5</property>
 829 -         <property name="xscale">0.03</property>
 830 +         <property name="xscale">0.03</property>
 831           <property name="yscale">1</property>
 832           <property name="top_padding">0</property>
 833           <property name="bottom_padding">0</property>
 834 @@ -1286,6 +1308,8 @@
 835    <property name="type">GTK_WINDOW_TOPLEVEL</property>
 836    <property name="window_position">GTK_WIN_POS_CENTER</property>
 837    <property name="modal">True</property>
 838 +  <property name="default_width">240</property>
 839 +  <property name="default_height">300</property>
 840    <property name="resizable">True</property>
 841    <property name="destroy_with_parent">False</property>
 842    <property name="decorated">True</property>
 843 @@ -1296,14 +1320,13 @@
 844
 845    <child>
 846      <widget class="GtkVBox" id="vbox3">
 847 -      <property name="border_width">2</property>
 848 +      <property name="border_width">3</property>
 849        <property name="visible">True</property>
 850        <property name="homogeneous">False</property>
 851 -      <property name="spacing">5</property>
 852 +      <property name="spacing">3</property>
 853
 854        <child>
 855         <widget class="GtkNotebook" id="notebook2">
 856 -         <property name="border_width">4</property>
 857           <property name="visible">True</property>
 858           <property name="can_focus">True</property>
 859           <property name="show_tabs">True</property>
 860 @@ -1313,312 +1336,330 @@
 861           <property name="enable_popup">False</property>
 862
 863           <child>
 864 -           <widget class="GtkTable" id="table5">
 865 -             <property name="border_width">12</property>
 866 +           <widget class="GtkScrolledWindow" id="scrolledwindow5">
 867               <property name="visible">True</property>
 868 -             <property name="n_rows">7</property>
 869 -             <property name="n_columns">2</property>
 870 -             <property name="homogeneous">False</property>
 871 -             <property name="row_spacing">8</property>
 872 -             <property name="column_spacing">5</property>
 873 +             <property name="can_focus">True</property>
 874 +             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 875 +             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 876 +             <property name="shadow_type">GTK_SHADOW_NONE</property>
 877 +             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 878
 879               <child>
 880 -               <widget class="GtkLabel" id="label27">
 881 +               <widget class="GtkViewport" id="viewport1">
 882                   <property name="visible">True</property>
 883 -                 <property name="label" translatable="yes">Connection name:</property>
 884 -                 <property name="use_underline">False</property>
 885 -                 <property name="use_markup">True</property>
 886 -                 <property name="justify">GTK_JUSTIFY_LEFT</property>
 887 -                 <property name="wrap">False</property>
 888 -                 <property name="selectable">False</property>
 889 -                 <property name="xalign">0</property>
 890 -                 <property name="yalign">0.5</property>
 891 -                 <property name="xpad">0</property>
 892 -                 <property name="ypad">0</property>
 893 -               </widget>
 894 -               <packing>
 895 -                 <property name="left_attach">0</property>
 896 -                 <property name="right_attach">1</property>
 897 -                 <property name="top_attach">0</property>
 898 -                 <property name="bottom_attach">1</property>
 899 -                 <property name="x_options">fill</property>
 900 -                 <property name="y_options"></property>
 901 -               </packing>
 902 -             </child>
 903 +                 <property name="shadow_type">GTK_SHADOW_NONE</property>
 904
 905 -             <child>
 906 -               <widget class="GtkEntry" id="cp_entry_conn_name">
 907 -                 <property name="visible">True</property>
 908 -                 <property name="can_focus">True</property>
 909 -                 <property name="editable">True</property>
 910 -                 <property name="visibility">True</property>
 911 -                 <property name="max_length">255</property>
 912 -                 <property name="text" translatable="yes"></property>
 913 -                 <property name="has_frame">True</property>
 914 -                 <property name="invisible_char" translatable="yes">*</property>
 915 -                 <property name="activates_default">False</property>
 916 -               </widget>
 917 -               <packing>
 918 -                 <property name="left_attach">1</property>
 919 -                 <property name="right_attach">2</property>
 920 -                 <property name="top_attach">0</property>
 921 -                 <property name="bottom_attach">1</property>
 922 -                 <property name="y_options"></property>
 923 -               </packing>
 924 -             </child>
 925 -
 926 -             <child>
 927 -               <widget class="GtkLabel" id="label28">
 928 -                 <property name="visible">True</property>
 929 -                 <property name="label" translatable="yes">Phone number:</property>
 930 -                 <property name="use_underline">False</property>
 931 -                 <property name="use_markup">True</property>
 932 -                 <property name="justify">GTK_JUSTIFY_LEFT</property>
 933 -                 <property name="wrap">False</property>
 934 -                 <property name="selectable">False</property>
 935 -                 <property name="xalign">0</property>
 936 -                 <property name="yalign">0.5</property>
 937 -                 <property name="xpad">0</property>
 938 -                 <property name="ypad">0</property>
 939 -               </widget>
 940 -               <packing>
 941 -                 <property name="left_attach">0</property>
 942 -                 <property name="right_attach">1</property>
 943 -                 <property name="top_attach">1</property>
 944 -                 <property name="bottom_attach">2</property>
 945 -                 <property name="x_options">fill</property>
 946 -                 <property name="y_options"></property>
 947 -               </packing>
 948 -             </child>
 949 -
 950 -             <child>
 951 -               <widget class="GtkEntry" id="cp_entry_phone">
 952 -                 <property name="visible">True</property>
 953 -                 <property name="can_focus">True</property>
 954 -                 <property name="editable">True</property>
 955 -                 <property name="visibility">True</property>
 956 -                 <property name="max_length">0</property>
 957 -                 <property name="text" translatable="yes"></property>
 958 -                 <property name="has_frame">True</property>
 959 -                 <property name="invisible_char" translatable="yes">*</property>
 960 -                 <property name="activates_default">False</property>
 961 -               </widget>
 962 -               <packing>
 963 -                 <property name="left_attach">1</property>
 964 -                 <property name="right_attach">2</property>
 965 -                 <property name="top_attach">1</property>
 966 -                 <property name="bottom_attach">2</property>
 967 -                 <property name="y_options"></property>
 968 -               </packing>
 969 -             </child>
 970 -
 971 -             <child>
 972 -               <widget class="GtkHSeparator" id="hseparator3">
 973 -                 <property name="visible">True</property>
 974 -               </widget>
 975 -               <packing>
 976 -                 <property name="left_attach">0</property>
 977 -                 <property name="right_attach">2</property>
 978 -                 <property name="top_attach">2</property>
 979 -                 <property name="bottom_attach">3</property>
 980 -                 <property name="x_options">fill</property>
 981 -                 <property name="y_options"></property>
 982 -               </packing>
 983 -             </child>
 984 -
 985 -             <child>
 986 -               <widget class="GtkLabel" id="label29">
 987 -                 <property name="visible">True</property>
 988 -                 <property name="label" translatable="yes">User name:</property>
 989 -                 <property name="use_underline">False</property>
 990 -                 <property name="use_markup">False</property>
 991 -                 <property name="justify">GTK_JUSTIFY_LEFT</property>
 992 -                 <property name="wrap">False</property>
 993 -                 <property name="selectable">False</property>
 994 -                 <property name="xalign">0</property>
 995 -                 <property name="yalign">0.5</property>
 996 -                 <property name="xpad">0</property>
 997 -                 <property name="ypad">0</property>
 998 -               </widget>
 999 -               <packing>
1000 -                 <property name="left_attach">0</property>
1001 -                 <property name="right_attach">1</property>
1002 -                 <property name="top_attach">3</property>
1003 -                 <property name="bottom_attach">4</property>
1004 -                 <property name="x_options">fill</property>
1005 -                 <property name="y_options"></property>
1006 -               </packing>
1007 -             </child>
1008 +                 <child>
1009 +                   <widget class="GtkTable" id="table5">
1010 +                     <property name="border_width">12</property>
1011 +                     <property name="visible">True</property>
1012 +                     <property name="n_rows">7</property>
1013 +                     <property name="n_columns">2</property>
1014 +                     <property name="homogeneous">False</property>
1015 +                     <property name="row_spacing">8</property>
1016 +                     <property name="column_spacing">5</property>
1017
1018 -             <child>
1019 -               <widget class="GtkEntry" id="cp_entry_user">
1020 -                 <property name="visible">True</property>
1021 -                 <property name="can_focus">True</property>
1022 -                 <property name="editable">True</property>
1023 -                 <property name="visibility">True</property>
1024 -                 <property name="max_length">0</property>
1025 -                 <property name="text" translatable="yes"></property>
1026 -                 <property name="has_frame">True</property>
1027 -                 <property name="invisible_char" translatable="yes">*</property>
1028 -                 <property name="activates_default">False</property>
1029 -               </widget>
1030 -               <packing>
1031 -                 <property name="left_attach">1</property>
1032 -                 <property name="right_attach">2</property>
1033 -                 <property name="top_attach">3</property>
1034 -                 <property name="bottom_attach">4</property>
1035 -                 <property name="y_options"></property>
1036 -               </packing>
1037 -             </child>
1038 +                     <child>
1039 +                       <widget class="GtkLabel" id="label27">
1040 +                         <property name="visible">True</property>
1041 +                         <property name="label" translatable="yes">Connection name:</property>
1042 +                         <property name="use_underline">False</property>
1043 +                         <property name="use_markup">True</property>
1044 +                         <property name="justify">GTK_JUSTIFY_LEFT</property>
1045 +                         <property name="wrap">False</property>
1046 +                         <property name="selectable">False</property>
1047 +                         <property name="xalign">0</property>
1048 +                         <property name="yalign">0.5</property>
1049 +                         <property name="xpad">0</property>
1050 +                         <property name="ypad">0</property>
1051 +                       </widget>
1052 +                       <packing>
1053 +                         <property name="left_attach">0</property>
1054 +                         <property name="right_attach">1</property>
1055 +                         <property name="top_attach">0</property>
1056 +                         <property name="bottom_attach">1</property>
1057 +                         <property name="x_options">fill</property>
1058 +                         <property name="y_options"></property>
1059 +                       </packing>
1060 +                     </child>
1061
1062 -             <child>
1063 -               <widget class="GtkLabel" id="label30">
1064 -                 <property name="visible">True</property>
1065 -                 <property name="label" translatable="yes">Password:</property>
1066 -                 <property name="use_underline">False</property>
1067 -                 <property name="use_markup">False</property>
1068 -                 <property name="justify">GTK_JUSTIFY_LEFT</property>
1069 -                 <property name="wrap">False</property>
1070 -                 <property name="selectable">False</property>
1071 -                 <property name="xalign">0</property>
1072 -                 <property name="yalign">0.5</property>
1073 -                 <property name="xpad">0</property>
1074 -                 <property name="ypad">0</property>
1075 -               </widget>
1076 -               <packing>
1077 -                 <property name="left_attach">0</property>
1078 -                 <property name="right_attach">1</property>
1079 -                 <property name="top_attach">4</property>
1080 -                 <property name="bottom_attach">5</property>
1081 -                 <property name="x_options">fill</property>
1082 -                 <property name="y_options"></property>
1083 -               </packing>
1084 -             </child>
1085 +                     <child>
1086 +                       <widget class="GtkEntry" id="cp_entry_conn_name">
1087 +                         <property name="visible">True</property>
1088 +                         <property name="can_focus">True</property>
1089 +                         <property name="editable">True</property>
1090 +                         <property name="visibility">True</property>
1091 +                         <property name="max_length">255</property>
1092 +                         <property name="text" translatable="yes"></property>
1093 +                         <property name="has_frame">True</property>
1094 +                         <property name="invisible_char">*</property>
1095 +                         <property name="activates_default">False</property>
1096 +                       </widget>
1097 +                       <packing>
1098 +                         <property name="left_attach">1</property>
1099 +                         <property name="right_attach">2</property>
1100 +                         <property name="top_attach">0</property>
1101 +                         <property name="bottom_attach">1</property>
1102 +                         <property name="y_options"></property>
1103 +                       </packing>
1104 +                     </child>
1105
1106 -             <child>
1107 -               <widget class="GtkEntry" id="cp_entry_password">
1108 -                 <property name="visible">True</property>
1109 -                 <property name="can_focus">True</property>
1110 -                 <property name="editable">True</property>
1111 -                 <property name="visibility">False</property>
1112 -                 <property name="max_length">0</property>
1113 -                 <property name="text" translatable="yes"></property>
1114 -                 <property name="has_frame">True</property>
1115 -                 <property name="invisible_char" translatable="yes">*</property>
1116 -                 <property name="activates_default">False</property>
1117 -               </widget>
1118 -               <packing>
1119 -                 <property name="left_attach">1</property>
1120 -                 <property name="right_attach">2</property>
1121 -                 <property name="top_attach">4</property>
1122 -                 <property name="bottom_attach">5</property>
1123 -                 <property name="y_options"></property>
1124 -               </packing>
1125 -             </child>
1126 +                     <child>
1127 +                       <widget class="GtkLabel" id="label28">
1128 +                         <property name="visible">True</property>
1129 +                         <property name="label" translatable="yes">Phone number:</property>
1130 +                         <property name="use_underline">False</property>
1131 +                         <property name="use_markup">True</property>
1132 +                         <property name="justify">GTK_JUSTIFY_LEFT</property>
1133 +                         <property name="wrap">False</property>
1134 +                         <property name="selectable">False</property>
1135 +                         <property name="xalign">0</property>
1136 +                         <property name="yalign">0.5</property>
1137 +                         <property name="xpad">0</property>
1138 +                         <property name="ypad">0</property>
1139 +                       </widget>
1140 +                       <packing>
1141 +                         <property name="left_attach">0</property>
1142 +                         <property name="right_attach">1</property>
1143 +                         <property name="top_attach">1</property>
1144 +                         <property name="bottom_attach">2</property>
1145 +                         <property name="x_options">fill</property>
1146 +                         <property name="y_options"></property>
1147 +                       </packing>
1148 +                     </child>
1149
1150 -             <child>
1151 -               <widget class="GtkHSeparator" id="hseparator4">
1152 -                 <property name="visible">True</property>
1153 -               </widget>
1154 -               <packing>
1155 -                 <property name="left_attach">0</property>
1156 -                 <property name="right_attach">2</property>
1157 -                 <property name="top_attach">5</property>
1158 -                 <property name="bottom_attach">6</property>
1159 -                 <property name="x_options">fill</property>
1160 -                 <property name="y_options"></property>
1161 -               </packing>
1162 -             </child>
1163 +                     <child>
1164 +                       <widget class="GtkEntry" id="cp_entry_phone">
1165 +                         <property name="visible">True</property>
1166 +                         <property name="can_focus">True</property>
1167 +                         <property name="editable">True</property>
1168 +                         <property name="visibility">True</property>
1169 +                         <property name="max_length">0</property>
1170 +                         <property name="text" translatable="yes"></property>
1171 +                         <property name="has_frame">True</property>
1172 +                         <property name="invisible_char">*</property>
1173 +                         <property name="activates_default">False</property>
1174 +                       </widget>
1175 +                       <packing>
1176 +                         <property name="left_attach">1</property>
1177 +                         <property name="right_attach">2</property>
1178 +                         <property name="top_attach">1</property>
1179 +                         <property name="bottom_attach">2</property>
1180 +                         <property name="y_options"></property>
1181 +                       </packing>
1182 +                     </child>
1183
1184 -             <child>
1185 -               <widget class="GtkLabel" id="label31">
1186 -                 <property name="visible">True</property>
1187 -                 <property name="label" translatable="yes">Authentication:</property>
1188 -                 <property name="use_underline">False</property>
1189 -                 <property name="use_markup">False</property>
1190 -                 <property name="justify">GTK_JUSTIFY_LEFT</property>
1191 -                 <property name="wrap">False</property>
1192 -                 <property name="selectable">False</property>
1193 -                 <property name="xalign">0</property>
1194 -                 <property name="yalign">0.5</property>
1195 -                 <property name="xpad">0</property>
1196 -                 <property name="ypad">0</property>
1197 -               </widget>
1198 -               <packing>
1199 -                 <property name="left_attach">0</property>
1200 -                 <property name="right_attach">1</property>
1201 -                 <property name="top_attach">6</property>
1202 -                 <property name="bottom_attach">7</property>
1203 -                 <property name="x_options">fill</property>
1204 -                 <property name="y_options"></property>
1205 -               </packing>
1206 -             </child>
1207 +                     <child>
1208 +                       <widget class="GtkHSeparator" id="hseparator3">
1209 +                         <property name="visible">True</property>
1210 +                       </widget>
1211 +                       <packing>
1212 +                         <property name="left_attach">0</property>
1213 +                         <property name="right_attach">2</property>
1214 +                         <property name="top_attach">2</property>
1215 +                         <property name="bottom_attach">3</property>
1216 +                         <property name="x_options">fill</property>
1217 +                         <property name="y_options"></property>
1218 +                       </packing>
1219 +                     </child>
1220
1221 -             <child>
1222 -               <widget class="GtkCombo" id="cp_combo_auth">
1223 -                 <property name="visible">True</property>
1224 -                 <property name="value_in_list">True</property>
1225 -                 <property name="allow_empty">False</property>
1226 -                 <property name="case_sensitive">False</property>
1227 -                 <property name="enable_arrow_keys">False</property>
1228 -                 <property name="enable_arrows_always">False</property>
1229 +                     <child>
1230 +                       <widget class="GtkLabel" id="label29">
1231 +                         <property name="visible">True</property>
1232 +                         <property name="label" translatable="yes">User name:</property>
1233 +                         <property name="use_underline">False</property>
1234 +                         <property name="use_markup">False</property>
1235 +                         <property name="justify">GTK_JUSTIFY_LEFT</property>
1236 +                         <property name="wrap">False</property>
1237 +                         <property name="selectable">False</property>
1238 +                         <property name="xalign">0</property>
1239 +                         <property name="yalign">0.5</property>
1240 +                         <property name="xpad">0</property>
1241 +                         <property name="ypad">0</property>
1242 +                       </widget>
1243 +                       <packing>
1244 +                         <property name="left_attach">0</property>
1245 +                         <property name="right_attach">1</property>
1246 +                         <property name="top_attach">3</property>
1247 +                         <property name="bottom_attach">4</property>
1248 +                         <property name="x_options">fill</property>
1249 +                         <property name="y_options"></property>
1250 +                       </packing>
1251 +                     </child>
1252
1253 -                 <child internal-child="entry">
1254 -                   <widget class="GtkEntry" id="cp_entry_auth">
1255 -                     <property name="visible">True</property>
1256 -                     <property name="can_focus">True</property>
1257 -                     <property name="editable">False</property>
1258 -                     <property name="visibility">True</property>
1259 -                     <property name="max_length">0</property>
1260 -                     <property name="text" translatable="yes"></property>
1261 -                     <property name="has_frame">True</property>
1262 -                     <property name="invisible_char" translatable="yes">*</property>
1263 -                     <property name="activates_default">False</property>
1264 -                   </widget>
1265 -                 </child>
1266 +                     <child>
1267 +                       <widget class="GtkEntry" id="cp_entry_user">
1268 +                         <property name="visible">True</property>
1269 +                         <property name="can_focus">True</property>
1270 +                         <property name="editable">True</property>
1271 +                         <property name="visibility">True</property>
1272 +                         <property name="max_length">0</property>
1273 +                         <property name="text" translatable="yes"></property>
1274 +                         <property name="has_frame">True</property>
1275 +                         <property name="invisible_char">*</property>
1276 +                         <property name="activates_default">False</property>
1277 +                       </widget>
1278 +                       <packing>
1279 +                         <property name="left_attach">1</property>
1280 +                         <property name="right_attach">2</property>
1281 +                         <property name="top_attach">3</property>
1282 +                         <property name="bottom_attach">4</property>
1283 +                         <property name="y_options"></property>
1284 +                       </packing>
1285 +                     </child>
1286
1287 -                 <child internal-child="list">
1288 -                   <widget class="GtkList" id="combo-list2">
1289 -                     <property name="visible">True</property>
1290 -                     <property name="selection_mode">GTK_SELECTION_BROWSE</property>
1291 +                     <child>
1292 +                       <widget class="GtkLabel" id="label30">
1293 +                         <property name="visible">True</property>
1294 +                         <property name="label" translatable="yes">Password:</property>
1295 +                         <property name="use_underline">False</property>
1296 +                         <property name="use_markup">False</property>
1297 +                         <property name="justify">GTK_JUSTIFY_LEFT</property>
1298 +                         <property name="wrap">False</property>
1299 +                         <property name="selectable">False</property>
1300 +                         <property name="xalign">0</property>
1301 +                         <property name="yalign">0.5</property>
1302 +                         <property name="xpad">0</property>
1303 +                         <property name="ypad">0</property>
1304 +                       </widget>
1305 +                       <packing>
1306 +                         <property name="left_attach">0</property>
1307 +                         <property name="right_attach">1</property>
1308 +                         <property name="top_attach">4</property>
1309 +                         <property name="bottom_attach">5</property>
1310 +                         <property name="x_options">fill</property>
1311 +                         <property name="y_options"></property>
1312 +                       </packing>
1313 +                     </child>
1314
1315                       <child>
1316 -                       <widget class="GtkListItem" id="listitem12">
1317 +                       <widget class="GtkEntry" id="cp_entry_password">
1318                           <property name="visible">True</property>
1319                           <property name="can_focus">True</property>
1320 -                         <property name="label" translatable="yes">PAP</property>
1321 +                         <property name="editable">True</property>
1322 +                         <property name="visibility">False</property>
1323 +                         <property name="max_length">0</property>
1324 +                         <property name="text" translatable="yes"></property>
1325 +                         <property name="has_frame">True</property>
1326 +                         <property name="invisible_char">*</property>
1327 +                         <property name="activates_default">False</property>
1328                         </widget>
1329 +                       <packing>
1330 +                         <property name="left_attach">1</property>
1331 +                         <property name="right_attach">2</property>
1332 +                         <property name="top_attach">4</property>
1333 +                         <property name="bottom_attach">5</property>
1334 +                         <property name="y_options"></property>
1335 +                       </packing>
1336                       </child>
1337
1338                       <child>
1339 -                       <widget class="GtkListItem" id="listitem13">
1340 +                       <widget class="GtkHSeparator" id="hseparator4">
1341                           <property name="visible">True</property>
1342 -                         <property name="can_focus">True</property>
1343 -                         <property name="label" translatable="yes">CHAP</property>
1344                         </widget>
1345 +                       <packing>
1346 +                         <property name="left_attach">0</property>
1347 +                         <property name="right_attach">2</property>
1348 +                         <property name="top_attach">5</property>
1349 +                         <property name="bottom_attach">6</property>
1350 +                         <property name="x_options">fill</property>
1351 +                         <property name="y_options"></property>
1352 +                       </packing>
1353 +                     </child>
1354 +
1355 +                     <child>
1356 +                       <widget class="GtkLabel" id="label31">
1357 +                         <property name="visible">True</property>
1358 +                         <property name="label" translatable="yes">Authentication:</property>
1359 +                         <property name="use_underline">False</property>
1360 +                         <property name="use_markup">False</property>
1361 +                         <property name="justify">GTK_JUSTIFY_LEFT</property>
1362 +                         <property name="wrap">False</property>
1363 +                         <property name="selectable">False</property>
1364 +                         <property name="xalign">0</property>
1365 +                         <property name="yalign">0.5</property>
1366 +                         <property name="xpad">0</property>
1367 +                         <property name="ypad">0</property>
1368 +                       </widget>
1369 +                       <packing>
1370 +                         <property name="left_attach">0</property>
1371 +                         <property name="right_attach">1</property>
1372 +                         <property name="top_attach">6</property>
1373 +                         <property name="bottom_attach">7</property>
1374 +                         <property name="x_options">fill</property>
1375 +                         <property name="y_options"></property>
1376 +                       </packing>
1377                       </child>
1378
1379                       <child>
1380 -                       <widget class="GtkListItem" id="listitem14">
1381 +                       <widget class="GtkCombo" id="cp_combo_auth">
1382                           <property name="visible">True</property>
1383 -                         <property name="can_focus">True</property>
1384 -                         <property name="label" translatable="yes">CHAT</property>
1385 +                         <property name="value_in_list">True</property>
1386 +                         <property name="allow_empty">False</property>
1387 +                         <property name="case_sensitive">False</property>
1388 +                         <property name="enable_arrow_keys">False</property>
1389 +                         <property name="enable_arrows_always">False</property>
1390 +
1391 +                         <child internal-child="entry">
1392 +                           <widget class="GtkEntry" id="cp_entry_auth">
1393 +                             <property name="visible">True</property>
1394 +                             <property name="can_focus">True</property>
1395 +                             <property name="editable">False</property>
1396 +                             <property name="visibility">True</property>
1397 +                             <property name="max_length">0</property>
1398 +                             <property name="text" translatable="yes"></property>
1399 +                             <property name="has_frame">True</property>
1400 +                             <property name="invisible_char">*</property>
1401 +                             <property name="activates_default">False</property>
1402 +                           </widget>
1403 +                         </child>
1404 +
1405 +                         <child internal-child="list">
1406 +                           <widget class="GtkList" id="combo-list2">
1407 +                             <property name="visible">True</property>
1408 +                             <property name="selection_mode">GTK_SELECTION_BROWSE</property>
1409 +
1410 +                             <child>
1411 +                               <widget class="GtkListItem" id="listitem12">
1412 +                                 <property name="visible">True</property>
1413 +                                 <property name="can_focus">True</property>
1414 +                                 <property name="label" translatable="yes">PAP</property>
1415 +                               </widget>
1416 +                             </child>
1417 +
1418 +                             <child>
1419 +                               <widget class="GtkListItem" id="listitem13">
1420 +                                 <property name="visible">True</property>
1421 +                                 <property name="can_focus">True</property>
1422 +                                 <property name="label" translatable="yes">CHAP</property>
1423 +                               </widget>
1424 +                             </child>
1425 +
1426 +                             <child>
1427 +                               <widget class="GtkListItem" id="listitem14">
1428 +                                 <property name="visible">True</property>
1429 +                                 <property name="can_focus">True</property>
1430 +                                 <property name="label" translatable="yes">CHAT</property>
1431 +                               </widget>
1432 +                             </child>
1433 +                           </widget>
1434 +                         </child>
1435                         </widget>
1436 +                       <packing>
1437 +                         <property name="left_attach">1</property>
1438 +                         <property name="right_attach">2</property>
1439 +                         <property name="top_attach">6</property>
1440 +                         <property name="bottom_attach">7</property>
1441 +                         <property name="y_options"></property>
1442 +                       </packing>
1443                       </child>
1444                     </widget>
1445                   </child>
1446                 </widget>
1447 -               <packing>
1448 -                 <property name="left_attach">1</property>
1449 -                 <property name="right_attach">2</property>
1450 -                 <property name="top_attach">6</property>
1451 -                 <property name="bottom_attach">7</property>
1452 -                 <property name="y_options"></property>
1453 -               </packing>
1454               </child>
1455             </widget>
1456             <packing>
1457 -             <property name="tab_expand">False</property>
1458 +             <property name="tab_expand">True</property>
1459               <property name="tab_fill">True</property>
1460             </packing>
1461           </child>
1462 @@ -1685,7 +1726,7 @@
1463                   <property name="max_length">220</property>
1464                   <property name="text" translatable="yes"></property>
1465                   <property name="has_frame">True</property>
1466 -                 <property name="invisible_char" translatable="yes">*</property>
1467 +                 <property name="invisible_char">*</property>
1468                   <property name="activates_default">False</property>
1469                 </widget>
1470                 <packing>
1471 @@ -1730,7 +1771,7 @@
1472                   <property name="max_length">220</property>
1473                   <property name="text" translatable="yes"></property>
1474                   <property name="has_frame">True</property>
1475 -                 <property name="invisible_char" translatable="yes">*</property>
1476 +                 <property name="invisible_char">*</property>
1477                   <property name="activates_default">False</property>
1478                 </widget>
1479                 <packing>
1480 @@ -1775,7 +1816,7 @@
1481                   <property name="max_length">220</property>
1482                   <property name="text" translatable="yes"></property>
1483                   <property name="has_frame">True</property>
1484 -                 <property name="invisible_char" translatable="yes">*</property>
1485 +                 <property name="invisible_char">*</property>
1486                   <property name="activates_default">False</property>
1487                 </widget>
1488                 <packing>
1489 @@ -1788,7 +1829,7 @@
1490               </child>
1491             </widget>
1492             <packing>
1493 -             <property name="tab_expand">False</property>
1494 +             <property name="tab_expand">True</property>
1495               <property name="tab_fill">True</property>
1496             </packing>
1497           </child>
1498 @@ -1836,7 +1877,7 @@
1499           <property name="visible">True</property>
1500           <property name="xalign">1</property>
1501           <property name="yalign">0.5</property>
1502 -         <property name="xscale">0.03</property>
1503 +         <property name="xscale">0.0299999993294</property>
1504           <property name="yscale">1</property>
1505           <property name="top_padding">0</property>
1506           <property name="bottom_padding">0</property>
1507 diff -ru gkdial-1.8.1-psi/src/tray.c gkdial-1.8.1/src/tray.c
1508 --- gkdial-1.8.1-psi/src/tray.c 2004-10-29 11:40:00.000000000 +0200
1509 +++ gkdial-1.8.1/src/tray.c     2005-01-25 16:52:42.000000000 +0100
1510 @@ -137,6 +137,5 @@
1511
1512    gkdial->tray_icon = gtk_image_new_from_pixbuf (gkdial->pixbuf_ppp_off);
1513    gtk_container_add (GTK_CONTAINER (box), gkdial->tray_icon);
1514 -tray_menu_init (gkdial);
1515 -  //gnome_popup_menu_attach (tray_menu_init (gkdial), box, NULL);
1516 +  tray_menu_init (gkdial);
1517  }
1518 --- /tmp/main.c 2005-01-25 17:54:28.000000000 +0100
1519 +++ gkdial-1.8.1/src/main.c     2005-01-25 17:56:26.000000000 +0100
1520 @@ -37,15 +37,15 @@
1521  gkdial_show_about (GtkWidget * widget, gpointer data)
1522  {
1523    gchar *translator_credits =
1524 -       g_strdup (_("Adapted to GPE by Florian Boor <florian@kernelconcepts.de>"));
1525 +       g_strdup (_("GPE port by Florian Boor <florian@kernelconcepts.de>"));
1526
1527    gk_dialog (GTK_MESSAGE_INFO,
1528 -            _("Internet Dialler (GkDial) %s\n\n"
1529 -              "A PPP setup and dialing tool for GNOME.\n\n"
1530 -              "Author:\n\n"
1531 -              "\tGustavo Noronha Silva <kov@debian.org>\n\n"
1532 -              "Thanks to:\n\n"
1533 -              "\tLeandro A. F. Pereira <leandro@linuxmag.com.br>\n\n"
1534 +            _("Modem Dialler (GkDial) %s\n\n"
1535 +              "A PPP setup and dialing tool.\n\n"
1536 +              "Author:\n"
1537 +              "Gustavo Noronha Silva <kov@debian.org>\n\n"
1538 +              "Thanks to:\n"
1539 +              "Leandro A. F. Pereira <leandro@linuxmag.com.br>\n\n"
1540                "%s"), PACKAGE_VERSION, translator_credits);
1541
1542    g_free (translator_credits);