org.handhelds.familiar/packages/vlc/vlc-gpe-0.8.4/pda-interface.patch

   1 diff -ur vlc-0.8.4a/modules/gui/pda/pda.c vlc-0.8.4a-pda/modules/gui/pda/pda.c
   2 --- vlc-0.8.4a/modules/gui/pda/pda.c    2005-12-11 22:36:19.000000000 +0100
   3 +++ vlc-0.8.4a-pda/modules/gui/pda/pda.c        2006-04-04 17:41:06.000000000 +0200
   4 @@ -445,8 +445,6 @@
   5              }
   6
   7              /* Manage the slider */
   8 -#if 0
   9 -#define p_area p_input->p_selected_area
  10              if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
  11              {
  12                  /* Manage the slider for CPU_CAPABILITY_FPU hardware */
  13 @@ -461,7 +459,7 @@
  14                          /* Update the value */
  15                          p_intf->p_sys->p_adj->value =
  16                          p_intf->p_sys->f_adj_oldvalue =
  17 -                            ( 100. * p_area->i_tell ) / p_area->i_size;
  18 +                            ( 100. * var_GetTime( p_intf->p_sys->p_input, "time" ) ) / var_GetTime( p_intf->p_sys->p_input, "length" );
  19                          g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
  20                                                   "value_changed" );
  21                      }
  22 @@ -495,7 +493,7 @@
  23                          /* Update the value */
  24                          p_intf->p_sys->p_adj->value =
  25                          p_intf->p_sys->i_adj_oldvalue =
  26 -                            ( 100 * p_area->i_tell ) / p_area->i_size;
  27 +                            ( 100 * var_GetTime( p_intf->p_sys->p_input, "time" ) ) / var_GetTime( p_intf->p_sys->p_input, "length" );
  28                          g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
  29                                                   "value_changed" );
  30                      }
  31 @@ -515,8 +513,6 @@
  32                      }
  33                  }
  34              }
  35 -#undef p_area
  36 -#endif
  37          }
  38          vlc_mutex_unlock( &p_input->object_lock );
  39      }
  40 diff -ur vlc-0.8.4a/modules/gui/pda/pda_callbacks.c vlc-0.8.4a-pda/modules/gui/pda/pda_callbacks.c
  41 --- vlc-0.8.4a/modules/gui/pda/pda_callbacks.c  2005-12-11 22:36:19.000000000 +0100
  42 +++ vlc-0.8.4a-pda/modules/gui/pda/pda_callbacks.c      2006-04-05 10:26:41.000000000 +0200
  43 @@ -442,7 +442,7 @@
  44      p_intf->p_sys->b_slider_free = 1;
  45      vlc_mutex_unlock( &p_intf->change_lock );
  46
  47 -    return TRUE;
  48 +    return FALSE;
  49  }
  50
  51
  52 @@ -455,7 +455,7 @@
  53      p_intf->p_sys->b_slider_free = 0;
  54      vlc_mutex_unlock( &p_intf->change_lock );
  55
  56 -    return TRUE;
  57 +    return FALSE;
  58  }
  59
  60  void SliderMove(GtkRange *range, GtkScrollType scroll, gpointer user_data)
  61 @@ -1102,6 +1102,8 @@
  62      p_entryStdURL = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdURL" );
  63      p_entryStdAnnounce = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryAnnounceChannel" );
  64      p_entryStdTTL = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryStdTTL" );
  65 +    p_checkSAP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkSAP" );
  66 +    p_checkSLP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkSLP" );
  67
  68      p_std_access = gtk_entry_get_text(GTK_ENTRY(p_entryStdAccess));
  69      p_std_muxer = gtk_entry_get_text(GTK_ENTRY(p_entryStdMuxer));
  70 diff -ur vlc-0.8.4a/modules/gui/pda/pda.glade vlc-0.8.4a-pda/modules/gui/pda/pda.glade
  71 --- vlc-0.8.4a/modules/gui/pda/pda.glade        2005-12-11 22:36:19.000000000 +0100
  72 +++ vlc-0.8.4a-pda/modules/gui/pda/pda.glade    2006-04-05 10:50:39.000000000 +0200
  73 @@ -14,6 +14,12 @@
  74    <property name="resizable">True</property>
  75    <property name="destroy_with_parent">False</property>
  76    <property name="icon">vlc16x16.png</property>
  77 +  <property name="decorated">True</property>
  78 +  <property name="skip_taskbar_hint">False</property>
  79 +  <property name="skip_pager_hint">False</property>
  80 +  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
  81 +  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  82 +  <property name="focus_on_map">True</property>
  83    <signal name="delete_event" handler="onPDADeleteEvent" last_modification_time="Fri, 26 Sep 2003 13:23:22 GMT"/>
  84
  85    <child>
  86 @@ -30,9 +36,23 @@
  87           <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
  88           <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
  89           <property name="tooltips">True</property>
  90 +         <property name="show_arrow">True</property>
  91
  92           <child>
  93 -           <widget class="button" id="tbRewind">
  94 +           <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
  95 +             <property name="visible">True</property>
  96 +             <property name="draw">True</property>
  97 +             <property name="visible_horizontal">True</property>
  98 +             <property name="visible_vertical">True</property>
  99 +           </widget>
 100 +           <packing>
 101 +             <property name="expand">False</property>
 102 +             <property name="homogeneous">False</property>
 103 +           </packing>
 104 +         </child>
 105 +
 106 +         <child>
 107 +           <widget class="GtkToolButton" id="tbRewind">
 108               <property name="width_request">22</property>
 109               <property name="height_request">22</property>
 110               <property name="visible">True</property>
 111 @@ -40,16 +60,19 @@
 112               <property name="label" translatable="yes">Rewind</property>
 113               <property name="use_underline">True</property>
 114               <property name="icon">pda-rewindb16x16.xpm</property>
 115 -             <property name="new_group">True</property>
 116 +             <property name="visible_horizontal">True</property>
 117 +             <property name="visible_vertical">True</property>
 118 +             <property name="is_important">False</property>
 119               <signal name="clicked" handler="onRewind" last_modification_time="Fri, 26 Sep 2003 12:26:47 GMT"/>
 120             </widget>
 121             <packing>
 122 -             <property name="new_group">True</property>
 123 +             <property name="expand">False</property>
 124 +             <property name="homogeneous">True</property>
 125             </packing>
 126           </child>
 127
 128           <child>
 129 -           <widget class="button" id="tbPause">
 130 +           <widget class="GtkToolButton" id="tbPause">
 131               <property name="width_request">22</property>
 132               <property name="height_request">22</property>
 133               <property name="visible">True</property>
 134 @@ -57,12 +80,19 @@
 135               <property name="label" translatable="yes">Pause</property>
 136               <property name="use_underline">True</property>
 137               <property name="icon">pda-pauseb16x16.xpm</property>
 138 +             <property name="visible_horizontal">True</property>
 139 +             <property name="visible_vertical">True</property>
 140 +             <property name="is_important">False</property>
 141               <signal name="clicked" handler="onPause" last_modification_time="Fri, 26 Sep 2003 12:27:01 GMT"/>
 142             </widget>
 143 +           <packing>
 144 +             <property name="expand">False</property>
 145 +             <property name="homogeneous">True</property>
 146 +           </packing>
 147           </child>
 148
 149           <child>
 150 -           <widget class="button" id="tbPlay">
 151 +           <widget class="GtkToolButton" id="tbPlay">
 152               <property name="width_request">22</property>
 153               <property name="height_request">22</property>
 154               <property name="visible">True</property>
 155 @@ -70,12 +100,19 @@
 156               <property name="label" translatable="yes">Play</property>
 157               <property name="use_underline">True</property>
 158               <property name="icon">pda-playb16x16.xpm</property>
 159 +             <property name="visible_horizontal">True</property>
 160 +             <property name="visible_vertical">True</property>
 161 +             <property name="is_important">False</property>
 162               <signal name="clicked" handler="onPlay" last_modification_time="Fri, 26 Sep 2003 12:27:14 GMT"/>
 163             </widget>
 164 +           <packing>
 165 +             <property name="expand">False</property>
 166 +             <property name="homogeneous">True</property>
 167 +           </packing>
 168           </child>
 169
 170           <child>
 171 -           <widget class="button" id="tbStop">
 172 +           <widget class="GtkToolButton" id="tbStop">
 173               <property name="width_request">22</property>
 174               <property name="height_request">22</property>
 175               <property name="visible">True</property>
 176 @@ -83,12 +120,19 @@
 177               <property name="label" translatable="yes">Stop</property>
 178               <property name="use_underline">True</property>
 179               <property name="icon">pda-stopb16x16.xpm</property>
 180 +             <property name="visible_horizontal">True</property>
 181 +             <property name="visible_vertical">True</property>
 182 +             <property name="is_important">False</property>
 183               <signal name="clicked" handler="onStop" last_modification_time="Fri, 26 Sep 2003 12:27:25 GMT"/>
 184             </widget>
 185 +           <packing>
 186 +             <property name="expand">False</property>
 187 +             <property name="homogeneous">True</property>
 188 +           </packing>
 189           </child>
 190
 191           <child>
 192 -           <widget class="button" id="tbForward">
 193 +           <widget class="GtkToolButton" id="tbForward">
 194               <property name="width_request">22</property>
 195               <property name="height_request">22</property>
 196               <property name="visible">True</property>
 197 @@ -96,12 +140,32 @@
 198               <property name="label" translatable="yes">Forward</property>
 199               <property name="use_underline">True</property>
 200               <property name="icon">pda-forwardb16x16.xpm</property>
 201 +             <property name="visible_horizontal">True</property>
 202 +             <property name="visible_vertical">True</property>
 203 +             <property name="is_important">False</property>
 204               <signal name="clicked" handler="onForward" last_modification_time="Fri, 26 Sep 2003 12:27:35 GMT"/>
 205             </widget>
 206 +           <packing>
 207 +             <property name="expand">False</property>
 208 +             <property name="homogeneous">True</property>
 209 +           </packing>
 210           </child>
 211
 212           <child>
 213 -           <widget class="button" id="tbAbout">
 214 +           <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
 215 +             <property name="visible">True</property>
 216 +             <property name="draw">True</property>
 217 +             <property name="visible_horizontal">True</property>
 218 +             <property name="visible_vertical">True</property>
 219 +           </widget>
 220 +           <packing>
 221 +             <property name="expand">False</property>
 222 +             <property name="homogeneous">False</property>
 223 +           </packing>
 224 +         </child>
 225 +
 226 +         <child>
 227 +           <widget class="GtkToolButton" id="tbAbout">
 228               <property name="width_request">22</property>
 229               <property name="height_request">22</property>
 230               <property name="visible">True</property>
 231 @@ -109,31 +173,47 @@
 232               <property name="label" translatable="yes">About</property>
 233               <property name="use_underline">True</property>
 234               <property name="icon">vlc16x16.png</property>
 235 -             <property name="new_group">True</property>
 236 +             <property name="visible_horizontal">True</property>
 237 +             <property name="visible_vertical">True</property>
 238 +             <property name="is_important">False</property>
 239               <signal name="clicked" handler="onAbout" last_modification_time="Fri, 26 Sep 2003 12:27:44 GMT"/>
 240             </widget>
 241             <packing>
 242 -             <property name="new_group">True</property>
 243 +             <property name="expand">False</property>
 244 +             <property name="homogeneous">True</property>
 245             </packing>
 246           </child>
 247
 248           <child>
 249 -           <widget class="GtkLabel" id="timeLabel">
 250 +           <widget class="GtkToolItem" id="toolitem1">
 251               <property name="visible">True</property>
 252 -             <property name="label">00:00:00</property>
 253 -             <property name="use_underline">False</property>
 254 -             <property name="use_markup">False</property>
 255 -             <property name="justify">GTK_JUSTIFY_CENTER</property>
 256 -             <property name="wrap">False</property>
 257 -             <property name="selectable">False</property>
 258 -             <property name="xalign">0.5</property>
 259 -             <property name="yalign">0.5</property>
 260 -             <property name="xpad">0</property>
 261 -             <property name="ypad">0</property>
 262 -             <property name="new_group">True</property>
 263 +             <property name="visible_horizontal">True</property>
 264 +             <property name="visible_vertical">True</property>
 265 +             <property name="is_important">False</property>
 266 +
 267 +             <child>
 268 +               <widget class="GtkLabel" id="timeLabel">
 269 +                 <property name="visible">True</property>
 270 +                 <property name="label">00:00:00</property>
 271 +                 <property name="use_underline">False</property>
 272 +                 <property name="use_markup">False</property>
 273 +                 <property name="justify">GTK_JUSTIFY_LEFT</property>
 274 +                 <property name="wrap">False</property>
 275 +                 <property name="selectable">False</property>
 276 +                 <property name="xalign">0.5</property>
 277 +                 <property name="yalign">0.5</property>
 278 +                 <property name="xpad">0</property>
 279 +                 <property name="ypad">0</property>
 280 +                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 281 +                 <property name="width_chars">-1</property>
 282 +                 <property name="single_line_mode">False</property>
 283 +                 <property name="angle">0</property>
 284 +               </widget>
 285 +             </child>
 286             </widget>
 287             <packing>
 288 -             <property name="new_group">True</property>
 289 +             <property name="expand">False</property>
 290 +             <property name="homogeneous">False</property>
 291             </packing>
 292           </child>
 293         </widget>
 294 @@ -212,6 +292,9 @@
 295                               <property name="rules_hint">False</property>
 296                               <property name="reorderable">False</property>
 297                               <property name="enable_search">True</property>
 298 +                             <property name="fixed_height_mode">False</property>
 299 +                             <property name="hover_selection">False</property>
 300 +                             <property name="hover_expand">False</property>
 301                               <signal name="row_activated" handler="onFileListRow" last_modification_time="Fri, 26 Sep 2003 13:30:40 GMT"/>
 302                             </widget>
 303                           </child>
 304 @@ -240,6 +323,7 @@
 305                               <property name="label" translatable="yes">Add to Playlist</property>
 306                               <property name="use_underline">True</property>
 307                               <property name="relief">GTK_RELIEF_NORMAL</property>
 308 +                             <property name="focus_on_click">True</property>
 309                               <signal name="pressed" handler="onAddFileToPlaylist" last_modification_time="Fri, 26 Sep 2003 12:31:03 GMT"/>
 310                             </widget>
 311                             <packing>
 312 @@ -276,13 +360,17 @@
 313               <property name="label" translatable="yes">File</property>
 314               <property name="use_underline">False</property>
 315               <property name="use_markup">False</property>
 316 -             <property name="justify">GTK_JUSTIFY_CENTER</property>
 317 +             <property name="justify">GTK_JUSTIFY_LEFT</property>
 318               <property name="wrap">False</property>
 319               <property name="selectable">False</property>
 320               <property name="xalign">0.5</property>
 321               <property name="yalign">0.5</property>
 322               <property name="xpad">0</property>
 323               <property name="ypad">0</property>
 324 +             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 325 +             <property name="width_chars">-1</property>
 326 +             <property name="single_line_mode">False</property>
 327 +             <property name="angle">0</property>
 328             </widget>
 329             <packing>
 330               <property name="type">tab</property>
 331 @@ -311,13 +399,17 @@
 332                       <property name="label" translatable="yes">MRL:</property>
 333                       <property name="use_underline">False</property>
 334                       <property name="use_markup">False</property>
 335 -                     <property name="justify">GTK_JUSTIFY_CENTER</property>
 336 +                     <property name="justify">GTK_JUSTIFY_LEFT</property>
 337                       <property name="wrap">False</property>
 338                       <property name="selectable">False</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 +                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 344 +                     <property name="width_chars">-1</property>
 345 +                     <property name="single_line_mode">False</property>
 346 +                     <property name="angle">0</property>
 347                     </widget>
 348                     <packing>
 349                       <property name="padding">0</property>
 350 @@ -462,6 +554,10 @@
 351                       <property name="yalign">0.5</property>
 352                       <property name="xpad">0</property>
 353                       <property name="ypad">0</property>
 354 +                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 355 +                     <property name="width_chars">-1</property>
 356 +                     <property name="single_line_mode">False</property>
 357 +                     <property name="angle">0</property>
 358                     </widget>
 359                     <packing>
 360                       <property name="left_attach">0</property>
 361 @@ -486,6 +582,10 @@
 362                       <property name="yalign">0.5</property>
 363                       <property name="xpad">0</property>
 364                       <property name="ypad">0</property>
 365 +                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 366 +                     <property name="width_chars">-1</property>
 367 +                     <property name="single_line_mode">False</property>
 368 +                     <property name="angle">0</property>
 369                     </widget>
 370                     <packing>
 371                       <property name="left_attach">0</property>
 372 @@ -628,6 +728,10 @@
 373                       <property name="yalign">0.5</property>
 374                       <property name="xpad">0</property>
 375                       <property name="ypad">0</property>
 376 +                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 377 +                     <property name="width_chars">-1</property>
 378 +                     <property name="single_line_mode">False</property>
 379 +                     <property name="angle">0</property>
 380                     </widget>
 381                     <packing>
 382                       <property name="left_attach">0</property>
 383 @@ -756,6 +860,10 @@
 384                       <property name="yalign">0.5</property>
 385                       <property name="xpad">0</property>
 386                       <property name="ypad">0</property>
 387 +                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 388 +                     <property name="width_chars">-1</property>
 389 +                     <property name="single_line_mode">False</property>
 390 +                     <property name="angle">0</property>
 391                     </widget>
 392                     <packing>
 393                       <property name="left_attach">0</property>
 394 @@ -780,6 +888,10 @@
 395                       <property name="yalign">0.5</property>
 396                       <property name="xpad">0</property>
 397                       <property name="ypad">0</property>
 398 +                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 399 +                     <property name="width_chars">-1</property>
 400 +                     <property name="single_line_mode">False</property>
 401 +                     <property name="angle">0</property>
 402                     </widget>
 403                     <packing>
 404                       <property name="left_attach">0</property>
 405 @@ -798,6 +910,7 @@
 406                       <property name="label" translatable="yes">enable</property>
 407                       <property name="use_underline">True</property>
 408                       <property name="relief">GTK_RELIEF_NORMAL</property>
 409 +                     <property name="focus_on_click">True</property>
 410                       <property name="active">False</property>
 411                       <property name="inconsistent">False</property>
 412                       <property name="draw_indicator">True</property>
 413 @@ -836,6 +949,7 @@
 414                       <property name="label" translatable="yes">Add to Playlist</property>
 415                       <property name="use_underline">True</property>
 416                       <property name="relief">GTK_RELIEF_NORMAL</property>
 417 +                     <property name="focus_on_click">True</property>
 418                       <signal name="pressed" handler="onAddNetworkPlaylist" last_modification_time="Fri, 26 Sep 2003 12:37:36 GMT"/>
 419                     </widget>
 420                     <packing>
 421 @@ -857,7 +971,7 @@
 422               </child>
 423             </widget>
 424             <packing>
 425 -             <property name="tab_expand">True</property>
 426 +             <property name="tab_expand">False</property>
 427               <property name="tab_fill">True</property>
 428             </packing>
 429           </child>
 430 @@ -868,13 +982,17 @@
 431               <property name="label" translatable="yes">Network</property>
 432               <property name="use_underline">False</property>
 433               <property name="use_markup">False</property>
 434 -             <property name="justify">GTK_JUSTIFY_CENTER</property>
 435 +             <property name="justify">GTK_JUSTIFY_LEFT</property>
 436               <property name="wrap">False</property>
 437               <property name="selectable">False</property>
 438               <property name="xalign">0.5</property>
 439               <property name="yalign">0.5</property>
 440               <property name="xpad">0</property>
 441               <property name="ypad">0</property>
 442 +             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 443 +             <property name="width_chars">-1</property>
 444 +             <property name="single_line_mode">False</property>
 445 +             <property name="angle">0</property>
 446             </widget>
 447             <packing>
 448               <property name="type">tab</property>
 449 @@ -923,6 +1041,10 @@
 450                               <property name="yalign">0.5</property>
 451                               <property name="xpad">0</property>
 452                               <property name="ypad">0</property>
 453 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 454 +                             <property name="width_chars">-1</property>
 455 +                             <property name="single_line_mode">False</property>
 456 +                             <property name="angle">0</property>
 457                             </widget>
 458                             <packing>
 459                               <property name="left_attach">0</property>
 460 @@ -947,6 +1069,10 @@
 461                               <property name="yalign">0.5</property>
 462                               <property name="xpad">0</property>
 463                               <property name="ypad">0</property>
 464 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 465 +                             <property name="width_chars">-1</property>
 466 +                             <property name="single_line_mode">False</property>
 467 +                             <property name="angle">0</property>
 468                             </widget>
 469                             <packing>
 470                               <property name="left_attach">0</property>
 471 @@ -971,6 +1097,10 @@
 472                               <property name="yalign">0.5</property>
 473                               <property name="xpad">0</property>
 474                               <property name="ypad">0</property>
 475 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 476 +                             <property name="width_chars">-1</property>
 477 +                             <property name="single_line_mode">False</property>
 478 +                             <property name="angle">0</property>
 479                             </widget>
 480                             <packing>
 481                               <property name="left_attach">0</property>
 482 @@ -995,6 +1125,10 @@
 483                               <property name="yalign">0.5</property>
 484                               <property name="xpad">0</property>
 485                               <property name="ypad">0</property>
 486 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 487 +                             <property name="width_chars">-1</property>
 488 +                             <property name="single_line_mode">False</property>
 489 +                             <property name="angle">0</property>
 490                             </widget>
 491                             <packing>
 492                               <property name="left_attach">0</property>
 493 @@ -1019,6 +1153,10 @@
 494                               <property name="yalign">0.5</property>
 495                               <property name="xpad">0</property>
 496                               <property name="ypad">0</property>
 497 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 498 +                             <property name="width_chars">-1</property>
 499 +                             <property name="single_line_mode">False</property>
 500 +                             <property name="angle">0</property>
 501                             </widget>
 502                             <packing>
 503                               <property name="left_attach">0</property>
 504 @@ -1043,6 +1181,10 @@
 505                               <property name="yalign">0.5</property>
 506                               <property name="xpad">0</property>
 507                               <property name="ypad">0</property>
 508 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 509 +                             <property name="width_chars">-1</property>
 510 +                             <property name="single_line_mode">False</property>
 511 +                             <property name="angle">0</property>
 512                             </widget>
 513                             <packing>
 514                               <property name="left_attach">0</property>
 515 @@ -1067,6 +1209,10 @@
 516                               <property name="yalign">0.5</property>
 517                               <property name="xpad">0</property>
 518                               <property name="ypad">0</property>
 519 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 520 +                             <property name="width_chars">-1</property>
 521 +                             <property name="single_line_mode">False</property>
 522 +                             <property name="angle">0</property>
 523                             </widget>
 524                             <packing>
 525                               <property name="left_attach">0</property>
 526 @@ -1091,6 +1237,10 @@
 527                               <property name="yalign">0.5</property>
 528                               <property name="xpad">0</property>
 529                               <property name="ypad">0</property>
 530 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 531 +                             <property name="width_chars">-1</property>
 532 +                             <property name="single_line_mode">False</property>
 533 +                             <property name="angle">0</property>
 534                             </widget>
 535                             <packing>
 536                               <property name="left_attach">0</property>
 537 @@ -1115,6 +1265,10 @@
 538                               <property name="yalign">0.5</property>
 539                               <property name="xpad">0</property>
 540                               <property name="ypad">0</property>
 541 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 542 +                             <property name="width_chars">-1</property>
 543 +                             <property name="single_line_mode">False</property>
 544 +                             <property name="angle">0</property>
 545                             </widget>
 546                             <packing>
 547                               <property name="left_attach">0</property>
 548 @@ -1139,6 +1293,10 @@
 549                               <property name="yalign">0.5</property>
 550                               <property name="xpad">0</property>
 551                               <property name="ypad">0</property>
 552 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 553 +                             <property name="width_chars">-1</property>
 554 +                             <property name="single_line_mode">False</property>
 555 +                             <property name="angle">0</property>
 556                             </widget>
 557                             <packing>
 558                               <property name="left_attach">0</property>
 559 @@ -1163,6 +1321,10 @@
 560                               <property name="yalign">0.5</property>
 561                               <property name="xpad">0</property>
 562                               <property name="ypad">0</property>
 563 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 564 +                             <property name="width_chars">-1</property>
 565 +                             <property name="single_line_mode">False</property>
 566 +                             <property name="angle">0</property>
 567                             </widget>
 568                             <packing>
 569                               <property name="left_attach">0</property>
 570 @@ -1187,6 +1349,10 @@
 571                               <property name="yalign">0.5</property>
 572                               <property name="xpad">0</property>
 573                               <property name="ypad">0</property>
 574 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 575 +                             <property name="width_chars">-1</property>
 576 +                             <property name="single_line_mode">False</property>
 577 +                             <property name="angle">0</property>
 578                             </widget>
 579                             <packing>
 580                               <property name="left_attach">0</property>
 581 @@ -1677,6 +1843,7 @@
 582                               <property name="label" translatable="yes">enable</property>
 583                               <property name="use_underline">True</property>
 584                               <property name="relief">GTK_RELIEF_NORMAL</property>
 585 +                             <property name="focus_on_click">True</property>
 586                               <property name="active">False</property>
 587                               <property name="inconsistent">False</property>
 588                               <property name="draw_indicator">True</property>
 589 @@ -1726,6 +1893,10 @@
 590                               <property name="yalign">0.5</property>
 591                               <property name="xpad">0</property>
 592                               <property name="ypad">0</property>
 593 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 594 +                             <property name="width_chars">-1</property>
 595 +                             <property name="single_line_mode">False</property>
 596 +                             <property name="angle">0</property>
 597                             </widget>
 598                             <packing>
 599                               <property name="left_attach">0</property>
 600 @@ -1744,6 +1915,7 @@
 601                               <property name="label" translatable="yes">enable</property>
 602                               <property name="use_underline">True</property>
 603                               <property name="relief">GTK_RELIEF_NORMAL</property>
 604 +                             <property name="focus_on_click">True</property>
 605                               <property name="active">False</property>
 606                               <property name="inconsistent">False</property>
 607                               <property name="draw_indicator">True</property>
 608 @@ -1786,6 +1958,7 @@
 609                       <property name="label" translatable="yes">Add to Playlist</property>
 610                       <property name="use_underline">True</property>
 611                       <property name="relief">GTK_RELIEF_NORMAL</property>
 612 +                     <property name="focus_on_click">True</property>
 613                       <signal name="pressed" handler="onAddCameraToPlaylist" last_modification_time="Fri, 26 Sep 2003 12:47:31 GMT"/>
 614                     </widget>
 615                     <packing>
 616 @@ -1825,6 +1998,10 @@
 617               <property name="yalign">0.5</property>
 618               <property name="xpad">0</property>
 619               <property name="ypad">0</property>
 620 +             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 621 +             <property name="width_chars">-1</property>
 622 +             <property name="single_line_mode">False</property>
 623 +             <property name="angle">0</property>
 624             </widget>
 625             <packing>
 626               <property name="type">tab</property>
 627 @@ -1873,6 +2050,10 @@
 628                               <property name="yalign">0.5</property>
 629                               <property name="xpad">0</property>
 630                               <property name="ypad">0</property>
 631 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 632 +                             <property name="width_chars">-1</property>
 633 +                             <property name="single_line_mode">False</property>
 634 +                             <property name="angle">0</property>
 635                             </widget>
 636                             <packing>
 637                               <property name="left_attach">0</property>
 638 @@ -1993,6 +2174,10 @@
 639                               <property name="yalign">0.5</property>
 640                               <property name="xpad">0</property>
 641                               <property name="ypad">0</property>
 642 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 643 +                             <property name="width_chars">-1</property>
 644 +                             <property name="single_line_mode">False</property>
 645 +                             <property name="angle">0</property>
 646                             </widget>
 647                             <packing>
 648                               <property name="left_attach">0</property>
 649 @@ -2017,6 +2202,10 @@
 650                               <property name="yalign">0.5</property>
 651                               <property name="xpad">0</property>
 652                               <property name="ypad">0</property>
 653 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 654 +                             <property name="width_chars">-1</property>
 655 +                             <property name="single_line_mode">False</property>
 656 +                             <property name="angle">0</property>
 657                             </widget>
 658                             <packing>
 659                               <property name="left_attach">0</property>
 660 @@ -2041,6 +2230,10 @@
 661                               <property name="yalign">0.5</property>
 662                               <property name="xpad">0</property>
 663                               <property name="ypad">0</property>
 664 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 665 +                             <property name="width_chars">-1</property>
 666 +                             <property name="single_line_mode">False</property>
 667 +                             <property name="angle">0</property>
 668                             </widget>
 669                             <packing>
 670                               <property name="left_attach">0</property>
 671 @@ -2065,6 +2258,10 @@
 672                               <property name="yalign">0.5</property>
 673                               <property name="xpad">0</property>
 674                               <property name="ypad">0</property>
 675 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 676 +                             <property name="width_chars">-1</property>
 677 +                             <property name="single_line_mode">False</property>
 678 +                             <property name="angle">0</property>
 679                             </widget>
 680                             <packing>
 681                               <property name="left_attach">0</property>
 682 @@ -2089,6 +2286,10 @@
 683                               <property name="yalign">0.5</property>
 684                               <property name="xpad">0</property>
 685                               <property name="ypad">0</property>
 686 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 687 +                             <property name="width_chars">-1</property>
 688 +                             <property name="single_line_mode">False</property>
 689 +                             <property name="angle">0</property>
 690                             </widget>
 691                             <packing>
 692                               <property name="left_attach">0</property>
 693 @@ -2113,6 +2314,10 @@
 694                               <property name="yalign">0.5</property>
 695                               <property name="xpad">0</property>
 696                               <property name="ypad">0</property>
 697 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 698 +                             <property name="width_chars">-1</property>
 699 +                             <property name="single_line_mode">False</property>
 700 +                             <property name="angle">0</property>
 701                             </widget>
 702                             <packing>
 703                               <property name="left_attach">0</property>
 704 @@ -2137,6 +2342,10 @@
 705                               <property name="yalign">0.5</property>
 706                               <property name="xpad">0</property>
 707                               <property name="ypad">0</property>
 708 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 709 +                             <property name="width_chars">-1</property>
 710 +                             <property name="single_line_mode">False</property>
 711 +                             <property name="angle">0</property>
 712                             </widget>
 713                             <packing>
 714                               <property name="left_attach">0</property>
 715 @@ -2161,6 +2370,10 @@
 716                               <property name="yalign">0.5</property>
 717                               <property name="xpad">0</property>
 718                               <property name="ypad">0</property>
 719 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 720 +                             <property name="width_chars">-1</property>
 721 +                             <property name="single_line_mode">False</property>
 722 +                             <property name="angle">0</property>
 723                             </widget>
 724                             <packing>
 725                               <property name="left_attach">0</property>
 726 @@ -2185,6 +2398,10 @@
 727                               <property name="yalign">0.5</property>
 728                               <property name="xpad">0</property>
 729                               <property name="ypad">0</property>
 730 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 731 +                             <property name="width_chars">-1</property>
 732 +                             <property name="single_line_mode">False</property>
 733 +                             <property name="angle">0</property>
 734                             </widget>
 735                             <packing>
 736                               <property name="left_attach">0</property>
 737 @@ -2507,6 +2724,7 @@
 738                               <property name="label" translatable="yes">enable</property>
 739                               <property name="use_underline">True</property>
 740                               <property name="relief">GTK_RELIEF_NORMAL</property>
 741 +                             <property name="focus_on_click">True</property>
 742                               <property name="active">False</property>
 743                               <property name="inconsistent">False</property>
 744                               <property name="draw_indicator">True</property>
 745 @@ -2553,7 +2771,7 @@
 746                               <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 747                               <property name="snap_to_ticks">False</property>
 748                               <property name="wrap">False</property>
 749 -                             <property name="adjustment">800000 0 1e+06 1 10 10</property>
 750 +                             <property name="adjustment">800000 0 1000000 1 10 10</property>
 751                             </widget>
 752                             <packing>
 753                               <property name="left_attach">1</property>
 754 @@ -2599,6 +2817,10 @@
 755                               <property name="yalign">0.5</property>
 756                               <property name="xpad">0</property>
 757                               <property name="ypad">0</property>
 758 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 759 +                             <property name="width_chars">-1</property>
 760 +                             <property name="single_line_mode">False</property>
 761 +                             <property name="angle">0</property>
 762                             </widget>
 763                             <packing>
 764                               <property name="left_attach">0</property>
 765 @@ -2730,6 +2952,10 @@
 766                               <property name="yalign">0.5</property>
 767                               <property name="xpad">0</property>
 768                               <property name="ypad">0</property>
 769 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 770 +                             <property name="width_chars">-1</property>
 771 +                             <property name="single_line_mode">False</property>
 772 +                             <property name="angle">0</property>
 773                             </widget>
 774                             <packing>
 775                               <property name="left_attach">0</property>
 776 @@ -2748,6 +2974,7 @@
 777                               <property name="label" translatable="yes">enable</property>
 778                               <property name="use_underline">True</property>
 779                               <property name="relief">GTK_RELIEF_NORMAL</property>
 780 +                             <property name="focus_on_click">True</property>
 781                               <property name="active">False</property>
 782                               <property name="inconsistent">False</property>
 783                               <property name="draw_indicator">True</property>
 784 @@ -2769,6 +2996,7 @@
 785                               <property name="label" translatable="yes">enable</property>
 786                               <property name="use_underline">True</property>
 787                               <property name="relief">GTK_RELIEF_NORMAL</property>
 788 +                             <property name="focus_on_click">True</property>
 789                               <property name="active">False</property>
 790                               <property name="inconsistent">False</property>
 791                               <property name="draw_indicator">True</property>
 792 @@ -2796,6 +3024,10 @@
 793                               <property name="yalign">0.5</property>
 794                               <property name="xpad">0</property>
 795                               <property name="ypad">0</property>
 796 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 797 +                             <property name="width_chars">-1</property>
 798 +                             <property name="single_line_mode">False</property>
 799 +                             <property name="angle">0</property>
 800                             </widget>
 801                             <packing>
 802                               <property name="left_attach">0</property>
 803 @@ -2820,6 +3052,10 @@
 804                               <property name="yalign">0.5</property>
 805                               <property name="xpad">0</property>
 806                               <property name="ypad">0</property>
 807 +                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 808 +                             <property name="width_chars">-1</property>
 809 +                             <property name="single_line_mode">False</property>
 810 +                             <property name="angle">0</property>
 811                             </widget>
 812                             <packing>
 813                               <property name="left_attach">0</property>
 814 @@ -2898,6 +3134,7 @@
 815                       <property name="label" translatable="yes">Add to Playlist</property>
 816                       <property name="use_underline">True</property>
 817                       <property name="relief">GTK_RELIEF_NORMAL</property>
 818 +                     <property name="focus_on_click">True</property>
 819                       <signal name="pressed" handler="onAddTranscodeToPlaylist" last_modification_time="Sun, 09 Nov 2003 15:55:09 GMT"/>
 820                     </widget>
 821                     <packing>
 822 @@ -2930,13 +3167,17 @@
 823               <property name="label" translatable="yes">Transcode</property>
 824               <property name="use_underline">False</property>
 825               <property name="use_markup">False</property>
 826 -             <property name="justify">GTK_JUSTIFY_CENTER</property>
 827 +             <property name="justify">GTK_JUSTIFY_LEFT</property>
 828               <property name="wrap">False</property>
 829               <property name="selectable">False</property>
 830               <property name="xalign">0.5</property>
 831               <property name="yalign">0.5</property>
 832               <property name="xpad">0</property>
 833               <property name="ypad">0</property>
 834 +             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 835 +             <property name="width_chars">-1</property>
 836 +             <property name="single_line_mode">False</property>
 837 +             <property name="angle">0</property>
 838             </widget>
 839             <packing>
 840               <property name="type">tab</property>
 841 @@ -2965,6 +3206,9 @@
 842                       <property name="rules_hint">False</property>
 843                       <property name="reorderable">False</property>
 844                       <property name="enable_search">True</property>
 845 +                     <property name="fixed_height_mode">False</property>
 846 +                     <property name="hover_selection">False</property>
 847 +                     <property name="hover_expand">False</property>
 848                       <signal name="event" handler="PlaylistEvent" last_modification_time="Fri, 26 Sep 2003 12:48:10 GMT"/>
 849                       <signal name="columns_changed" handler="onPlaylistColumnsChanged" last_modification_time="Fri, 26 Sep 2003 13:36:25 GMT"/>
 850                       <signal name="select_cursor_row" handler="onPlaylistRowSelected" last_modification_time="Fri, 26 Sep 2003 13:37:22 GMT"/>
 851 @@ -2992,6 +3236,7 @@
 852                       <property name="label" translatable="yes">Update</property>
 853                       <property name="use_underline">True</property>
 854                       <property name="relief">GTK_RELIEF_NORMAL</property>
 855 +                     <property name="focus_on_click">True</property>
 856                       <signal name="pressed" handler="onUpdatePlaylist" last_modification_time="Fri, 26 Sep 2003 12:48:43 GMT"/>
 857                     </widget>
 858                     <packing>
 859 @@ -3008,6 +3253,7 @@
 860                       <property name="label" translatable="yes">Delete</property>
 861                       <property name="use_underline">True</property>
 862                       <property name="relief">GTK_RELIEF_NORMAL</property>
 863 +                     <property name="focus_on_click">True</property>
 864                       <signal name="pressed" handler="onDeletePlaylist" last_modification_time="Fri, 26 Sep 2003 12:49:22 GMT"/>
 865                     </widget>
 866                     <packing>
 867 @@ -3024,6 +3270,7 @@
 868                       <property name="label" translatable="yes"> Clear </property>
 869                       <property name="use_underline">True</property>
 870                       <property name="relief">GTK_RELIEF_NORMAL</property>
 871 +                     <property name="focus_on_click">True</property>
 872                       <signal name="pressed" handler="onClearPlaylist" last_modification_time="Fri, 26 Sep 2003 12:49:47 GMT"/>
 873                     </widget>
 874                     <packing>
 875 @@ -3052,13 +3299,17 @@
 876               <property name="label" translatable="yes">Playlist</property>
 877               <property name="use_underline">False</property>
 878               <property name="use_markup">False</property>
 879 -             <property name="justify">GTK_JUSTIFY_CENTER</property>
 880 +             <property name="justify">GTK_JUSTIFY_LEFT</property>
 881               <property name="wrap">False</property>
 882               <property name="selectable">False</property>
 883               <property name="xalign">0.5</property>
 884               <property name="yalign">0.5</property>
 885               <property name="xpad">0</property>
 886               <property name="ypad">0</property>
 887 +             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 888 +             <property name="width_chars">-1</property>
 889 +             <property name="single_line_mode">False</property>
 890 +             <property name="angle">0</property>
 891             </widget>
 892             <packing>
 893               <property name="type">tab</property>
 894 @@ -3088,6 +3339,9 @@
 895                       <property name="rules_hint">False</property>
 896                       <property name="reorderable">False</property>
 897                       <property name="enable_search">True</property>
 898 +                     <property name="fixed_height_mode">False</property>
 899 +                     <property name="hover_selection">False</property>
 900 +                     <property name="hover_expand">False</property>
 901                     </widget>
 902                   </child>
 903                 </widget>
 904 @@ -3111,6 +3365,7 @@
 905                       <property name="label" translatable="yes"> Save </property>
 906                       <property name="use_underline">True</property>
 907                       <property name="relief">GTK_RELIEF_NORMAL</property>
 908 +                     <property name="focus_on_click">True</property>
 909                       <signal name="pressed" handler="onPreferenceSave" last_modification_time="Fri, 26 Sep 2003 13:26:11 GMT"/>
 910                     </widget>
 911                     <packing>
 912 @@ -3127,6 +3382,7 @@
 913                       <property name="label" translatable="yes"> Apply </property>
 914                       <property name="use_underline">True</property>
 915                       <property name="relief">GTK_RELIEF_NORMAL</property>
 916 +                     <property name="focus_on_click">True</property>
 917                       <signal name="pressed" handler="onPreferenceApply" last_modification_time="Fri, 26 Sep 2003 13:26:54 GMT"/>
 918                     </widget>
 919                     <packing>
 920 @@ -3147,6 +3403,7 @@
 921                       <property name="label" translatable="yes"> Cancel </property>
 922                       <property name="use_underline">True</property>
 923                       <property name="relief">GTK_RELIEF_NORMAL</property>
 924 +                     <property name="focus_on_click">True</property>
 925                       <signal name="pressed" handler="onPreferenceCancel" last_modification_time="Fri, 26 Sep 2003 13:27:19 GMT"/>
 926                     </widget>
 927                     <packing>
 928 @@ -3177,13 +3434,17 @@
 929               <property name="label" translatable="yes">Preference</property>
 930               <property name="use_underline">False</property>
 931               <property name="use_markup">False</property>
 932 -             <property name="justify">GTK_JUSTIFY_CENTER</property>
 933 +             <property name="justify">GTK_JUSTIFY_LEFT</property>
 934               <property name="wrap">False</property>
 935               <property name="selectable">False</property>
 936               <property name="xalign">0.5</property>
 937               <property name="yalign">0.5</property>
 938               <property name="xpad">0</property>
 939               <property name="ypad">0</property>
 940 +             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 941 +             <property name="width_chars">-1</property>
 942 +             <property name="single_line_mode">False</property>
 943 +             <property name="angle">0</property>
 944             </widget>
 945             <packing>
 946               <property name="type">tab</property>
 947 @@ -3239,6 +3500,10 @@
 948                           <property name="yalign">0.5</property>
 949                           <property name="xpad">0</property>
 950                           <property name="ypad">0</property>
 951 +                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 952 +                         <property name="width_chars">-1</property>
 953 +                         <property name="single_line_mode">False</property>
 954 +                         <property name="angle">0</property>
 955                         </widget>
 956                         <packing>
 957                           <property name="x">16</property>
 958 @@ -3247,46 +3512,54 @@
 959                       </child>
 960
 961                       <child>
 962 -                       <widget class="GtkLabel" id="labelAuthors">
 963 +                       <widget class="GtkLabel" id="labelCopyright">
 964                           <property name="width_request">208</property>
 965 -                         <property name="height_request">32</property>
 966 +                         <property name="height_request">16</property>
 967                           <property name="visible">True</property>
 968 -                         <property name="label" translatable="yes">Authors: the VideoLAN Team, http://www.videolan.org/team/</property>
 969 +                         <property name="label" translatable="yes">(c) 1996-2004 the VideoLAN team</property>
 970                           <property name="use_underline">False</property>
 971                           <property name="use_markup">False</property>
 972 -                         <property name="justify">GTK_JUSTIFY_LEFT</property>
 973 -                         <property name="wrap">True</property>
 974 +                         <property name="justify">GTK_JUSTIFY_CENTER</property>
 975 +                         <property name="wrap">False</property>
 976                           <property name="selectable">False</property>
 977                           <property name="xalign">0.5</property>
 978                           <property name="yalign">0.5</property>
 979                           <property name="xpad">0</property>
 980                           <property name="ypad">0</property>
 981 +                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 982 +                         <property name="width_chars">-1</property>
 983 +                         <property name="single_line_mode">False</property>
 984 +                         <property name="angle">0</property>
 985                         </widget>
 986                         <packing>
 987                           <property name="x">16</property>
 988 -                         <property name="y">72</property>
 989 +                         <property name="y">48</property>
 990                         </packing>
 991                       </child>
 992
 993                       <child>
 994 -                       <widget class="GtkLabel" id="labelCopyright">
 995 +                       <widget class="GtkLabel" id="labelAuthors">
 996                           <property name="width_request">208</property>
 997 -                         <property name="height_request">16</property>
 998 +                         <property name="height_request">32</property>
 999                           <property name="visible">True</property>
