gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r29095 - gnunet-gtk/contrib
Date: Sat, 7 Sep 2013 20:45:18 +0200

Author: grothoff
Date: 2013-09-07 20:45:18 +0200 (Sat, 07 Sep 2013)
New Revision: 29095

Modified:
   gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
   gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
Log:
-delete dead dialog

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade  2013-09-07 17:49:05 UTC 
(rev 29094)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade  2013-09-07 18:45:18 UTC 
(rev 29095)
@@ -90,6 +90,7 @@
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" 
id="GNUNET_GTK_main_menu_file_sharing">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_File 
sharing</property>
@@ -100,6 +101,7 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_publish">
                         <property name="label" 
translatable="yes">_Publish</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" 
translatable="yes">Publish files or directories on GNUnet</property>
@@ -113,6 +115,7 @@
                     </child>
                     <child>
                       <object class="GtkMenuItem" 
id="GNUNET_GTK_main_menu_unindex">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_List 
indexed files</property>
@@ -129,6 +132,7 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_download_uri">
                         <property name="label" 
translatable="yes">_Download</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" 
translatable="yes">Download a file or directory with a known URI.</property>
@@ -143,6 +147,7 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_open_gnunet_directory">
                         <property name="label" translatable="yes">_Open GNUnet 
directory</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Use 
this option to browse a GNUnet directory file that has been previously 
downloaded.</property>
@@ -163,6 +168,7 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_quit">
                         <property name="label">gtk-quit</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Exit 
gnunet-fs-gtk.  Active file-sharing operations will resume upon 
restart.</property>
@@ -179,6 +185,7 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_edit">
+                <property name="use_action_appearance">False</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
@@ -189,6 +196,7 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_edit_preferences">
                         <property name="label">gtk-preferences</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Edit 
the system configuration.</property>
@@ -203,6 +211,7 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_view">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_View</property>
@@ -213,6 +222,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_metadata">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Show 
meta data in main window</property>
@@ -224,6 +234,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_preview">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Show 
preview (when available)</property>
@@ -235,6 +246,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_search_preview">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Show 
search box in main window</property>
@@ -250,6 +262,7 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_help">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Help</property>
@@ -261,6 +274,7 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_help_about">
                         <property name="label">gtk-about</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" 
translatable="yes">Display information about this version of 
gnunet-fs-gtk</property>
@@ -327,6 +341,7 @@
                 <child>
                   <object class="GtkButton" id="main_window_search_button">
                     <property name="label" translatable="yes">Find:</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>
@@ -584,6 +599,7 @@
                         <child>
                           <object class="GtkButton" 
id="GNUNET_GTK_search_frame_download_filename_change_button">
                             <property name="label">…</property>
+                            <property 
name="use_action_appearance">False</property>
                             <property name="height_request">1</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -659,6 +675,7 @@
                         <child>
                           <object class="GtkCheckButton" 
id="GNUNET_GTK_search_frame_download_recursive_checkbox">
                             <property name="label" 
translatable="yes">Recursive</property>
+                            <property 
name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -685,6 +702,7 @@
                         <child>
                           <object class="GtkButton" 
id="GNUNET_GTK_search_frame_download_download_button">
                             <property name="label" 
translatable="yes">Download!</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>
@@ -813,6 +831,27 @@
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="GNUNET_FS_GTK_download_frame_vsize_group">
+    <property name="mode">vertical</property>
+    <property name="ignore_hidden">True</property>
+    <widgets>
+      <widget name="GNUNET_GTK_search_frame_download_location_label"/>
+      <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
+      <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
+      <widget name="GNUNET_GTK_search_frame_download_location_chooser"/>
+      <widget name="GNUNET_GTK_search_frame_download_filename_entry"/>
+      <widget name="GNUNET_GTK_search_frame_download_filename_change_button"/>
+      <widget name="main_window_download_anonymity_combobox_alignment"/>
+      <widget name="GNUNET_GTK_search_frame_download_recursive_checkbox"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" 
id="GNUNET_GTK_download_frame_labels_size_group">
+    <widgets>
+      <widget name="GNUNET_GTK_search_frame_download_location_label"/>
+      <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
+      <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
+    </widgets>
+  </object>
   <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
     <columns>
       <!-- column-name extractor_meta_type -->
@@ -921,6 +960,14 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-go-down</property>
   </object>
+  <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="main_window_search_entry"/>
+      <widget name="main_window_search_anonymity_combobox"/>
+      <widget name="main_window_search_mime_combobox"/>
+    </widgets>
+  </object>
   <object class="GtkAdjustment" id="expiration_year_adjustment">
     <property name="upper">9999</property>
     <property name="step_increment">1</property>
@@ -941,35 +988,6 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-index</property>
   </object>
