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

[gnunet]

Author: grothoff
Date: 2010-10-29 09:47:59 +0200 (Fri, 29 Oct 2010)
New Revision: 13450

Modified:
   gnunet-gtk/contrib/advertise_pseudonym_dialog.glade
   gnunet-gtk/contrib/publish-directory-dialog.glade
   gnunet-gtk/contrib/publish-file-dialog.glade
   gnunet-gtk/contrib/publish_edit_dialog.glade
Log:
adding expiration year options

Modified: gnunet-gtk/contrib/advertise_pseudonym_dialog.glade
===================================================================
--- gnunet-gtk/contrib/advertise_pseudonym_dialog.glade 2010-10-29 07:27:11 UTC 
(rev 13449)
+++ gnunet-gtk/contrib/advertise_pseudonym_dialog.glade 2010-10-29 07:47:59 UTC 
(rev 13450)
@@ -476,7 +476,7 @@
                     <child>
                       <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_anonymity_label">
                         <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Anonymity</property>
+                        <property name="label" 
translatable="yes">_Anonymity:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -523,7 +523,7 @@
                     <child>
                       <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_priority_label">
                         <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Priority</property>
+                        <property name="label" 
translatable="yes">_Priority:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -567,11 +567,12 @@
                     <child>
                       <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_root_label">
                         <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Root</property>
+                        <property name="label" 
translatable="yes">_Root:</property>
                         <property name="use_underline">True</property>
                         <property name="selectable">True</property>
                       </object>
                       <packing>
+                        <property name="padding">5</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -591,6 +592,49 @@
                     <property name="position">6</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator4">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_expiration_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Expriation 
year:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" 
id="GNUNET_GTK_advertise_pseudonym_expiration_year_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="max_length">4</property>
+                        <property name="invisible_char">•</property>
+                        <property 
name="adjustment">expiration_year_adjustment</property>
+                        <property name="climb_rate">1</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">8</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -671,4 +715,9 @@
     <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">5</property>
+  </object>
 </interface>

Modified: gnunet-gtk/contrib/publish-directory-dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish-directory-dialog.glade   2010-10-29 07:27:11 UTC 
(rev 13449)
+++ gnunet-gtk/contrib/publish-directory-dialog.glade   2010-10-29 07:47:59 UTC 
(rev 13450)
@@ -2,20 +2,33 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="anonymity_adjustment">
-    <property name="upper">10000000</property>
-    <property name="value">1</property>
+  <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="GtkListStore" 
id="GNUNET_GTK_publish_directory_dialog_expiration_list_store">
+    <columns>
+      <!-- column-name human_readable_time -->
+      <column type="gchararray"/>
+      <!-- column-name time_in_ms -->
+      <column type="guint64"/>
+    </columns>
+  </object>
   <object class="GtkFileChooserDialog" 
id="GNUNET_GTK_publish_directory_dialog">
     <property name="can_default">True</property>
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <property name="action">select-folder</property>
-    <property name="create_folders">False</property>
     <property name="select_multiple">True</property>
+    <property name="create_folders">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
@@ -85,7 +98,7 @@
                 <child>
                   <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_expiration_label">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Expires 
in:</property>
+                    <property name="label" translatable="yes">Expiration 
year:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -95,28 +108,17 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" 
id="GNUNET_GTK_publish_directory_dialog_expiration_combo_box">
+                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_expiration_year">
                     <property name="visible">True</property>
-                    <property name="active">0</property>
-                    <property 
name="model">GNUNET_GTK_publish_directory_dialog_expiration_list_store</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_publish_directory_dialog_expiration_box_time_renderer"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property 
name="adjustment">expiration_year_adjustment</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <placeholder/>
-                </child>
-                <child>
                   <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_label">
                     <property name="visible">True</property>
                     <property name="label" 
translatable="yes">Anonymity:</property>
@@ -124,7 +126,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="padding">5</property>
-                    <property name="position">3</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -139,7 +141,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="padding">20</property>
-                    <property name="position">4</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>
@@ -202,17 +204,9 @@
       <action-widget 
