[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33555 - in gnunet-gtk: contrib src/conversation
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33555 - in gnunet-gtk: contrib src/conversation |
|
Date: |
Fri, 6 Jun 2014 11:18:39 +0200 |
Author: grothoff
Date: 2014-06-06 11:18:39 +0200 (Fri, 06 Jun 2014)
New Revision: 33555
Modified:
gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
gnunet-gtk/src/conversation/gnunet-conversation-gtk_visibility.c
Log:
simplify conversation GUI to make it work easily out-of-the box
Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-06-06 08:57:31 UTC (rev 33554)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-06-06 09:18:39 UTC (rev 33555)
@@ -133,11 +133,20 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Caller
Identity</property>
<property name="use_underline">True</property>
- <property name="active">True</property>
<signal name="toggled"
handler="gnunet_conversation_gtk_view_caller_id_checkmenuitem_toggled_cb"
swapped="no"/>
</object>
</child>
<child>
+ <object class="GtkCheckMenuItem"
id="gnunet_conversation_gtk_view_zone_selection_checkmenuitem">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Zone
Selection</property>
+ <property name="use_underline">True</property>
+ <signal name="toggled"
handler="gnunet_conversation_gtk_view_zone_selection_checkmenuitem_toggled_cb"
swapped="no"/>
+ </object>
+ </child>
+ <child>
<object class="GtkCheckMenuItem"
id="gnunet_conversation_gtk_view_history_checkmenuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -210,7 +219,6 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame"
id="gnunet_conversation_gtk_caller_identity_frame">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
@@ -240,6 +248,7 @@
<object class="GtkComboBox"
id="gnunet_conversation_gtk_ego_combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Select the ego which is supposed to be used for outgoing
calls. This is the public key that you will be visible under to other
users.</property>
<property
name="model">gnunet_conversation_gtk_ego_liststore</property>
<signal name="changed"
handler="gnunet_conversation_gtk_ego_combobox_changed_cb" swapped="no"/>
<child>
@@ -352,101 +361,6 @@
<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">
- <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_conversation_gtk_address_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <signal name="changed"
handler="gnunet_conversation_gtk_address_entry_changed_cb" swapped="no"/>
- </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_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_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>
- <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_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>
- <property
name="image_position">top</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_suspend_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">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_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>
- <property
name="image_position">top</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_hangup_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>
- <child>
<object class="GtkBox"
id="gnunet_conversation_gtk_active_calls_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -560,6 +474,7 @@
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Copy the phone address of the selected caller to our address
book.</property>
<property
name="xalign">0.4699999988079071</property>
<signal name="clicked"
handler="gnunet_conversation_gtk_add_contact_button_clicked_cb" swapped="no"/>
</object>
@@ -578,6 +493,7 @@
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Accept incoming call.</property>
<signal name="clicked"
handler="gnunet_conversation_gtk_accept_button_clicked_cb" swapped="no"/>
</object>
<packing>
@@ -595,6 +511,7 @@
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Refuse incoming call.</property>
<signal name="clicked"
handler="gnunet_conversation_gtk_refuse_button_clicked_cb" swapped="no"/>
</object>
<packing>
@@ -612,6 +529,7 @@
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Resume suspended call.</property>
<signal name="clicked"
handler="gnunet_conversation_gtk_resume_button_clicked_cb" swapped="no"/>
</object>
<packing>
@@ -634,7 +552,7 @@
<property name="expand">True</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -658,24 +576,23 @@
</packing>
</child>
<child>
- <object class="GtkFrame"
id="gnunet_conversation_gtk_contact_list_frame">
+ <object class="GtkFrame"
id="gnunet_conversation_gtk_initiate_calls_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">
+ <object class="GtkAlignment"
id="gnunet_conversation_gtk_initiate_calls_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="GtkBox"
id="gnunet_conversation_gtk_initiate_calls_toplevel_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_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">
@@ -694,6 +611,7 @@
<object class="GtkComboBox"
id="gnunet_conversation_gtk_contacts_zone_combobox">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Select the GNU Name System zone that should be used for
resolving target names and to manage the address book.</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"/>
@@ -711,17 +629,59 @@
<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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox"
id="gnunet_conversation_gtk_call_action_button_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_contacts_paste_button">
- <property
name="label">gtk-paste</property>
+ <object class="GtkLabel"
id="gnunet_conversation_call_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_conversation_gtk_address_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Enter the GNU Name System name of the person you want to
call here to initiate a call. During a call, the name of the caller is shown
here.</property>
+ <property
name="invisible_char">•</property>
+ <signal name="changed"
handler="gnunet_conversation_gtk_address_entry_changed_cb" swapped="no"/>
+ </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_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="tooltip_text"
translatable="yes">Add phone address from clipboard to address book.</property>
+ <property name="tooltip_text"
translatable="yes">Initiate a conversation.</property>
+ <property
name="use_underline">True</property>
<property
name="use_stock">True</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_contacts_paste_button_clicked_cb"
swapped="no"/>
+ <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>
@@ -730,61 +690,130 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_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="tooltip_text"
translatable="yes">Suspend the call, putting the other person on
hold.</property>
+ <property
name="use_stock">True</property>
+ <property
name="image_position">top</property>
+ <signal name="clicked"
handler="gnunet_conversation_gtk_suspend_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">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_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="tooltip_text"
translatable="yes">Terminate a conversation.</property>
+ <property
name="use_stock">True</property>
+ <property
name="image_position">top</property>
+ <signal name="clicked"
handler="gnunet_conversation_gtk_hangup_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>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow"
id="gnunet_conversation_gtk_contact_list_scrolledwindow">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_address_book_hbox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkTreeView"
id="gnunet_conversation_gtk_contact_list_treeview">
+ <object class="GtkScrolledWindow"
id="gnunet_conversation_gtk_contact_list_scrolledwindow">
<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="shadow_type">in</property>
<child>
- <object class="GtkTreeViewColumn"
id="gnunet_conversation_gtk_contact_list_type_column">
- <property name="title"
translatable="yes">Type</property>
+ <object class="GtkTreeView"
id="gnunet_conversation_gtk_contact_list_treeview">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">This is your address book.</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="GtkCellRendererText"
id="gnunet_conversation_gtk_contact_list_type_renderer"/>
- <attributes>
- <attribute
name="text">1</attribute>
- </attributes>
+ <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>
- </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>
+ <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>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</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="sensitive">False</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Add phone address from clipboard to address book.</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">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="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -792,10 +821,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel"
id="gnunet_conversation_address_book_label">
+ <object class="GtkLabel"
id="gnunet_conversation_initiate_calls_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Address Book</b></property>
+ <property name="label"
translatable="yes"><b>Initiate Calls</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -826,6 +855,7 @@
<object class="GtkTreeView"
id="gnunet_conversation_gtk_history_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">You can see your call activity during this session here. It
is not stored after you close this window.</property>
<property
name="model">gnunet_conversation_gtk_history_liststore</property>
<property
name="headers_clickable">False</property>
<property name="search_column">0</property>
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-06-06
08:57:31 UTC (rev 33554)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-06-06
09:18:39 UTC (rev 33555)
@@ -195,7 +195,7 @@
&shutdown_task,
NULL);
if (NULL == ego_name)
- ego_name = GNUNET_strdup ("gns-master");
+ ego_name = GNUNET_strdup ("master-zone");
GCG_HISTORY_init ();
GCG_ZONES_init (ego_name);
GCG_EGOS_init (ego_name);
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-06
08:57:31 UTC (rev 33554)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-06
09:18:39 UTC (rev 33555)
@@ -878,7 +878,10 @@
struct IncomingCall *ic = cls;
ic->qe = NULL;
- // FIXME!
+ if (NULL == label)
+ return;
+ GNUNET_free (ic->caller_id_str);
+ ic->caller_id_str = GNUNET_strdup (label);
}
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_visibility.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_visibility.c
2014-06-06 08:57:31 UTC (rev 33554)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_visibility.c
2014-06-06 09:18:39 UTC (rev 33555)
@@ -95,6 +95,21 @@
/**
+ * Zone selection view is toggled.
+ *
+ * @param dummy widget triggering the event
+ * @param data main window builder (unused)
+ */
+void
+gnunet_conversation_gtk_view_zone_selection_checkmenuitem_toggled_cb
(GtkWidget * dummy,
+ gpointer
data)
+{
+ toggle_view ("gnunet_conversation_gtk_zone_hbox",
+ "gnunet_conversation_gtk_view_zone_selection_checkmenuitem");
+}
+
+
+/**
* Address book view is toggled.
*
* @param dummy widget triggering the event
@@ -104,7 +119,7 @@
gnunet_conversation_gtk_view_address_book_checkmenuitem_toggled_cb (GtkWidget
*dummy,
gpointer data)
{
- toggle_view ("gnunet_conversation_gtk_contact_list_frame",
+ toggle_view ("gnunet_conversation_gtk_address_book_hbox",
"gnunet_conversation_gtk_view_address_book_checkmenuitem");
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33555 - in gnunet-gtk: contrib src/conversation,
gnunet <=