change callback, widget and variable names for choose gpg key dialog in glade and in the code
This commit is contained in:
		
							parent
							
								
									53e0f9a335
								
							
						
					
					
						commit
						6a71d6e1cd
					
				
					 2 changed files with 15 additions and 15 deletions
				
			
		|  | @ -119,7 +119,7 @@ class infoUser_Window: | |||
| 				stats += '\n' + u.show + ' : ' + u.status | ||||
| 		self.xml.get_widget('resource_label').set_text(resources) | ||||
| 		self.xml.get_widget('status_label').set_text(stats) | ||||
| 		plugin.send('ASK_VCARD', self.account, self.user.jid) | ||||
| 		self.plugin.send('ASK_VCARD', self.account, self.user.jid) | ||||
| 
 | ||||
| 	def add_to_vcard(self, vcard, entry, txt): | ||||
| 		"""Add an information to the vCard dictionary""" | ||||
|  | @ -265,35 +265,35 @@ class choose_gpg_Window: | |||
| 	"""Class for Away Message Window""" | ||||
| 	def run(self): | ||||
| 		"""Wait for Ok button to be pressed and return the selected key""" | ||||
| 		rep = self.xml.get_widget("Choose_gpg_key").run() | ||||
| 		rep = self.window.run() | ||||
| 		if rep == gtk.RESPONSE_OK: | ||||
| 			selection = self.treeview.get_selection() | ||||
| 			selection = self.keys_treeview.get_selection() | ||||
| 			(model, iter) = selection.get_selected() | ||||
| 			keyID = [model.get_value(iter, 0), model.get_value(iter, 1)] | ||||
| 		else: | ||||
| 			keyID = -1 | ||||
| 		self.xml.get_widget("Choose_gpg_key").destroy() | ||||
| 		self.window.destroy() | ||||
| 		return keyID | ||||
| 
 | ||||
| 	def fill_tree(self, list): | ||||
| 		model = self.treeview.get_model() | ||||
| 		model = self.keys_treeview.get_model() | ||||
| 		for keyID in list.keys(): | ||||
| 			model.append((keyID, list[keyID])) | ||||
| 	 | ||||
| 	def __init__(self): | ||||
| 		#list : {keyID: userName, ...} | ||||
| 		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Choose_gpg_key', APP) | ||||
| 		self.window = self.xml.get_widget("Choose_gpg_key") | ||||
| 		self.treeview = self.xml.get_widget("treeview") | ||||
| 		xml = gtk.glade.XML(GTKGUI_GLADE, 'choose_gpg_key_dialog', APP) | ||||
| 		self.window = xml.get_widget('choose_gpg_key_dialog') | ||||
| 		self.keys_treeview = xml.get_widget('keys_treeview') | ||||
| 		model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) | ||||
| 		self.treeview.set_model(model) | ||||
| 		self.keys_treeview.set_model(model) | ||||
| 		#columns | ||||
| 		renderer = gtk.CellRendererText() | ||||
| 		self.treeview.insert_column_with_attributes(-1, _('KeyID'), renderer, \ | ||||
| 			text=0) | ||||
| 		self.keys_treeview.insert_column_with_attributes(-1, _('KeyID'), \ | ||||
| 			renderer, text=0) | ||||
| 		renderer = gtk.CellRendererText() | ||||
| 		self.treeview.insert_column_with_attributes(-1, _('User name'), renderer,\ | ||||
| 			text=1) | ||||
| 		self.keys_treeview.insert_column_with_attributes(-1, _('User name'), \ | ||||
| 			renderer, text=1) | ||||
| 
 | ||||
| class awayMsg_Window: | ||||
| 	"""Class for Away Message Window""" | ||||
|  |  | |||
|  | @ -7835,7 +7835,7 @@ Custom</property> | |||
|   </child> | ||||
| </widget> | ||||
| 
 | ||||
| <widget class="GtkDialog" id="Choose_gpg_key"> | ||||
| <widget class="GtkDialog" id="choose_gpg_key_dialog"> | ||||
|   <property name="visible">True</property> | ||||
|   <property name="title" translatable="yes">Passphrase</property> | ||||
|   <property name="type">GTK_WINDOW_TOPLEVEL</property> | ||||
|  | @ -7936,7 +7936,7 @@ Custom</property> | |||
| 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property> | ||||
| 
 | ||||
| 	      <child> | ||||
| 		<widget class="GtkTreeView" id="treeview"> | ||||
| 		<widget class="GtkTreeView" id="keys_treeview"> | ||||
| 		  <property name="visible">True</property> | ||||
| 		  <property name="can_focus">True</property> | ||||
| 		  <property name="headers_visible">True</property> | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue