More modifications to layout of PDA interface.

diff --git a/modules/gui/pda/pda.glade b/modules/gui/pda/pda.glade
index 912101e33de19e825954b5e8f35469e63df3e7cd..9c59835b4d30838ea0a1027eb8a0180f87f12a78 100644 (file)
--- a/modules/gui/pda/pda.glade
+++ b/modules/gui/pda/pda.glade
@@ -3,7 +3,7 @@
 
 <glade-interface>
 
-<widget class="GtkWindow" id="gtk2">
+<widget class="GtkWindow" id="pda">
   <property name="width_request">240</property>
   <property name="height_request">320</property>
   <property name="visible">True</property>
@@ -227,25 +227,73 @@
                  <property name="shadow_type">GTK_SHADOW_IN</property>
 
                  <child>
-                   <widget class="GtkScrolledWindow" id="scrolledwindow7">
+                   <widget class="GtkVBox" id="vbox8">
                      <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                     <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                     <property name="shadow_type">GTK_SHADOW_NONE</property>
-                     <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                     <property name="homogeneous">False</property>
+                     <property name="spacing">0</property>
 
                      <child>
-                       <widget class="GtkTreeView" id="clistmedia">
+                       <widget class="GtkScrolledWindow" id="scrolledwindow7">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="headers_visible">True</property>
-                         <property name="rules_hint">False</property>
-                         <property name="reorderable">False</property>
-                         <property name="enable_search">True</property>
-                         <signal name="columns_changed" handler="on_clistmedia_columns_changed" last_modification_time="Wed, 30 Jul 2003 10:39:11 GMT"/>
-                         <signal name="event" handler="on_clistmedia_select_cursor_row" last_modification_time="Wed, 30 Jul 2003 10:39:45 GMT"/>
+                         <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                         <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                         <property name="shadow_type">GTK_SHADOW_NONE</property>
+                         <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+                         <child>
+                           <widget class="GtkTreeView" id="clistmedia">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="headers_visible">True</property>
+                             <property name="rules_hint">False</property>
+                             <property name="reorderable">False</property>
+                             <property name="enable_search">True</property>
+                             <signal name="row_activated" handler="on_treeview2_row_activated" last_modification_time="Thu, 11 Sep 2003 11:40:15 GMT"/>
+                           </widget>
+                         </child>
                        </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">True</property>
+                         <property name="fill">True</property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkHBox" id="hbox">
+                         <property name="visible">True</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">0</property>
+
+                         <child>
+                           <placeholder/>
+                         </child>
+
+                         <child>
+                           <widget class="GtkButton" id="clistmedia_AddPlaylist">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">Add to Playlist</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <placeholder/>
+                         </child>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
                      </child>
                    </widget>
                  </child>
@@ -684,7 +732,7 @@
                          <property name="editable">True</property>
                          <property name="visibility">True</property>
                          <property name="max_length">0</property>
-                         <property name="text" translatable="yes">unicast</property>
+                         <property name="text" translatable="yes"></property>
                          <property name="has_frame">True</property>
                          <property name="invisible_char" translatable="yes">*</property>
                          <property name="activates_default">False</property>
@@ -763,7 +811,7 @@
                          <property name="editable">True</property>
                          <property name="visibility">True</property>
                          <property name="max_length">0</property>
-                         <property name="text" translatable="yes">IPv4</property>
+                         <property name="text" translatable="yes"></property>
                          <property name="has_frame">True</property>
                          <property name="invisible_char" translatable="yes">*</property>
                          <property name="activates_default">False</property>
@@ -866,7 +914,7 @@
                          <property name="editable">True</property>
                          <property name="visibility">True</property>
                          <property name="max_length">0</property>
-                         <property name="text" translatable="yes">http</property>
+                         <property name="text" translatable="yes"></property>
                          <property name="has_frame">True</property>
                          <property name="invisible_char" translatable="yes">*</property>
                          <property name="activates_default">False</property>
@@ -969,7 +1017,7 @@
                          <property name="editable">True</property>
                          <property name="visibility">True</property>
                          <property name="max_length">0</property>
-                         <property name="text" translatable="yes">server</property>
+                         <property name="text" translatable="yes"></property>
                          <property name="has_frame">True</property>
                          <property name="invisible_char" translatable="yes">*</property>
                          <property name="activates_default">False</property>
@@ -1029,7 +1077,7 @@
                    <widget class="GtkButton" id="network_AddPlaylist">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">Add Playlist</property>
+                     <property name="label" translatable="yes">Add to Playlist</property>
                      <property name="use_underline">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
                    </widget>
@@ -1046,8 +1094,8 @@
                </widget>
                <packing>
                  <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
            </widget>
@@ -1077,27 +1125,170 @@
          </child>
 
          <child>
-           <widget class="GtkVBox" id="vbox1">
+           <widget class="GtkVBox" id="vbox7">
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
              <property name="spacing">0</property>
 
              <child>
