gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r13433 - gnunet-gtk/contrib


From: gnunet
Subject: [GNUnet-SVN] r13433 - gnunet-gtk/contrib
Date: Wed, 27 Oct 2010 14:52:52 +0200

Author: grothoff
Date: 2010-10-27 14:52:52 +0200 (Wed, 27 Oct 2010)
New Revision: 13433

Modified:
   gnunet-gtk/contrib/advertise_pseudonym_dialog.glade
   gnunet-gtk/contrib/main-window.glade
   gnunet-gtk/contrib/publish_dialog.glade
   gnunet-gtk/contrib/publish_edit_dialog.glade
   gnunet-gtk/contrib/publish_tab.glade
   gnunet-gtk/contrib/search_dialog.glade
   gnunet-gtk/contrib/search_tab.glade
   gnunet-gtk/contrib/select_pseudonym_dialog.glade
Log:
make all tree views scrollable

Modified: gnunet-gtk/contrib/advertise_pseudonym_dialog.glade
===================================================================
--- gnunet-gtk/contrib/advertise_pseudonym_dialog.glade 2010-10-27 12:38:51 UTC 
(rev 13432)
+++ gnunet-gtk/contrib/advertise_pseudonym_dialog.glade 2010-10-27 12:52:52 UTC 
(rev 13433)
@@ -2,24 +2,52 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">10000000</property>
-    <property name="value">1000</property>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_keyword_list_store">
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
     <columns>
-      <!-- column-name keyword -->
+      <!-- column-name description -->
       <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+      <!-- column-name helptext -->
+      <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+    <columns>
+      <!-- column-name extractor_meta_type -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_format -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_type_string -->
+      <column type="gchararray"/>
+      <!-- column-name extracotr_meta_value -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="GNUNET_GTK_advertise_pseudonym_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Advertise namespace</property>
@@ -124,6 +152,8 @@
                     <property name="height_request">120</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hadjustment">adjustment1</property>
+                    <property name="vadjustment">adjustment2</property>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
@@ -131,6 +161,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
+                        <property name="hadjustment">adjustment1</property>
+                        <property name="vadjustment">adjustment2</property>
                         <property name="enable_search">False</property>
                         <child>
                           <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_type_column">
@@ -307,6 +339,8 @@
                         <property name="height_request">120</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hadjustment">adjustment3</property>
+                        <property name="vadjustment">adjustment4</property>
                         <property name="hscrollbar_policy">never</property>
                         <property name="vscrollbar_policy">automatic</property>
                         <child>
@@ -314,6 +348,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property 
name="model">GNUNET_GTK_keyword_list_store</property>
+                            <property name="hadjustment">adjustment3</property>
+                            <property name="vadjustment">adjustment4</property>
                             <property name="search_column">0</property>
                             <child>
                               <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view_column">
@@ -617,26 +653,22 @@
       <action-widget 
response="-5">GNUNET_GTK_advertise_pseudonym_confirm_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+  <object class="GtkListStore" id="GNUNET_GTK_keyword_list_store">
     <columns>
-      <!-- column-name extractor_meta_type -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_format -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_type_string -->
+      <!-- column-name keyword -->
       <column type="gchararray"/>
-      <!-- column-name extracotr_meta_value -->
-      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
-    <columns>
-      <!-- column-name description -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-      <!-- column-name helptext -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="priority_adjustment">
+    <property name="upper">10000000</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
 </interface>

Modified: gnunet-gtk/contrib/main-window.glade
===================================================================
--- gnunet-gtk/contrib/main-window.glade        2010-10-27 12:38:51 UTC (rev 
13432)
+++ gnunet-gtk/contrib/main-window.glade        2010-10-27 12:52:52 UTC (rev 
13433)
@@ -2,26 +2,60 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkImage" id="image5">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-down</property>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="stock">gtk-find</property>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="stock">gtk-open</property>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="stock">gtk-new</property>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
-  <object class="GtkImage" id="image2">
+  <object class="GtkImage" id="image6">
     <property name="visible">True</property>
-    <property name="stock">gtk-go-up</property>
+    <property name="stock">gtk-index</property>
   </object>
