gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r32127 - gnunet-gtk/contrib
Date: Thu, 30 Jan 2014 21:51:12 +0100

Author: hark
Date: 2014-01-30 21:51:12 +0100 (Thu, 30 Jan 2014)
New Revision: 32127

Modified:
   gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
Log:
new design of gui


Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-01-30 19:36:59 UTC (rev 32126)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-01-30 20:51:12 UTC (rev 32127)
@@ -75,104 +75,207 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="box1">
+          <placeholder/>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid1">
+              <object class="GtkBox" id="contacts_toplevel_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkEntry" 
id="GNUNET_GTK_conversation_address">
+                  <object class="GtkLabel" id="contacts_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="text" translatable="yes">Address</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" 
translatable="yes">Contacts</property>
+                    <attributes>
+                      <attribute name="style" value="oblique"/>
+                    </attributes>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButtonBox" 
id="GNUNET_GTK_conversation_buttons">
+                  <object class="GtkGrid" id="contacts_buttons_grid">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="layout_style">start</property>
                     <child>
-                      <object class="GtkButton" 
id="GNUNET_GTK_conversation_call_button">
-                        <property name="label" 
translatable="yes">call</property>
+                      <object class="GtkButton" 
id="GNUNET_GTK_conversation_add_contact_button">
+                        <property name="label" translatable="yes">Add 
contact</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_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_call_clicked" swapped="no"/>
+                        <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_add_clicked" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" 
id="GNUNET_GTK_conversation_hangup_button">
-                        <property name="label" 
translatable="yes">hangup</property>
+                      <object class="GtkButton" 
id="GNUNET_GTK_conversation_remove_contact_button">
+                        <property name="label" translatable="yes">Remove 
contact</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_action_appearance">False</property>
-                        <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/>
+                        <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_remove_clicked" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkImage" id="GNUNET_GTK_status_icon">
+                      <object class="GtkComboBox" 
id="gnunet_conversation_gtk_contacts_zone_combobox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" 
translatable="yes">Status indicator</property>
-                        <property name="icon_name">bluefish</property>
+                        <property 
name="model">gnunet_conversation_gtk_contacts_zone_liststore</property>
+                        <property name="tearoff_title">Phonebook:</property>
+                        <child>
+                          <object class="GtkCellRendererText" 
id="gnunet_conversation_gtk_contacts_zone_ego_name_cellrenderertext"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
+                      <object class="GtkLabel" 
id="contacts_zone_chooser_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">Zone:</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</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="GtkScrolledWindow" 
id="contacts_scrolledwindow">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkButton" 
id="GNUNET_GTK_conversation_pause_button">
-                        <property name="label" translatable="yes">pause 
call</property>
+                      <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>
+                        <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>
+                        </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>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="log_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">1</property>
+                <child>
+                  <object class="GtkLabel" id="log_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Debug 
Log</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButtonBox" id="log_buttonbox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="layout_style">start</property>
+                    <child>
+                      <object class="GtkButton" id="gnunet-contact-test">
+                        <property name="label" 
translatable="yes">test_button</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_action_appearance">False</property>
-                        <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/>
+                        <signal name="clicked" handler="GNUNET_contact_test" 
swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" 
id="GNUNET_GTK_conversation_status_button">
-                        <property name="label" 
translatable="yes">status</property>
+                        <property name="label" 
translatable="yes">test_update_status</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -183,247 +286,421 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinner" 
id="GNUNET_GTK_conversation_spinner">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="active">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
+                      <placeholder/>
                     </child>
                     <child>
-                      <object class="GtkButton" id="gnunet-contact-test">
-                        <property name="label" 
translatable="yes">button</property>
-                        <property name="use_action_appearance">False</property>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_conversation_log_scroll">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">always</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTextView" 
id="GNUNET_GTK_conversation_log">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
-                        <signal name="clicked" handler="GNUNET_contact_test" 
swapped="no"/>
+                        <property name="editable">False</property>
+                        <property name="left_margin">1</property>
+                        <property name="right_margin">1</property>
+                        <property name="indent">1</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" 
id="GNUNET_GTK_conversation_log_scroll">
+              <object class="GtkBox" id="call_toplevel_box">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">always</property>
-                <property name="shadow_type">in</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkTextView" id="GNUNET_GTK_conversation_log">
+                  <object class="GtkLabel" id="call_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="left_margin">1</property>
-                    <property name="right_margin">1</property>
-                    <property name="indent">1</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Phone 
Controls</property>
+                    <attributes>
+                      <attribute name="style" value="oblique"/>
+                    </attributes>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkTreeView" 
id="gnunet_conversation_gtk_treeview">
+                  <object class="GtkBox" id="outgoing_ego_chooser_box">
                     <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>
+                    <property name="can_focus">False</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 class="GtkLabel" id="ego_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">Ego:</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="contactType">
-                        <property name="title" 
translatable="yes">Contact</property>
+                      <object class="GtkComboBox" 
id="gnunet_conversation_gtk_outgoing_zone_combobox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property 
name="model">gnunet_conversation_gtk_outgoing_zone_liststore</property>
                         <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_main_window_name_renderer"/>
+                          <object class="GtkCellRendererText" 
id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/>
                           <attributes>
                             <attribute name="text">0</attribute>
                           </attributes>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkStatusbar" 
