[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33461 - gnunet-gtk/contrib
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33461 - gnunet-gtk/contrib |
|
Date: |
Sun, 1 Jun 2014 18:54:32 +0200 |
Author: grothoff
Date: 2014-06-01 18:54:32 +0200 (Sun, 01 Jun 2014)
New Revision: 33461
Modified:
gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_gtk.glade
Log:
-new layout for conversation-gtk
Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-06-01 15:16:50 UTC (rev 33460)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-06-01 16:54:32 UTC (rev 33461)
@@ -61,6 +61,8 @@
<property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK |
GDK_STRUCTURE_MASK</property>
<property name="window_position">center</property>
+ <property name="default_width">700</property>
+ <property name="default_height">500</property>
<property name="icon_name">contact-new</property>
<signal name="delete-event" handler="GNUNET_GTK_conversation_quit_cb"
swapped="no"/>
<child>
@@ -174,165 +176,44 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkPaned" id="gnunet_conversation_main_paned">
+ <object class="GtkScrolledWindow"
id="gnunet_conversation_gtk_scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="position">500</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkBox" id="gnunet_converstation_main_left_vbox">
+ <object class="GtkViewport"
id="gnunet_conversation_gtk_viewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkFrame"
id="gnunet_conversation_gtk_caller_identity_frame">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_scrolled_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkAlignment"
id="gnunet_conversation_gtk_caller_identity_alignment">
+ <object class="GtkFrame"
id="gnunet_conversation_gtk_caller_identity_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkBox"
id="gnunet_conversation_gtk_outgoing_ego_chooser_hbox">
+ <object class="GtkAlignment"
id="gnunet_conversation_gtk_caller_identity_alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkLabel"
id="gnunet_conversation_gtk_ego_label_label">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_outgoing_ego_chooser_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Label:</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="GtkComboBoxText"
id="gnunet_conversation_gtk_ego_label_comboboxtext">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_entry">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">phone</item>
- </items>
- <child internal-child="entry">
- <object class="GtkEntry"
id="comboboxtext-entry">
- <property name="can_focus">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="gnunet_conversation_gtk_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">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox"
id="gnunet_conversation_gtk_ego_combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="model">gnunet_conversation_gtk_ego_liststore</property>
- <signal name="changed"
handler="gnunet_conversation_gtk_ego_combobox_changed_cb" swapped="no"/>
<child>
- <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/>
- <attributes>
- <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">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_ego_copy_button">
- <property name="label">gtk-copy</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_stock">True</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_ego_copy_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel"
id="gnunet_conversation_gtk_ego_frame_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Caller
Identity</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame"
id="gnunet_conversation_gtk_call_frame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment"
id="gnunet_conversation_gtk_call_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox"
id="gnunet_conversation_gtk_call_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox"
id="gnunet_conversation_gtk_address_and_action_button_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="gnunet_conversation_address_label">
+ <object class="GtkLabel"
id="gnunet_conversation_gtk_ego_label_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Target:</property>
+ <property name="label"
translatable="yes">Label:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -342,32 +223,33 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="gnunet_conversation_gtk_address_entry">
+ <object class="GtkComboBoxText"
id="gnunet_conversation_gtk_ego_label_comboboxtext">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
- <signal name="changed"
handler="gnunet_conversation_gtk_address_entry_changed_cb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <property
name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">phone</item>
+ </items>
+ <child internal-child="entry">
+ <object class="GtkEntry"
id="comboboxtext-entry">
+ <property
name="can_focus">False</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_call_button">
- <property
name="label">gtk-connect</property>
- <property
name="use_action_appearance">False</property>
+ <object class="GtkLabel"
id="gnunet_conversation_gtk_ego_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>
- <property
name="use_underline">True</property>
- <property name="use_stock">True</property>
- <property
name="image_position">top</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_call_button_clicked_cb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Ego:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -377,145 +259,86 @@
</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_action_appearance">False</property>
- <property name="use_stock">True</property>
- <property
name="image_position">top</property>
- <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/>
+ <object class="GtkComboBox"
id="gnunet_conversation_gtk_ego_combobox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="model">gnunet_conversation_gtk_ego_liststore</property>
+ <signal name="changed"
handler="gnunet_conversation_gtk_ego_combobox_changed_cb" swapped="no"/>
+ <child>
+ <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_hangup_button">
- <property
name="label">gtk-disconnect</property>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_ego_copy_button">
+ <property name="label">gtk-copy</property>
<property
name="use_action_appearance">False</property>
- <property name="sensitive">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_stock">True</property>
- <property
name="image_position">top</property>
- <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/>
+ <signal name="clicked"
handler="gnunet_conversation_gtk_ego_copy_button_clicked_cb" 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">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
</child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel"
id="gnunet_conversation_gtk_ego_frame_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Caller
Identity</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame"
id="gnunet_conversation_gtk_call_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment"
id="gnunet_conversation_gtk_call_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkBox"
id="gnunet_conversation_gtk_active_calls_hbox">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_call_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow"
id="gnunet_conversation_gtk_active_calls_scrolledwindow">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_address_and_action_button_hbox">
<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="enable_search">False</property>
- <property
name="search_column">0</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection5"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="caller_numColumn">
- <property name="title">#</property>
- <property
name="clickable">True</property>
- <property
name="reorderable">True</property>
- <property
name="sort_indicator">True</property>
- <property
name="sort_column_id">2</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>
- <property
name="clickable">True</property>
- <property
name="reorderable">True</property>
- <property
name="sort_indicator">True</property>
- <property
name="sort_column_id">7</property>
- <child>
- <object
class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_state"/>
- <attributes>
- <attribute
name="text">7</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="caller_idColumn">
- <property name="title"
translatable="yes">Caller ID</property>
- <property
name="expand">True</property>
- <property
name="clickable">True</property>
- <property
name="reorderable">True</property>
- <property
name="sort_indicator">True</property>
- <property
name="sort_column_id">0</property>
- <child>
- <object
class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_id"/>
- <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">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButtonBox"
id="gnunet_conversation_gtk_active_call_list_buttons_vbox">
- <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">2</property>
- <property
name="orientation">vertical</property>
- <property
name="layout_style">start</property>
<child>
- <object class="GtkImage"
id="GNUNET_GTK_status_icon">
+ <object class="GtkLabel"
id="gnunet_conversation_address_label">
<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="label"
translatable="yes">Target:</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -525,34 +348,32 @@
</packing>
</child>
<child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_add_contact_button">
- <property name="label"
translatable="yes">> contact</property>
- <property
name="use_action_appearance">False</property>
+ <object class="GtkEntry"
id="gnunet_conversation_gtk_address_entry">
<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"/>
+ <property
name="invisible_char">•</property>
+ <property
name="invisible_char_set">True</property>
+ <signal name="changed"
handler="gnunet_conversation_gtk_address_entry_changed_cb" swapped="no"/>
</object>
<packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
+ <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_conversation_gtk_accept_button">
- <property name="label"
translatable="yes">accept</property>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_call_button">
+ <property
name="label">gtk-connect</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"/>
+ <property
name="use_underline">True</property>
+ <property
name="use_stock">True</property>
+ <property
name="image_position">top</property>
+ <signal name="clicked"
handler="gnunet_conversation_gtk_call_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -562,15 +383,16 @@
</packing>
</child>
<child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_refuse_button">
- <property name="label"
translatable="yes">refuse</property>
+ <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="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"/>
+ <property
name="use_stock">True</property>
+ <property
name="image_position">top</property>
+ <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -580,14 +402,16 @@
</packing>
</child>
<child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_resume_button">
- <property name="label"
translatable="yes">resume</property>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_hangup_button">
+ <property
name="label">gtk-disconnect</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_stock">True</property>
+ <property
name="image_position">top</property>
+ <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -601,307 +425,488 @@
<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="GtkBox"
id="gnunet_conversation_gtk_active_calls_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkScrolledWindow"
id="gnunet_conversation_gtk_active_calls_scrolledwindow">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="shadow_type">in</property>
+ <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="enable_search">False</property>
+ <property
name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection5"/>
+ </child>
+ <child>
+ <object
class="GtkTreeViewColumn" id="caller_numColumn">
+ <property
name="title">#</property>
+ <property
name="clickable">True</property>
+ <property
name="reorderable">True</property>
+ <property
name="sort_indicator">True</property>
+ <property
name="sort_column_id">2</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>
+ <property
name="clickable">True</property>
+ <property
name="reorderable">True</property>
+ <property
name="sort_indicator">True</property>
+ <property
name="sort_column_id">7</property>
+ <child>
+ <object
class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_state"/>
+ <attributes>
+ <attribute
name="text">7</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object
class="GtkTreeViewColumn" id="caller_idColumn">
+ <property name="title"
translatable="yes">Caller ID</property>
+ <property
name="expand">True</property>
+ <property
name="clickable">True</property>
+ <property
name="reorderable">True</property>
+ <property
name="sort_indicator">True</property>
+ <property
name="sort_column_id">0</property>
+ <child>
+ <object
class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_id"/>
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox"
id="gnunet_conversation_gtk_active_call_list_buttons_vbox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="border_width">2</property>
+ <property
name="orientation">vertical</property>
+ <property
name="layout_style">start</property>
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_add_contact_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">False</property>
+ <property
name="padding">5</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_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">False</property>
+ <property
name="padding">5</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_refuse_button">
+ <property name="label"
translatable="yes">refuse</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">False</property>
+ <property
name="padding">5</property>
+ <property
name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_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>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ <property
name="padding">5</property>
+ <property
name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">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">1</property>
</packing>
</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>
</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="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">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="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </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="GtkAlignment"
id="gnunet_conversation_gtk_contact_list_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkBox"
id="gnunet_conversation_gtk_contacts_toplevel_vbox">
+ <object class="GtkFrame"
id="gnunet_conversation_gtk_contact_list_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkBox"
id="gnunet_conversation_gtk_zone_hbox">
+ <object class="GtkAlignment"
id="gnunet_conversation_gtk_contact_list_alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkLabel"
id="gnunet_conversation_gtk_contacts_zone_chooser_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">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="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"/>
+ <property
name="orientation">vertical</property>
<child>
- <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_contacts_zone_ego_name_cellrenderertext"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <object class="GtkBox"
id="gnunet_conversation_gtk_zone_hbox">
+ <property name="visible">True</property>
+ <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="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_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>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_contacts_paste_button">
+ <property
name="label">gtk-paste</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_stock">True</property>
+ <signal name="clicked"
handler="gnunet_conversation_gtk_contacts_paste_button_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">False</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">0</property>
+ </packing>
</child>
+ <child>
+ <object class="GtkTreeView"
id="gnunet_conversation_gtk_contact_list_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_contact_list_treeview_row_activated_cb"
swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="gnunet_conversation_gtk_contact_list_type_column">
+ <property name="title"
translatable="yes">Type</property>
+ <child>
+ <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_contact_list_type_renderer"/>
+ <attributes>
+ <attribute
name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="gnunet_conversation_gtk_contact_list_value_column">
+ <property
name="resizable">True</property>
+ <property name="title"
translatable="yes">Name</property>
+ <property name="expand">True</property>
+ <child>
+ <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_contact_list_value_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">1</property>
+ </packing>
+ </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="GtkButton"
id="gnunet_conversation_gtk_contacts_paste_button">
- <property name="label">gtk-paste</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_stock">True</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_contacts_paste_button_clicked_cb"
swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</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">0</property>
- </packing>
</child>
+ <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>
+ </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_history_frame">
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkTreeView"
id="gnunet_conversation_gtk_contact_list_treeview">
+ <object class="GtkAlignment"
id="gnunet_conversation_gtk_history_alignment">
<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_contact_list_treeview_row_activated_cb"
swapped="no"/>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection"/>
- </child>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkTreeViewColumn"
id="gnunet_conversation_gtk_contact_list_type_column">
- <property name="title"
translatable="yes">Type</property>
+ <object class="GtkScrolledWindow"
id="gnunet_conversation_gtk_history_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_contact_list_type_renderer"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
+ <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-selection4"/>
+ </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>
</child>
- <child>
- <object class="GtkTreeViewColumn"
id="gnunet_conversation_gtk_contact_list_value_column">
- <property name="resizable">True</property>
- <property name="title"
translatable="yes">Name</property>
- <property name="expand">True</property>
- <child>
- <object class="GtkCellRendererText"
id="gnunet_conversation_gtk_contact_list_value_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">1</property>
- </packing>
</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">3</property>
+ </packing>
</child>
- </object>
- </child>
- <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>
- </object>
- <packing>
- <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="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment"
id="gnunet_conversation_gtk_history_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkScrolledWindow"
id="gnunet_conversation_gtk_history_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_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-selection4"/>
- </child>
+ <object class="GtkFrame"
id="gnunet_conversation_gtk_log_frame">
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkTreeViewColumn" id="timeColumn">
- <property name="title"
translatable="yes">Time</property>
+ <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="GtkCellRendererText"
id="GNUNET_CONVERSATION_GTK_time_window_renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <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="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>
</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>
+ <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>
- <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>
+ <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="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="gnunet_conversation_gtk_log_frame">
- <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="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>
- </child>
- </object>
- </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">3</property>
- </packing>
- </child>
- <child>
<object class="GtkStatusbar" id="GNUNET_GTK_conversation_statusbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -910,7 +915,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
Modified: gnunet-gtk/contrib/gnunet_gtk.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gtk.glade 2014-06-01 15:16:50 UTC (rev 33460)
+++ gnunet-gtk/contrib/gnunet_gtk.glade 2014-06-01 16:54:32 UTC (rev 33461)
@@ -5,188 +5,213 @@
<property name="can_focus">False</property>
<property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK
| GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK |
GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK |
GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK |
GDK_SCROLL_MASK</property>
<property name="title" translatable="yes">gnunet-gtk</property>
+ <property name="default_width">800</property>
+ <property name="default_height">600</property>
<signal name="delete-event" handler="gnunet_gtk_quit_cb" swapped="no"/>
<child>
- <object class="GtkNotebook" id="gnunt_gtk_notebook">
+ <object class="GtkScrolledWindow" id="gnunet_gtk_scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK
| GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK |
GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK |
GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK |
GDK_SCROLL_MASK</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkHBox" id="gnunet_statistics_hbox">
+ <object class="GtkViewport" id="gnunet_gtk_viewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="events">GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK
| GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK |
GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK |
GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
<child>
- <placeholder/>
+ <object class="GtkNotebook" id="gnunt_gtk_notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK
| GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK |
GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK |
GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
+ <property name="scrollable">True</property>
+ <child>
+ <object class="GtkHBox" id="gnunet_statistics_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK
| GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK |
GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK |
GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="tab_expand">True</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkImage" id="statistics_image">
+ <property name="width_request">100</property>
+ <property name="height_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Statistics</property>
+ <property name="pixbuf">statistics.png</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="gnunet_peerinfo_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_expand">True</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkImage" id="peerinfo_image">
+ <property name="width_request">100</property>
+ <property name="height_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Information about known and connected peers</property>
+ <property name="pixbuf">peerinfo.png</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="gnunet_namestore_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_expand">True</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkImage" id="namestore_image">
+ <property name="width_request">100</property>
+ <property name="height_request">0</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">GNU Name
System Zone Management</property>
+ <property name="pixbuf">gns.png</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="gnunet_fs_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_expand">True</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkImage" id="fs_image">
+ <property name="width_request">100</property>
+ <property name="height_request">0</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">File-Sharing</property>
+ <property name="pixbuf">fs.png</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="gnunet_identity_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_expand">True</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkImage" id="identity_image">
+ <property name="width_request">100</property>
+ <property name="height_request">0</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Identity
management</property>
+ <property name="pixbuf">identity.png</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="gnunet_conversation_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_expand">True</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkImage" id="conversation_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Voice
conversation</property>
+ <property name="pixbuf">conversation.png</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="gnunet_setup_hbox">
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_expand">True</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkImage" id="setup_image">
+ <property name="width_request">100</property>
+ <property name="height_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Configuration</property>
+ <property name="pixbuf">setup.png</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
</child>
</object>
</child>
- <child type="tab">
- <object class="GtkImage" id="statistics_image">
- <property name="width_request">100</property>
- <property name="height_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Statistics</property>
- <property name="pixbuf">statistics.png</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="gnunet_peerinfo_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkImage" id="peerinfo_image">
- <property name="width_request">100</property>
- <property name="height_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Information about
known and connected peers</property>
- <property name="pixbuf">peerinfo.png</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="gnunet_namestore_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkImage" id="namestore_image">
- <property name="width_request">100</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">GNU Name System
Zone Management</property>
- <property name="pixbuf">gns.png</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="gnunet_fs_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkImage" id="fs_image">
- <property name="width_request">100</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">File-Sharing</property>
- <property name="pixbuf">fs.png</property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="gnunet_identity_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkImage" id="identity_image">
- <property name="width_request">100</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Identity
management</property>
- <property name="pixbuf">identity.png</property>
- </object>
- <packing>
- <property name="position">4</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="gnunet_conversation_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkImage" id="conversation_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Voice
conversation</property>
- <property name="pixbuf">conversation.png</property>
- </object>
- <packing>
- <property name="position">5</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="gnunet_setup_hbox">
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">6</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkImage" id="setup_image">
- <property name="width_request">100</property>
- <property name="height_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Configuration</property>
- <property name="pixbuf">setup.png</property>
- </object>
- <packing>
- <property name="position">6</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
</object>
</child>
</object>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33461 - gnunet-gtk/contrib,
gnunet <=