gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r22417 - gnunet-gtk/contrib
Date: Sun, 1 Jul 2012 18:47:11 +0200

Author: grothoff
Date: 2012-07-01 18:47:11 +0200 (Sun, 01 Jul 2012)
New Revision: 22417

Modified:
   gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
Log:
-nicer layout

Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-07-01 
16:37:20 UTC (rev 22416)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-07-01 
16:47:11 UTC (rev 22417)
@@ -16,41 +16,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_exit_interface_mask_adjustment">
-    <property name="lower">1</property>
-    <property name="upper">127</property>
-    <property name="value">48</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
-    <property name="lower">1</property>
-    <property name="upper">65535</property>
-    <property name="value">3306</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_quota_adjustment">
-    <property name="lower">65536</property>
-    <property name="upper">9999999999</property>
-    <property name="value">1024000</property>
-    <property name="step_increment">65536</property>
-    <property name="page_increment">1024000</property>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
-    <property name="lower">1</property>
-    <property name="upper">65535</property>
-    <property name="value">3306</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_quota_adjustment">
-    <property name="lower">1000000</property>
-    <property name="upper">999999999999</property>
-    <property name="value">100000000</property>
-    <property name="step_increment">1000000</property>
-    <property name="page_increment">1000000000</property>
-  </object>
   <object class="GtkDialog" id="GNUNET_setup_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -4450,235 +4415,223 @@
               <object class="GtkVBox" id="GNUNET_setup_gns_vbox">
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkFrame" id="GNUNET_setup_gns_key_frame">
+                  <object class="GtkHBox" id="GNUNET_setup_gns_top_hbox">
                     <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="GtkHBox" id="hbox1">
+                      <object class="GtkVBox" id="GNUNET_setup_gns_zone_vbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkAlignment" 
id="GNUNET_setup_gns_key_alignment">
+                          <object class="GtkHBox" 
id="GNUNET_setup_gns_zone_label_hbox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkVBox" id="vbox1">
+                              <object class="GtkLabel" 
id="GNUNET_setup_gns_zone_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkHBox" 
id="GNUNET_setup_gns_pseu_hbox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkLabel" 
id="GNUNET_setup_gns_pseu_label">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
-                                        <property name="label" 
translatable="yes">Preferred zone name (PSEU):</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="GtkEntry" 
id="GNUNET_setup_gns_pseu_entry">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="max_length">63</property>
-                                        <property 
name="invisible_char">●</property>
-                                        <property 
name="width_chars">32</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>
-                                        <signal name="changed" 
handler="GNUNET_setup_gns_pseu_entry_changed_cb" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="padding">5</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkHButtonBox" 
id="GNUNET_setup_gns_zone_selection_hbuttonbox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property 
name="layout_style">center</property>
-                                    <child>
-                                      <object class="GtkRadioButton" 
id="GNUNET_setup_gns_master_zone_selection_radiobutton">
-                                        <property name="label" 
translatable="yes">_Master Zone</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_underline">True</property>
-                                        <property name="active">True</property>
-                                        <property 
name="draw_indicator">True</property>
-                                        <signal name="toggled" 
handler="GNUNET_setup_gns_master_zone_selection_radiobutton_toggled_cb" 
swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="padding">10</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" 
id="GNUNET_setup_gns_private_zone_selection_radiobutton">
-                                        <property name="label" 
translatable="yes">_Private Zone</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_underline">True</property>
-                                        <property 
name="draw_indicator">True</property>
-                                        <property 
name="group">GNUNET_setup_gns_master_zone_selection_radiobutton</property>
-                                        <signal name="toggled" 
handler="GNUNET_setup_gns_private_zone_selection_radiobutton_toggled_cb" 
swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="padding">10</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" 
id="GNUNET_setup_gns_shorten_zone_selection_radiobutton">
-                                        <property name="label" 
translatable="yes">_Shorten Zone</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_underline">True</property>
-                                        <property 
name="draw_indicator">True</property>
-                                        <property 
name="group">GNUNET_setup_gns_master_zone_selection_radiobutton</property>
-                                        <signal name="toggled" 
handler="GNUNET_setup_gns_shorten_zone_selection_radiobutton_toggled_cb" 
swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="padding">10</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="label" 
translatable="yes">&lt;b&gt;SET TO PUBLIC KEY OF THE ZONE&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
                               </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