id="GNUNET_GTK_conversation_statusbar">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">8</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkTreeView" 
id="gnunet_conversation_gtk_history_treeview">
+                  <object class="GtkBox" id="call_hbox">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property 
name="model">gnunet_conversation_gtk_history_liststore</property>
-                    <property name="headers_clickable">False</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" 
id="treeview-selection2"/>
-                    </child>
+                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="timeColumn">
-                        <property name="title" 
translatable="yes">Time</property>
+                      <object class="GtkBox" id="address_active_calls_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_time_window_renderer"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
+                          <object class="GtkEntry" 
id="GNUNET_GTK_conversation_address">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="text" 
translatable="yes">Address</property>
+                            <property name="invisible_char_set">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="eventColumn">
-                        <property name="title" 
translatable="yes">Event</property>
                         <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_event_window_renderer"/>
-                          <attributes>
-                            <attribute name="text">1</attribute>
-                          </attributes>
+                          <object class="GtkScrolledWindow" 
id="active_calls_scrolledwindow">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkTreeView" 
id="gnunet_conversation_gtk_active_calls_treeview">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="model">gnunet_conversation_gtk_active_calls_liststore</property>
+                                <property 
name="headers_clickable">False</property>
+                                <property name="enable_search">False</property>
+                                <property name="search_column">0</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" 
id="treeview-selection4"/>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" 
id="caller_numColumn">
+                                    <property name="title" 
translatable="yes">#</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_active_calls_num">
+                                        <property 
name="background_gdk">#000000000000</property>
+                                        <property name="font">Normal</property>
+                                        <property 
name="foreground_gdk">#000000000000</property>
+                                        <property 
name="background_rgba">rgba(0,0,0,0)</property>
+                                        <property 
name="foreground_rgba">rgba(0,0,0,0)</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">2</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" 
id="caller_idColumn">
+                                    <property name="title" 
translatable="yes">Caller ID</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_event_window_renderer1"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="contactColumn">
-                        <property name="title" 
translatable="yes">Contact</property>
+                      <object class="GtkButtonBox" 
id="GNUNET_GTK_conversation_buttons">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <property name="layout_style">start</property>
                         <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_contact_window_renderer"/>
-                          <attributes>
-                            <attribute name="text">2</attribute>
-                          </attributes>
+                          <object class="GtkImage" id="GNUNET_GTK_status_icon">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" 
translatable="yes">Status indicator</property>
+                            <property name="icon_name">bluefish</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_conversation_call_button">
+                            <property name="label" 
translatable="yes">call</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_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_call_clicked" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_conversation_hangup_button">
+                            <property name="label" 
translatable="yes">hangup</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_action_appearance">False</property>
+                            <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_conversation_pause_button">
+                            <property name="label" translatable="yes">pause 
call</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_action_appearance">False</property>
+                            <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkGrid" id="grid2">
+              <object class="GtkBox" id="call_history_toplevel_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_conversation_add_contact_button">
-                    <property name="label" translatable="yes">Add 
contact</property>
-                    <property name="use_action_appearance">False</property>
+                  <object class="GtkLabel" id="call_history_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_add_clicked" swapped="no"/>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Call 
History</property>
+                    <attributes>
+                      <attribute name="style" value="oblique"/>
+                    </attributes>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_conversation_remove_contact_button">
-                    <property name="label" translatable="yes">Remove 
contact</property>
-                    <property name="use_action_appearance">False</property>
+                  <object class="GtkScrolledWindow" 
id="call_history_scrolledwindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_remove_clicked" swapped="no"/>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTreeView" 
id="gnunet_conversation_gtk_history_treeview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="model">gnunet_conversation_gtk_history_liststore</property>
+                        <property name="headers_clickable">False</property>
+                        <property name="search_column">0</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" 
id="treeview-selection2"/>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="timeColumn">
+                            <property name="title" 
translatable="yes">Time</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_time_window_renderer"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="eventColumn">
+                            <property name="title" 
translatable="yes">Event</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_event_window_renderer"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="contactColumn">
+                            <property name="title" 
translatable="yes">Contact</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_CONVERSATION_GTK_contact_window_renderer"/>
+                              <attributes>
+                                <attribute name="text">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">5</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkStatusbar" id="GNUNET_GTK_conversation_statusbar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">8</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>
+  <object class="GtkListStore" 
id="gnunet_conversation_gtk_active_calls_liststore">
+    <columns>
+      <!-- column-name caller_id -->
+      <column type="gchararray"/>
+      <!-- column-name caller -->
+      <column type="gpointer"/>
+      <!-- column-name caller_num -->
+      <column type="gint"/>
+    </columns>
+  </object>
   <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
     <columns>
       <!-- column-name contactName -->
@@ -438,6 +715,19 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkListStore" 
id="gnunet_conversation_gtk_contacts_zone_liststore">
+    <columns>
+      <!-- column-name ego_name -->
+      <column type="gchararray"/>
+      <!-- column-name ego -->
+      <column type="gpointer"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">not working yet</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
     <columns>
       <!-- column-name logTime -->
@@ -449,4 +739,17 @@
     </columns>
   </object>
   <object class="GtkTreeStore" id="gnunet_conversation_gtk_history_treestore"/>
+  <object class="GtkListStore" 
id="gnunet_conversation_gtk_outgoing_zone_liststore">
+    <columns>
+      <!-- column-name ego_name -->
+      <column type="gchararray"/>
+      <!-- column-name ego -->
+      <column type="gpointer"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Outgoing identity, doesn't work 
yet.</col>
+      </row>
+    </data>
+  </object>
 </interface>




reply via email to

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