response="-5">GNUNET_GTK_publish_directory_dialog_ok_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_publish_directory_dialog_expiration_list_store">
-    <columns>
-      <!-- column-name human_readable_time -->
-      <column type="gchararray"/>
-      <!-- column-name time_in_ms -->
-      <column type="guint64"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">100000000</property>
-    <property name="value">1000</property>
+  <object class="GtkAdjustment" id="anonymity_adjustment">
+    <property name="upper">10000000</property>
+    <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>

Modified: gnunet-gtk/contrib/publish-file-dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish-file-dialog.glade        2010-10-29 07:27:11 UTC 
(rev 13449)
+++ gnunet-gtk/contrib/publish-file-dialog.glade        2010-10-29 07:47:59 UTC 
(rev 13450)
@@ -2,14 +2,39 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
+  <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="anonymity_adjustment">
+    <property name="upper">10000000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" 
id="GNUNET_GTK_publish_file_dialog_expiration_list_store">
+    <columns>
+      <!-- column-name human_readable_time -->
+      <column type="gchararray"/>
+      <!-- column-name time_in_ms -->
+      <column type="guint64"/>
+    </columns>
+  </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="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog">
     <property name="can_default">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Publish file...</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
-    <property name="select_multiple">True</property>
     <property name="create_folders">False</property>
+    <property name="select_multiple">True</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -79,7 +104,7 @@
                 <child>
                   <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_expiration_label">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Expires 
in:</property>
+                    <property name="label" translatable="yes">Expiration 
year:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -89,28 +114,18 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" 
id="GNUNET_GTK_publish_file_dialog_expiration_combo_box">
+                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_expiration_year_spin_button">
                     <property name="visible">True</property>
-                    <property 
name="model">GNUNET_GTK_publish_file_dialog_expiration_list_store</property>
-                    <property name="active">0</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_publish_file_dialog_expiration_box_time_renderer"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property 
name="adjustment">expiration_year_adjustment</property>
+                    <property name="numeric">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <placeholder/>
-                </child>
-                <child>
                   <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_anonymity_label">
                     <property name="visible">True</property>
                     <property name="label" 
translatable="yes">Anonymity:</property>
@@ -118,7 +133,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="padding">5</property>
-                    <property name="position">3</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -133,7 +148,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="padding">20</property>
-                    <property name="position">4</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>
@@ -196,24 +211,4 @@
       <action-widget 
response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget>
     </action-widgets>
   </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="GtkListStore" 
id="GNUNET_GTK_publish_file_dialog_expiration_list_store">
-    <columns>
-      <!-- column-name human_readable_time -->
-      <column type="gchararray"/>
-      <!-- column-name time_in_ms -->
-      <column type="guint64"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" id="anonymity_adjustment">
-    <property name="upper">10000000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>

Modified: gnunet-gtk/contrib/publish_edit_dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish_edit_dialog.glade        2010-10-29 07:27:11 UTC 
(rev 13449)
+++ gnunet-gtk/contrib/publish_edit_dialog.glade        2010-10-29 07:47:59 UTC 
(rev 13450)
@@ -459,7 +459,7 @@
                     <child>
                       <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_anonymity_label">
                         <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Anonymity</property>
+                        <property name="label" 
translatable="yes">_Anonymity:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -506,7 +506,7 @@
                     <child>
                       <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_priority_label">
                         <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Priority</property>
+                        <property name="label" 
translatable="yes">_Priority:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -584,6 +584,50 @@
                     <property name="position">6</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator4">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_expiration_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Expriation 
year:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" 
id="GNUNET_GTK_edit_file_information_expiration_year_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="max_length">4</property>
+                        <property name="invisible_char">•</property>
+                        <property name="invisible_char_set">True</property>
+                        <property 
name="adjustment">GNUNET_GTK_year_adjustment</property>
+                        <property name="climb_rate">1</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">8</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>