+  <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
+    <columns>
+      <!-- column-name peer_identity -->
+      <column type="gchararray"/>
+      <!-- column-name number_of_known_addresses -->
+      <column type="guint"/>
+      <!-- column-name country_name -->
+      <column type="gchararray"/>
+      <!-- column-name country_flag -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name bandwidth -->
+      <column type="guint64"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+    <columns>
+      <!-- column-name extractor_meta_type -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_format -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_type_string -->
+      <column type="gchararray"/>
+      <!-- column-name extracotr_meta_value -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="GNUNET_GTK_main_window">
     <property name="title" translatable="yes">gnunet-gtk</property>
     <property name="window_position">center</property>
@@ -326,43 +360,55 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkTreeView" 
id="GNUNET_GTK_main_window_metadata_treeview">
+                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_main_window_metadata_scroll">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
-                    <property name="search_column">0</property>
-                    <property name="enable_grid_lines">both</property>
+                    <property name="hadjustment">adjustment1</property>
+                    <property name="vadjustment">adjustment2</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
-                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_type_column">
-                        <property name="sizing">autosize</property>
-                        <property name="title" 
translatable="yes">Type</property>
-                        <property name="clickable">True</property>
-                        <property name="reorderable">True</property>
-                        <property name="sort_indicator">True</property>
+                      <object class="GtkTreeView" 
id="GNUNET_GTK_main_window_metadata_treeview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
+                        <property name="hadjustment">adjustment1</property>
+                        <property name="vadjustment">adjustment2</property>
+                        <property name="search_column">0</property>
+                        <property name="enable_grid_lines">both</property>
                         <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_metadata_type_renderer"/>
-                          <attributes>
-                            <attribute name="text">2</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_type_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Type</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_indicator">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_metadata_type_renderer"/>
+                              <attributes>
+                                <attribute name="text">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_value_column">
-                        <property name="sizing">autosize</property>
-                        <property name="title" 
translatable="yes">Value</property>
-                        <property name="expand">True</property>
-                        <property name="clickable">True</property>
-                        <property name="reorderable">True</property>
-                        <property name="sort_indicator">True</property>
                         <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_metadata_value_renderer">
-                            <property name="sensitive">False</property>
-                            <property name="wrap_mode">word</property>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_value_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Value</property>
+                            <property name="expand">True</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_indicator">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_metadata_value_renderer">
+                                <property name="sensitive">False</property>
+                                <property name="wrap_mode">word</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">3</attribute>
+                              </attributes>
+                            </child>
                           </object>
-                          <attributes>
-                            <attribute name="text">3</attribute>
-                          </attributes>
                         </child>
                       </object>
                     </child>
@@ -372,59 +418,71 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkTreeView" 
id="GNUNET_GTK_main_window_peerinfo_treeview">
+                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_main_window_peerinfo_scroll">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property 
name="model">GNUNET_GTK_peer_info_list_store</property>
-                    <property name="headers_clickable">False</property>
-                    <property name="reorderable">True</property>
-                    <property name="search_column">0</property>
+                    <property name="hadjustment">adjustment3</property>
+                    <property name="vadjustment">adjustment4</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
-                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_name_column">
-                        <property name="sizing">autosize</property>
-                        <property name="title" 
translatable="yes">Peer</property>
-                        <property name="expand">True</property>
-                        <property name="clickable">True</property>
+                      <object class="GtkTreeView" 
id="GNUNET_GTK_main_window_peerinfo_treeview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="model">GNUNET_GTK_peer_info_list_store</property>
+                        <property name="hadjustment">adjustment3</property>
+                        <property name="vadjustment">adjustment4</property>
+                        <property name="headers_clickable">False</property>
                         <property name="reorderable">True</property>
-                        <property name="sort_column_id">0</property>
+                        <property name="search_column">0</property>
                         <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_peerinfo_name_renderer">
-                            <property name="sensitive">False</property>
-                            <property name="width_chars">16</property>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_name_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Peer</property>
+                            <property name="expand">True</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_column_id">0</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_peerinfo_name_renderer">
+                                <property name="sensitive">False</property>
+                                <property name="width_chars">16</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                           </object>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_bandwidth_column">
-                        <property name="sizing">autosize</property>
-                        <property name="title" 
translatable="yes">Bandwidth</property>
-                        <property name="sort_order">descending</property>
-                        <property name="sort_column_id">5</property>
                         <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_peerinfo_bandwidth_renderer"/>
-                          <attributes>
-                            <attribute name="text">4</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_bandwidth_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Bandwidth</property>
+                            <property name="sort_order">descending</property>
+                            <property name="sort_column_id">5</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_peerinfo_bandwidth_renderer"/>
+                              <attributes>
+                                <attribute name="text">4</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_country_column">
-                        <property name="sizing">autosize</property>
-                        <property name="title" 
translatable="yes">Country</property>
-                        <property name="clickable">True</property>
-                        <property name="reorderable">True</property>
-                        <property name="sort_indicator">True</property>
-                        <property name="sort_column_id">3</property>
                         <child>
-                          <object class="GtkCellRendererPixbuf" 
id="GNUNET_GTK_main_window_peerinfo_country_renderer"/>
-                          <attributes>
-                            <attribute name="pixbuf">3</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_country_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Country</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_indicator">True</property>
+                            <property name="sort_column_id">3</property>
+                            <child>
+                              <object class="GtkCellRendererPixbuf" 
id="GNUNET_GTK_main_window_peerinfo_country_renderer"/>
+                              <attributes>
+                                <attribute name="pixbuf">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
                       </object>
                     </child>
@@ -435,8 +493,6 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -459,34 +515,24 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
-    <columns>
-      <!-- column-name extractor_meta_type -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_format -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_type_string -->
-      <column type="gchararray"/>
-      <!-- column-name extracotr_meta_value -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-go-up</property>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
-    <columns>
-      <!-- column-name peer_identity -->
-      <column type="gchararray"/>
-      <!-- column-name number_of_known_addresses -->
-      <column type="guint"/>
-      <!-- column-name country_name -->
-      <column type="gchararray"/>
-      <!-- column-name country_flag -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name bandwidth -->
-      <column type="guint64"/>
-    </columns>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
   </object>
-  <object class="GtkImage" id="image6">
+  <object class="GtkImage" id="image1">
     <property name="visible">True</property>
-    <property name="stock">gtk-index</property>
+    <property name="stock">gtk-open</property>
   </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="stock">gtk-find</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="stock">gtk-go-down</property>
+  </object>
 </interface>

Modified: gnunet-gtk/contrib/publish_dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish_dialog.glade     2010-10-27 12:38:51 UTC (rev 
13432)
+++ gnunet-gtk/contrib/publish_dialog.glade     2010-10-27 12:52:52 UTC (rev 
13433)
@@ -2,26 +2,64 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkTreeStore" id="GNUNET_GTK_pseudonym_tree_store">
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkImage" id="right_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-go-forward</property>
+  </object>
+  <object class="GtkImage" id="left_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-go-back</property>
+  </object>
+  <object class="GtkImage" id="add_stock_image_2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkImage" id="new_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
+  </object>
+  <object class="GtkImage" id="add_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkTreeStore" 
id="GNUNET_GTK_file_sharing_publishing_tree_store">
     <columns>
-      <!-- column-name local_name -->
+      <!-- column-name filesize -->
       <column type="gchararray"/>
-      <!-- column-name namespace_handle -->
-      <column type="gpointer"/>
-      <!-- column-name last_id -->
+      <!-- column-name do_index -->
+      <column type="gboolean"/>
+      <!-- column-name filename -->
       <column type="gchararray"/>
-      <!-- column-name last_uri -->
-      <column type="gchararray"/>
-      <!-- column-name last_meta -->
+      <!-- column-name anonymity_level -->
+      <column type="guint"/>
+      <!-- column-name priority -->
+      <column type="guint"/>
+      <!-- column-name file_information_struct -->
       <column type="gpointer"/>
-      <!-- column-name next_id -->
-      <column type="gchararray"/>
-      <!-- column-name last_description_from_meta -->
-      <column type="gchararray"/>
-      <!-- column-name next_id_editable -->
-      <column type="gboolean"/>
-      <!-- column-name current_id_editable -->
-      <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkDialog" id="GNUNET_GTK_master_publish_dialog">
@@ -41,47 +79,64 @@
           <object class="GtkVBox" 
