[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33394 - gnunet-gtk/contrib
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33394 - gnunet-gtk/contrib |
|
Date: |
Mon, 26 May 2014 16:59:55 +0200 |
Author: grothoff
Date: 2014-05-26 16:59:54 +0200 (Mon, 26 May 2014)
New Revision: 33394
Modified:
gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_setup_calendar_dialog.glade
Log:
cleaning up conversation UI to avoid duplicate/confusing buttons
Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-05-26 14:14:05 UTC (rev 33393)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-05-26 14:59:54 UTC (rev 33394)
@@ -1,7 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAction" id="action1"/>
+ <requires lib="gtk+" version="3.0"/>
+ <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"/>
+ <!-- column-name caller_type -->
+ <column type="gint"/>
+ <!-- column-name caller_state -->
+ <column type="gint"/>
+ <!-- column-name call -->
+ <column type="gpointer"/>
+ <!-- column-name call_state -->
+ <column type="gint"/>
+ <!-- column-name call_id -->
+ <column type="gint"/>
+ </columns>
+ </object>
+ <object class="GtkListStore"
id="gnunet_conversation_gtk_caller_id_zone_liststore">
+ <columns>
+ <!-- column-name ego_name -->
+ <column type="gchararray"/>
+ <!-- column-name ego -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
+ <columns>
+ <!-- column-name contactName -->
+ <column type="gchararray"/>
+ <!-- column-name contactType -->
+ <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>
+ </object>
+ <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
+ <columns>
+ <!-- column-name logTime -->
+ <column type="gchararray"/>
+ <!-- column-name logEvent -->
+ <column type="gchararray"/>
+ <!-- column-name logContact -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkWindow" id="GNUNET_GTK_conversation_window">
<property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK |
GDK_STRUCTURE_MASK</property>
@@ -9,7 +63,7 @@
<property name="icon_name">contact-new</property>
<signal name="delete-event" handler="GNUNET_GTK_conversation_quit_cb"
swapped="no"/>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkBox" id="gnunet_conversation_gtk_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -44,6 +98,36 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem"
id="gnunet_conversation_gtk_view_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_View</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu"
id="gnunet_conversation_gtk_view_sub_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckMenuItem"
id="gnunet_conversation_gtk_view_history_checkmenuitem">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">_History</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem"
id="gnunet_conversation_gtk_view_log_checkmenuitem">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">_Logs</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem"
id="GNUNET_GTK_conversation_help_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -77,181 +161,79 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkPaned" id="gnunet_conversation_main_paned">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="position">400</property>
+ <property name="position_set">True</property>
<child>
- <object class="GtkGrid" id="grid4">
+ <object class="GtkFrame" id="gnunet_conversation_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="GtkBox" id="GNUNET_CONVERSATION_log_box">
- <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_contact_test" swapped="no"/>
- </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_status_button">
- <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>
- <property name="receives_default">True</property>
- <property
name="use_action_appearance">False</property>
- <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_status_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_test_button_two">
- <property name="label" translatable="yes">test
2</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_test_button_two" 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_test_button_three">
- <property name="label" translatable="yes">test
2</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="test_notification"
swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</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="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="editable">False</property>
- <property name="left_margin">1</property>
- <property name="right_margin">1</property>
- <property name="indent">1</property>
- </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">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="call_toplevel_box">
+ <object class="GtkAlignment"
id="gnunet_conversation_call_alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkLabel" id="call_label">
+ <object class="GtkBox"
id="gnunet_conversation_call_vbox">
<property name="visible">True</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>
- <child>
- <object class="GtkLabel"
id="GNUNET_CONVERSATION_GTK_my_address">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">This
is the address the phone is listening on.</property>
- <property name="label" translatable="yes">my
address</property>
- <property name="selectable">True</property>
- <property name="single_line_mode">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="outgoing_ego_chooser_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="ego_label">
+ <object class="GtkBox" id="outgoing_ego_chooser_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Ego:</property>
+ <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">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <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_contacts_zone_liststore</property>
+ <signal name="changed"
handler="gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb"
swapped="no"/>
+ <child>
+ <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="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <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="hexpand">True</property>
+ <property name="icon_name">bluefish</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>
</object>
<packing>
<property name="expand">False</property>
@@ -260,71 +242,185 @@
</packing>
</child>
<child>
- <object class="GtkComboBox"
id="gnunet_conversation_gtk_outgoing_zone_combobox">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_address_and_action_button_hbox">
<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"/>
<child>
- <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <object class="GtkLabel"
id="gnunet_conversation_address_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Target:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
</child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_GTK_conversation_address">
+ <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="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_conversation_call_button">
+ <property name="label">gtk-connect</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_underline">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_call_clicked" swapped="no"/>
+ </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="GtkButton"
id="GNUNET_GTK_conversation_suspend_button">
+ <property
name="label">gtk-media-pause</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="sensitive">False</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_pause_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_conversation_hangup_button">
+ <property
name="label">gtk-disconnect</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="sensitive">False</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_hangup_clicked" swapped="no"/>
+ </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">True</property>
+ <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>
- <object class="GtkBox" id="call_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkBox" id="address_active_calls_box">
+ <object class="GtkBox" id="active_calls">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkBox"
id="addres_and_call_button">
+ <object class="GtkScrolledWindow"
id="active_calls_scrolledwindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkEntry"
id="GNUNET_GTK_conversation_address">
+ <object class="GtkTreeView"
id="gnunet_conversation_gtk_active_calls_treeview">
<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>
+ <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-selection5">
+ <signal name="changed"
handler="GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed"
swapped="no"/>
+ </object>
+ </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_stateColumn">
+ <property name="title"
translatable="yes">state</property>
+ <child>
+ <object class="GtkCellRendererText"
id="GNUNET_CONVERSATION_GTK_active_calls_state"/>
+ <attributes>
+ <attribute
name="markup">4</attribute>
+ <attribute
name="text">4</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_active_calls_id"/>
+ <attributes>
+ <attribute
name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox"
id="GNUNET_GTK_conversation_active_call_list_buttons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">2</property>
+ <property
name="orientation">vertical</property>
+ <property name="layout_style">start</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_conversation_call_button">
- <property name="label"
translatable="yes">call</property>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_conversation_use_current_button">
+ <property name="label"
translatable="yes">> contact</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>
- <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"/>
+ <property
name="xalign">0.4699999988079071</property>
+ <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_use_current_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -333,13 +429,14 @@
</packing>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_conversation_hangup_button_extra">
- <property name="label"
translatable="yes">hangup</property>
+ <object class="GtkButton"
id="GNUNET_GTK_conversation_accept_button">
+ <property name="label"
translatable="yes">accept</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>
- <property
name="use_action_appearance">False</property>
+ <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_accept_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -348,12 +445,14 @@
</packing>
</child>
<child>
- <object class="GtkImage"
id="GNUNET_GTK_status_icon">
+ <object class="GtkButton"
id="GNUNET_GTK_conversation_refuse_button">
+ <property name="label"
translatable="yes">refuse</property>
+ <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Status indicator</property>
- <property name="hexpand">True</property>
- <property
name="icon_name">bluefish</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_resume_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -365,555 +464,402 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkBox" id="active_calls">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <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-selection5">
- <signal name="changed"
handler="GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed"
swapped="no"/>
- </object>
- </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="GNUNET_CONVERSATION_GTK_caller_typeColumn">
- <property name="title"
translatable="yes">type</property>
- <child>
- <object
class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_type"/>
- <attributes>
- <attribute
name="markup">3</attribute>
- <attribute
name="text">3</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="caller_stateColumn">
- <property name="title"
translatable="yes">state</property>
- <child>
- <object
class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_state"/>
- <attributes>
- <attribute
name="markup">4</attribute>
- <attribute
name="text">4</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_active_calls_id"/>
- <attributes>
- <attribute
name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="caller_testcolumn">
- <property name="title"
translatable="yes">type</property>
- <property
name="clickable">True</property>
- <property
name="sort_column_id">0</property>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="call_stateColumn">
- <property name="title"
translatable="yes">call_state</property>
- <child>
- <object
class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_call_state"/>
- <attributes>
- <attribute
name="markup">6</attribute>
- <attribute
name="text">6</attribute>
- </attributes>
- </child>
- </object>
- </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="GtkButtonBox"
id="GNUNET_GTK_conversation_active_call_list_buttons">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">2</property>
- <property
name="orientation">vertical</property>
- <property
name="layout_style">start</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_conversation_use_current_button">
- <property name="label"
translatable="yes">> contact</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>
- <property
name="use_action_appearance">False</property>
- <property
name="xalign">0.4699999988079071</property>
- <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_use_current_button_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_accept_button">
- <property name="label"
translatable="yes">accept</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>
- <property
name="use_action_appearance">False</property>
- <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_accept_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_hangup_button">
- <property name="label"
translatable="yes">hangup</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>
- <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">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_conversation_suspend_button">
- <property name="label"
translatable="yes">suspend</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>
- <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>
- <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>
- <property
name="use_action_appearance">False</property>
- <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_resume_clicked" swapped="no"/>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">True</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
</child>
</object>
- <packing>
- <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 type="label">
+ <object class="GtkLabel"
id="gnunet_conversation_gtk_call_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Call
Information</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame"
id="gnunet_conversation_gtk_contact_list_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="GtkBox" id="call_history_toplevel_box">
+ <object class="GtkAlignment"
id="gnunet_conversation_gtk_contact_list_alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkLabel" id="call_history_label">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_contacts_toplevel_vbox">
<property name="visible">True</property>
<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="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="call_history_scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkTreeView"
id="gnunet_conversation_gtk_history_treeview">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_zone_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>
- <property name="search_column">0</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection4"/>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="gnunet_conversation_gtk_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="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="timeColumn">
- <property name="title"
translatable="yes">Time</property>
+ <object class="GtkComboBox"
id="gnunet_conversation_gtk_contacts_zone_combobox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="model">gnunet_conversation_gtk_contacts_zone_liststore</property>
+ <property
name="tearoff_title">Phonebook:</property>
+ <signal name="changed"
handler="gnunet_conversation_gtk_contacts_zone_combobox_changed_cb"
swapped="no"/>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_CONVERSATION_GTK_time_window_renderer"/>
+ <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">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox"
id="gnunet_conversation_gtk_contact_add_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkTreeViewColumn"
id="eventColumn">
- <property name="title"
translatable="yes">Event</property>
+ <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>
+ </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>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_CONVERSATION_GTK_event_window_renderer"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
+ <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>
+ <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="GtkBox"
id="gnunet_conversation_contact_action_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_CONVERSATION_GTK_contact_window_renderer"/>
- <attributes>
- <attribute name="text">2</attribute>
- </attributes>
+ <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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="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>
+ </packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <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 type="label">
+ <object class="GtkLabel"
id="gnunet_conversation_address_book_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Address
Book</property>
+ </object>
</child>
- <child>
- <placeholder/>
- </child>
</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="resize">True</property>
+ <property name="shrink">True</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="GtkFrame" id="gnunet_conversation_gtk_history_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="GtkBox" id="box2">
+ <object class="GtkAlignment"
id="gnunet_conversation_gtk_history_alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkBox" id="contacts_toplevel_box">
+ <object class="GtkScrolledWindow"
id="gnunet_conversation_gtk_history_scrolledwindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkLabel" id="contacts_label">
+ <object class="GtkTreeView"
id="gnunet_conversation_gtk_history_treeview">
<property name="visible">True</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="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="contacts_buttons_grid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <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">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
+ <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-selection4"/>
</child>
<child>
- <object class="GtkComboBox"
id="gnunet_conversation_gtk_contacts_zone_combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="model">gnunet_conversation_gtk_contacts_zone_liststore</property>
- <property
name="tearoff_title">Phonebook:</property>
- <signal name="changed"
handler="gnunet_conversation_gtk_contacts_zone_combobox_changed_cb"
swapped="no"/>
+ <object class="GtkTreeViewColumn" id="timeColumn">
+ <property name="title"
translatable="yes">Time</property>
<child>
- <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_contacts_zone_ego_name_cellrenderertext"/>
+ <object class="GtkCellRendererText"
id="GNUNET_CONVERSATION_GTK_time_window_renderer"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</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>
<child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </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>
- <property name="text" translatable="yes">Name of
contact</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</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>
- <property name="text" translatable="yes">Address of
contact</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <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"/>
+ <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>
- <packing>
- <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_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_remove_clicked" swapped="no"/>
+ <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>
- <packing>
- <property name="left_attach">1</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">4</property>
- </packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel"
id="gnunet_conversation_gtk_history_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">History</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="gnunet_conversation_gtk_log_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_gtk_log_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow"
id="GNUNET_GTK_conversation_log_scroll">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow"
id="contacts_scrolledwindow">
+ <object class="GtkTextView"
id="GNUNET_GTK_conversation_log">
<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">
- <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>
+ <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">True</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</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>
- </packing>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="gnunet_conversation_gtk_log_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Logs</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -926,65 +872,10 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">4</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"/>
- <!-- column-name caller_type -->
- <column type="gint"/>
- <!-- column-name caller_state -->
- <column type="gint"/>
- <!-- column-name call -->
- <column type="gpointer"/>
- <!-- column-name call_state -->
- <column type="gint"/>
- <!-- column-name call_id -->
- <column type="gint"/>
- </columns>
- </object>
- <object class="GtkListStore"
id="gnunet_conversation_gtk_caller_id_zone_liststore">
- <columns>
- <!-- column-name ego_name -->
- <column type="gchararray"/>
- <!-- column-name ego -->
- <column type="gpointer"/>
- </columns>
- </object>
- <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
- <columns>
- <!-- column-name contactName -->
- <column type="gchararray"/>
- <!-- column-name contactType -->
- <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>
- </object>
- <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
- <columns>
- <!-- column-name logTime -->
- <column type="gchararray"/>
- <!-- column-name logEvent -->
- <column type="gchararray"/>
- <!-- column-name logContact -->
- <column type="gchararray"/>
- </columns>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade 2014-05-26
14:14:05 UTC (rev 33393)
+++ gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade 2014-05-26
14:59:54 UTC (rev 33394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkTreeStore" id="GNUNET_PEERINFO_GTK_tree_store">
<columns>
<!-- column-name peer_identity -->
@@ -70,6 +70,12 @@
<property name="page_increment">10</property>
<property name="page_size">10</property>
</object>
+ <object class="GtkImage" id="connected_image_ats">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">ATS</property>
+ <property name="stock">gtk-connect</property>
+ </object>
<object class="GtkImage" id="connected_image_core">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -83,17 +89,10 @@
<property name="stock">gtk-connect</property>
</object>
<object class="GtkImage" id="connected_image_plugin">
- <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">PLUGIN</property>
<property name="stock">gtk-connect</property>
</object>
- <object class="GtkImage" id="connected_image_ats">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">ATS</property>
- <property name="stock">gtk-connect</property>
- </object>
<object class="GtkImage" id="validated_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -155,17 +154,18 @@
<property name="can_focus">True</property>
<property name="hadjustment">adjustment3</property>
<property name="vadjustment">adjustment4</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView"
id="GNUNET_PEERINFO_GTK_main_window_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_PEERINFO_GTK_tree_store</property>
<property name="hadjustment">adjustment3</property>
<property name="vadjustment">adjustment4</property>
+ <property
name="model">GNUNET_PEERINFO_GTK_tree_store</property>
<property name="reorderable">True</property>
<property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_name_column">
<property name="spacing">5</property>
@@ -205,9 +205,9 @@
</child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_plugin_connectivity_treeviewcolumn">
+ <property name="visible">False</property>
<property name="widget">connected_image_plugin</property>
<property name="reorderable">True</property>
- <property name="visible">False</property>
<property name="sort_indicator">True</property>
<property name="sort_column_id">22</property>
<child>
Modified: gnunet-gtk/contrib/gnunet_setup_calendar_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_calendar_dialog.glade 2014-05-26
14:14:05 UTC (rev 33393)
+++ gnunet-gtk/contrib/gnunet_setup_calendar_dialog.glade 2014-05-26
14:59:54 UTC (rev 33394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="GNUNET_setup_calendar_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -9,12 +9,13 @@
<property name="type_hint">dialog</property>
<signal name="response" handler="GNUNET_setup_calendar_dialog_response_cb"
swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="GNUNET_setup_calendar_dialog-vbox">
+ <object class="GtkBox" id="GNUNET_setup_calendar_dialog-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox"
id="GNUNET_setup_calendar_dialog-action_area">
+ <object class="GtkButtonBox"
id="GNUNET_setup_calendar_dialog-action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33394 - gnunet-gtk/contrib,
gnunet <=