1000 -                         <property name="label" translatable="yes">(c) 1996-2004 the VideoLAN team</property>
1001 +                         <property name="label" translatable="yes">Authors: the VideoLAN Team, http://www.videolan.org/team/</property>
1002                           <property name="use_underline">False</property>
1003                           <property name="use_markup">False</property>
1004 -                         <property name="justify">GTK_JUSTIFY_CENTER</property>
1005 -                         <property name="wrap">False</property>
1006 +                         <property name="justify">GTK_JUSTIFY_LEFT</property>
1007 +                         <property name="wrap">True</property>
1008                           <property name="selectable">False</property>
1009                           <property name="xalign">0.5</property>
1010                           <property name="yalign">0.5</property>
1011                           <property name="xpad">0</property>
1012                           <property name="ypad">0</property>
1013 +                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1014 +                         <property name="width_chars">-1</property>
1015 +                         <property name="single_line_mode">False</property>
1016 +                         <property name="angle">0</property>
1017                         </widget>
1018                         <packing>
1019                           <property name="x">16</property>
1020 -                         <property name="y">48</property>
1021 +                         <property name="y">72</property>
1022                         </packing>
1023                       </child>
1024
1025 @@ -3305,6 +3578,10 @@
1026                           <property name="yalign">0.5</property>
1027                           <property name="xpad">0</property>
1028                           <property name="ypad">0</property>
1029 +                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1030 +                         <property name="width_chars">-1</property>
1031 +                         <property name="single_line_mode">False</property>
1032 +                         <property name="angle">0</property>
1033                         </widget>
1034                         <packing>
1035                           <property name="x">48</property>
1036 @@ -3328,13 +3605,17 @@
1037               <property name="label" translatable="yes">About</property>
1038               <property name="use_underline">False</property>
1039               <property name="use_markup">False</property>
1040 -             <property name="justify">GTK_JUSTIFY_CENTER</property>
1041 +             <property name="justify">GTK_JUSTIFY_LEFT</property>
1042               <property name="wrap">False</property>
1043               <property name="selectable">False</property>
1044               <property name="xalign">0.5</property>
1045               <property name="yalign">0.5</property>
1046               <property name="xpad">0</property>
1047               <property name="ypad">0</property>
1048 +             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1049 +             <property name="width_chars">-1</property>
1050 +             <property name="single_line_mode">False</property>
1051 +             <property name="angle">0</property>
1052             </widget>
1053             <packing>
1054               <property name="type">tab</property>
1055 diff -ur vlc-0.8.4a/modules/gui/pda/pda_interface.c vlc-0.8.4a-pda/modules/gui/pda/pda_interface.c
1056 --- vlc-0.8.4a/modules/gui/pda/pda_interface.c  2005-12-11 22:36:19.000000000 +0100
1057 +++ vlc-0.8.4a-pda/modules/gui/pda/pda_interface.c      2006-04-05 10:50:39.000000000 +0200
1058 @@ -33,13 +33,17 @@
1059    GdkPixbuf *pda_icon_pixbuf;
1060    GtkWidget *vbox;
1061    GtkWidget *toolbar;
1062 -  GtkWidget *tmp_toolbar_icon;
1063 +  GtkIconSize tmp_toolbar_icon_size;
1064 +  GtkWidget *separatortoolitem1;
1065 +  GtkWidget *tmp_image;
1066    GtkWidget *tbRewind;
1067    GtkWidget *tbPause;
1068    GtkWidget *tbPlay;
1069    GtkWidget *tbStop;
1070    GtkWidget *tbForward;
1071 +  GtkWidget *separatortoolitem2;
1072    GtkWidget *tbAbout;
1073 +  GtkWidget *toolitem1;
1074    GtkWidget *timeLabel;
1075    GtkWidget *timeSlider;
1076    GtkWidget *notebook;
1077 @@ -198,8 +202,8 @@
1078    GtkWidget *fixed2;
1079    GtkWidget *aboutImage;
1080    GtkWidget *labelDescription;
1081 -  GtkWidget *labelAuthors;
1082    GtkWidget *labelCopyright;
1083 +  GtkWidget *labelAuthors;
1084    GtkWidget *labelProgramName;
1085    GtkWidget *about;
1086    GtkTooltips *tooltips;
1087 @@ -228,89 +232,81 @@
1088    gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 5);
1089    gtk_widget_set_size_request (toolbar, 240, 22);
1090    gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
1091 +  tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar));
1092
1093 -  gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
1094 -
1095 -  tmp_toolbar_icon = create_pixmap (pda, "pda-rewindb16x16.xpm");
1096 -  tbRewind = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
1097 -                                GTK_TOOLBAR_CHILD_BUTTON,
1098 -                                NULL,
1099 -                                _("Rewind"),
1100 -                                _("Rewind"), NULL,
1101 -                                tmp_toolbar_icon, NULL, NULL);
1102 -  gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE);
1103 +  separatortoolitem1 = (GtkWidget*) gtk_separator_tool_item_new ();
1104 +  gtk_widget_set_name (separatortoolitem1, "separatortoolitem1");
1105 +  gtk_widget_show (separatortoolitem1);
1106 +  gtk_container_add (GTK_CONTAINER (toolbar), separatortoolitem1);
1107 +
1108 +  tmp_image = create_pixmap (pda, "pda-rewindb16x16.xpm");
1109 +  gtk_widget_show (tmp_image);
1110 +  tbRewind = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Rewind"));
1111    gtk_widget_set_name (tbRewind, "tbRewind");
1112    gtk_widget_show (tbRewind);
1113 +  gtk_container_add (GTK_CONTAINER (toolbar), tbRewind);
1114    gtk_widget_set_size_request (tbRewind, 22, 22);
1115 +  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbRewind), tooltips, _("Rewind"), NULL);
1116
1117 -  tmp_toolbar_icon = create_pixmap (pda, "pda-pauseb16x16.xpm");
1118 -  tbPause = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
1119 -                                GTK_TOOLBAR_CHILD_BUTTON,
1120 -                                NULL,
1121 -                                _("Pause"),
1122 -                                _("Pause"), NULL,
1123 -                                tmp_toolbar_icon, NULL, NULL);
1124 -  gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE);
1125 +  tmp_image = create_pixmap (pda, "pda-pauseb16x16.xpm");
1126 +  gtk_widget_show (tmp_image);
1127 +  tbPause = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Pause"));
1128    gtk_widget_set_name (tbPause, "tbPause");
1129    gtk_widget_show (tbPause);
1130 +  gtk_container_add (GTK_CONTAINER (toolbar), tbPause);
1131    gtk_widget_set_size_request (tbPause, 22, 22);
1132 +  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbPause), tooltips, _("Pause"), NULL);
1133
1134 -  tmp_toolbar_icon = create_pixmap (pda, "pda-playb16x16.xpm");
1135 -  tbPlay = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
1136 -                                GTK_TOOLBAR_CHILD_BUTTON,
1137 -                                NULL,
1138 -                                _("Play"),
1139 -                                _("Play"), NULL,
1140 -                                tmp_toolbar_icon, NULL, NULL);
1141 -  gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE);
1142 +  tmp_image = create_pixmap (pda, "pda-playb16x16.xpm");
1143 +  gtk_widget_show (tmp_image);
1144 +  tbPlay = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Play"));
1145    gtk_widget_set_name (tbPlay, "tbPlay");
1146    gtk_widget_show (tbPlay);
1147 +  gtk_container_add (GTK_CONTAINER (toolbar), tbPlay);
1148    gtk_widget_set_size_request (tbPlay, 22, 22);
1149 +  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbPlay), tooltips, _("Play"), NULL);
1150
1151 -  tmp_toolbar_icon = create_pixmap (pda, "pda-stopb16x16.xpm");
1152 -  tbStop = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
1153 -                                GTK_TOOLBAR_CHILD_BUTTON,
1154 -                                NULL,
1155 -                                _("Stop"),
1156 -                                _("Stop"), NULL,
1157 -                                tmp_toolbar_icon, NULL, NULL);
1158 -  gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE);
1159 +  tmp_image = create_pixmap (pda, "pda-stopb16x16.xpm");
1160 +  gtk_widget_show (tmp_image);
1161 +  tbStop = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Stop"));
1162    gtk_widget_set_name (tbStop, "tbStop");
1163    gtk_widget_show (tbStop);
1164 +  gtk_container_add (GTK_CONTAINER (toolbar), tbStop);
1165    gtk_widget_set_size_request (tbStop, 22, 22);
1166 +  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbStop), tooltips, _("Stop"), NULL);
1167
1168 -  tmp_toolbar_icon = create_pixmap (pda, "pda-forwardb16x16.xpm");
1169 -  tbForward = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
1170 -                                GTK_TOOLBAR_CHILD_BUTTON,
1171 -                                NULL,
1172 -                                _("Forward"),
1173 -                                _("Forward"), NULL,
1174 -                                tmp_toolbar_icon, NULL, NULL);
1175 -  gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE);
1176 +  tmp_image = create_pixmap (pda, "pda-forwardb16x16.xpm");
1177 +  gtk_widget_show (tmp_image);
1178 +  tbForward = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Forward"));
1179    gtk_widget_set_name (tbForward, "tbForward");
1180    gtk_widget_show (tbForward);
1181 +  gtk_container_add (GTK_CONTAINER (toolbar), tbForward);
1182    gtk_widget_set_size_request (tbForward, 22, 22);
1183 +  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbForward), tooltips, _("Forward"), NULL);
1184
1185 -  gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
1186 -
1187 -  tmp_toolbar_icon = create_pixmap (pda, "vlc16x16.png");
1188 -  tbAbout = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
1189 -                                GTK_TOOLBAR_CHILD_BUTTON,
1190 -                                NULL,
1191 -                                _("About"),
1192 -                                _("About"), NULL,
1193 -                                tmp_toolbar_icon, NULL, NULL);
1194 -  gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE);
1195 +  separatortoolitem2 = (GtkWidget*) gtk_separator_tool_item_new ();
1196 +  gtk_widget_set_name (separatortoolitem2, "separatortoolitem2");
1197 +  gtk_widget_show (separatortoolitem2);
1198 +  gtk_container_add (GTK_CONTAINER (toolbar), separatortoolitem2);
1199 +
1200 +  tmp_image = create_pixmap (pda, "vlc16x16.png");
1201 +  gtk_widget_show (tmp_image);
1202 +  tbAbout = (GtkWidget*) gtk_tool_button_new (tmp_image, _("About"));
1203    gtk_widget_set_name (tbAbout, "tbAbout");
1204    gtk_widget_show (tbAbout);
1205 +  gtk_container_add (GTK_CONTAINER (toolbar), tbAbout);
1206    gtk_widget_set_size_request (tbAbout, 22, 22);
1207 +  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbAbout), tooltips, _("About"), NULL);
1208 +
1209 +  toolitem1 = (GtkWidget*) gtk_tool_item_new ();
1210 +  gtk_widget_set_name (toolitem1, "toolitem1");
1211 +  gtk_widget_show (toolitem1);
1212 +  gtk_container_add (GTK_CONTAINER (toolbar), toolitem1);
1213
1214 -  timeLabel = gtk_label_new (_("00:00:00"));
1215 +  timeLabel = gtk_label_new ("00:00:00");
1216    gtk_widget_set_name (timeLabel, "timeLabel");
1217    gtk_widget_show (timeLabel);
1218 -  gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
1219 -
1220 -  gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), timeLabel, NULL, NULL);
1221 +  gtk_container_add (GTK_CONTAINER (toolitem1), timeLabel);
1222
1223    timeSlider = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 6.25, 0)));
1224    gtk_widget_set_name (timeSlider, "timeSlider");
1225 @@ -372,8 +368,6 @@
1226    gtk_widget_set_name (vbox5, "vbox5");
1227    gtk_widget_show (vbox5);
1228    gtk_container_add (GTK_CONTAINER (notebook), vbox5);
1229 -  gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (notebook), vbox5,
1230 -                                      TRUE, TRUE, GTK_PACK_START);
1231
1232    hbox12 = gtk_hbox_new (FALSE, 0);
1233    gtk_widget_set_name (hbox12, "hbox12");
1234 @@ -393,13 +387,13 @@
1235    gtk_widget_set_name (comboMRL, "comboMRL");
1236    gtk_widget_show (comboMRL);
1237    gtk_box_pack_start (GTK_BOX (hbox12), comboMRL, TRUE, TRUE, 0);
1238 -  comboMRL_items = g_list_append (comboMRL_items, (gpointer) "udp://@:1234");
1239 -  comboMRL_items = g_list_append (comboMRL_items, (gpointer) "udp6://@:1234");
1240 -  comboMRL_items = g_list_append (comboMRL_items, (gpointer) "rtp://");
1241 -  comboMRL_items = g_list_append (comboMRL_items, (gpointer) "rtp6://");
1242 -  comboMRL_items = g_list_append (comboMRL_items, (gpointer) "ftp://");
1243 -  comboMRL_items = g_list_append (comboMRL_items, (gpointer) "http://");
1244 -  comboMRL_items = g_list_append (comboMRL_items, (gpointer) "mms://");
1245 +  comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("udp://@:1234"));
1246 +  comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("udp6://@:1234"));
1247 +  comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("rtp://"));
1248 +  comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("rtp6://"));
1249 +  comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("ftp://"));
1250 +  comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("http://"));
1251 +  comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("mms://"));
1252    gtk_combo_set_popdown_strings (GTK_COMBO (comboMRL), comboMRL_items);
1253    g_list_free (comboMRL_items);
1254
1255 @@ -413,7 +407,7 @@
1256    gtk_widget_set_name (hseparator15, "hseparator15");
1257    gtk_widget_show (hseparator15);
1258    gtk_box_pack_start (GTK_BOX (vbox5), hseparator15, FALSE, FALSE, 0);
1259 -  gtk_widget_set_size_request (hseparator15, -2, 10);
1260 +  gtk_widget_set_size_request (hseparator15, -1, 10);
1261
1262    table2 = gtk_table_new (6, 2, FALSE);
1263    gtk_widget_set_name (table2, "table2");
1264 @@ -426,7 +420,6 @@
1265    gtk_table_attach (GTK_TABLE (table2), labelNetworkPort, 0, 1, 0, 1,
1266                      (GtkAttachOptions) (GTK_FILL),
1267                      (GtkAttachOptions) (0), 0, 0);
1268 -  gtk_label_set_justify (GTK_LABEL (labelNetworkPort), GTK_JUSTIFY_LEFT);
1269    gtk_misc_set_alignment (GTK_MISC (labelNetworkPort), 0, 0.5);
1270
1271    labelNetworkAddress = gtk_label_new (_("Address:"));
1272 @@ -435,7 +428,6 @@
1273    gtk_table_attach (GTK_TABLE (table2), labelNetworkAddress, 0, 1, 1, 2,
1274                      (GtkAttachOptions) (GTK_FILL),
1275                      (GtkAttachOptions) (0), 0, 0);
1276 -  gtk_label_set_justify (GTK_LABEL (labelNetworkAddress), GTK_JUSTIFY_LEFT);
1277    gtk_misc_set_alignment (GTK_MISC (labelNetworkAddress), 0, 0.5);
1278
1279    entryNetworkPort_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10);
1280 @@ -484,7 +476,6 @@
1281    gtk_table_attach (GTK_TABLE (table2), labelNetworkType, 0, 1, 2, 3,
1282                      (GtkAttachOptions) (GTK_FILL),
1283                      (GtkAttachOptions) (0), 0, 0);
1284 -  gtk_label_set_justify (GTK_LABEL (labelNetworkType), GTK_JUSTIFY_LEFT);
1285    gtk_misc_set_alignment (GTK_MISC (labelNetworkType), 0, 0.5);
1286
1287    comboNetworkProtocolType = gtk_combo_new ();
1288 @@ -516,7 +507,6 @@
1289    gtk_table_attach (GTK_TABLE (table2), labelNetworkProtocol, 0, 1, 3, 4,
1290                      (GtkAttachOptions) (GTK_FILL),
1291                      (GtkAttachOptions) (0), 0, 0);
1292 -  gtk_label_set_justify (GTK_LABEL (labelNetworkProtocol), GTK_JUSTIFY_LEFT);
1293    gtk_misc_set_alignment (GTK_MISC (labelNetworkProtocol), 0, 0.5);
1294
1295    labelNetworkTranscode = gtk_label_new (_("Transcode:"));
1296 @@ -525,7 +515,6 @@
1297    gtk_table_attach (GTK_TABLE (table2), labelNetworkTranscode, 0, 1, 4, 5,
1298                      (GtkAttachOptions) (GTK_FILL),
1299                      (GtkAttachOptions) (0), 0, 0);
1300 -  gtk_label_set_justify (GTK_LABEL (labelNetworkTranscode), GTK_JUSTIFY_LEFT);
1301    gtk_misc_set_alignment (GTK_MISC (labelNetworkTranscode), 0, 0.5);
1302
1303    checkNetworkTranscode = gtk_check_button_new_with_mnemonic (_("enable"));
1304 @@ -578,7 +567,6 @@
1305    gtk_table_attach (GTK_TABLE (tableV4L), labelV4lVideDevice, 0, 1, 0, 1,
1306                      (GtkAttachOptions) (GTK_FILL),
1307                      (GtkAttachOptions) (0), 0, 0);
1308 -  gtk_label_set_justify (GTK_LABEL (labelV4lVideDevice), GTK_JUSTIFY_LEFT);
1309    gtk_misc_set_alignment (GTK_MISC (labelV4lVideDevice), 0, 0.5);
1310
1311    labelV4LAudioDevice = gtk_label_new (_("Audio:"));
1312 @@ -587,7 +575,6 @@
1313    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LAudioDevice, 0, 1, 1, 2,
1314                      (GtkAttachOptions) (GTK_FILL),
1315                      (GtkAttachOptions) (0), 0, 0);
1316 -  gtk_label_set_justify (GTK_LABEL (labelV4LAudioDevice), GTK_JUSTIFY_LEFT);
1317    gtk_misc_set_alignment (GTK_MISC (labelV4LAudioDevice), 0, 0.5);
1318
1319    labelV4LChannel = gtk_label_new (_("Channel:"));
1320 @@ -596,7 +583,6 @@
1321    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LChannel, 0, 1, 2, 3,
1322                      (GtkAttachOptions) (GTK_FILL),
1323                      (GtkAttachOptions) (0), 0, 0);
1324 -  gtk_label_set_justify (GTK_LABEL (labelV4LChannel), GTK_JUSTIFY_LEFT);
1325    gtk_misc_set_alignment (GTK_MISC (labelV4LChannel), 0, 0.5);
1326
1327    labelV4LNorm = gtk_label_new (_("Norm:"));
1328 @@ -605,7 +591,6 @@
1329    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LNorm, 0, 1, 3, 4,
1330                      (GtkAttachOptions) (GTK_FILL),
1331                      (GtkAttachOptions) (0), 0, 0);
1332 -  gtk_label_set_justify (GTK_LABEL (labelV4LNorm), GTK_JUSTIFY_LEFT);
1333    gtk_misc_set_alignment (GTK_MISC (labelV4LNorm), 0, 0.5);
1334
1335    labelV4LSize = gtk_label_new (_("Size:"));
1336 @@ -614,7 +599,6 @@
1337    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSize, 0, 1, 4, 5,
1338                      (GtkAttachOptions) (GTK_FILL),
1339                      (GtkAttachOptions) (0), 0, 0);
1340 -  gtk_label_set_justify (GTK_LABEL (labelV4LSize), GTK_JUSTIFY_LEFT);
1341    gtk_misc_set_alignment (GTK_MISC (labelV4LSize), 0, 0.5);
1342
1343    labelV4LFrequency = gtk_label_new (_("Frequency:"));
1344 @@ -623,7 +607,6 @@
1345    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LFrequency, 0, 1, 5, 6,
1346                      (GtkAttachOptions) (GTK_FILL),
1347                      (GtkAttachOptions) (0), 0, 0);
1348 -  gtk_label_set_justify (GTK_LABEL (labelV4LFrequency), GTK_JUSTIFY_LEFT);
1349    gtk_misc_set_alignment (GTK_MISC (labelV4LFrequency), 0, 0.5);
1350
1351    labelV4LSampleRate = gtk_label_new (_("Samplerate:"));
1352 @@ -632,7 +615,6 @@
1353    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSampleRate, 0, 1, 6, 7,
1354                      (GtkAttachOptions) (GTK_FILL),
1355                      (GtkAttachOptions) (0), 0, 0);
1356 -  gtk_label_set_justify (GTK_LABEL (labelV4LSampleRate), GTK_JUSTIFY_LEFT);
1357    gtk_misc_set_alignment (GTK_MISC (labelV4LSampleRate), 0, 0.5);
1358
1359    labelV4LQuality = gtk_label_new (_("Quality:"));
1360 @@ -641,7 +623,6 @@
1361    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LQuality, 0, 1, 7, 8,
1362                      (GtkAttachOptions) (GTK_FILL),
1363                      (GtkAttachOptions) (0), 0, 0);
1364 -  gtk_label_set_justify (GTK_LABEL (labelV4LQuality), GTK_JUSTIFY_LEFT);
1365    gtk_misc_set_alignment (GTK_MISC (labelV4LQuality), 0, 0.5);
1366
1367    labelV4LTuner = gtk_label_new (_("Tuner:"));
1368 @@ -650,7 +631,6 @@
1369    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LTuner, 0, 1, 9, 10,
1370                      (GtkAttachOptions) (GTK_FILL),
1371                      (GtkAttachOptions) (0), 0, 0);
1372 -  gtk_label_set_justify (GTK_LABEL (labelV4LTuner), GTK_JUSTIFY_LEFT);
1373    gtk_misc_set_alignment (GTK_MISC (labelV4LTuner), 0, 0.5);
1374
1375    labelV4LSoundDirection = gtk_label_new (_("Sound:"));
1376 @@ -659,7 +639,6 @@
1377    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSoundDirection, 0, 1, 8, 9,
1378                      (GtkAttachOptions) (GTK_FILL),
1379                      (GtkAttachOptions) (0), 0, 0);
1380 -  gtk_label_set_justify (GTK_LABEL (labelV4LSoundDirection), GTK_JUSTIFY_LEFT);
1381    gtk_misc_set_alignment (GTK_MISC (labelV4LSoundDirection), 0, 0.5);
1382
1383    labelV4LMJPEG = gtk_label_new (_("MJPEG:"));
1384 @@ -668,7 +647,6 @@
1385    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LMJPEG, 0, 1, 10, 11,
1386                      (GtkAttachOptions) (GTK_FILL),
1387                      (GtkAttachOptions) (0), 0, 0);
1388 -  gtk_label_set_justify (GTK_LABEL (labelV4LMJPEG), GTK_JUSTIFY_LEFT);
1389    gtk_misc_set_alignment (GTK_MISC (labelV4LMJPEG), 0, 0.5);
1390
1391    labelV4LDecimation = gtk_label_new (_("Decimation:"));
1392 @@ -677,7 +655,6 @@
1393    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LDecimation, 0, 1, 11, 12,
1394                      (GtkAttachOptions) (GTK_FILL),
1395                      (GtkAttachOptions) (0), 0, 0);
1396 -  gtk_label_set_justify (GTK_LABEL (labelV4LDecimation), GTK_JUSTIFY_LEFT);
1397    gtk_misc_set_alignment (GTK_MISC (labelV4LDecimation), 0, 0.5);
1398
1399    comboV4lVideoDevice = gtk_combo_new ();
1400 @@ -689,9 +666,9 @@
1401                      (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL),
1402                      (GtkAttachOptions) (0), 0, 0);
1403    gtk_combo_set_value_in_list (GTK_COMBO (comboV4lVideoDevice), TRUE, TRUE);
1404 -  comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video");
1405 -  comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video0");
1406 -  comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video1");
1407 +  comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video"));
1408 +  comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video0"));
1409 +  comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video1"));
1410    gtk_combo_set_popdown_strings (GTK_COMBO (comboV4lVideoDevice), comboV4lVideoDevice_items);
1411    g_list_free (comboV4lVideoDevice_items);
1412
1413 @@ -708,10 +685,10 @@
1414    gtk_table_attach (GTK_TABLE (tableV4L), comboV4lAudioDevice, 1, 2, 1, 2,
1415                      (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL),
1416                      (GtkAttachOptions) (0), 0, 0);
1417 -  comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/dsp");
1418 -  comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio");
1419 -  comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio0");
1420 -  comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio1");
1421 +  comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/dsp"));
1422 +  comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio"));
1423 +  comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio0"));
1424 +  comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio1"));
1425    gtk_combo_set_popdown_strings (GTK_COMBO (comboV4lAudioDevice), comboV4lAudioDevice_items);
1426    g_list_free (comboV4lAudioDevice_items);
1427
1428 @@ -851,7 +828,6 @@
1429    gtk_table_attach (GTK_TABLE (tableV4L), labelV4LTranscode, 0, 1, 12, 13,
1430                      (GtkAttachOptions) (GTK_FILL),
1431                      (GtkAttachOptions) (0), 0, 0);
1432 -  gtk_label_set_justify (GTK_LABEL (labelV4LTranscode), GTK_JUSTIFY_LEFT);
1433    gtk_misc_set_alignment (GTK_MISC (labelV4LTranscode), 0, 0.5);
1434
1435    checkV4LTranscode = gtk_check_button_new_with_mnemonic (_("enable"));
1436 @@ -875,7 +851,6 @@
1437    gtk_widget_set_name (Camera, "Camera");
1438    gtk_widget_show (Camera);
1439    gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), Camera);
1440 -  gtk_label_set_justify (GTK_LABEL (Camera), GTK_JUSTIFY_LEFT);
1441
1442    vbox1 = gtk_vbox_new (FALSE, 0);
1443    gtk_widget_set_name (vbox1, "vbox1");
1444 @@ -904,7 +879,6 @@
1445    gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoCodec, 0, 1, 0, 1,
1446                      (GtkAttachOptions) (GTK_FILL),
1447                      (GtkAttachOptions) (0), 0, 0);
1448 -  gtk_label_set_justify (GTK_LABEL (labelVideoCodec), GTK_JUSTIFY_LEFT);
1449    gtk_misc_set_alignment (GTK_MISC (labelVideoCodec), 0, 0.5);
1450
1451    comboVideoCodec = gtk_combo_new ();
1452 @@ -936,7 +910,6 @@
1453    gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoBitrate, 0, 1, 1, 2,
1454                      (GtkAttachOptions) (GTK_FILL),
1455                      (GtkAttachOptions) (0), 0, 0);
1456 -  gtk_label_set_justify (GTK_LABEL (labelVideoBitrate), GTK_JUSTIFY_LEFT);
1457    gtk_misc_set_alignment (GTK_MISC (labelVideoBitrate), 0, 0.5);
1458
1459    labelVideoBitrateTolerance = gtk_label_new (_("Bitrate Tolerance:"));
1460 @@ -945,7 +918,6 @@
1461    gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoBitrateTolerance, 0, 1, 2, 3,
1462                      (GtkAttachOptions) (GTK_FILL),
1463                      (GtkAttachOptions) (0), 0, 0);
1464 -  gtk_label_set_justify (GTK_LABEL (labelVideoBitrateTolerance), GTK_JUSTIFY_LEFT);
1465    gtk_misc_set_alignment (GTK_MISC (labelVideoBitrateTolerance), 0, 0.5);
1466
1467    labelVideoKeyInterval = gtk_label_new (_("Keyframe Interval:"));
1468 @@ -954,7 +926,6 @@
1469    gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoKeyInterval, 0, 1, 3, 4,
1470                      (GtkAttachOptions) (GTK_FILL),
1471                      (GtkAttachOptions) (0), 0, 0);
1472 -  gtk_label_set_justify (GTK_LABEL (labelVideoKeyInterval), GTK_JUSTIFY_LEFT);
1473    gtk_misc_set_alignment (GTK_MISC (labelVideoKeyInterval), 0, 0.5);
1474
1475    labelAudioCodec = gtk_label_new (_("Audio Codec:"));
1476 @@ -963,7 +934,6 @@
1477    gtk_table_attach (GTK_TABLE (tableTranscode), labelAudioCodec, 0, 1, 5, 6,
1478                      (GtkAttachOptions) (GTK_FILL),
1479                      (GtkAttachOptions) (0), 0, 0);
1480 -  gtk_label_set_justify (GTK_LABEL (labelAudioCodec), GTK_JUSTIFY_LEFT);
1481    gtk_misc_set_alignment (GTK_MISC (labelAudioCodec), 0, 0.5);
1482
1483    labelVideoDeinterlace = gtk_label_new (_("Deinterlace:"));
1484 @@ -972,7 +942,6 @@
1485    gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoDeinterlace, 0, 1, 4, 5,
1486                      (GtkAttachOptions) (GTK_FILL),
1487                      (GtkAttachOptions) (0), 0, 0);
1488 -  gtk_label_set_justify (GTK_LABEL (labelVideoDeinterlace), GTK_JUSTIFY_LEFT);
1489    gtk_misc_set_alignment (GTK_MISC (labelVideoDeinterlace), 0, 0.5);
1490
1491    labelStdAccess = gtk_label_new (_("Access:"));
1492 @@ -981,7 +950,6 @@
1493    gtk_table_attach (GTK_TABLE (tableTranscode), labelStdAccess, 0, 1, 7, 8,
1494                      (GtkAttachOptions) (GTK_FILL),
1495                      (GtkAttachOptions) (0), 0, 0);
1496 -  gtk_label_set_justify (GTK_LABEL (labelStdAccess), GTK_JUSTIFY_LEFT);
1497    gtk_misc_set_alignment (GTK_MISC (labelStdAccess), 0, 0.5);
1498
1499    labelStdMuxer = gtk_label_new (_("Muxer:"));
1500 @@ -990,7 +958,6 @@
1501    gtk_table_attach (GTK_TABLE (tableTranscode), labelStdMuxer, 0, 1, 8, 9,
1502                      (GtkAttachOptions) (GTK_FILL),
1503                      (GtkAttachOptions) (0), 0, 0);
1504 -  gtk_label_set_justify (GTK_LABEL (labelStdMuxer), GTK_JUSTIFY_LEFT);
1505    gtk_misc_set_alignment (GTK_MISC (labelStdMuxer), 0, 0.5);
1506
1507    labelStdUrl = gtk_label_new (_("URL:"));
1508 @@ -999,7 +966,6 @@
1509    gtk_table_attach (GTK_TABLE (tableTranscode), labelStdUrl, 0, 1, 9, 10,
1510                      (GtkAttachOptions) (GTK_FILL),
1511                      (GtkAttachOptions) (0), 0, 0);
1512 -  gtk_label_set_justify (GTK_LABEL (labelStdUrl), GTK_JUSTIFY_LEFT);
1513    gtk_misc_set_alignment (GTK_MISC (labelStdUrl), 0, 0.5);
1514
1515    labelStdTimeToLive = gtk_label_new (_("Time To Live (TTL):"));
1516 @@ -1008,7 +974,6 @@
1517    gtk_table_attach (GTK_TABLE (tableTranscode), labelStdTimeToLive, 0, 1, 10, 11,
1518                      (GtkAttachOptions) (GTK_FILL),
1519                      (GtkAttachOptions) (0), 0, 0);
1520 -  gtk_label_set_justify (GTK_LABEL (labelStdTimeToLive), GTK_JUSTIFY_LEFT);
1521    gtk_misc_set_alignment (GTK_MISC (labelStdTimeToLive), 0, 0.5);
1522
1523    entryStdTTL_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
1524 @@ -1047,14 +1012,14 @@
1525    gtk_table_attach (GTK_TABLE (tableTranscode), comboStdMuxer, 1, 2, 8, 9,
1526                      (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
1527                      (GtkAttachOptions) (0), 0, 0);
1528 -  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("PS"));
1529 -  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("TS"));
1530 -  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MPEG1"));
1531 -  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("AVI"));
1532 -  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("OGG"));
1533 -  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MP4"));
1534 -  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MOV"));
1535 -  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ASF"));
1536 +  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ps"));
1537 +  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ts"));
1538 +  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mpeg1"));
1539 +  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("avi"));
1540 +  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ogg"));
1541 +  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mp4"));
1542 +  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mov"));
1543 +  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("asf"));
1544    gtk_combo_set_popdown_strings (GTK_COMBO (comboStdMuxer), comboStdMuxer_items);
1545    g_list_free (comboStdMuxer_items);
1546
1547 @@ -1111,7 +1076,7 @@
1548                      (GtkAttachOptions) (0), 0, 0);
1549    gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entryVideoKeyFrameInterval), TRUE);
1550
1551 -  entryVideoBitrateTolerance_adj = gtk_adjustment_new (800000, 0, 1e+06, 1, 10, 10);
1552 +  entryVideoBitrateTolerance_adj = gtk_adjustment_new (800000, 0, 1000000, 1, 10, 10);
1553    entryVideoBitrateTolerance = gtk_spin_button_new (GTK_ADJUSTMENT (entryVideoBitrateTolerance_adj), 1, 0);
1554    gtk_widget_set_name (entryVideoBitrateTolerance, "entryVideoBitrateTolerance");
1555    gtk_widget_show (entryVideoBitrateTolerance);
1556 @@ -1137,7 +1102,6 @@
1557    gtk_table_attach (GTK_TABLE (tableTranscode), labelAudioBitrate, 0, 1, 6, 7,
1558                      (GtkAttachOptions) (GTK_FILL),
1559                      (GtkAttachOptions) (0), 0, 0);
1560 -  gtk_label_set_justify (GTK_LABEL (labelAudioBitrate), GTK_JUSTIFY_LEFT);
1561    gtk_misc_set_alignment (GTK_MISC (labelAudioBitrate), 0, 0.5);
1562
1563    comboStdAccess = gtk_combo_new ();
1564 @@ -1160,7 +1124,6 @@
1565    gtk_table_attach (GTK_TABLE (tableTranscode), labelSAP, 0, 1, 11, 12,
1566                      (GtkAttachOptions) (GTK_FILL),
1567                      (GtkAttachOptions) (0), 0, 0);
1568 -  gtk_label_set_justify (GTK_LABEL (labelSAP), GTK_JUSTIFY_LEFT);
1569    gtk_misc_set_alignment (GTK_MISC (labelSAP), 0, 0.5);
1570
1571    checkSAP = gtk_check_button_new_with_mnemonic (_("enable"));
1572 @@ -1183,7 +1146,6 @@
1573    gtk_table_attach (GTK_TABLE (tableTranscode), labelSLP_, 0, 1, 12, 13,
1574                      (GtkAttachOptions) (GTK_FILL),
1575                      (GtkAttachOptions) (0), 0, 0);
1576 -  gtk_label_set_justify (GTK_LABEL (labelSLP_), GTK_JUSTIFY_LEFT);
1577    gtk_misc_set_alignment (GTK_MISC (labelSLP_), 0, 0.5);
1578
1579    labelAnounceChannel = gtk_label_new (_("Announce Channel:"));
1580 @@ -1192,7 +1154,6 @@
1581    gtk_table_attach (GTK_TABLE (tableTranscode), labelAnounceChannel, 0, 1, 13, 14,
1582                      (GtkAttachOptions) (GTK_FILL),
1583                      (GtkAttachOptions) (0), 0, 0);
1584 -  gtk_label_set_justify (GTK_LABEL (labelAnounceChannel), GTK_JUSTIFY_LEFT);
1585    gtk_misc_set_alignment (GTK_MISC (labelAnounceChannel), 0, 0.5);
1586
1587    comboAnnounceChannel = gtk_combo_new ();
1588 @@ -1335,28 +1296,28 @@
1589    gtk_widget_show (labelDescription);
1590    gtk_fixed_put (GTK_FIXED (fixed2), labelDescription, 16, 112);
1591    gtk_widget_set_size_request (labelDescription, 200, 112);
1592 -  gtk_label_set_justify (GTK_LABEL (labelDescription), GTK_JUSTIFY_LEFT);
1593    gtk_label_set_line_wrap (GTK_LABEL (labelDescription), TRUE);
1594
1595 +  labelCopyright = gtk_label_new (_("(c) 1996-2004 the VideoLAN team"));
1596 +  gtk_widget_set_name (labelCopyright, "labelCopyright");
1597 +  gtk_widget_show (labelCopyright);
1598 +  gtk_fixed_put (GTK_FIXED (fixed2), labelCopyright, 16, 48);
1599 +  gtk_widget_set_size_request (labelCopyright, 208, 16);
1600 +  gtk_label_set_justify (GTK_LABEL (labelCopyright), GTK_JUSTIFY_CENTER);
1601 +
1602    labelAuthors = gtk_label_new (_("Authors: the VideoLAN Team, http://www.videolan.org/team/"));
1603    gtk_widget_set_name (labelAuthors, "labelAuthors");
1604    gtk_widget_show (labelAuthors);
1605    gtk_fixed_put (GTK_FIXED (fixed2), labelAuthors, 16, 72);
1606    gtk_widget_set_size_request (labelAuthors, 208, 32);
1607 -  gtk_label_set_justify (GTK_LABEL (labelAuthors), GTK_JUSTIFY_LEFT);
1608    gtk_label_set_line_wrap (GTK_LABEL (labelAuthors), TRUE);
1609
1610 -  labelCopyright = gtk_label_new (_("(c) 1996-2004 the the VideoLAN team team"));
1611 -  gtk_widget_set_name (labelCopyright, "labelCopyright");
1612 -  gtk_widget_show (labelCopyright);
1613 -  gtk_fixed_put (GTK_FIXED (fixed2), labelCopyright, 16, 48);
1614 -  gtk_widget_set_size_request (labelCopyright, 208, 16);
1615 -
1616    labelProgramName = gtk_label_new (_("VLC media player"));
1617    gtk_widget_set_name (labelProgramName, "labelProgramName");
1618    gtk_widget_show (labelProgramName);
1619    gtk_fixed_put (GTK_FIXED (fixed2), labelProgramName, 48, 16);
1620    gtk_widget_set_size_request (labelProgramName, 152, 16);
1621 +  gtk_label_set_justify (GTK_LABEL (labelProgramName), GTK_JUSTIFY_CENTER);
1622    gtk_label_set_line_wrap (GTK_LABEL (labelProgramName), TRUE);
1623
1624    about = gtk_label_new (_("About"));
1625 @@ -1459,12 +1420,15 @@
1626    GLADE_HOOKUP_OBJECT_NO_REF (pda, pda, "pda");
1627    GLADE_HOOKUP_OBJECT (pda, vbox, "vbox");
1628    GLADE_HOOKUP_OBJECT (pda, toolbar, "toolbar");
1629 +  GLADE_HOOKUP_OBJECT (pda, separatortoolitem1, "separatortoolitem1");
1630    GLADE_HOOKUP_OBJECT (pda, tbRewind, "tbRewind");
1631    GLADE_HOOKUP_OBJECT (pda, tbPause, "tbPause");
1632    GLADE_HOOKUP_OBJECT (pda, tbPlay, "tbPlay");
1633    GLADE_HOOKUP_OBJECT (pda, tbStop, "tbStop");
1634    GLADE_HOOKUP_OBJECT (pda, tbForward, "tbForward");
1635 +  GLADE_HOOKUP_OBJECT (pda, separatortoolitem2, "separatortoolitem2");
1636    GLADE_HOOKUP_OBJECT (pda, tbAbout, "tbAbout");
1637 +  GLADE_HOOKUP_OBJECT (pda, toolitem1, "toolitem1");
1638    GLADE_HOOKUP_OBJECT (pda, timeLabel, "timeLabel");
1639    GLADE_HOOKUP_OBJECT (pda, timeSlider, "timeSlider");
1640    GLADE_HOOKUP_OBJECT (pda, notebook, "notebook");
1641 @@ -1599,8 +1563,8 @@
1642    GLADE_HOOKUP_OBJECT (pda, fixed2, "fixed2");
1643    GLADE_HOOKUP_OBJECT (pda, aboutImage, "aboutImage");
1644    GLADE_HOOKUP_OBJECT (pda, labelDescription, "labelDescription");
1645 -  GLADE_HOOKUP_OBJECT (pda, labelAuthors, "labelAuthors");
1646    GLADE_HOOKUP_OBJECT (pda, labelCopyright, "labelCopyright");
1647 +  GLADE_HOOKUP_OBJECT (pda, labelAuthors, "labelAuthors");
1648    GLADE_HOOKUP_OBJECT (pda, labelProgramName, "labelProgramName");
1649    GLADE_HOOKUP_OBJECT (pda, about, "about");
1650    GLADE_HOOKUP_OBJECT_NO_REF (pda, tooltips, "tooltips");
1651 diff -ur vlc-0.8.4a/modules/gui/pda/pda_support.h vlc-0.8.4a-pda/modules/gui/pda/pda_support.h
1652 --- vlc-0.8.4a/modules/gui/pda/pda_support.h    2005-12-11 22:36:19.000000000 +0100
1653 +++ vlc-0.8.4a-pda/modules/gui/pda/pda_support.h        2006-04-05 10:50:39.000000000 +0200
1654 @@ -15,6 +15,7 @@
1655  #  include <libintl.h>
1656  #  undef _
1657  #  define _(String) dgettext (PACKAGE, String)
1658 +#  define Q_(String) g_strip_context ((String), gettext (String))
1659  #  ifdef gettext_noop
1660  #    define N_(String) gettext_noop (String)
1661  #  else
1662 @@ -27,6 +28,7 @@
1663  #  define dcgettext(Domain,Message,Type) (Message)
1664  #  define bindtextdomain(Domain,Directory) (Domain)
1665  #  define _(String) (String)
1666 +#  define Q_(String) g_strip_context ((String), (String))
1667  #  define N_(String) (String)
1668  #endif
1669