gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r33402 - gnunet-gtk/contrib
Date: Mon, 26 May 2014 21:14:02 +0200

Author: grothoff
Date: 2014-05-26 21:14:02 +0200 (Mon, 26 May 2014)
New Revision: 33402

Modified:
   gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
Log:
nicer names

Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-05-26 19:13:52 UTC (rev 33401)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-05-26 19:14:02 UTC (rev 33402)
@@ -30,19 +30,19 @@
       <column type="gpointer"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
+  <object class="GtkListStore" 
id="gnunet_conversation_gtk_contacts_zone_liststore">
     <columns>
-      <!-- column-name contactName -->
+      <!-- column-name ego_name -->
       <column type="gchararray"/>
-      <!-- column-name contactType -->
-      <column type="gchararray"/>
+      <!-- column-name ego -->
+      <column type="gpointer"/>
     </columns>
   </object>
-  <object class="GtkListStore" 
id="gnunet_conversation_gtk_contacts_zone_liststore">
+  <object class="GtkListStore" id="gnunet_conversation_gtk_ego_liststore">
     <columns>
       <!-- column-name ego_name -->
       <column type="gchararray"/>
-      <!-- column-name ego -->
+      <!-- column-name ego_ptr -->
       <column type="gpointer"/>
     </columns>
   </object>
@@ -56,7 +56,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkWindow" id="GNUNET_GTK_conversation_window">
+  <object class="GtkWindow" id="gnunet_conversation_gtk_main_window">
     <property name="can_focus">False</property>
     <property name="events">GDK_BUTTON_PRESS_MASK | 
GDK_STRUCTURE_MASK</property>
     <property name="window_position">center</property>
@@ -68,7 +68,7 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkMenuBar" id="GNUNET_GTK_conversation_menubar">
+          <object class="GtkMenuBar" id="gnunet_conversation_gtk_menubar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -164,26 +164,26 @@
           <object class="GtkPaned" id="gnunet_conversation_main_paned">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="position">400</property>
+            <property name="position">350</property>
             <property name="position_set">True</property>
             <child>
-              <object class="GtkFrame" id="gnunet_conversation_call_frame">
+              <object class="GtkFrame" id="gnunet_conversation_gtk_call_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_conversation_call_alignment">
+                  <object class="GtkAlignment" 
id="gnunet_conversation_gtk_call_alignment">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkBox" 
id="gnunet_conversation_call_vbox">
+                      <object class="GtkBox" 
id="gnunet_conversation_gtk_call_vbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkBox" id="outgoing_ego_chooser_box">
+                          <object class="GtkBox" 
id="gnunet_conversation_gtk_outgoing_ego_chooser_hbox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
@@ -200,11 +200,11 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" 
id="gnunet_conversation_gtk_outgoing_zone_combobox">
+                              <object class="GtkComboBox" 
id="gnunet_conversation_gtk_ego_combobox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property 
name="model">gnunet_conversation_gtk_contacts_zone_liststore</property>
-                                <signal name="changed" 
handler="gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb" 
swapped="no"/>
+                                <property 
name="model">gnunet_conversation_gtk_ego_liststore</property>
+                                <signal name="changed" 
handler="gnunet_conversation_gtk_ego_combobox_changed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" 
id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/>
                                   <attributes>
@@ -331,11 +331,11 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="active_calls">
+                          <object class="GtkBox" 
id="gnunet_conversation_gtk_active_calls_hbox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkScrolledWindow" 
id="active_calls_scrolledwindow">
+                              <object class="GtkScrolledWindow" 
id="gnunet_conversation_gtk_active_calls_scrolledwindow">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="shadow_type">in</property>
@@ -348,8 +348,8 @@
                                     <property 
name="enable_search">False</property>
                                     <property name="search_column">0</property>
                                     <child internal-child="selection">
-                                      <object class="GtkTreeSelection" 
id="treeview-selection5">
-                                        <signal name="changed" 
handler="GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed" 
swapped="no"/>
+                                      <object class="GtkTreeSelection" 
id="gnunet_conversation_gtk_active_calls_treeview_selection">
+                                        <signal name="changed" 
handler="gnunet_conversation_gtk_active_calls_treeview_selection_changed_cb" 
swapped="no"/>
                                       </object>
                                     </child>
                                     <child>