id="GNUNET_GTK_master_publish_dialog_file_information_vbox">
             <property name="visible">True</property>
             <child>
-              <object class="GtkTreeView" 
id="GNUNET_GTK_master_publish_dialog_file_information_tree_view">
+              <object class="GtkScrolledWindow" 
id="GNUNET_GTK_master_publish_dialog_file_information_scrolled_window">
+                <property name="height_request">100</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property 
name="model">GNUNET_GTK_file_sharing_publishing_tree_store</property>
-                <property name="enable_tree_lines">True</property>
+                <property name="hadjustment">adjustment1</property>
+                <property name="vadjustment">adjustment2</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
                 <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_column">
-                    <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Size</property>
+                  <object class="GtkTreeView" 
id="GNUNET_GTK_master_publish_dialog_file_information_tree_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property 
name="model">GNUNET_GTK_file_sharing_publishing_tree_store</property>
+                    <property name="hadjustment">adjustment1</property>
+                    <property name="vadjustment">adjustment2</property>
+                    <property name="enable_tree_lines">True</property>
                     <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_renderer"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
+                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_column">
+                        <property name="sizing">autosize</property>
+                        <property name="title" 
translatable="yes">Size</property>
+                        <child>
+                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_renderer"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_file_information_filename_column">
-                    <property name="resizable">True</property>
-                    <property name="sizing">autosize</property>
-                    <property name="title" 
translatable="yes">Filename</property>
-                    <property name="expand">True</property>
-                    <property name="clickable">True</property>
-                    <property name="reorderable">True</property>
-                    <property name="sort_indicator">True</property>
                     <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_file_information_filename_renderer"/>
-                      <attributes>
-                        <attribute name="text">2</attribute>
-                      </attributes>
+                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_file_information_filename_column">
+                        <property name="resizable">True</property>
+                        <property name="sizing">autosize</property>
+                        <property name="title" 
translatable="yes">Filename</property>
+                        <property name="expand">True</property>
+                        <property name="clickable">True</property>
+                        <property name="reorderable">True</property>
+                        <property name="sort_indicator">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_file_information_filename_renderer"/>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                     </child>
                   </object>
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="padding">8</property>
             <property name="position">0</property>
           </packing>
@@ -177,6 +232,7 @@
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="padding">25</property>
                 <property name="position">0</property>
               </packing>
@@ -266,6 +322,7 @@
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="padding">25</property>
                 <property name="position">1</property>
               </packing>
@@ -273,82 +330,97 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkTreeView" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_tree_view">
+          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_scrolled_window">
+            <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="model">GNUNET_GTK_pseudonym_tree_store</property>
-            <property name="reorderable">True</property>
-            <property name="rubber_banding">True</property>
-            <property name="enable_grid_lines">both</property>
+            <property name="hadjustment">adjustment3</property>
+            <property name="vadjustment">adjustment4</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
-              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_column">
-                <property name="resizable">True</property>
-                <property name="title" translatable="yes">Pseudonym</property>
-                <property name="clickable">True</property>
+              <object class="GtkTreeView" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_tree_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property 
name="model">GNUNET_GTK_pseudonym_tree_store</property>
+                <property name="hadjustment">adjustment3</property>
+                <property name="vadjustment">adjustment4</property>
                 <property name="reorderable">True</property>
-                <property name="sort_indicator">True</property>
+                <property name="rubber_banding">True</property>
+                <property name="enable_grid_lines">both</property>
                 <child>
-                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_renderer"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_column">
+                    <property name="resizable">True</property>
+                    <property name="title" 
translatable="yes">Pseudonym</property>
+                    <property name="clickable">True</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_indicator">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_renderer"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_column">
-                <property name="resizable">True</property>
-                <property name="sizing">autosize</property>
-                <property name="title" translatable="yes">Current 
identifier</property>
-                <property name="clickable">True</property>
                 <child>
-                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer">
-                    <signal name="edited" 
handler="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb"
 swapped="no"/>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_column">
+                    <property name="resizable">True</property>
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Current 
identifier</property>
+                    <property name="clickable">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer">
+                        <signal name="edited" 
handler="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb"
 swapped="no"/>
+                      </object>
+                      <attributes>
+                        <attribute name="editable">8</attribute>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
                   </object>
