gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: gnunet
Subject: [GNUnet-SVN] r28494 - gnunet-gtk/contrib
Date: Sun, 11 Aug 2013 14:33:59 +0200 
Author: grothoff
Date: 2013-08-11 14:33:59 +0200 (Sun, 11 Aug 2013)
New Revision: 28494

Added:
   gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
Modified:
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
   gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
Log:
-working on identity dialogs

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade       2013-08-11 
12:32:23 UTC (rev 28493)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade       2013-08-11 
12:33:59 UTC (rev 28494)
@@ -348,6 +348,12 @@
                             <child>
                               <placeholder/>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -450,9 +456,13 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property 
name="model">GNUNET_GTK_master_publish_dialog_ego_liststore</property>
-                            <property name="has_entry">True</property>
-                            <property name="entry_text_column">0</property>
                             <signal name="changed" 
handler="GNUNET_GTK_master_publish_dialog_ego_combobox_changed_cb" 
swapped="no"/>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_ego_cellrenderertext"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -790,11 +800,6 @@
       <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>
@@ -805,6 +810,11 @@
     <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"/>

Added: gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade                   
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade   2013-08-11 
12:33:59 UTC (rev 28494)
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkTextBuffer" id="credits_art_contents">
+    <property name="text">Jakub 'jimmac' Steiner &lt;address@hidden&gt;
+Christian Muellner &lt;address@hidden&gt;
+Alex Jones &lt;address@hidden&gt;
+Nicklas Larsson &lt;address@hidden&gt;</property>
+  </object>
+  <object class="GtkTextBuffer" id="credits_authors_contents">
+    <property name="text">Juergen Appel &lt;address@hidden&gt;
+Krista Grothoff &lt;address@hidden&gt;
+James Blackwell &lt;address@hidden&gt;
+Ludovic Courtes &lt;address@hidden&gt;
+Nils Durner &lt;address@hidden&gt;
+Renaldo Ferreira &lt;address@hidden&gt;
+Christian Grothoff &lt;address@hidden&gt;
+Eric Haumant
+Tzvetan Horozov &lt;address@hidden&gt;
+Gerd Knorr &lt;address@hidden&gt;
+Werner Koch &lt;address@hidden&gt;
+Uli Luckas &lt;address@hidden&gt;
+Blake Matheny
+Glenn McGrath
+Hendrik Pagenhardt &lt;address@hidden&gt;
+Ioana Patrascu &lt;address@hidden&gt;
+Marko Raeihae
+Paul Ruth &lt;address@hidden&gt;
+Risto Saarelma
+Antti Salonen
+Tiberius Stef &lt;address@hidden&gt;
+Tuomas Toivonen
+Tomi Tukiainen
+Kevin Vandersloot &lt;address@hidden&gt;
+Simo Viitanen
+Larry Waldo
+Igor Wronsky &lt;address@hidden&gt;
+&lt;address@hidden&gt;</property>
+  </object>
+  <object class="GtkTextBuffer" id="credits_docs_contents">
+    <property name="text">Christian Grothoff &lt;address@hidden&gt;
+Anders Carlsson &lt;address@hidden&gt;
+Nils Durner &lt;address@hidden&gt;
+Nicklas Larsson &lt;address@hidden&gt;
+Milan Bouchet-Valat &lt;address@hidden&gt;
+Igor Wronsky &lt;address@hidden&gt;</property>
+  </object>
+  <object class="GtkTextBuffer" id="credits_trans_contents">
+    <property name="text">Di Ma
+Jens Palsberg &lt;address@hidden&gt;
+Christian Grothoff &lt;address@hidden&gt;
+Nils Durner &lt;address@hidden&gt;
+Mathieu &lt;address@hidden&gt;
+Eric Haumant
address@hidden
+Hiroshi Yamauchi &lt;address@hidden&gt;
+Adam Welc &lt;address@hidden&gt;
+Bogdan Carbunar &lt;address@hidden&gt;
+Steven Michael Murphy &lt;address@hidden&gt;
+Phan Vinh Thinh &lt;address@hidden&gt;
+Daniel Nylander &lt;address@hidden&gt;</property>
+  </object>
+  <object class="GtkTextBuffer" id="license_contents">
+    <property name="text" translatable="yes">License should be loaded here at 
runtime from the license file (no need to copy the whole GPL in 
here...).</property>
+  </object>
+  <object class="GtkWindow" id="about_window">
+    <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
+    <signal name="realize" handler="GNUNET_GTK_about_window_realized" 
swapped="no"/>
+    <signal name="delete-event" 
handler="GNUNET_GTK_about_window_got_delete_event" swapped="no"/>
+    <child>
+      <object class="GtkVBox" id="about_main_vbox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">10</property>
+        <child>
+          <object class="GtkImage" id="about_logo_image">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="pixbuf">gnunet_logo.png</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="about_name_version_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label">GNUnet-Peerinfo-GTK r28462</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+              <attribute name="size" value="200"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="about_copyright_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label">(C) 2010-2013 The GNUnet Project</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="about_link_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label">&lt;a href="https://gnunet.org/"&gt;GNUnet: 
GNU's Framework for Secure P2P Networking&lt;/a&gt;</property>
+            <property name="use_markup">True</property>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook" id="about_credits_notebook">
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkScrolledWindow" 
id="about_credits_authors_scroller">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTextView" 
id="about_credits_authors_textview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="wrap_mode">word</property>
+                    <property name="cursor_visible">False</property>
+                    <property name="buffer">credits_authors_contents</property>
+                    <property name="accepts_tab">False</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="about_credits_authors_tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Developed 
by</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" 
id="about_credits_docs_scroller">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTextView" id="about_credits_docs_textview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="wrap_mode">word</property>
+                    <property name="cursor_visible">False</property>
+                    <property name="buffer">credits_docs_contents</property>
+                    <property name="accepts_tab">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="about_credits_docs_tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Documented 
by</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" 
id="about_credits_trans_scroller">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTextView" 
id="about_credits_trans_textview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="wrap_mode">word</property>
+                    <property name="cursor_visible">False</property>
+                    <property name="buffer">credits_trans_contents</property>
+                    <property name="accepts_tab">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="about_credits_trans_tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Translated 
by</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" 
id="about_credits_art_scroller">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTextView" id="about_credits_art_textview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="wrap_mode">word</property>
+                    <property name="cursor_visible">False</property>
+                    <property name="buffer">credits_art_contents</property>
+                    <property name="accepts_tab">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="about_credits_art_tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Artwork by</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="about_license_scroller">
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="shadow_type">out</property>
+            <child>
+              <object class="GtkTextView" id="about_license_textview">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="wrap_mode">word</property>
+                <property name="cursor_visible">False</property>
+                <property name="buffer">license_contents</property>
+                <property name="accepts_tab">False</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="about_buttons_hbox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">5</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkButton" id="about_credits_button">
+                <property name="label" translatable="yes">Credits</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>
+                <signal name="clicked" 
handler="GNUNET_GTK_about_credits_button_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="about_license_button">
+                <property name="label" translatable="yes">License</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>
+                <signal name="clicked" 
handler="GNUNET_GTK_about_license_button_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="about_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_GTK_about_close_button_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">6</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