+                            <child>
+                              <object class="GtkButton" 
id="GNUNET_setup_gns_public_key_copy_button">
+                                <property name="label">gtk-copy</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_setup_gns_public_key_copy_button_clicked_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">2</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVSeparator" 
id="GNUNET_setup_gns_qr_vseparator">
-                            <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>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkImage" 
id="GNUNET_setup_gns_qr_image">
-                            <property name="width_request">64</property>
-                            <property name="height_request">64</property>
+                          <object class="GtkHBox" 
id="GNUNET_setup_gns_pseu_hbox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" 
translatable="yes">QR code for the selected zone</property>
-                            <property name="stock">gtk-missing-image</property>
+                            <child>
+                              <object class="GtkLabel" 
id="GNUNET_setup_gns_pseu_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">Preferred zone name (PSEU):</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="GtkEntry" 
id="GNUNET_setup_gns_pseu_entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="max_length">63</property>
+                                <property name="invisible_char">●</property>
+                                <property name="width_chars">32</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>
+                                <signal name="changed" 
handler="GNUNET_setup_gns_pseu_entry_changed_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" 
id="GNUNET_setup_gns_qr_saveas_button">
-                            <property name="label">gtk-save-as</property>
-                            <property 
name="use_action_appearance">False</property>
+                          <object class="GtkHButtonBox" 
id="GNUNET_setup_gns_zone_selection_hbuttonbox">
                             <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_setup_gns_qr_saveas_button_clicked_cb" swapped="no"/>
+                            <property name="can_focus">False</property>
+                            <property name="layout_style">center</property>
+                            <child>
+                              <object class="GtkRadioButton" 
id="GNUNET_setup_gns_master_zone_selection_radiobutton">
+                                <property name="label" 
translatable="yes">_Master Zone</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_underline">True</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" 
handler="GNUNET_setup_gns_master_zone_selection_radiobutton_toggled_cb" 
swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">10</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" 
id="GNUNET_setup_gns_private_zone_selection_radiobutton">
+                                <property name="label" 
translatable="yes">_Private Zone</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_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property 
name="group">GNUNET_setup_gns_master_zone_selection_radiobutton</property>
+                                <signal name="toggled" 
handler="GNUNET_setup_gns_private_zone_selection_radiobutton_toggled_cb" 
swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">10</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" 
id="GNUNET_setup_gns_shorten_zone_selection_radiobutton">
+                                <property name="label" 
translatable="yes">_Shorten Zone</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_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property 
name="group">GNUNET_setup_gns_master_zone_selection_radiobutton</property>
+                                <signal name="toggled" 
handler="GNUNET_setup_gns_shorten_zone_selection_radiobutton_toggled_cb" 
swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">10</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="padding">5</property>
-                            <property name="position">3</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
-                    <child type="label">
-                      <object class="GtkHBox" 
id="GNUNET_setup_gns_zone_label_hbox">
+                    <child>
+                      <object class="GtkVSeparator" 
id="GNUNET_setup_gns_qr_vseparator">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkLabel" 
id="GNUNET_setup_gns_zone_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" 
translatable="yes">&lt;b&gt;SET TO PUBLIC KEY OF THE ZONE&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" 
id="GNUNET_setup_gns_public_key_copy_button">
-                            <property name="label">gtk-copy</property>
-                            <property 
name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="tooltip_text" 
translatable="yes">Copy public zone key to clipboard</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" 
handler="GNUNET_setup_gns_public_key_copy_button_clicked_cb" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">2</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
+                    <child>
+                      <object class="GtkImage" id="GNUNET_setup_gns_qr_image">
+                        <property name="width_request">64</property>
+                        <property name="height_request">64</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">QR 
code for the selected zone</property>
+                        <property name="stock">gtk-missing-image</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" 
id="GNUNET_setup_gns_qr_saveas_button">
+                        <property name="label">gtk-save-as</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_setup_gns_qr_saveas_button_clicked_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">3</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>
@@ -4871,6 +4824,41 @@
       <action-widget response="-3">GNUNET_setup_save_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_exit_interface_mask_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">127</property>
+    <property name="value">48</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">3306</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_quota_adjustment">
+    <property name="lower">65536</property>
+    <property name="upper">9999999999</property>
+    <property name="value">1024000</property>
+    <property name="step_increment">65536</property>
+    <property name="page_increment">1024000</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">3306</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_quota_adjustment">
+    <property name="lower">1000000</property>
+    <property name="upper">999999999999</property>
+    <property name="value">100000000</property>
+    <property name="step_increment">1000000</property>
+    <property name="page_increment">1000000000</property>
+  </object>
   <object class="GtkMenu" id="GNUNET_setup_gns_delete_popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>




reply via email to

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