-                  <attributes>
-                    <attribute name="editable">8</attribute>
-                    <attribute name="text">2</attribute>
-                  </attributes>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_column">
-                <property name="resizable">True</property>
-                <property name="sizing">autosize</property>
-                <property name="fixed_width">5</property>
-                <property name="title" translatable="yes">Update 
identifier</property>
                 <child>
-                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer">
-                    <signal name="edited" 
handler="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb" 
swapped="no"/>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_column">
+                    <property name="resizable">True</property>
+                    <property name="sizing">autosize</property>
+                    <property name="fixed_width">5</property>
+                    <property name="title" translatable="yes">Update 
identifier</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer">
+                        <signal name="edited" 
handler="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb" 
swapped="no"/>
+                      </object>
+                      <attributes>
+                        <attribute name="editable">7</attribute>
+                        <attribute name="text">5</attribute>
+                      </attributes>
+                    </child>
                   </object>
-                  <attributes>
-                    <attribute name="editable">7</attribute>
-                    <attribute name="text">5</attribute>
-                  </attributes>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_column">
-                <property name="title" translatable="yes">Description (of 
existing content)</property>
                 <child>
-                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_renderer">
-                    <property name="wrap_mode">word</property>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_column">
+                    <property name="title" translatable="yes">Description (of 
existing content)</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_renderer">
+                        <property name="wrap_mode">word</property>
+                      </object>
+                      <attributes>
+                        <attribute name="text">6</attribute>
+                      </attributes>
+                    </child>
                   </object>
-                  <attributes>
-                    <attribute name="text">6</attribute>
-                  </attributes>
                 </child>
               </object>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -390,6 +462,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">3</property>
           </packing>
@@ -401,40 +474,26 @@
       <action-widget 
response="-5">GNUNET_GTK_master_publish_dialog_execute_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkTreeStore" 
id="GNUNET_GTK_file_sharing_publishing_tree_store">
+  <object class="GtkTreeStore" id="GNUNET_GTK_pseudonym_tree_store">
     <columns>
-      <!-- column-name filesize -->
+      <!-- column-name local_name -->
       <column type="gchararray"/>
-      <!-- column-name do_index -->
-      <column type="gboolean"/>
-      <!-- column-name filename -->
+      <!-- column-name namespace_handle -->
+      <column type="gpointer"/>
+      <!-- column-name last_id -->
       <column type="gchararray"/>
-      <!-- column-name anonymity_level -->
-      <column type="guint"/>
-      <!-- column-name priority -->
-      <column type="guint"/>
-      <!-- column-name file_information_struct -->
+      <!-- column-name last_uri -->
+      <column type="gchararray"/>
+      <!-- column-name last_meta -->
       <column type="gpointer"/>
+      <!-- column-name next_id -->
+      <column type="gchararray"/>
+      <!-- column-name last_description_from_meta -->
+      <column type="gchararray"/>
+      <!-- column-name next_id_editable -->
+      <column type="gboolean"/>
+      <!-- column-name current_id_editable -->
+      <column type="gboolean"/>
     </columns>
   </object>
-  <object class="GtkImage" id="add_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="new_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-new</property>
-  </object>
-  <object class="GtkImage" id="add_stock_image_2">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="left_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-back</property>
-  </object>
-  <object class="GtkImage" id="right_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-forward</property>
-  </object>
 </interface>

Modified: gnunet-gtk/contrib/publish_edit_dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish_edit_dialog.glade        2010-10-27 12:38:51 UTC 
(rev 13432)
+++ gnunet-gtk/contrib/publish_edit_dialog.glade        2010-10-27 12:52:52 UTC 
(rev 13433)
@@ -2,24 +2,40 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">10000000</property>
-    <property name="value">1000</property>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_keyword_list_store">
+  <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
     <columns>
-      <!-- column-name keyword -->
+      <!-- column-name description -->
       <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+      <!-- column-name helptext -->
+      <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+    <columns>
+      <!-- column-name extractor_meta_type -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_format -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_type_string -->
+      <column type="gchararray"/>
+      <!-- column-name extracotr_meta_value -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="GNUNET_GTK_edit_file_information_dialog">
     <property name="border_width">5</property>
     <property name="destroy_with_parent">True</property>