Modified: gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-08-11 12:32:23 UTC (rev 28493)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-08-11 12:33:59 UTC (rev 28494)
@@ -7,26 +7,17 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_identity_advertise_metadata_liststore">
+  <object class="GtkListStore" 
id="GNUNET_GTK_identity_advertise_keywords_liststore">
     <columns>
-      <!-- column-name TypeBin -->
-      <column type="gint"/>
-      <!-- column-name Type -->
+      <!-- column-name Keyword -->
       <column type="gchararray"/>
-      <!-- column-name Value -->
-      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_metadata_vadj">
+  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_keywords_vadj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_metadata_hadj">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -54,7 +45,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkHBox" 
id="GNUNET_GTK_identity_advertise_metadata_add_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -74,6 +65,13 @@
                           <object class="GtkComboBox" 
id="GNUNET_GTK_identity_advertise_metadata_type_combobox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property 
name="model">GNUNET_GTK_identity_metadata_types_liststore</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_identity_metadata_type_cellrenderertext"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -163,8 +161,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property 
name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
-                            <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
-                            <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
+                            <property 
name="hadjustment">GNUNET_GTK_identity_advertise_metadata_hadj</property>
+                            <property 
name="vadjustment">GNUNET_GTK_identity_advertise_metadata_vadj</property>
                             <property name="headers_clickable">False</property>
                             <property name="rules_hint">True</property>
                             <property name="search_column">0</property>
@@ -237,6 +235,7 @@
               <object class="GtkButton" 
id="GNUNET_GTK_identity_advertise_ok_button">
                 <property name="label">gtk-execute</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">Execute 
advertisement.</property>
@@ -286,8 +285,8 @@
                   <object class="GtkScrolledWindow" 
id="GNUNET_GTK_identity_advertise_keywords_scrolledwindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_order_hadj</property>
-                    <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_order_vadj</property>
+                    <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
+                    <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
@@ -295,8 +294,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property 
name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
-                        <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_order_hadj</property>
-                        <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_order_vadj</property>
+                        <property 
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
+                        <property 
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
                         <property name="reorderable">True</property>
                         <property name="enable_search">False</property>
                         <property name="search_column">0</property>
@@ -346,15 +345,32 @@
       <action-widget 
response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_identity_advertise_keywords_liststore">
+  <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 Keyword -->
+      <!-- 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_keywords_vadj">
+  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_metadata_vadj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" 
id="GNUNET_GTK_identity_metadata_types_liststore">
+    <columns>
+      <!-- column-name type_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name type_as_enum -->
+      <column type="guint"/>
+    </columns>
+  </object>
 </interface>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]