1 files changed, 71 insertions, 11 deletions
diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade
index 24cee986..6611c99b 100644
--- a/contrib/gnunet_conversation_gtk_main_window.glade
+++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -172,6 +172,54 @@
                        <property name="height">1</property>
                      </packing>
                    </child>
+                    <child>
+                      <placeholder/>
+                    </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>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="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>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="GNUNET_GTK_conversation_use_current_button">
+                        <property name="label" translatable="yes">Use address of current call</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_action_appearance">False</property>
+                        <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                  </object>
                  <packing>
                    <property name="expand">False</property>
@@ -546,7 +594,19 @@
                          </packing>
                        </child>
                        <child>
-                          <placeholder/>
+                          <object class="GtkButton" id="GNUNET_GTK_add_active_call_to_contacts">
+                            <property name="label" translatable="yes">Create 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>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
                        </child>
                        <child>
                          <placeholder/>
@@ -728,16 +788,6 @@
      </row>
    </data>
  </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="GtkTreeStore" id="gnunet_conversation_gtk_history_treestore"/>
  <object class="GtkListStore" id="gnunet_conversation_gtk_outgoing_zone_liststore">
    <columns>
@@ -752,4 +802,14 @@
      </row>
    </data>
  </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>

diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade index 24cee986..6611c99b 100644 --- a/contrib/gnunet_conversation_gtk_main_window.glade +++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -172,6 +172,54 @@
172	<property name="height">1</property>	172	<property name="height">1</property>
173	</packing>	173	</packing>
174	</child>	174	</child>
		175	<child>
		176	<placeholder/>
		177	</child>
		178	<child>
		179	<object class="GtkEntry" id="GNUNET_GTK_conversation_nameAdd">
		180	<property name="visible">True</property>
		181	<property name="can_focus">True</property>
		182	<property name="invisible_char">•</property>
		183	<property name="text" translatable="yes">Name of contact</property>
		184	</object>
		185	<packing>
		186	<property name="left_attach">0</property>
		187	<property name="top_attach">1</property>
		188	<property name="width">1</property>
		189	<property name="height">1</property>
		190	</packing>
		191	</child>
		192	<child>
		193	<object class="GtkEntry" id="GNUNET_GTK_conversation_addressAdd">
		194	<property name="visible">True</property>
		195	<property name="can_focus">True</property>
		196	<property name="invisible_char">•</property>
		197	<property name="text" translatable="yes">Address of contact</property>
		198	</object>
		199	<packing>
		200	<property name="left_attach">1</property>
		201	<property name="top_attach">1</property>
		202	<property name="width">1</property>
		203	<property name="height">1</property>
		204	</packing>
		205	</child>
		206	<child>
		207	<object class="GtkButton" id="GNUNET_GTK_conversation_use_current_button">
		208	<property name="label" translatable="yes">Use address of current call</property>
		209	<property name="use_action_appearance">False</property>
		210	<property name="visible">True</property>
		211	<property name="can_focus">True</property>
		212	<property name="receives_default">True</property>
		213	<property name="use_action_appearance">False</property>
		214	<signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/>
		215	</object>
		216	<packing>
		217	<property name="left_attach">2</property>
		218	<property name="top_attach">1</property>
		219	<property name="width">1</property>
		220	<property name="height">1</property>
		221	</packing>
		222	</child>
175	</object>	223	</object>
176	<packing>	224	<packing>
177	<property name="expand">False</property>	225	<property name="expand">False</property>
@@ -546,7 +594,19 @@
546	</packing>	594	</packing>
547	</child>	595	</child>
548	<child>	596	<child>
549	<placeholder/>	597	<object class="GtkButton" id="GNUNET_GTK_add_active_call_to_contacts">
		598	<property name="label" translatable="yes">Create contact</property>
		599	<property name="use_action_appearance">False</property>
		600	<property name="visible">True</property>
		601	<property name="can_focus">True</property>
		602	<property name="receives_default">True</property>
		603	<property name="use_action_appearance">False</property>
		604	</object>
		605	<packing>
		606	<property name="expand">False</property>
		607	<property name="fill">True</property>
		608	<property name="position">4</property>
		609	</packing>
550	</child>	610	</child>
551	<child>	611	<child>
552	<placeholder/>	612	<placeholder/>
@@ -728,16 +788,6 @@
728	</row>	788	</row>
729	</data>	789	</data>
730	</object>	790	</object>
731	<object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
732	<columns>
733	<!-- column-name logTime -->
734	<column type="gchararray"/>
735	<!-- column-name logEvent -->
736	<column type="gchararray"/>
737	<!-- column-name logContact -->
738	<column type="gchararray"/>
739	</columns>
740	</object>
741	<object class="GtkTreeStore" id="gnunet_conversation_gtk_history_treestore"/>	791	<object class="GtkTreeStore" id="gnunet_conversation_gtk_history_treestore"/>
742	<object class="GtkListStore" id="gnunet_conversation_gtk_outgoing_zone_liststore">	792	<object class="GtkListStore" id="gnunet_conversation_gtk_outgoing_zone_liststore">
743	<columns>	793	<columns>
@@ -752,4 +802,14 @@
752	</row>	802	</row>
753	</data>	803	</data>
754	</object>	804	</object>
		805	<object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
		806	<columns>
		807	<!-- column-name logTime -->
		808	<column type="gchararray"/>
		809	<!-- column-name logEvent -->
		810	<column type="gchararray"/>
		811	<!-- column-name logContact -->
		812	<column type="gchararray"/>
		813	</columns>
		814	</object>
755	</interface>	815	</interface>