ange callback, widget and variable names for awaqy message dialog in glade and in the code

plugins/gtkgui/dialogs.py

@@ -296,39 +296,39 @@ class choose_gpg_Window:
 		self.keys_treeview.insert_column_with_attributes(-1, _('User name'), \
 			renderer, text=1)
 
-class awayMsg_Window:
+class away_message_dialog:
-	"""Class for Away Message Window"""
+	"""Class for away_message_dialogWindow"""
 	def run(self):
 		"""Wait for Ok button to be pressed and return away messsage"""
-		rep = self.xml.get_widget("Away_msg").run()
+		rep = self.window.run()
 		if rep == gtk.RESPONSE_OK:
-			beg, end = self.txtBuffer.get_bounds()
+			beg, end = self.message_buffer.get_bounds()
-			msg = self.txtBuffer.get_text(beg, end, 0)
+			message = self.message_buffer.get_text(beg, end, 0)
-			self.plugin.config['last_msg'] = msg
+			self.plugin.config['last_msg'] = message
 		else:
-			msg = -1
+			message = -1
-		self.xml.get_widget("Away_msg").destroy()
+		self.window.destroy()
-		return msg
+		return message
 
-	def on_entry_changed(self, widget, data=None):
+	def on_message_comboboxentry_changed(self, widget, data=None):
 		model = widget.get_model()
 		active = widget.get_active()
 		if active < 0:
 			return None
 		name = model[active][0]
-		self.txtBuffer.set_text(self.values[name])
+		self.message_buffer.set_text(self.values[name])
 	
-	def on_key_pressed(self, widget, event):
+	def on_away_message_dialog_key_press_event(self, widget, event):
 		if event.keyval == gtk.keysyms.Return:
 			if (event.state & gtk.gdk.CONTROL_MASK):
-				self.xml.get_widget("Away_msg").response(gtk.RESPONSE_OK)
+				self.window.response(gtk.RESPONSE_OK)
 	
 	def __init__(self, plugin):
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Away_msg', APP)
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'away_message_dialog', APP)
 		self.plugin = plugin
-		txt = self.xml.get_widget("textview")
+		message_textview = self.xml.get_widget('message_textview')
-		self.txtBuffer = txt.get_buffer()
+		self.message_buffer = message_textview.get_buffer()
-		self.txtBuffer.set_text(self.plugin.config['last_msg'])
+		self.message_buffer.set_text(self.plugin.config['last_msg'])
 		self.values = {'':''}
 		i = 0
 		while self.plugin.config.has_key('msg%s_name' % i):
@@ -336,13 +336,12 @@ class awayMsg_Window:
 				self.plugin.config['msg%s' % i]
 			i += 1
 		liststore = gtk.ListStore(str, str)
-		cb = self.xml.get_widget('comboboxentry')
+		message_comboboxentry = self.xml.get_widget('message_comboboxentry')
-		cb.set_model(liststore)
+		message_comboboxentry.set_model(liststore)
-		cb.set_text_column(0)
+		message_comboboxentry.set_text_column(0)
 		for val in self.values.keys():
-			cb.append_text(val)
+			message_comboboxentry.append_text(val)
-		self.xml.signal_connect('on_comboboxentry_changed', self.on_entry_changed)
+		self.xml.signal_autoconnect(self)
-		self.xml.signal_connect('on_key_press_event', self.on_key_pressed)
 
 class add_contact_window:
 	"""Class for add_contact_window"""

plugins/gtkgui/gtkgui.glade

@@ -7803,7 +7803,7 @@ Custom</property>
 	  <child>
 	    <widget class="GtkLabel" id="message_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">label</property>
+	      <property name="label" translatable="yes"></property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7845,7 +7845,7 @@ Custom</property>
 	    <widget class="GtkCheckButton" id="save_passphrase_checkbutton">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">checkbutton</property>
+	      <property name="label" translatable="yes">Save passphrase</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
@@ -7998,7 +7998,7 @@ Custom</property>
   </child>
 </widget>
 
-<widget class="GtkDialog" id="Away_msg">
+<widget class="GtkDialog" id="away_message_dialog">
   <property name="border_width">5</property>
   <property name="width_request">303</property>
   <property name="height_request">225</property>
@@ -8015,7 +8015,7 @@ Custom</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
-  <signal name="key_press_event" handler="on_key_press_event" last_modification_time="Sat, 08 Jan 2005 14:19:25 GMT"/>
+  <signal name="key_press_event" handler="on_away_message_dialog_key_press_event" last_modification_time="Wed, 02 Mar 2005 12:35:32 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox5">
@@ -8029,7 +8029,7 @@ Custom</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="okbutton3">
+	    <widget class="GtkButton" id="ok_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -8087,7 +8087,7 @@ Custom</property>
 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	      <child>
-		<widget class="GtkTextView" id="textview">
+		<widget class="GtkTextView" id="message_textview">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="editable">True</property>
@@ -8135,9 +8135,9 @@ Custom</property>
 	  </child>
 
 	  <child>
-	    <widget class="GtkComboBoxEntry" id="comboboxentry">
+	    <widget class="GtkComboBoxEntry" id="message_comboboxentry">
 	      <property name="visible">True</property>
-	      <signal name="changed" handler="on_comboboxentry_changed" last_modification_time="Mon, 25 Oct 2004 21:43:08 GMT"/>
+	      <signal name="changed" handler="on_message_comboboxentry_changed" last_modification_time="Wed, 02 Mar 2005 12:34:51 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>

plugins/gtkgui/gtkgui.py

@@ -1887,7 +1887,7 @@ class roster_window:
 
 	def change_status(self, widget, account, status):
 		if status != 'online' and status != 'offline':
-			w = awayMsg_Window(self.plugin)
+			w = away_message_dialog(self.plugin)
 			txt = w.run()
 			if txt == -1:
 				return
@@ -1908,7 +1908,7 @@ class roster_window:
 			return
 		status = model[active][0]
 		if status != 'online' and status != 'offline':
-			w = awayMsg_Window(self.plugin)
+			w = away_message_dialog(self.plugin)
 			txt = w.run()
 			if txt == -1:
 				self.set_cb()