@@ -402,7 +402,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButtonBox" 
id="GNUNET_GTK_conversation_active_call_list_buttons">
+                              <object class="GtkButtonBox" 
id="gnunet_conversation_gtk_active_call_list_buttons_vbox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="border_width">2</property>
@@ -424,7 +424,8 @@
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -440,7 +441,8 @@
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -456,14 +458,32 @@
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkButton" 
id="GNUNET_GTK_conversation_resume_button">
+                                    <property name="label" 
translatable="yes">resume</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>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -553,166 +573,47 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" 
id="gnunet_conversation_gtk_contact_add_hbox">
+                          <object class="GtkTreeView" 
id="gnunet_conversation_gtk_contact_list_treeview">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkLabel" 
id="gnunet_conversation_contact_book_add_name_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" 
translatable="yes">Name:</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">0</property>
-                              </packing>
+                            <property name="can_focus">True</property>
+                            <property name="model"/>
+                            <property name="headers_clickable">False</property>
+                            <property name="search_column">0</property>
+                            <signal name="row-activated" 
handler="gnunet_conversation_gtk_contact_list_treeview_row_activated_cb" 
swapped="no"/>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" 
id="treeview-selection"/>
                             </child>
                             <child>
-                              <object class="GtkEntry" 
id="GNUNET_GTK_conversation_nameAdd">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" 
id="gnunet_conversation_contact_book_add_address_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" 
translatable="yes">Address:</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" 
id="GNUNET_GTK_conversation_addressAdd">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" 
id="GNUNET_GTK_conversation_add_contact_button">
-                                <property name="label">gtk-add</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_CONVERSATION_GTK_on_add_clicked" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">5</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" 
id="gnunet_conversation_contact_hbox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkTreeView" 
id="gnunet_conversation_gtk_treeview">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="model">gnunet_conversation_gtk_contacts_liststore</property>
-                                <property 
name="headers_clickable">False</property>
-                                <property name="search_column">0</property>
-                                <signal name="row-activated" 
handler="GNUNET_CONVERSATION_GTK_row_activated" swapped="no"/>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" 
id="treeview-selection"/>
-                                </child>
+                              <object class="GtkTreeViewColumn" 
id="gnunet_conversation_gtk_contact_list_type_column">
+                                <property name="title" 
translatable="yes">Type</property>
                                 <child>
-                                  <object class="GtkTreeViewColumn" 
id="contactName">
-                                    <property name="title" 
translatable="yes">Type</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_type_window_name_renderer"/>
-                                      <attributes>
-                                        <attribute name="text">1</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
+                                  <object class="GtkCellRendererText" 
id="gnunet_conversation_gtk_contact_list_type_renderer"/>
+                                  <attributes>
+                                    <attribute name="text">1</attribute>
+                                  </attributes>
                                 </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" 
id="contactType">
-                                    <property name="title" 
translatable="yes">Contact</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_main_window_name_renderer"/>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkBox" 
id="gnunet_conversation_contact_action_vbox">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property 
name="orientation">vertical</property>
+                              <object class="GtkTreeViewColumn" 
id="gnunet_conversation_gtk_contact_list_value_column">
+                                <property name="resizable">True</property>
+                                <property name="title" 
translatable="yes">Name</property>
+                                <property name="expand">True</property>
                                 <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" 
id="GNUNET_GTK_conversation_remove_contact_button">
-                                    <property 
name="label">gtk-delete</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_CONVERSATION_GTK_on_remove_clicked" swapped="no"/>
+                                  <object class="GtkCellRendererText" 
id="gnunet_conversation_gtk_contact_list_value_renderer">
+                                    <signal name="edited" 
handler="gnunet_conversation_gtk_contact_list_value_renderer_edited_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>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
                                 </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>
                           </object>
                           <packing>
                             <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>




reply via email to

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