gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r29919 - gnunet-gtk/contrib
Date: Mon, 7 Oct 2013 11:49:04 +0200

Author: grothoff
Date: 2013-10-07 11:49:04 +0200 (Mon, 07 Oct 2013)
New Revision: 29919

Modified:
   gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_unindex.glade
   gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
   gnunet-gtk/contrib/gnunet_setup_calendar_dialog.glade
Log:
-fix #3036

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade   2013-10-07 
09:38:36 UTC (rev 29918)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade   2013-10-07 
09:49:04 UTC (rev 29919)
@@ -1,45 +1,95 @@
-<?xml version="1.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_anonymity_adjustment">
+    <property name="upper">100000</property>
     <property name="value">1</property>
-    <property name="upper">100000</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkFileChooserDialog" id="GNUNET_GTK_save_as_dialog">
+    <property name="can_focus">False</property>
     <property name="can_default">True</property>
     <property name="has_default">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Save file as...</property>
+    <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
     <property name="icon_name">document-save-as</property>
     <property name="type_hint">dialog</property>
     <property name="action">save</property>
-    <property name="use_preview_label">False</property>
     <property name="do_overwrite_confirmation">True</property>
     <property name="preview_widget_active">False</property>
-    <signal name="response" handler="GNUNET_GTK_save_as_dialog_response_cb"/>
-    <signal name="delete_event" 
handler="GNUNET_GTK_save_as_dialog_delete_event_cb"/>
+    <property name="use_preview_label">False</property>
+    <signal name="delete-event" 
handler="GNUNET_GTK_save_as_dialog_delete_event_cb" swapped="no"/>
+    <signal name="response" handler="GNUNET_GTK_save_as_dialog_response_cb" 
swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_save_as_dialog_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">False</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_save_as_dialog_ok_button">
+                <property name="label">gtk-save</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">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkHBox" id="GNUNET_GTK_save_as_dialog_options_hbox">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_save_as_dialog_anonymity_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" 
translatable="yes">_Anonymity:</property>
                 <property name="use_underline">True</property>
                 <property name="selectable">True</property>
                 <property 
name="mnemonic_widget">GNUNET_GTK_save_as_dialog_anonymity_spin_button</property>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -47,13 +97,15 @@
               <object class="GtkSpinButton" 
id="GNUNET_GTK_save_as_dialog_anonymity_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
                 <property name="caps_lock_warning">False</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>
                 <property 
name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
                 <property name="numeric">True</property>
-                <signal name="value_changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes"/>
+                <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" 
swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -64,6 +116,7 @@
             <child>
               <object class="GtkCheckButton" 
id="GNUNET_GTK_save_as_recursive_check_button">
                 <property name="label" translatable="yes">_recursive</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -85,47 +138,6 @@
             <property name="position">2</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area5">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_save_as_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</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_save_as_dialog_ok_button">
-                <property name="label">gtk-save</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="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade        
2013-10-07 09:38:36 UTC (rev 29918)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade        
2013-10-07 09:49:04 UTC (rev 29919)
@@ -7,6 +7,7 @@
     <property name="can_focus">False</property>
     <property name="can_default">True</property>
     <property name="border_width">5</property>
+    <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <property name="create_folders">False</property>
     <property name="filter">gnunet_directory_filter</property>

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade      2013-10-07 
09:38:36 UTC (rev 29918)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade      2013-10-07 
09:49:04 UTC (rev 29919)
@@ -1,27 +1,36 @@
-<?xml version="1.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_FS_GTK_progress_bar_adjustment">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
   <object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">2</property>
+    <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
-    <property name="destroy_with_parent">True</property>
-    <signal name="delete_event" 
handler="GNUNET_FS_GTK_progress_dialog_delete_event_cb"/>
+    <signal name="delete-event" 
handler="GNUNET_FS_GTK_progress_dialog_delete_event_cb" swapped="no"/>
     <child>
       <object class="GtkVBox" id="GNUNET_FS_GTK_progress_dialog_main_vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkFrame" id="GNUNET_FS_GTK_progress_dialog_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_FS_GTK_progress_dialog_alignment">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkScrolledWindow" 
id="GNUNET_FS_GTK_progress_dialog_scrolled_window">
@@ -49,21 +58,25 @@
             <child type="label">
               <object class="GtkLabel" 
