gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r28464 - gnunet-gtk/contrib
Date: Thu, 8 Aug 2013 13:47:43 +0200

Author: grothoff
Date: 2013-08-08 13:47:43 +0200 (Thu, 08 Aug 2013)
New Revision: 28464

Removed:
   gnunet-gtk/contrib/gnunet_identity_gtk_create_ego_dialog.glade
Modified:
   gnunet-gtk/contrib/Makefile.am
   gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade
   gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
Log:
initial work on identity dialogs, based on former FS dialogs

Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am      2013-08-08 11:27:12 UTC (rev 28463)
+++ gnunet-gtk/contrib/Makefile.am      2013-08-08 11:47:43 UTC (rev 28464)
@@ -41,7 +41,6 @@
   gnunet_fs_gtk_unindex.glade \
   gnunet_fs_gtk_progress_dialog.glade \
   gnunet_gtk_status_bar_menu.glade \
-  gnunet_identity_gtk_create_ego_dialog.glade \
   gnunet_identity_gtk_organize_ego_dialog.glade \
   gnunet_identity_gtk_namespace_manager.glade \
   gnunet_peerinfo_gtk_about_window.glade \

Deleted: gnunet-gtk/contrib/gnunet_identity_gtk_create_ego_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_create_ego_dialog.glade      
2013-08-08 11:27:12 UTC (rev 28463)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_create_ego_dialog.glade      
2013-08-08 11:47:43 UTC (rev 28464)
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkDialog" id="GNUNET_GTK_create_namespace_dialog">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="can_default">True</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Create namespace</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="icon_name">folder-new</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <signal name="response" 
handler="GNUNET_GTK_create_namespace_dialog_response_cb" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_create_namespace_vbox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" id="GNUNET_GTK_create_namespace_value_hbox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkLabel" 
id="GNUNET_GTK_create_namespace_name_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Name:</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">4</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" 
id="GNUNET_GTK_create_namespace_name_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <property name="activates_default">True</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
-                <property name="primary_icon_sensitive">True</property>
-                <property name="secondary_icon_sensitive">True</property>
-                <signal name="insert-text" 
handler="GNUNET_FS_GTK_create_namespace_insert_text_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">5</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_GTK_create_namespace_dialog-action_area">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_create_namespace_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_create_namespace_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_create_namespace_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_create_namespace_ok_button</action-widget>
-    </action-widgets>
-  </object>
-</interface>

Modified: gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade      
2013-08-08 11:27:12 UTC (rev 28463)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade      
2013-08-08 11:47:43 UTC (rev 28464)
@@ -2,364 +2,204 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkListStore" 
id="GNUNET_GTK_namespace_manager_known_liststore">
+  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_keywords_hadj">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" 
id="GNUNET_GTK_identity_advertise_metadata_liststore">
     <columns>
-      <!-- column-name IsMine -->
-      <column type="gboolean"/>
-      <!-- column-name Rank -->
+      <!-- column-name TypeBin -->
       <column type="gint"/>
-      <!-- column-name NamespaceName -->
+      <!-- column-name Type -->
       <column type="gchararray"/>
-      <!-- column-name NamespaceKey -->
+      <!-- column-name Value -->
       <column type="gchararray"/>
-      <!-- column-name NamespaceKeyBinary -->
-      <column type="gpointer"/>
-      <!-- column-name OrderListRowReference -->
-      <column type="gpointer"/>
-      <!-- column-name MetaData -->
-      <column type="gpointer"/>
-      <!-- column-name NonUniqueName -->
-      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_namespace_manager_known_namespaces_hadj">
+  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_metadata_vadj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_namespace_manager_known_namespaces_vadj">
+  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_metadata_hadj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_namespace_manager_namespace_details_hadj">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkDialog" id="GNUNET_GTK_namespace_manager_dialog">
+  <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <signal name="response" 
handler="GNUNET_GTK_namespace_manager_dialog_response_cb" swapped="no"/>
+    <signal name="response" 
handler="GNUNET_GTK_identity_advertise_dialog_response_cb" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_namespace_manager_vbox">
+      <object class="GtkVBox" id="GNUNET_GTK_identity_advertise_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_GTK_namespace_manager_action_area">
+        <child>
+          <object class="GtkFrame" 
id="GNUNET_GTK_identity_advertise_metadata_frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_apply_button">
-                <property name="label">gtk-apply</property>
-                <property name="use_action_appearance">False</property>
+              <object class="GtkAlignment" 
id="GNUNET_GTK_identity_advertise_metadata_alignment">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Saves all 
changes made in this dialog to disk without closing the dialog.</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Saves all 
changes made in this dialog to disk and closes the dialog.</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Closes the 
dialog. Changes made in this dialog will not be preserved.</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVPaned" 
id="GNUNET_GTK_namespace_manager_main_vpaned">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <child>
-              <object class="GtkHPaned" 
id="GNUNET_GTK_namespace_manager_top_hpaned">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkVBox" 
id="GNUNET_GTK_namespace_manager_known_namespaces_vbox">
+                  <object class="GtkVBox" 
id="GNUNET_GTK_identity_advertise_metadata_details_vbox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_namespace_manager_known_namespaces_label">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Known 
namespaces:
-Select a namespace to see its complete metadata. Click "Delete" to delete 
(forget) namespace.
-Namespace names are editable.</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_namespace_manager_known_namespaces_scrolledwindow">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property 
name="hadjustment">GNUNET_GTK_namespace_manager_known_namespaces_hadj</property>
-                        <property 
name="vadjustment">GNUNET_GTK_namespace_manager_known_namespaces_vadj</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkTreeView" 
id="GNUNET_GTK_namespace_manager_known_treeview">
+                          <object class="GtkLabel" 
id="GNUNET_GTK_identity_advertise_metadata_type_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property 
name="model">GNUNET_GTK_namespace_manager_known_liststore</property>
-                            <property 
name="hadjustment">GNUNET_GTK_namespace_manager_known_namespaces_hadj</property>
-                            <property 
name="vadjustment">GNUNET_GTK_namespace_manager_known_namespaces_vadj</property>
-                            <property name="rules_hint">True</property>
-                            <property name="search_column">2</property>
-                            <property name="show_expanders">False</property>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_is_mine_column">
-                                <property name="title" translatable="yes">Is 
mine</property>
-                                <property name="clickable">True</property>
-                                <property name="sort_indicator">True</property>
-                                <property name="sort_column_id">0</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="GNUNET_GTK_namespace_manager_is_mine_toggle">
-                                    <property 
name="activatable">False</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_rank_column">
-                                <property name="title" 
translatable="yes">Rank</property>
-                                <property name="clickable">True</property>
-                                <property name="sort_indicator">True</property>
-                                <property name="sort_column_id">1</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_manager_rank_text"/>
-                                  <attributes>
-                                    <attribute name="text">1</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_namespace_name_column">
-                                <property name="title" 
translatable="yes">Name</property>
-                                <property name="clickable">True</property>
-                                <property name="sort_indicator">True</property>
-                                <property name="sort_column_id">2</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_manager_name_text">
-                                    <property name="editable">True</property>
-                                    <signal name="editing-started" 
handler="GNUNET_GTK_namespace_manager_name_text_editing_started_cb" 
swapped="no"/>
-                                    <signal name="edited" 
handler="GNUNET_GTK_namespace_manager_name_text_edited_cb" swapped="no"/>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">2</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_namespace_id_column">
-                                <property name="title" 
translatable="yes">Identifier</property>
-                                <property name="clickable">True</property>
-                                <property name="sort_indicator">True</property>
-                                <property name="sort_column_id">3</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_manager_namespace_id_text"/>
-                                  <attributes>
-                                    <attribute name="text">3</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
+                            <property name="can_focus">False</property>
+                            <property name="label" 
translatable="yes">Type:</property>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="padding">5</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHButtonBox" 
id="GNUNET_GTK_namespace_manager_known_namespaces_buttonbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="border_width">5</property>
-                        <property name="spacing">5</property>
-                        <property name="layout_style">end</property>
                         <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_known_namespaces_delete_button">
-                            <property name="label">gtk-delete</property>
-                            <property 
name="use_action_appearance">False</property>
+                          <object class="GtkComboBox" 
id="GNUNET_GTK_identity_advertise_metadata_type_combobox">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="tooltip_text" 
translatable="yes">Makes GNUnet "forget" about selected known namespace.
-However, GNUnet will be able to learn about this namespace, if it ever 
discovers it again.</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_known_namespaces_delete_button_clicked_cb"
 swapped="no"/>
+                            <property name="can_focus">False</property>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" 
id="GNUNET_GTK_identity_advertise_metadata_value_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" 
translatable="yes">Value:</property>
+                          </object>
+                          <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">0</property>
+                            <property name="padding">5</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button">
-                            <property name="label" translatable="yes">Swap 
_Rank</property>
-                            <property 
name="use_action_appearance">False</property>
+                          <object class="GtkEntry" 
id="GNUNET_GTK_identity_advertise_metadata_value_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="tooltip_text" 
translatable="yes">Changes the rank value of the selected namespace in "Known 
namespaces" list.
-If it had rank 0, it's given rank -1, otherwise the sign of its rank is 
flipped.
-Only namespaces with positive ranks are displayed in "Namespace order" 
list.</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button_clicked_cb"
 swapped="no"/>
+                            <property name="invisible_char">●</property>
+                            <property name="invisible_char_set">True</property>
+                            <property 
name="primary_icon_activatable">False</property>
+                            <property 
name="secondary_icon_activatable">False</property>
+                            <property 
name="primary_icon_sensitive">True</property>
+                            <property 
name="secondary_icon_sensitive">True</property>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHButtonBox" 
id="GNUNET_GTK_identity_advertise_metadata_buttonbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="border_width">5</property>
+                            <property name="spacing">5</property>
+                            <property name="layout_style">end</property>
+                            <child>
+                              <object class="GtkButton" 
id="GNUNET_GTK_identity_advertise_metadata_add_button">
+                                <property name="label">gtk-add</property>
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">True</property>
+                                <property name="use_stock">True</property>
+                                <signal name="clicked" 
handler="GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb" 
swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">1</property>
+                            <property name="position">4</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" 
id="GNUNET_GTK_namespace_manager_namespace_order_vbox_vbox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_namespace_manager_namespace_order_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Namespace 
order:
-Drag rows to change namespace order, click "Apply" to save it.</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="padding">5</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_namespace_manager_namespace_order_scrolledwindow">
+                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_identity_advertise_metadata_scrolledwindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property 
name="hadjustment">GNUNET_GTK_namespace_manager_namespace_order_hadj</property>
-                        <property 
name="vadjustment">GNUNET_GTK_namespace_manager_namespace_order_vadj</property>
+                        <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
+                        <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
                         <property name="hscrollbar_policy">automatic</property>
                         <property name="vscrollbar_policy">automatic</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkTreeView" 
id="GNUNET_GTK_namespace_manager_namespace_order_treeview">
+                          <object class="GtkTreeView" 
id="GNUNET_GTK_identity_advertise_metadata_treeview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property 
name="model">GNUNET_GTK_namespace_manager_namespace_order_liststore</property>
-                            <property 
name="hadjustment">GNUNET_GTK_namespace_manager_namespace_order_hadj</property>
-                            <property 
name="vadjustment">GNUNET_GTK_namespace_manager_namespace_order_vadj</property>
+                            <property 
name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
+                            <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
+                            <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
                             <property name="headers_clickable">False</property>
