we now have file manager too in enviroment;pot/po update
This commit is contained in:
		
							parent
							
								
									af52ebd127
								
							
						
					
					
						commit
						49bbb10134
					
				
					 12 changed files with 2430 additions and 2409 deletions
				
			
		
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
							
								
								
									
										474
									
								
								po/gajim.pot
									
										
									
									
									
								
							
							
						
						
									
										474
									
								
								po/gajim.pot
									
										
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
				
			
			@ -83,6 +83,7 @@ class Config:
 | 
			
		|||
		'openwith': [ opt_str, 'gnome-open' ],
 | 
			
		||||
		'custombrowser': [ opt_str, 'firefox' ],
 | 
			
		||||
		'custommailapp': [ opt_str, 'mozilla-thunderbird -compose' ],
 | 
			
		||||
		'custom_file_manager': [ opt_str, 'xffm' ],
 | 
			
		||||
		'gc-x-position': [opt_int, 0],
 | 
			
		||||
		'gc-y-position': [opt_int, 0],
 | 
			
		||||
		'gc-width': [opt_int, 675],
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -378,26 +378,28 @@ class PreferencesWindow:
 | 
			
		|||
 | 
			
		||||
		#open links with
 | 
			
		||||
		if os.name == 'nt':
 | 
			
		||||
			self.links_frame = self.xml.get_widget('links_frame')
 | 
			
		||||
			self.links_frame.set_no_show_all(True)
 | 
			
		||||
			self.applications_frame = self.xml.get_widget('applications_frame')
 | 
			
		||||
			self.applications_frame.set_no_show_all(True)
 | 
			
		||||
		else:
 | 
			
		||||
			self.links_open_with_combobox = self.xml.get_widget('links_open_with_combobox')
 | 
			
		||||
			self.applications_combobox = self.xml.get_widget('applications_combobox')
 | 
			
		||||
			if gajim.config.get('autodetect_browser_mailer'):
 | 
			
		||||
				self.links_open_with_combobox.set_active(0)
 | 
			
		||||
				self.applications_combobox.set_active(0)
 | 
			
		||||
				gtkgui_helpers.autodetect_browser_mailer()
 | 
			
		||||
			# autodetect_browser_mailer is now False.
 | 
			
		||||
			# so user has 'Always Use GNOME/KDE' or Custom
 | 
			
		||||
			elif gajim.config.get('openwith') == 'gnome-open':
 | 
			
		||||
				self.links_open_with_combobox.set_active(1)
 | 
			
		||||
				self.applications_combobox.set_active(1)
 | 
			
		||||
			elif gajim.config.get('openwith') == 'kfmclient exec':
 | 
			
		||||
				self.links_open_with_combobox.set_active(2)
 | 
			
		||||
				self.applications_combobox.set_active(2)
 | 
			
		||||
			elif gajim.config.get('openwith') == 'custom':
 | 
			
		||||
				self.links_open_with_combobox.set_active(3)
 | 
			
		||||
				self.applications_combobox.set_active(3)
 | 
			
		||||
				self.xml.get_widget('custom_apps_frame').set_sensitive(True)
 | 
			
		||||
			self.xml.get_widget('custom_browser_entry').set_text(
 | 
			
		||||
				gajim.config.get('custombrowser'))
 | 
			
		||||
			self.xml.get_widget('custom_mail_client_entry').set_text(
 | 
			
		||||
				gajim.config.get('custommailapp'))
 | 
			
		||||
			self.xml.get_widget('custom_file_manager_entry').set_text(
 | 
			
		||||
			gajim.config.set('custom_file_manager', widget.get_text())
 | 
			
		||||
				
 | 
			
		||||
		#log presences in user file
 | 
			
		||||
		st = gajim.config.get('log_notif_in_user_file')
 | 
			
		||||
| 
						 | 
				
			
			@ -855,7 +857,7 @@ class PreferencesWindow:
 | 
			
		|||
	def on_msg_treemodel_row_deleted(self, model, path):
 | 
			
		||||
		self.save_status_messages(model)
 | 
			
		||||
 | 
			
		||||
	def on_links_open_with_combobox_changed(self, widget):
 | 
			
		||||
	def on_applications_combobox_changed(self, widget):
 | 
			
		||||
		gajim.config.set('autodetect_browser_mailer', False)
 | 
			
		||||
		if widget.get_active() == 3:
 | 
			
		||||
			self.xml.get_widget('custom_apps_frame').set_sensitive(True)
 | 
			
		||||
| 
						 | 
				
			
			@ -878,6 +880,10 @@ class PreferencesWindow:
 | 
			
		|||
		gajim.config.set('custommailapp', widget.get_text())
 | 
			
		||||
		self.plugin.save_config()
 | 
			
		||||
 | 
			
		||||
	def on_custom_file_manager_entry_changed(self, widget):
 | 
			
		||||
		gajim.config.set('custom_file_manager', widget.get_text())
 | 
			
		||||
		self.plugin.save_config()
 | 
			
		||||
 | 
			
		||||
	def on_log_in_contact_checkbutton_toggled(self, widget):
 | 
			
		||||
		gajim.config.set('log_notif_in_user_file', widget.get_active())
 | 
			
		||||
		self.plugin.save_config()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5287,13 +5287,14 @@ Disabled</property>
 | 
			
		|||
	      <property name="spacing">6</property>
 | 
			
		||||
 | 
			
		||||
	      <child>
 | 
			
		||||
		<widget class="GtkFrame" id="links_frame">
 | 
			
		||||
		<widget class="GtkFrame" id="applications_frame">
 | 
			
		||||
		  <property name="visible">True</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="GtkAlignment" id="alignment42">
 | 
			
		||||
		    <widget class="GtkAlignment" id="alignment89">
 | 
			
		||||
		      <property name="border_width">6</property>
 | 
			
		||||
		      <property name="visible">True</property>
 | 
			
		||||
		      <property name="xalign">0.5</property>
 | 
			
		||||
| 
						 | 
				
			
			@ -5312,47 +5313,13 @@ Disabled</property>
 | 
			
		|||
			  <property name="spacing">6</property>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <widget class="GtkHBox" id="hbox2918">
 | 
			
		||||
			    <widget class="GtkComboBox" id="applications_combobox">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="homogeneous">False</property>
 | 
			
		||||
			      <property name="spacing">6</property>
 | 
			
		||||
 | 
			
		||||
			      <child>
 | 
			
		||||
				<widget class="GtkLabel" id="label197">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="label" translatable="yes">Open _with:</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.5</property>
 | 
			
		||||
				  <property name="yalign">0.5</property>
 | 
			
		||||
				  <property name="xpad">0</property>
 | 
			
		||||
				  <property name="ypad">0</property>
 | 
			
		||||
				</widget>
 | 
			
		||||
				<packing>
 | 
			
		||||
				  <property name="padding">0</property>
 | 
			
		||||
				  <property name="expand">False</property>
 | 
			
		||||
				  <property name="fill">False</property>
 | 
			
		||||
				</packing>
 | 
			
		||||
			      </child>
 | 
			
		||||
 | 
			
		||||
			      <child>
 | 
			
		||||
				<widget class="GtkComboBox" id="links_open_with_combobox">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="items" translatable="yes">Autodetect at every application startup
 | 
			
		||||
			      <property name="items" translatable="yes">Autodetect at every application startup
 | 
			
		||||
Always use GNOME default applications
 | 
			
		||||
Always use KDE default applications
 | 
			
		||||
Custom</property>
 | 
			
		||||
				  <signal name="changed" handler="on_links_open_with_combobox_changed" last_modification_time="Sat, 05 Mar 2005 16:44:57 GMT"/>
 | 
			
		||||
				</widget>
 | 
			
		||||
				<packing>
 | 
			
		||||
				  <property name="padding">0</property>
 | 
			
		||||
				  <property name="expand">True</property>
 | 
			
		||||
				  <property name="fill">True</property>
 | 
			
		||||
				</packing>
 | 
			
		||||
			      </child>
 | 
			
		||||
			      <signal name="changed" handler="on_applications_combobox_changed" last_modification_time="Tue, 09 Aug 2005 15:12:31 GMT"/>
 | 
			
		||||
			    </widget>
 | 
			
		||||
			    <packing>
 | 
			
		||||
			      <property name="padding">0</property>
 | 
			
		||||
| 
						 | 
				
			
			@ -5385,7 +5352,7 @@ Custom</property>
 | 
			
		|||
				  <child>
 | 
			
		||||
				    <widget class="GtkTable" id="table22">
 | 
			
		||||
				      <property name="visible">True</property>
 | 
			
		||||
				      <property name="n_rows">2</property>
 | 
			
		||||
				      <property name="n_rows">3</property>
 | 
			
		||||
				      <property name="n_columns">2</property>
 | 
			
		||||
				      <property name="homogeneous">False</property>
 | 
			
		||||
				      <property name="row_spacing">6</property>
 | 
			
		||||
| 
						 | 
				
			
			@ -5484,6 +5451,52 @@ Custom</property>
 | 
			
		|||
					  <property name="y_options"></property>
 | 
			
		||||
					</packing>
 | 
			
		||||
				      </child>
 | 
			
		||||
 | 
			
		||||
				      <child>
 | 
			
		||||
					<widget class="GtkLabel" id="label355">
 | 
			
		||||
					  <property name="visible">True</property>
 | 
			
		||||
					  <property name="label" translatable="yes">File manager:</property>
 | 
			
		||||
					  <property name="use_underline">False</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>
 | 
			
		||||
					</widget>
 | 
			
		||||
					<packing>
 | 
			
		||||
					  <property name="left_attach">0</property>
 | 
			
		||||
					  <property name="right_attach">1</property>
 | 
			
		||||
					  <property name="top_attach">2</property>
 | 
			
		||||
					  <property name="bottom_attach">3</property>
 | 
			
		||||
					  <property name="x_options">fill</property>
 | 
			
		||||
					  <property name="y_options"></property>
 | 
			
		||||
					</packing>
 | 
			
		||||
				      </child>
 | 
			
		||||
 | 
			
		||||
				      <child>
 | 
			
		||||
					<widget class="GtkEntry" id="custom_file_manager_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>
 | 
			
		||||
					  <signal name="changed" handler="on_custom_file_manager_entry_changed" last_modification_time="Tue, 09 Aug 2005 14:55:18 GMT"/>
 | 
			
		||||
					</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>
 | 
			
		||||
| 
						 | 
				
			
			@ -5492,7 +5505,7 @@ Custom</property>
 | 
			
		|||
			      <child>
 | 
			
		||||
				<widget class="GtkLabel" id="label198">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="label" translatable="yes"><b>Custom Applications</b></property>
 | 
			
		||||
				  <property name="label" translatable="yes"><b>Custom</b></property>
 | 
			
		||||
				  <property name="use_underline">False</property>
 | 
			
		||||
				  <property name="use_markup">True</property>
 | 
			
		||||
				  <property name="justify">GTK_JUSTIFY_LEFT</property>
 | 
			
		||||
| 
						 | 
				
			
			@ -5520,9 +5533,9 @@ Custom</property>
 | 
			
		|||
		  </child>
 | 
			
		||||
 | 
			
		||||
		  <child>
 | 
			
		||||
		    <widget class="GtkLabel" id="label196">
 | 
			
		||||
		    <widget class="GtkLabel" id="label355">
 | 
			
		||||
		      <property name="visible">True</property>
 | 
			
		||||
		      <property name="label" translatable="yes"><b>Links</b></property>
 | 
			
		||||
		      <property name="label" translatable="yes"><b>Applications</b></property>
 | 
			
		||||
		      <property name="use_underline">False</property>
 | 
			
		||||
		      <property name="use_markup">True</property>
 | 
			
		||||
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue