From 92e1436f0e2592cb6c80a87eb7f758d5cb6d90c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1=D1?=
 =?UTF-8?q?=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
Date: Mon, 12 Dec 2011 18:37:24 +0400
Subject: [PATCH 2/3] Remove has-entry, hide columns, del signals

---
 contrib/gnunet_fs_gtk_main_window.glade |  144 ++++++++++++++++---------------
 1 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index 209cc51..dadb2e1 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -2,6 +2,50 @@
 <interface>
   <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
+  <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="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="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="can_focus">False</property>
+    <property name="stock">gtk-new</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-find</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-down</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-index</property>
+  </object>
   <object class="GtkWindow" id="GNUNET_GTK_main_window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">gnunet-fs-gtk</property>
@@ -470,10 +514,6 @@
                     <property name="can_focus">False</property>
                     <property name="model">main_window_search_mime_liststore</property>
                     <property name="active">0</property>
-                    <property name="has_entry">True</property>
-                    <property name="entry_text_column">0</property>
-                    <signal name="popdown" handler="main_window_search_mime_combobox_popdown_cb" swapped="no"/>
-                    <signal name="popup" handler="main_window_search_mime_combobox_popup_cb" swapped="no"/>
                     <child>
                       <object class="GtkCellRendererText" id="main_window_search_mime_renderer_description"/>
                       <attributes>
@@ -481,7 +521,9 @@
                       </attributes>
                     </child>
                     <child>
-                      <object class="GtkCellRendererText" id="main_window_search_mime_renderer_type"/>
+                      <object class="GtkCellRendererText" id="main_window_search_mime_renderer_type">
+                        <property name="visible">False</property>
+                      </object>
                       <attributes>
                         <attribute name="text">0</attribute>
                       </attributes>
@@ -493,13 +535,17 @@
                       </attributes>
                     </child>
                     <child>
-                      <object class="GtkCellRendererText" id="main_window_search_mime_renderer_lossyness"/>
+                      <object class="GtkCellRendererText" id="main_window_search_mime_renderer_lossyness">
+                        <property name="visible">False</property>
+                      </object>
                       <attributes>
                         <attribute name="text">3</attribute>
                       </attributes>
                     </child>
                     <child>
-                      <object class="GtkCellRendererText" id="main_window_search_mime_renderer_freedom"/>
+                      <object class="GtkCellRendererText" id="main_window_search_mime_renderer_freedom">
+                        <property name="visible">False</property>
+                      </object>
                       <attributes>
                         <attribute name="text">4</attribute>
                       </attributes>
@@ -685,30 +731,6 @@
       <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="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="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="adjustment3">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -731,26 +753,6 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-go-up</property>
   </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-new</property>
-  </object>
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-find</property>
-  </object>
-  <object class="GtkImage" id="image5">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-down</property>
-  </object>
-  <object class="GtkImage" id="image6">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-index</property>
-  </object>
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -837,6 +839,26 @@
       </row>
     </data>
   </object>
+  <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="main_window_search_entry"/>
+      <widget name="main_window_search_anonymity_combobox"/>
+      <widget name="main_window_search_mime_combobox"/>
+    </widgets>
+  </object>
+  <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
+    <columns>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+      <!-- column-name Key -->
+      <column type="gpointer"/>
+      <!-- column-name KeyTextual -->
+      <column type="gchararray"/>
+      <!-- column-name Tooltip -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="namespace_selector_window">
     <property name="can_focus">False</property>
     <property name="events">GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
@@ -889,24 +911,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
-    <property name="mode">vertical</property>
-    <widgets>
-      <widget name="main_window_search_entry"/>
-      <widget name="main_window_search_anonymity_combobox"/>
-      <widget name="main_window_search_mime_combobox"/>
-    </widgets>
-  </object>
-  <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
-    <columns>
-      <!-- column-name Name -->
-      <column type="gchararray"/>
-      <!-- column-name Key -->
-      <column type="gpointer"/>
-      <!-- column-name KeyTextual -->
-      <column type="gchararray"/>
-      <!-- column-name Tooltip -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
 </interface>
-- 
1.7.4