-                            <property name="reorderable">True</property>
                             <property name="rules_hint">True</property>
                             <property name="search_column">0</property>
                             <property name="show_expanders">False</property>
                             <property name="rubber_banding">True</property>
+                            <property name="enable_grid_lines">both</property>
+                            <signal name="key-press-event" 
handler="GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb" 
swapped="no"/>
+                            <signal name="delete-event" 
handler="GNUNET_GTK_identity_advertise_metadata_treeview_delete_event_cb" 
swapped="no"/>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_namespace_order_rank_column">
-                                <property name="title" 
translatable="yes">Rank</property>
-                                <property name="clickable">True</property>
-                                <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb" 
swapped="no"/>
+                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_identity_advertise_metadata_type_column">
+                                <property name="title" 
translatable="yes">Type</property>
                                 <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_manager_namespace_order_rank_text"/>
+                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_identity_advertise_metadata_type_text">
+                                    <signal name="edited" 
handler="GNUNET_GTK_identity_advertise_metadata_type_text_edited_cb" 
swapped="no"/>
+                                  </object>
                                   <attributes>
-                                    <attribute name="text">0</attribute>
+                                    <attribute name="text">2</attribute>
                                   </attributes>
                                 </child>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_namespace_order_name_column">
-                                <property name="title" 
translatable="yes">Name</property>
-                                <property name="clickable">True</property>
-                                <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb" 
swapped="no"/>
+                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_identity_advertise_metadata_value_column">
+                                <property name="title" 
translatable="yes">Value</property>
                                 <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_manager_namespace_order_name_text"/>
+                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_identity_advertise_metadata_value_text">
+                                    <property name="editable">True</property>
+                                    <signal name="edited" 
handler="GNUNET_GTK_identity_advertise_metadata_value_text_edited_cb" 
swapped="no"/>
+                                  </object>
                                   <attributes>
-                                    <attribute name="text">1</attribute>
+                                    <attribute name="text">5</attribute>
                                   </attributes>
                                 </child>
                               </object>
                             </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_namespace_order_identifier_column">
-                                <property name="title" 
translatable="yes">Identifier</property>
-                                <property name="clickable">True</property>
-                                <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb" 
swapped="no"/>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_manager_namespace_order_identifier_text"/>
-                                  <attributes>
-                                    <attribute name="text">2</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
                           </object>
                         </child>
                       </object>
@@ -369,112 +209,111 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkHButtonBox" 
id="GNUNET_GTK_namespace_manager_namespace_order_buttonbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="border_width">5</property>
-                        <property name="layout_style">end</property>
-                        <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_namespace_order_apply">
-                            <property name="label">gtk-apply</property>
-                            <property 
name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="tooltip_text" 
translatable="yes">Convert the order in which namespaces are arranged in 
"Namespace order" list to ranks.
-Top namespace is assigned rank 0, namespace below it - rank 1, and so 
on.</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_namespace_order_apply_clicked_cb" 
swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
                   </object>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">False</property>
-                  </packing>
                 </child>
               </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" 
id="GNUNET_GTK_identity_advertise_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Namespace 
description to use in advertisement:&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" 
id="GNUNET_GTK_identity_advertise_action_area">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_identity_advertise_ok_button">
+                <property name="label">gtk-execute</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Execute 
advertisement.</property>
+                <property name="use_stock">True</property>
+              </object>
               <packing>