id="GNUNET_FS_GTK_progress_dialog_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" 
translatable="yes">&lt;b&gt;Messages&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>
           <object class="GtkProgressBar" 
id="GNUNET_FS_GTK_progress_dialog_progressbar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="activity_mode">True</property>
             <property name="show_text">True</property>
-            <property name="pulse_step">0.05</property>
+            <property name="pulse_step">0.050000000000000003</property>
             <property name="text" 
translatable="yes">Preprocessing...</property>
             <property 
name="adjustment">GNUNET_FS_GTK_progress_bar_adjustment</property>
             <property name="discrete_blocks">5</property>
@@ -77,6 +90,7 @@
         <child>
           <object class="GtkHBox" 
id="GNUNET_FS_GTK_progress_dialog_buttons_hbox">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">2</property>
             <child>
               <placeholder/>
@@ -84,11 +98,12 @@
             <child>
               <object class="GtkButton" 
id="GNUNET_FS_GTK_progress_dialog_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>
-                <signal name="clicked" 
handler="GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb"/>
+                <signal name="clicked" 
handler="GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -118,10 +133,4 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_bar_adjustment">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
 </interface>

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade 2013-10-07 
09:38:36 UTC (rev 29918)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade 2013-10-07 
09:49:04 UTC (rev 29919)
@@ -12,10 +12,10 @@
     <property name="can_focus">False</property>
     <property name="border_width">2</property>
     <property name="title" translatable="yes">Preparing to save namespace in 
GNS zone</property>
+    <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
-    <property name="destroy_with_parent">True</property>
     <signal name="delete-event" 
handler="GNUNET_FS_GTK_pseu_progress_dialog_delete_event_cb" swapped="no"/>
     <child>
       <object class="GtkVBox" 
id="GNUNET_FS_GTK_pseu_progress_dialog_main_vbox">

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade       2013-10-07 
09:38:36 UTC (rev 29918)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade       2013-10-07 
09:49:04 UTC (rev 29919)
@@ -26,6 +26,7 @@
     <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Publish content on 
GNUnet</property>
+    <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <signal name="delete-event" 
handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/>
     <child>
@@ -115,6 +116,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_add_button">
                                 <property name="label" translatable="yes">Add 
_File</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>
@@ -125,6 +127,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_new_button">
                                 <property name="label" 
translatable="yes">_Create empty directory</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>
@@ -140,6 +143,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_open_button">
                                 <property name="label" translatable="yes">Add 
_Directory</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>
@@ -154,6 +158,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_edit_button">
                                 <property name="label">gtk-edit</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -171,6 +176,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_delete_button">
                                 <property name="label">gtk-delete</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -203,6 +209,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_up_button">
                                 <property name="label">gtk-go-up</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -219,6 +226,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_left_button">
                                 <property name="label" 
translatable="yes">_Left</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -236,6 +244,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_down_button">
                                 <property name="label">gtk-go-down</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -254,6 +263,7 @@
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_right_button">
                                 <property name="label" 
translatable="yes">_Right</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -354,6 +364,12 @@
                             <child>
                               <placeholder/>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -398,6 +414,7 @@
                         <child>
                           <object class="GtkCheckButton" 
id="GNUNET_GTK_master_publish_dialog_global_checkbox">
                             <property name="label" translatable="yes">Publish 
in global namespace</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>
@@ -429,6 +446,7 @@
                         <child>
                           <object class="GtkCheckButton" 
id="GNUNET_GTK_master_publish_dialog_own_checkbox">
                             <property name="label" translatable="yes">Publish 
in your own namespace</property>
+                            <property 
name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -616,6 +634,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_GTK_master_publish_dialog_updateable_checkbox">
                                 <property name="label" translatable="yes">Make 
publication updateable</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -720,6 +739,7 @@
             <child>
               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_execute_button">
                 <property name="label" translatable="yes">_Execute</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>
@@ -736,6 +756,7 @@
             <child>
               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_clear_button">
                 <property name="label" translatable="yes">Remove all 
_Keywords</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>
@@ -755,6 +776,7 @@
             <child>
               <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_cancel_button">
                 <property name="label" translatable="yes">_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>