@@ -123,6 +139,8 @@
                     <property name="height_request">120</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hadjustment">adjustment1</property>
+                    <property name="vadjustment">adjustment2</property>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
@@ -130,6 +148,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
+                        <property name="hadjustment">adjustment1</property>
+                        <property name="vadjustment">adjustment2</property>
                         <property name="enable_search">False</property>
                         <child>
                           <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_type_column">
@@ -626,26 +646,22 @@
       <action-widget 
response="-5">GNUNET_GTK_edit_file_information_confirm_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+  <object class="GtkListStore" id="GNUNET_GTK_keyword_list_store">
     <columns>
-      <!-- column-name extractor_meta_type -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_format -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_type_string -->
+      <!-- column-name keyword -->
       <column type="gchararray"/>
-      <!-- column-name extracotr_meta_value -->
-      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
-    <columns>
-      <!-- column-name description -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-      <!-- column-name helptext -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="priority_adjustment">
+    <property name="upper">10000000</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
 </interface>

Modified: gnunet-gtk/contrib/publish_tab.glade
===================================================================
--- gnunet-gtk/contrib/publish_tab.glade        2010-10-27 12:38:51 UTC (rev 
13432)
+++ gnunet-gtk/contrib/publish_tab.glade        2010-10-27 12:52:52 UTC (rev 
13433)
@@ -4,6 +4,15 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="_publish_frame_window">
     <property name="title">You should never see this</property>
+
+                   <child>
+                      <object class="GtkScrolledWindow" 
id="_publish_frame_scrolled_window">
+                        <property name="height_request">100</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+
     <child>
       <object class="GtkTreeView" id="_publish_frame">
         <property name="visible">True</property>
@@ -42,6 +51,8 @@
       </object>
     </child>
   </object>
+    </child>
+  </object>
   <object class="GtkWindow" id="_publish_label_window">
     <child>
       <object class="GtkHBox" id="_publish_label_hbox">

Modified: gnunet-gtk/contrib/search_dialog.glade
===================================================================
--- gnunet-gtk/contrib/search_dialog.glade      2010-10-27 12:38:51 UTC (rev 
13432)
+++ gnunet-gtk/contrib/search_dialog.glade      2010-10-27 12:52:52 UTC (rev 
13433)
@@ -2,18 +2,24 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
-    <columns>
-      <!-- column-name unique_name -->
-      <column type="gchararray"/>
-      <!-- column-name namespace_root -->
-      <column type="gchararray"/>
-      <!-- column-name nsid -->
-      <column type="gpointer"/>
-      <!-- column-name namespace_description -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="GNUNET_GTK_search_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="GNUNET_GTK_search_dialog">
     <property name="width_request">500</property>
     <property name="height_request">350</property>
@@ -100,53 +106,66 @@
           </packing>
         </child>
         <child>
-          <object class="GtkTreeView" 
id="GNUNET_GTK_search_dialog_namespace_tree_view">
+          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_search_dialog_namespace_scrolled_window">
+            <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="model">GNUNET_GTK_namespace_list_store</property>
-            <property name="reorderable">True</property>
-            <property name="rules_hint">True</property>
-            <signal name="row-activated" 
handler="GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb" 
swapped="no"/>
+            <property name="hadjustment">adjustment1</property>
+            <property name="vadjustment">adjustment2</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
-              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_name_column">
-                <property name="resizable">True</property>
-                <property name="title" translatable="yes">Name</property>
-                <property name="clickable">True</property>
+              <object class="GtkTreeView" 
id="GNUNET_GTK_search_dialog_namespace_tree_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property 
name="model">GNUNET_GTK_namespace_list_store</property>
+                <property name="hadjustment">adjustment1</property>
+                <property name="vadjustment">adjustment2</property>
                 <property name="reorderable">True</property>
-                <property name="sort_indicator">True</property>
+                <property name="rules_hint">True</property>
+                <signal name="row-activated" 
handler="GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb" 
swapped="no"/>
                 <child>
-                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_name_renderer"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_name_column">
+                    <property name="resizable">True</property>
+                    <property name="title" translatable="yes">Name</property>
+                    <property name="clickable">True</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_indicator">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_name_renderer"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_root_column">
-                <property name="resizable">True</property>
-                <property name="title" translatable="yes">Root</property>
-                <property name="clickable">True</property>
                 <child>
-                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_root_renderer"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_root_column">
+                    <property name="resizable">True</property>
+                    <property name="title" translatable="yes">Root</property>
+                    <property name="clickable">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_root_renderer"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_description_column">
-                <property name="title" 
translatable="yes">Description</property>
-                <property name="expand">True</property>
-                <property name="clickable">True</property>
                 <child>
-                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_description_renderer">
-                    <property name="wrap_mode">word</property>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_description_column">
+                    <property name="title" 
translatable="yes">Description</property>
+                    <property name="expand">True</property>
+                    <property name="clickable">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_description_renderer">
+                        <property name="wrap_mode">word</property>
+                      </object>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                      </attributes>
+                    </child>
                   </object>
-                  <attributes>
-                    <attribute name="text">3</attribute>
-                  </attributes>
                 </child>
               </object>
             </child>
@@ -204,10 +223,16 @@
       <action-widget 
response="0">GNUNET_GTK_search_dialog_search_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_search_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+  <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
+    <columns>
+      <!-- column-name unique_name -->
+      <column type="gchararray"/>
+      <!-- column-name namespace_root -->
+      <column type="gchararray"/>
+      <!-- column-name nsid -->
+      <column type="gpointer"/>
+      <!-- column-name namespace_description -->
+      <column type="gchararray"/>
+    </columns>
   </object>
 </interface>

Modified: gnunet-gtk/contrib/search_tab.glade
===================================================================
--- gnunet-gtk/contrib/search_tab.glade 2010-10-27 12:38:51 UTC (rev 13432)
+++ gnunet-gtk/contrib/search_tab.glade 2010-10-27 12:52:52 UTC (rev 13433)
@@ -36,6 +36,14 @@
   </object>
   <object class="GtkWindow" id="_search_result_frame_window">
     <property name="title">You should never see this</property>
+                   <child>
+                      <object class="GtkScrolledWindow" 
id="_search_frame_scrolled_window">
+                        <property name="height_request">100</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+
     <child>
       <object class="GtkTreeView" id="_search_result_frame">
         <property name="visible">True</property>
@@ -132,6 +140,8 @@
       </object>
     </child>
   </object>
+    </child>
+  </object>
   <object class="GtkWindow" id="_search_result_label_window">
     <child>
       <object class="GtkHBox" id="_search_result_label_hbox">

Modified: gnunet-gtk/contrib/select_pseudonym_dialog.glade
===================================================================
--- gnunet-gtk/contrib/select_pseudonym_dialog.glade    2010-10-27 12:38:51 UTC 
(rev 13432)
+++ gnunet-gtk/contrib/select_pseudonym_dialog.glade    2010-10-27 12:52:52 UTC 
(rev 13433)
@@ -2,14 +2,18 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
-    <columns>
-      <!-- column-name namespace_name -->
-      <column type="gchararray"/>
-      <!-- column-name namespace_handle -->
-      <column type="gpointer"/>
-    </columns>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
   <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Select pseudonym...</property>
@@ -24,6 +28,8 @@
           <object class="GtkScrolledWindow" 
id="GNUNET_GTK_select_pseudonym_scrolledwindow">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hadjustment">adjustment1</property>
+            <property name="vadjustment">adjustment2</property>
             <property name="hscrollbar_policy">automatic</property>
             <property name="vscrollbar_policy">automatic</property>
             <child>
@@ -31,6 +37,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property 
name="model">GNUNET_GTK_select_pseudonym_liststore</property>
+                <property name="hadjustment">adjustment1</property>
+                <property name="vadjustment">adjustment2</property>
                 <child>
                   <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_select_pseudonym_tree_view_column">
                     <property name="title" translatable="yes">Name</property>
@@ -106,4 +114,12 @@
       <action-widget 
response="-5">GNUNET_GTK_select_pseudonym_ok_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
+    <columns>
+      <!-- column-name namespace_name -->
+      <column type="gchararray"/>
+      <!-- column-name namespace_handle -->
+      <column type="gpointer"/>
+    </columns>
+  </object>
 </interface>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]