-                <property name="resize">True</property>
-                <property name="shrink">False</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_namespace_manager_namespace_details_vbox">
+              <object class="GtkButton" 
id="GNUNET_GTK_identity_advertise_cancel_button">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Closes the 
dialog without advertising the namespace.</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" 
id="GNUNET_GTK_identity_advertise_keywords_frame">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" 
id="GNUNET_GTK_identity_advertise_keywords_alignment">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_namespace_manager_namespace_details_label">
+                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_identity_advertise_keywords_scrolledwindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Selected 
namespace details:
-Metadata can be &lt;s&gt;added,&lt;/s&gt; deleted and edited. Click "Apply" to 
save metadata changes.</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_namespace_manager_namespace_details_scrolledwindow">
-                    <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property 
name="hadjustment">GNUNET_GTK_namespace_manager_namespace_details_hadj</property>
-                    <property 
name="vadjustment">GNUNET_GTK_namespace_manager_namespace_details_vadj</property>
+                    <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_order_hadj</property>
+                    <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_order_vadj</property>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkTreeView" 
id="GNUNET_GTK_namespace_manager_namespace_details_treeview">
+                      <object class="GtkTreeView" 
id="GNUNET_GTK_identity_advertise_keywords_treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property 
name="model">GNUNET_GTK_namespace_manager_namespace_details_liststore</property>
-                        <property 
name="hadjustment">GNUNET_GTK_namespace_manager_namespace_details_hadj</property>
-                        <property 
name="vadjustment">GNUNET_GTK_namespace_manager_namespace_details_vadj</property>
-                        <property name="headers_clickable">False</property>
-                        <property name="rules_hint">True</property>
+                        <property 
name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
+                        <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_order_hadj</property>
+                        <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_order_vadj</property>
+                        <property name="reorderable">True</property>
+                        <property name="enable_search">False</property>
                         <property name="search_column">0</property>
                         <property name="show_expanders">False</property>
                         <property name="rubber_banding">True</property>
-                        <property name="enable_grid_lines">both</property>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_details_type_column">
-                            <property name="title" 
translatable="yes">Type</property>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_identity_advertise_keywords_name_column">
+                            <property name="title" 
translatable="yes">Name</property>
+                            <property name="clickable">True</property>
+                            <signal name="clicked" 
handler="GNUNET_GTK_identity_advertise_keywords_column_clicked_cb" 
swapped="no"/>
                             <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_manager_namespace_details_type_text">
-                                <signal name="edited" 
handler="GNUNET_GTK_namespace_manager_namespace_details_type_text_edited_cb" 
swapped="no"/>
-                              </object>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_manager_details_value_column">
-                            <property name="title" 
translatable="yes">Value</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_manager_namespace_details_value_text">
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_identity_advertise_keywords_name_text">
                                 <property name="editable">True</property>
-                                <signal name="edited" 
handler="GNUNET_GTK_namespace_manager_namespace_details_value_text_edited_cb" 
swapped="no"/>
+                                <signal name="edited" 
handler="GNUNET_GTK_identity_advertise_keywords_text_edited_cb" swapped="no"/>
                               </object>
                               <attributes>
-                                <attribute name="text">5</attribute>
+                                <attribute name="text">1</attribute>
                               </attributes>
                             </child>
                           </object>
@@ -482,145 +321,40 @@
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
-                <child>
-                  <object class="GtkHButtonBox" 
id="GNUNET_GTK_namespace_manager_namespace_details_buttonbox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="border_width">5</property>
-                    <property name="spacing">5</property>
-                    <property name="layout_style">end</property>
-                    <child>
-                      <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_namespace_details_add_button">
-                        <property name="label">gtk-add</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Adds 
a new metadata Type=Value pair to the list.
-This functionality is not available at the moment.</property>
-                        <property name="use_stock">True</property>
-                        <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_namespace_details_add_button_clicked_cb" 
swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_namespace_details_delete_button">
-                        <property name="label">gtk-delete</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" 
translatable="yes">Removes selected Type=Value pair from metadata list.
-The change will not last unless you click on "Apply" button before closing the 
window or selecing some other known namespace.</property>
-                        <property name="use_stock">True</property>
-                        <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_namespace_details_delete_button_clicked_cb"
 swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" 
id="GNUNET_GTK_namespace_manager_namespace_details_apply_button">
-                        <property name="label">gtk-apply</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" 
translatable="yes">Applies changes made in metadata list to currently selected 
known namespace.</property>
-                        <property name="use_stock">True</property>
-                        <signal name="clicked" 
handler="GNUNET_GTK_namespace_manager_namespace_details_apply_button_clicked_cb"
 swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">False</property>
