From cb4d4bc233697a9b45ede48ecb436f1129a4a3cd Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Wed, 4 May 2005 19:12:38 +0000
Subject: [PATCH] glade fixes (mostly titles)

---
 src/gtkgui.glade | 95 ++++++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index f3f1486bd..1c6bb163a 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -1583,7 +1583,7 @@
 <widget class="GtkWindow" id="add_new_contact_window">
   <property name="border_width">4</property>
   <property name="width_request">317</property>
-  <property name="height_request">290</property>
+  <property name="height_request">300</property>
   <property name="title" translatable="yes">Add New Contact</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -1601,7 +1601,7 @@
     <widget class="GtkVBox" id="vbox8">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">5</property>
+      <property name="spacing">0</property>
 
       <child>
 	<widget class="GtkTable" id="table21">
@@ -1985,7 +1985,7 @@
 	  </child>
 	</widget>
 	<packing>
-	  <property name="padding">0</property>
+	  <property name="padding">8</property>
 	  <property name="expand">False</property>
 	  <property name="fill">False</property>
 	</packing>
@@ -1998,7 +1998,7 @@
   <property name="border_width">4</property>
   <property name="width_request">400</property>
   <property name="height_request">200</property>
-  <property name="title" translatable="yes">Subscription request</property>
+  <property name="title" translatable="yes">Subscription Request</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -7141,7 +7141,7 @@ Custom</property>
 
 <widget class="GtkWindow" id="history_window">
   <property name="border_width">4</property>
-  <property name="title" translatable="yes">Log</property>
+  <property name="title" translatable="yes">Conversation History</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -8353,17 +8353,54 @@ Custom</property>
       </child>
 
       <child>
-	<widget class="GtkVBox" id="vbox34">
+	<widget class="GtkFrame" id="frame32">
 	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
+	  <property name="label_xalign">0</property>
+	  <property name="label_yalign">0.5</property>
+	  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="label154">
+	    <widget class="GtkAlignment" id="alignment65">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Choose your OpenGPG key :</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xscale">1</property>
+	      <property name="yscale">1</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">5</property>
+	      <property name="right_padding">0</property>
+
+	      <child>
+		<widget class="GtkScrolledWindow" id="scrolledwindow20">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		  <child>
+		    <widget class="GtkTreeView" id="keys_treeview">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="headers_visible">True</property>
+		      <property name="rules_hint">False</property>
+		      <property name="reorderable">False</property>
+		      <property name="enable_search">True</property>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label251">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">&lt;b&gt;Choose your OpenGPG key&lt;/b&gt;</property>
 	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
+	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
@@ -8373,36 +8410,7 @@ Custom</property>
 	      <property name="ypad">0</property>
 	    </widget>
 	    <packing>
-	      <property name="padding">5</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow20">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="keys_treeview">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
+	      <property name="type">label_item</property>
 	    </packing>
 	  </child>
 	</widget>
@@ -8596,7 +8604,6 @@ Custom</property>
   <child>
     <widget class="GtkNotebook" id="chat_notebook">
       <property name="visible">True</property>
-      <property name="can_focus">True</property>
       <property name="show_tabs">False</property>
       <property name="show_border">False</property>
       <property name="tab_pos">GTK_POS_TOP</property>
@@ -8665,7 +8672,7 @@ Custom</property>
 			  <child>
 			    <widget class="GtkLabel" id="label205">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">History</property>
+			      <property name="label" translatable="yes">_History</property>
 			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -10092,7 +10099,7 @@ send a chat message to</property>
   <property name="width_request">650</property>
   <property name="height_request">450</property>
   <property name="visible">True</property>
-  <property name="title" translatable="yes">Groupchat configuration</property>
+  <property name="title" translatable="yes">Groupchat Configuration</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>