From 8175a92f7d95421cd1df505a7d32f782a8c52571 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Tue, 10 May 2005 15:08:31 +0000
Subject: [PATCH] proxy user/pass gui rdy

---
 src/config.py    |   6 +-
 src/gtkgui.glade | 150 ++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 123 insertions(+), 33 deletions(-)

diff --git a/src/config.py b/src/config.py
index 1e3f18d54..ef0ac1c6d 100644
--- a/src/config.py
+++ b/src/config.py
@@ -923,10 +923,8 @@ class Account_modification_window:
 			w.set_sensitive(widget.get_active())
 
 	def on_use_proxy_checkbutton_toggled(self, widget):
-		proxyhost_entry = self.xml.get_widget('proxyhost_entry')
-		proxyport_entry = self.xml.get_widget('proxyport_entry')
-		self.on_checkbutton_toggled(widget, [proxyhost_entry,
-							proxyport_entry])
+		proxy_table = self.xml.get_widget('proxy_table')
+		self.on_checkbutton_toggled(widget, [proxy_table])
 
 	def init_account_gpg(self):
 		keyid = gajim.config.get_per('accounts', self.account, 'keyid')
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index e03130d5f..125f508d8 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -541,7 +541,7 @@
 <widget class="GtkWindow" id="account_modification_window">
   <property name="border_width">4</property>
   <property name="width_request">440</property>
-  <property name="height_request">270</property>
+  <property name="height_request">290</property>
   <property name="title" translatable="yes">Account Modification</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -979,7 +979,7 @@
 		    <widget class="GtkCheckButton" id="log_history_checkbutton">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Log history for all contacts in this account</property>
+		      <property name="label" translatable="yes">Conversation _history for all contacts in this account</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -1029,7 +1029,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label7">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Preferences</property>
+	      <property name="label" translatable="yes">General</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1345,10 +1345,10 @@
 		      <property name="right_padding">0</property>
 
 		      <child>
-			<widget class="GtkTable" id="table14">
+			<widget class="GtkTable" id="proxy_table">
 			  <property name="border_width">5</property>
 			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
+			  <property name="n_rows">5</property>
 			  <property name="n_columns">2</property>
 			  <property name="homogeneous">False</property>
 			  <property name="row_spacing">5</property>
@@ -1425,6 +1425,119 @@
 			    </packing>
 			  </child>
 
+			  <child>
+			    <widget class="GtkEntry" id="proxyport_entry">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes">3128</property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">*</property>
+			      <property name="activates_default">False</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label253">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Username:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">proxyusername_entry</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label254">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Pass_word:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">proxyport_entry</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">4</property>
+			      <property name="bottom_attach">5</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkEntry" id="proxyusername_entry">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes"></property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">*</property>
+			      <property name="activates_default">False</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkEntry" id="proxypassword_entry">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes"></property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">*</property>
+			      <property name="activates_default">False</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">4</property>
+			      <property name="bottom_attach">5</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
 			  <child>
 			    <widget class="GtkCheckButton" id="use_proxy_checkbutton">
 			      <property name="visible">True</property>
@@ -1447,27 +1560,6 @@
 			      <property name="y_options"></property>
 			    </packing>
 			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="proxyport_entry">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes">3128</property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
 			</widget>
 		      </child>
 		    </widget>
@@ -1494,7 +1586,7 @@
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
+		  <property name="expand">False</property>
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
@@ -1508,7 +1600,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label8">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Connection</property>
+	      <property name="label" translatable="yes">Proxy</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1578,7 +1670,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label86">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Details</property>
+	      <property name="label" translatable="yes">Personal Details</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>