-              </packing>
             </child>
+            <child type="label">
+              <object class="GtkLabel" id="GNUNET_GTK_identity_keywords_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Keywords to 
advertise namespace under:&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget 
response="-10">GNUNET_GTK_namespace_manager_apply_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_namespace_manager_ok_button</action-widget>
-      <action-widget 
response="-6">GNUNET_GTK_namespace_manager_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_identity_advertise_ok_button</action-widget>
+      <action-widget 
response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_namespace_manager_namespace_details_liststore">
+  <object class="GtkListStore" 
id="GNUNET_GTK_identity_advertise_keywords_liststore">
     <columns>
-      <!-- column-name PluginName -->
+      <!-- column-name Keyword -->
       <column type="gchararray"/>
-      <!-- column-name TypeBin -->
-      <column type="gint"/>
-      <!-- column-name Type -->
-      <column type="gchararray"/>
-      <!-- column-name Format -->
-      <column type="gint"/>
-      <!-- column-name DataMime -->
-      <column type="gchararray"/>
-      <!-- column-name Value -->
-      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_namespace_manager_namespace_details_vadj">
+  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_keywords_vadj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_namespace_manager_namespace_order_hadj">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_namespace_manager_namespace_order_liststore">
-    <columns>
-      <!-- column-name Rank -->
-      <column type="gint"/>
-      <!-- column-name Name -->
-      <column type="gchararray"/>
-      <!-- column-name Identifier -->
-      <column type="gchararray"/>
-      <!-- column-name IdentifierBin -->
-      <column type="gpointer"/>
-      <!-- column-name KnownListRowReference -->
-      <column type="gpointer"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_namespace_manager_namespace_order_vadj">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>

Modified: gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade    
2013-08-08 11:27:12 UTC (rev 28463)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade    
2013-08-08 11:47:43 UTC (rev 28464)
@@ -2,101 +2,112 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkDialog" id="GNUNET_GTK_namespace_organizer_dialog">
+  <object class="GtkListStore" id="GNUNET_GTK_identity_liststore">
+    <columns>
+      <!-- column-name NamespaceName -->
+      <column type="gchararray"/>
+      <!-- column-name NamespaceKey -->
+      <column type="gchararray"/>
+      <!-- column-name NamespaceKeyBinary -->
+      <column type="gpointer"/>
+    </columns>
+  </object>
+  <object class="GtkWindow" id="GNUNET_GTK_identity_window">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Namespace selection</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="has_separator">True</property>
-    <signal name="response" 
handler="GNUNET_GTK_namespace_organizer_dialog_response_cb" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_namespace_organizer_vbox">
+    <property name="icon_name">contact-new</property>
+    <child>
+      <object class="GtkVBox" id="GNUNET_GTK_identityvbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_GTK_namespace_organizer_action_area">
+        <child>
+          <object class="GtkMenuBar" id="GNUNET_GTK_identity_menubar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_organizer_close_button">
-                <property name="label">gtk-close</property>
+              <object class="GtkMenuItem" 
id="GNUNET_GTK_identity_file_menuitem">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Saves all 
changes made in this dialog to disk and closes the dialog.</property>
-                <property name="use_stock">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="GNUNET_GTK_identity_file_menu">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_identity_quit_imagemenuitem">
+                        <property name="label">gtk-quit</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" 
handler="GNUNET_GTK_identity_quit_imagemenuitem_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
             </child>
+            <child>
+              <object class="GtkMenuItem" 
id="GNUNET_GTK_identity_help_menuitem">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="GNUNET_GTK_identity_help_menu">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_identity_about_imagemenuitem">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" 
handler="GNUNET_GTK_identity_about_imagemenuitem_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" 
id="GNUNET_GTK_namespace_organizer_namespaces_label">
+          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_identity_scrolled_window">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="yes">List of the namespaces 
you have private key for.
-You can create new namespaces, delete or rename existing ones.
-Select one of the namespaces that will be (optionally) used for 
publishing.</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_namespace_organizer_scrolled">
-            <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>
-              <object class="GtkTreeView" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview">
+              <object class="GtkTreeView" id="GNUNET_GTK_identity_treeview">
                 <property name="height_request">300</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property 