-  <object class="GtkSizeGroup" id="GNUNET_FS_GTK_download_frame_vsize_group">
-    <property name="mode">vertical</property>
-    <property name="ignore_hidden">True</property>
-    <widgets>
-      <widget name="GNUNET_GTK_search_frame_download_location_label"/>
-      <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
-      <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
-      <widget name="GNUNET_GTK_search_frame_download_location_chooser"/>
-      <widget name="GNUNET_GTK_search_frame_download_filename_entry"/>
-      <widget name="GNUNET_GTK_search_frame_download_filename_change_button"/>
-      <widget name="main_window_download_anonymity_combobox_alignment"/>
-      <widget name="GNUNET_GTK_search_frame_download_recursive_checkbox"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" 
id="GNUNET_GTK_download_frame_labels_size_group">
-    <widgets>
-      <widget name="GNUNET_GTK_search_frame_download_location_label"/>
-      <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
-      <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
-    <property name="mode">vertical</property>
-    <widgets>
-      <widget name="main_window_search_entry"/>
-      <widget name="main_window_search_anonymity_combobox"/>
-      <widget name="main_window_search_mime_combobox"/>
-    </widgets>
-  </object>
   <object class="GtkListStore" id="main_window_search_mime_liststore">
     <columns>
       <!-- column-name MIME -->
@@ -1031,6 +1049,7 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="Copy selection">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Copy selection</property>
@@ -1050,71 +1069,6 @@
       </row>
     </data>
   </object>
-  <object class="GtkWindow" id="namespace_selector_window">
-    <property name="can_focus">False</property>
-    <property name="events">GDK_LEAVE_NOTIFY_MASK | 
GDK_STRUCTURE_MASK</property>
-    <property name="resizable">False</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dropdown-menu</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="urgency_hint">True</property>
-    <property name="decorated">False</property>
-    <property name="deletable">False</property>
-    <property name="transient_for">GNUNET_GTK_main_window</property>
-    <property name="mnemonics_visible">False</property>
-    <signal name="leave-notify-event" 
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb" 
swapped="no"/>
-    <signal name="enter-notify-event" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb" 
swapped="no"/>
-    <child>
-      <object class="GtkVBox" id="namespace_selector_main_vbox">
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkTreeView" id="namespace_selector_treeview">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="is_focus">True</property>
-            <property 
name="model">main_window_search_namespace_treestore</property>
-            <property name="headers_clickable">False</property>
-            <property name="search_column">0</property>
-            <property name="hover_selection">True</property>
-            <property name="hover_expand">True</property>
-            <property name="tooltip_column">3</property>
-            <signal name="button-press-event" 
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb" 
swapped="no"/>
-            <signal name="button-release-event" 
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb" 
swapped="no"/>
-            <child>
-              <object class="GtkTreeViewColumn" id="name_column">
-                <property name="sizing">autosize</property>
-                <property name="title">Name</property>
-                <child>
-                  <object class="GtkCellRendererText" 
id="namespace_selector_name_column_text_cell"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkTreeViewColumn" id="key_column">
-                <property name="sizing">autosize</property>
-                <property name="title">Root</property>
-                <child>
-                  <object class="GtkCellRendererText" 
id="namespace_selector_key_column_text_cell"/>
-                  <attributes>
-                    <attribute name="text">2</attribute>
-                  </attributes>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkImage" id="new_stock_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>

Modified: gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-09-07 17:49:05 UTC (rev 29094)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-09-07 18:45:18 UTC (rev 29095)
@@ -18,6 +18,16 @@
     <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="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="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -102,6 +112,7 @@
                             <property 
name="secondary_icon_activatable">False</property>
                             <property 
name="primary_icon_sensitive">True</property>
                             <property 
name="secondary_icon_sensitive">True</property>
+                            <signal name="changed" 
handler="GNUNET_GTK_identity_advertise_metadata_value_entry_changed_cb" 
swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -119,6 +130,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_identity_advertise_metadata_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>
@@ -170,14 +182,11 @@
                             <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>
+                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_identity_advertise_metadata_type_text"/>
                                   <attributes>
                                     <attribute name="text">2</attribute>
                                   </attributes>
@@ -234,6 +243,7 @@
             <child>
               <object class="GtkButton" 
id="GNUNET_GTK_identity_advertise_ok_button">
                 <property name="label">gtk-execute</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -250,6 +260,7 @@
             <child>
               <object class="GtkButton" 
id="GNUNET_GTK_identity_advertise_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>
@@ -305,7 +316,6 @@
                           <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>
@@ -345,11 +355,6 @@
       <action-widget 
response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
     </action-widgets>
   </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="GtkListStore" 
id="GNUNET_GTK_identity_advertise_metadata_liststore">
     <columns>
       <!-- column-name TypeBin -->
@@ -360,11 +365,6 @@
       <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="GtkListStore" 
id="GNUNET_GTK_identity_metadata_types_liststore">
     <columns>
       <!-- column-name type_as_string -->




reply via email to

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