-               <widget class="GtkVBox" id="vbox6">
+               <widget class="GtkTable" id="table">
+                 <property name="visible">True</property>
+                 <property name="n_rows">3</property>
+                 <property name="n_columns">2</property>
+                 <property name="homogeneous">False</property>
+                 <property name="row_spacing">0</property>
+                 <property name="column_spacing">0</property>
+
+                 <child>
+                   <widget class="GtkLabel" id="Audio">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Audio:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">0</property>
+                     <property name="right_attach">1</property>
+                     <property name="top_attach">0</property>
+                     <property name="bottom_attach">1</property>
+                     <property name="x_options">fill</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkLabel" id="Video">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Video:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">0</property>
+                     <property name="right_attach">1</property>
+                     <property name="top_attach">1</property>
+                     <property name="bottom_attach">2</property>
+                     <property name="x_options">fill</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkCombo" id="combo9">
+                     <property name="visible">True</property>
+                     <property name="value_in_list">False</property>
+                     <property name="allow_empty">True</property>
+                     <property name="case_sensitive">False</property>
+                     <property name="enable_arrow_keys">True</property>
+                     <property name="enable_arrows_always">False</property>
+
+                     <child internal-child="entry">
+                       <widget class="GtkEntry" id="combo-v4l-audio">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="editable">True</property>
+                         <property name="visibility">True</property>
+                         <property name="max_length">0</property>
+                         <property name="text" translatable="yes">/dev/dsp</property>
+                         <property name="has_frame">True</property>
+                         <property name="invisible_char" translatable="yes">*</property>
+                         <property name="activates_default">True</property>
+                       </widget>
+                     </child>
+
+                     <child internal-child="list">
+                       <widget class="GtkList" id="combo-list10">
+                         <property name="visible">True</property>
+                         <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">1</property>
+                     <property name="right_attach">2</property>
+                     <property name="top_attach">0</property>
+                     <property name="bottom_attach">1</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkCombo" id="combo10">
+                     <property name="visible">True</property>
+                     <property name="value_in_list">False</property>
+                     <property name="allow_empty">True</property>
+                     <property name="case_sensitive">False</property>
+                     <property name="enable_arrow_keys">True</property>
+                     <property name="enable_arrows_always">False</property>
+
+                     <child internal-child="entry">
+                       <widget class="GtkEntry" id="combo-v4l-video">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="editable">True</property>
+                         <property name="visibility">True</property>
+                         <property name="max_length">0</property>
+                         <property name="text" translatable="yes">/dev/video</property>
+                         <property name="has_frame">True</property>
+                         <property name="invisible_char" translatable="yes">*</property>
+                         <property name="activates_default">True</property>
+                       </widget>
+                     </child>
+
+                     <child internal-child="list">
+                       <widget class="GtkList" id="combo-list11">
+                         <property name="visible">True</property>
+                         <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">1</property>
+                     <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+                     <property name="bottom_attach">2</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">True</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkHBox" id="hbox16">
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
-                   <widget class="GtkCheckButton" id="checkStreamOutput">
+                   <placeholder/>
+                 </child>
+
+                 <child>
+                   <widget class="GtkButton" id="camera_AddPlaylist">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">Camera streaming</property>
+                     <property name="label" translatable="yes">Add to Playlist</property>
                      <property name="use_underline">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
-                     <property name="draw_indicator">True</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -1106,6 +1297,54 @@
                    </packing>
                  </child>
 
+                 <child>
+                   <placeholder/>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">True</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="Camera">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">Camera</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+           </widget>
+           <packing>
+             <property name="type">tab</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkVBox" id="vbox1">
+             <property name="visible">True</property>
+             <property name="homogeneous">False</property>
+             <property name="spacing">0</property>
+
+             <child>
+               <widget class="GtkVBox" id="vbox6">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">0</property>
+
                  <child>
                    <widget class="GtkFrame" id="frameVideo">
                      <property name="visible">True</property>
@@ -1557,7 +1796,7 @@
                    <widget class="GtkButton" id="camera_AddPlaylist">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">Add Playlist</property>
+                     <property name="label" translatable="yes">Add to Playlist</property>
                      <property name="use_underline">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
                    </widget>
@@ -1574,8 +1813,8 @@
                </widget>
                <packing>
                  <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
            </widget>
@@ -1586,9 +1825,9 @@
          </child>
 
          <child>
-           <widget class="GtkLabel" id="Camera">
+           <widget class="GtkLabel" id="Server">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Camera</property>
+             <property name="label" translatable="yes">Server</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1921,15 +2160,15 @@
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="label9">
+                       <widget class="GtkLabel" id="label27">
                          <property name="width_request">208</property>
-                         <property name="height_request">32</property>
+                         <property name="height_request">16</property>
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">Authors: The VideoLAN Team, http://www.videolan.org</property>
+                         <property name="label" translatable="yes">http://www.videolan.org</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">True</property>
+                         <property name="justify">GTK_JUSTIFY_CENTER</property>
+                         <property name="wrap">False</property>
                          <property name="selectable">False</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
@@ -1938,16 +2177,16 @@
                        </widget>
                        <packing>
                          <property name="x">16</property>
-                         <property name="y">72</property>
+                         <property name="y">184</property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="label10">
-                         <property name="width_request">224</property>
-                         <property name="height_request">64</property>
+                       <widget class="GtkLabel" id="label9">
+                         <property name="width_request">208</property>
+                         <property name="height_request">32</property>
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input from local or network sources.</property>
+                         <property name="label" translatable="yes">Authors: The VideoLAN Team, http://www.videolan.org</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1960,20 +2199,20 @@
                        </widget>
                        <packing>
                          <property name="x">16</property>
-                         <property name="y">112</property>
+                         <property name="y">72</property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="label27">
-                         <property name="width_request">112</property>
-                         <property name="height_request">16</property>
+                       <widget class="GtkLabel" id="label10">
+                         <property name="width_request">224</property>
+                         <property name="height_request">64</property>
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">http://www.videolan.org</property>
+                         <property name="label" translatable="yes">The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input from local or network sources.</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                         <property name="wrap">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">True</property>
                          <property name="selectable">False</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
@@ -1981,8 +2220,8 @@
                          <property name="ypad">0</property>
                        </widget>
                        <packing>
-                         <property name="x">64</property>
-                         <property name="y">184</property>
+                         <property name="x">16</property>
+                         <property name="y">112</property>
                        </packing>
                      </child>
                    </widget>