name="model">GNUNET_GTK_namespace_organizer_namespaces_liststore</property>
+                <property name="model">GNUNET_GTK_identity_liststore</property>
+                <property name="hadjustment">adjustment1</property>
+                <property name="vadjustment">adjustment2</property>
                 <property name="headers_clickable">False</property>
+                <property name="reorderable">True</property>
                 <property name="rules_hint">True</property>
                 <property name="enable_search">False</property>
+                <property name="search_column">0</property>
                 <property name="show_expanders">False</property>
                 <property name="enable_grid_lines">horizontal</property>
                 <property name="tooltip_column">5</property>
+                <signal name="button-press-event" 
handler="GNUNET_GTK_identity_treeview_button_press_event_cb" swapped="no"/>
+                <signal name="key-press-event" 
handler="GNUNET_GTK_identity_treeview_key_press_event_cb" swapped="no"/>
                 <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_usethis">
-                    <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Use for 
publications</property>
-                    <child>
-                      <object class="GtkCellRendererToggle" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_usethis_toggle">
-                        <property name="radio">True</property>
-                        <signal name="toggled" 
handler="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_usethis_toggle_toggled_cb"
 swapped="no"/>
-                      </object>
-                      <attributes>
-                        <attribute name="active">3</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
                   <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name">
                     <property name="sizing">autosize</property>
                     <property name="title" translatable="yes">Name</property>
-                    <property name="expand">True</property>
                     <child>
                       <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text">
                         <property name="editable">True</property>
@@ -111,7 +122,7 @@
                 <child>
                   <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key">
                     <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Hash of the 
public key</property>
+                    <property name="title" translatable="yes">Unique 
identifier</property>
                     <child>
                       <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key_text"/>
                       <attributes>
@@ -126,128 +137,20 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkHBox" 
id="GNUNET_GTK_namespace_organizer_namespaces_extra_buttons_hbox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_organizer_namespaces_create_namespace_button">
-                <property name="label" translatable="yes">Create</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Generate new 
namespace.</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_namespace_organizer_namespaces_create_namespace_button_clicked_cb"
 swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_organizer_namespaces_advertise_namespace_button">
-                <property name="label" translatable="yes">Advertise</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Make 
namespace findable with global file-sharing searches.</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_namespace_organizer_namespaces_advertise_namespace_button_clicked_cb"
 swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_button">
-                <property name="label" translatable="yes">Delete</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Delete 
namespace key.</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_button_clicked_cb"
 swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_button">
-                <property name="label" translatable="yes">Yes, delete 
it!</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_button_clicked_cb"
 swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_unconfirmation_button">
-                <property name="label" translatable="yes">No, keep 
it.</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_unconfirmation_button_clicked_cb"
 swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" 
id="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_label">
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Are you sure? Once 
you delete the private key of a namespace, it's lost forever!</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">5</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget 
response="-5">GNUNET_GTK_namespace_organizer_close_button</action-widget>
-    </action-widgets>
   </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_namespace_organizer_namespaces_liststore">
-    <columns>
-      <!-- column-name NamespaceName -->
-      <column type="gchararray"/>
-      <!-- column-name NamespaceKey -->
-      <column type="gchararray"/>
-      <!-- column-name NamespaceKeyBinary -->
-      <column type="gpointer"/>
-      <!-- column-name UseThis -->
-      <column type="gboolean"/>
-      <!-- column-name ActualName -->
-      <column type="gchararray"/>
-      <!-- column-name ToolTip -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">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>
+  </object>
 </interface>




reply via email to

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