gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r28465 - gnunet-gtk/contrib
Date: Thu, 8 Aug 2013 13:55:30 +0200

Author: grothoff
Date: 2013-08-08 13:55:30 +0200 (Thu, 08 Aug 2013)
New Revision: 28465

Added:
   gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
   gnunet-gtk/contrib/gnunet_identity_gtk_main_window.glade
Removed:
   gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade
   gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
Modified:
   gnunet-gtk/contrib/Makefile.am
Log:
-rename files


Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am      2013-08-08 11:47:43 UTC (rev 28464)
+++ gnunet-gtk/contrib/Makefile.am      2013-08-08 11:55:30 UTC (rev 28465)
@@ -41,8 +41,8 @@
   gnunet_fs_gtk_unindex.glade \
   gnunet_fs_gtk_progress_dialog.glade \
   gnunet_gtk_status_bar_menu.glade \
-  gnunet_identity_gtk_organize_ego_dialog.glade \
-  gnunet_identity_gtk_namespace_manager.glade \
+  gnunet_identity_gtk_advertise_dialog.glade \
+  gnunet_identity_gtk_main_window.glade \
   gnunet_peerinfo_gtk_about_window.glade \
   gnunet_peerinfo_gtk_main_window.glade \
   gnunet_statistics_gtk_about_window.glade \

Copied: gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade (from rev 
28464, gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade               
                (rev 0)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-08-08 11:55:30 UTC (rev 28465)
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <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 TypeBin -->
+      <column type="gint"/>
+      <!-- column-name Type -->
+      <column type="gchararray"/>
+      <!-- column-name Value -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <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_identity_advertise_metadata_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_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_identity_advertise_dialog_response_cb" swapped="no"/>
+    <child internal-child="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>
+          <object class="GtkFrame" 
id="GNUNET_GTK_identity_advertise_metadata_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_metadata_alignment">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <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="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" 
id="GNUNET_GTK_identity_advertise_metadata_type_label">
+                            <property name="visible">True</property>
+                            <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>
+                        <child>
+                          <object class="GtkComboBox" 
id="GNUNET_GTK_identity_advertise_metadata_type_combobox">
+                            <property name="visible">True</property>
+                            <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="padding">5</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" 
id="GNUNET_GTK_identity_advertise_metadata_value_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <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">4</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>
+                      <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_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_identity_advertise_metadata_treeview">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</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="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_identity_advertise_metadata_type_column">
+                                <property name="title" 
translatable="yes">Type</property>
+                                <child>
+                                  <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">2</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <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_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">5</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </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="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <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="GtkScrolledWindow" 
id="GNUNET_GTK_identity_advertise_keywords_scrolledwindow">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</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>
+                    <child>
+                      <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_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>
+                        <child>
+                          <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_identity_advertise_keywords_name_text">
+                                <property name="editable">True</property>
+                                <signal name="edited" 
handler="GNUNET_GTK_identity_advertise_keywords_text_edited_cb" swapped="no"/>
+                              </object>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </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">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <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_identity_advertise_keywords_liststore">
+    <columns>
+      <!-- column-name Keyword -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <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>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_identity_gtk_main_window.glade (from rev 
28464, gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_main_window.glade                    
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_main_window.glade    2013-08-08 
11:55:30 UTC (rev 28465)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <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="icon_name">contact-new</property>
+    <child>
+      <object class="GtkVBox" id="GNUNET_GTK_identityvbox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkMenuBar" id="GNUNET_GTK_identity_menubar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkMenuItem" 
id="GNUNET_GTK_identity_file_menuitem">
+                <property name="visible">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>
+            </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="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_identity_scrolled_window">
+            <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_identity_treeview">
+                <property name="height_request">300</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</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_name">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Name</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text">
+                        <property name="editable">True</property>
+                        <signal name="edited" 
handler="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text_edited_cb"
 swapped="no"/>
+                      </object>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Unique 
identifier</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key_text"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <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>

Deleted: gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade      
2013-08-08 11:47:43 UTC (rev 28464)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_namespace_manager.glade      
2013-08-08 11:55:30 UTC (rev 28465)
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <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 TypeBin -->
-      <column type="gint"/>
-      <!-- column-name Type -->
-      <column type="gchararray"/>
-      <!-- column-name Value -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <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_identity_advertise_metadata_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_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_identity_advertise_dialog_response_cb" swapped="no"/>
-    <child internal-child="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>
-          <object class="GtkFrame" 
id="GNUNET_GTK_identity_advertise_metadata_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_metadata_alignment">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <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="GtkHBox" id="hbox1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkLabel" 
id="GNUNET_GTK_identity_advertise_metadata_type_label">
-                            <property name="visible">True</property>
-                            <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>
-                        <child>
-                          <object class="GtkComboBox" 
id="GNUNET_GTK_identity_advertise_metadata_type_combobox">
-                            <property name="visible">True</property>
-                            <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="padding">5</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" 
id="GNUNET_GTK_identity_advertise_metadata_value_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <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">4</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>
-                      <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_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_identity_advertise_metadata_treeview">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</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="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_identity_advertise_metadata_type_column">
-                                <property name="title" 
translatable="yes">Type</property>
-                                <child>
-                                  <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">2</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <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_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">5</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </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="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <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="GtkScrolledWindow" 
id="GNUNET_GTK_identity_advertise_keywords_scrolledwindow">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</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>
-                    <child>
-                      <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_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>
-                        <child>
-                          <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_identity_advertise_keywords_name_text">
-                                <property name="editable">True</property>
-                                <signal name="edited" 
handler="GNUNET_GTK_identity_advertise_keywords_text_edited_cb" swapped="no"/>
-                              </object>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </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">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <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_identity_advertise_keywords_liststore">
-    <columns>
-      <!-- column-name Keyword -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <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>
-</interface>

Deleted: gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade    
2013-08-08 11:47:43 UTC (rev 28464)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_organize_ego_dialog.glade    
2013-08-08 11:55:30 UTC (rev 28465)
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <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="icon_name">contact-new</property>
-    <child>
-      <object class="GtkVBox" id="GNUNET_GTK_identityvbox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkMenuBar" id="GNUNET_GTK_identity_menubar">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkMenuItem" 
id="GNUNET_GTK_identity_file_menuitem">
-                <property name="visible">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>
-            </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="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_identity_scrolled_window">
-            <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_identity_treeview">
-                <property name="height_request">300</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</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_name">
-                    <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Name</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text">
-                        <property name="editable">True</property>
-                        <signal name="edited" 
handler="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text_edited_cb"
 swapped="no"/>
-                      </object>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key">
-                    <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Unique 
identifier</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key_text"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <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]