@@ -800,6 +822,11 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkImage" id="left_stock_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-back</property>
+  </object>
   <object class="GtkImage" id="new_stock_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -810,11 +837,6 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-go-forward</property>
   </object>
-  <object class="GtkImage" id="left_stock_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-back</property>
-  </object>
   <object class="GtkSizeGroup" 
id="GNUNET_GTK_master_publish_dialog_labels_sizegroup">
     <widgets>
       <widget name="GNUNET_GTK_master_publish_dialog_identifier_label"/>

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_unindex.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_unindex.glade      2013-10-07 09:38:36 UTC 
(rev 29918)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_unindex.glade      2013-10-07 09:49:04 UTC 
(rev 29919)
@@ -1,7 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.18"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkImage" id="GNUNET_FS_GTK_unindex_delete_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-delete</property>
+  </object>
   <object class="GtkListStore" id="GNUNET_FS_GTK_unindex_liststore">
     <columns>
       <!-- column-name filename -->
@@ -25,15 +30,65 @@
   <object class="GtkDialog" id="GNUNET_FS_GTK_unindex_dialog">
     <property name="width_request">600</property>
     <property name="height_request">300</property>
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Indexed files</property>
+    <property name="modal">True</property>
     <property name="icon_name">folder</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="GNUNET_FS_GTK_unindex_dialog-vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" 
id="GNUNET_FS_GTK_unindex_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_FS_GTK_unindex_button">
+                <property name="label">_Unindex</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">Unindex the 
selected indexed file.</property>
+                <property 
name="image">GNUNET_FS_GTK_unindex_delete_image</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" 
handler="GNUNET_FS_GTK_unindex_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_FS_GTK_unindex_close_button">
+                <property name="label">gtk-close</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>
+                <signal name="clicked" 
handler="GNUNET_FS_GTK_unindex_close_button_clicked_cb" swapped="no"/>
+              </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">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkScrolledWindow" 
id="GNUNET_FS_GTK_unindex_scrolledwindow">
             <property name="visible">True</property>
@@ -94,55 +149,11 @@
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
             <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_FS_GTK_unindex_dialog-action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="GNUNET_FS_GTK_unindex_button">
-                <property name="label">_Unindex</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">Unindex the 
selected indexed file.</property>
-                <property 
name="image">GNUNET_FS_GTK_unindex_delete_image</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" 
handler="GNUNET_FS_GTK_unindex_button_clicked_cb"/>
-              </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_FS_GTK_unindex_close_button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" 
handler="GNUNET_FS_GTK_unindex_close_button_clicked_cb"/>
-              </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="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -150,8 +161,4 @@
       <action-widget 
response="0">GNUNET_FS_GTK_unindex_close_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="GNUNET_FS_GTK_unindex_delete_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-delete</property>
-  </object>
 </interface>

Modified: gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-10-07 09:38:36 UTC (rev 29918)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-10-07 09:49:04 UTC (rev 29919)
@@ -2,6 +2,11 @@
 <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_keywords_liststore">
     <columns>
       <!-- column-name Keyword -->
@@ -13,10 +18,30 @@
     <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="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="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="modal">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">
@@ -561,48 +586,6 @@
       <action-widget 
response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
     </action-widgets>
   </object>
-  <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="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 -->
-      <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="expiration_year_adjustment">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">100000000</property>
-    <property name="value">1000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="replication_adjustment">
-    <property name="upper">99999</property>
-    <property name="value">5</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 -->
@@ -638,4 +621,21 @@
       </row>
     </data>
   </object>
+  <object class="GtkAdjustment" id="expiration_year_adjustment">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="priority_adjustment">
+    <property name="upper">100000000</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="replication_adjustment">
+    <property name="upper">99999</property>
+    <property name="value">5</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
 </interface>

Modified: gnunet-gtk/contrib/gnunet_setup_calendar_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_calendar_dialog.glade       2013-10-07 
09:38:36 UTC (rev 29918)
+++ gnunet-gtk/contrib/gnunet_setup_calendar_dialog.glade       2013-10-07 
09:49:04 UTC (rev 29919)
@@ -5,6 +5,7 @@
   <object class="GtkDialog" id="GNUNET_setup_calendar_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
+    <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="GNUNET_setup_calendar_dialog_response_cb" 
swapped="no"/>
     <child internal-child="vbox">




reply via email to

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