Merge lp:~freshapplepy/backintime/gtkbuilder into lp:backintime/1.0

[Isaiah Heyer]

[Bart de Koning (bratdaking)]

Nice rewrite of the GUI to switch from the libglade to the GTKbuilder format!

review: Approve

[Isaiah Heyer (freshapplepy)]

> Nice rewrite of the GUI to switch from the libglade to the GTKbuilder format!

Has Dan looked at it yet?

[lp:~freshapplepy/backintime/gtkbuilder]

616. By Isaiah Heyer on 2009-10-01

Corrected grammar.

=== modified file 'gnome/app.py'
--- gnome/app.py	2009-06-17 09:49:51 +0000
+++ gnome/app.py	2009-10-01 16:35:20 +0000
@@ -22,7 +22,7 @@
 import sys
 
 if len( os.getenv( 'DISPLAY', '' ) ) == 0:
-	os.putenv( 'DISPLAY', ':0.0' )
+    os.putenv( 'DISPLAY', ':0.0' )
 
 import pygtk
 pygtk.require("2.0")
@@ -30,7 +30,6 @@
 import pynotify
 import threading
 import gobject
-import gtk.glade
 import gnome
 import gnomevfs
 import datetime
@@ -57,1061 +56,1072 @@
 _=gettext.gettext
 
 
-class AboutDialog( gtk.AboutDialog ):
-	def __init__( self, config, parent ):
-		gtk.AboutDialog.__init__( self )
-	
-		self.connect( 'close', self.on_close )
-		self.connect( 'response', self.on_close )
-
-		self.set_transient_for( parent )
-
-		self.set_name( config.APP_NAME )
-		self.set_version( config.VERSION )
-		self.set_copyright( 'Copyright (C) 2008-2009 Oprea Dan' )
-		self.set_website( 'http://backintime.le-web.org' )
-		self.set_website_label( 'http://backintime.le-web.org' )
-		self.set_license( config.get_license() )
-		authors = config.get_authors()
-		if not authors is None:
-			self.set_authors( authors.split( '\n' ) )
-
-		#extra_translations = _('about-translators').strip()
-		#if extra_translations is None:
-		#	extra_translations = ''
-		#elif extra_translations == 'about-translators':
-		#	extra_translations = ''
-		#
-		#self.set_translator_credits( config.get_translations() + extra_translations )
-		self.set_translator_credits( config.get_translations() )
-
-	def on_close( self, *params ):
-		self.destroy()
-
-
-class MainWindow:
-	def __init__( self, config, app_instance ):
-		self.config = config
-		self.app_instance = app_instance
-		self.snapshots = snapshots.Snapshots( config )
-		self.special_background_color = 'lightblue'
-		self.popup_menu = None
-
-		self.folder_path = None
-		self.snapshot_id = ''
-
-		self.last_take_snapshot_message = None
-
-		self.glade = gtk.glade.XML( os.path.join( self.config.get_app_path(), 'gnome', 'mainwindow.glade' ), None, 'backintime' )
-
-		signals = { 
-				'on_MainWindow_destroy' : gtk.main_quit,
-				'on_MainWindow_delete_event' : self.on_close,
-				'on_MainWindow_key_release_event': self.on_key_release_event,
-				'on_btn_exit_clicked' : self.on_close,
-				'on_btn_link_clicked' : self.on_btn_link_clicked,
-				'on_btn_help_clicked' : self.on_btn_help_clicked,
-				'on_btn_about_clicked' : self.on_btn_about_clicked,
-				'on_btn_settings_clicked' : self.on_btn_settings_clicked,
-				'on_btn_backup_clicked' : self.on_btn_backup_clicked,
-				'on_btn_update_snapshots_clicked' : self.on_btn_update_snapshots_clicked,
-				'on_btn_snapshot_name_clicked' : self.on_btn_snapshot_name_clicked,
-				'on_btn_remove_snapshot_clicked' : self.on_btn_remove_snapshot_clicked,
-				'on_btn_restore_clicked' : self.on_btn_restore_clicked,
-				'on_btn_copy_clicked' : self.on_btn_copy_clicked,
-				'on_btn_snapshots_clicked' : self.on_btn_snapshots_clicked,
-				'on_btn_hidden_files_toggled' : self.on_btn_hidden_files_toggled,
-				'on_list_places_cursor_changed' : self.on_list_places_cursor_changed,
-				'on_list_time_line_cursor_changed' : self.on_list_time_line_cursor_changed,
-				'on_btn_folder_up_clicked' : self.on_btn_fodler_up_clicked,
-				'on_list_folder_view_row_activated' : self.on_list_folder_view_row_activated,
-				'on_list_folder_view_popup_menu' : self.on_list_folder_view_popup_menu,
-				'on_list_folder_view_button_press_event': self.on_list_folder_view_button_press_event,
-				'on_list_folder_view_drag_data_get': self.on_list_folder_view_drag_data_get,
-				'on_combo_profiles_changed': self.on_combo_profiles_changed,
-			}
-
-		self.glade.signal_autoconnect( signals )
-
-		self.window = self.glade.get_widget( 'MainWindow' )
-		self.window.set_title( self.config.APP_NAME )
-
-		#icons
-		self.icon_names = fileicons.GnomeFileIcons()
-
-		#fix a glade bug
-		self.glade.get_widget( 'btn_current_path' ).set_expand( True )
-		#self.glade.get_widget( 'tb_sep_item' ).set_expand( True )
-
-		#profiles
-		self.disable_combo_changed = True
-		self.first_update_all = True
-
-		self.store_profiles = gtk.ListStore( str, str )
-		
-		self.combo_profiles = self.glade.get_widget( 'combo_profiles' )
-
-		text_renderer = gtk.CellRendererText()
-		self.combo_profiles.pack_start( text_renderer, True )
-		self.combo_profiles.add_attribute( text_renderer, 'text', 0 )
-
-		self.combo_profiles.set_model( self.store_profiles )
-		
-		self.disable_combo_changed = False
-
-		#lbl snapshot
-		self.lbl_snapshot = self.glade.get_widget( 'lbl_snapshot' )
-
-		#status bar
-		self.status_bar = self.glade.get_widget( 'status_bar' )
-		self.status_bar.push( 0, _('Done') )
-
-		#show hidden files
-		self.show_hidden_files = self.config.get_bool_value( 'gnome.show_hidden_files', False )
-		self.btn_hidden_files = self.glade.get_widget( 'btn_hidden_files' )
-		self.btn_hidden_files.set_active( self.show_hidden_files )
-		#self.btn_hidden_files.set_label( _('Hidden files') ) #!!!
-
-		#setup places view
-		self.list_places = self.glade.get_widget( 'list_places' )
-
-		pix_renderer = gtk.CellRendererPixbuf()
-		text_renderer = gtk.CellRendererText()
-		
-		column = gtk.TreeViewColumn( _('Shortcuts') )
-		column.pack_start( pix_renderer, False )
-		column.pack_end( text_renderer, True )
-		column.add_attribute( pix_renderer, 'icon-name', 2 )
-		column.add_attribute( text_renderer, 'markup', 0 )
-		column.set_cell_data_func( pix_renderer, self.places_pix_renderer_function, None )
-		column.set_cell_data_func( text_renderer, self.places_text_renderer_function, None )
-		#column.set_alignment( 0.5 )
-		self.list_places.append_column( column )
-
-		#name, icon, path
-		self.store_places = gtk.ListStore( str, str, str )
-		self.list_places.set_model( self.store_places )
-		self.list_places.get_selection().set_select_function( self.places_select_function, self.store_places )
-
-		#setup folder view
-		self.list_folder_view_widget = self.glade.get_widget( 'list_folder_view_widget' )
-		self.list_folder_view_shadow = self.glade.get_widget( 'list_folder_view_shadow' )
-		self.list_folder_view = self.glade.get_widget( 'list_folder_view' )
-
-		pix_renderer = gtk.CellRendererPixbuf()
-		text_renderer = gtk.CellRendererText()
-
-		column = gtk.TreeViewColumn( _('Name') )
-		column.pack_start( pix_renderer, False )
-		column.pack_end( text_renderer, True )
-		column.add_attribute( pix_renderer, 'icon-name', 2 )
-		column.add_attribute( text_renderer, 'markup', 0 )
-		column.set_expand( True )
-		column.set_sizing( gtk.TREE_VIEW_COLUMN_AUTOSIZE )
-		column.set_sort_column_id( 0 )
-		self.list_folder_view.append_column( column )
-
-		text_renderer = gtk.CellRendererText()
-		column = gtk.TreeViewColumn( _('Size') )
-		column.pack_end( text_renderer, True )
-		column.add_attribute( text_renderer, 'markup', 4 )
-		column.set_sort_column_id( 1 )
-		self.list_folder_view.append_column( column )
-
-		text_renderer = gtk.CellRendererText()
-		column = gtk.TreeViewColumn( _('Date') )
-		column.pack_end( text_renderer, True )
-		column.add_attribute( text_renderer, 'markup', 5 )
-		column.set_sort_column_id( 2 )
-		self.list_folder_view.append_column( column )
-
-		# display name, relative path, icon_name, type (0 - directory, 1 - file), size (str), date, size (int)
-		self.store_folder_view = gtk.ListStore( str, str, str, int, str, str, int )
-		self.store_folder_view.set_sort_func( 0, self.sort_folder_view_by_column, 0 ) #name
-		self.store_folder_view.set_sort_func( 1, self.sort_folder_view_by_column, 6 ) #size
-		self.store_folder_view.set_sort_func( 2, self.sort_folder_view_by_column, 5 )	#date
-		self.store_folder_view.set_sort_column_id( 0, gtk.SORT_ASCENDING )
-
-		self.list_folder_view.set_model( self.store_folder_view )
-
-		#setup time line view
-		self.list_time_line = self.glade.get_widget( 'list_time_line' )
-
-		text_renderer = gtk.CellRendererText()
-		column = gtk.TreeViewColumn( _('Snapshots'), text_renderer, markup = 0 )
-		column.set_cell_data_func( text_renderer, self.places_text_renderer_function, None )
-		self.list_time_line.append_column( column )
-
-		#display name, id
-		self.store_time_line = gtk.ListStore( str, str )
-		self.list_time_line.set_model( self.store_time_line )
-		self.list_time_line.get_selection().set_select_function( self.places_select_function, self.store_time_line )
-		self.update_time_line = False
-
-		#calculate specialBackgroundColor
-		style = self.list_time_line.get_style()
-		bg1 = style.bg[gtk.STATE_NORMAL]
-		bg2 = style.bg[gtk.STATE_SELECTED]
-		self.special_background_color = gtk.gdk.Color( (2 * bg1.red + bg2.red) / 3, (2 * bg1.green + bg2.green) / 3,(2 * bg1.blue + bg2.blue) / 3 ).to_string()
-
-		#restore size & position
-		main_window_x = self.config.get_int_value( 'gnome.main_window.x', -1 )
-		main_window_y = self.config.get_int_value( 'gnome.main_window.y', -1 )
-		if main_window_x >= 0 and main_window_y >= 0:
-			self.window.move( main_window_x, main_window_y )
-
-		main_window_width = self.config.get_int_value( 'gnome.main_window.width', -1 )
-		main_window_height = self.config.get_int_value( 'gnome.main_window.height', -1 )
-		if main_window_width > 0 and main_window_height > 0:
-			self.window.resize( main_window_width, main_window_height )
-
-		main_window_hpaned1 = self.config.get_int_value( 'gnome.main_window.hpaned1', -1 )
-		main_window_hpaned2 = self.config.get_int_value( 'gnome.main_window.hpaned2', -1 )
-		if main_window_hpaned1 > 0 and main_window_hpaned2 > 0:
-			self.glade.get_widget('hpaned1').set_position( main_window_hpaned1 )
-			self.glade.get_widget('hpaned2').set_position( main_window_hpaned2 )
-
-		#prepare popup menu ids
-		gtk.stock_add( 
-				[ ('backintime.open', _('Open'), 0, 0, 'backintime' ),
-				  ('backintime.copy', _('Copy'), 0, 0, 'backintime' ),
-				  ('backintime.snapshots', _('Snapshots'), 0, 0, 'backintime' ),
-				  ('backintime.diff', _('Diff'), 0, 0, 'backintime' ),
-				  ('backintime.restore', _('Restore'), 0, 0, 'backintime' ) ] )
-
-		#show main window
-		self.window.show()
-		gnometools.run_gtk_update_loop()
-
-		self.force_wait_lock_counter = 0
-		gobject.timeout_add( 1000, self.raise_application )
-
-		if not self.config.is_configured():
-			settingsdialog.SettingsDialog( self.config, self ).run()
-
-			if not self.config.is_configured():
-				return 
-
-		if not self.config.can_backup():
-			messagebox.show_error( self.window, self.config, _('Can\'t find snapshots folder.\nIf it is on a removable drive please plug it and then press OK') )
-
-		self.update_profiles()
-		self.update_backup_info()
-		gobject.timeout_add( 1000, self.update_backup_info )
-
-	def on_combo_profiles_changed( self, *params ):
-		if self.disable_combo_changed:
-			return
-
-		iter = self.combo_profiles.get_active_iter()
-		if iter is None:
-			return
-
-		first_update_all = self.first_update_all
-
-		profile_id = self.store_profiles.get_value( iter, 1 )
-		if not first_update_all and profile_id == self.config.get_current_profile():
-			return
-
-		self.config.set_current_profile( profile_id )
-		self.first_update_all = False
-		self.update_all( first_update_all )
-
-	def update_profiles( self ):
-		self.disable_combo_changed = True
-
-		profiles = self.config.get_profiles_sorted_by_name()
-
-		select_iter = None
-		self.store_profiles.clear()
-
-		for profile_id in profiles:
-			iter = self.store_profiles.append( [ self.config.get_profile_name( profile_id ), profile_id ] )
-			if profile_id == self.config.get_current_profile():
-				select_iter = iter
-			
-
-		self.disable_combo_changed = False
-
-		if not select_iter is None:
-			self.combo_profiles.set_active_iter( select_iter )
-
-		#self.update_all( True )
-
-	def sort_folder_view_by_column( self, treemodel, iter1, iter2, column ):
-		if 0 == column:
-			ascending = 1
-			if self.store_folder_view.get_sort_column_id()[1] != gtk.SORT_ASCENDING:
-				ascending = -1
-
-			type1 = self.store_folder_view.get_value( iter1, 3 )
-			type2 = self.store_folder_view.get_value( iter2, 3 )
-
-			if type1 == 0 and type2 != 0:
-				return -1 * ascending
-
-			if type1 != 0 and type2 == 0:
-				return 1 * ascending
-
-		data1 = self.store_folder_view.get_value( iter1, column )
-		data2 = self.store_folder_view.get_value( iter2, column )
-
-		if type(data1) is str:
-			data1 = data1.upper()
-
-		if type(data2) is str:
-			data2 = data2.upper()
-
-		#print "sort_folder_view_by_column: " + str( data1 ) + " - " + str( data2 )
-
-		if data1 < data2:
-			return -1
-
-		if data1 > data2:
-			return 1
-
-		return 0
-
-
-	def get_default_startup_folder_and_file( self ):
-		last_path = self.config.get_str_value( 'gnome.last_path', '' )
-		if len(last_path) > 0 and os.path.isdir(last_path):
-			return ( last_path, None, False )
-		return ( '/', None, False )
-
-	def get_cmd_startup_folder_and_file( self, cmd ):
-		if cmd is None:
-			cmd = self.app_instance.raise_cmd
-
-		if len( cmd ) < 1:
-			return None
-
-		path = None
-		show_snapshots = False
-
-		for arg in cmd.split( '\n' ):
-			if len( arg ) < 1:
-				continue
-			if arg == '-s' or arg == '--snapshots':
-				show_snapshots = True
-				continue
-			if arg[0] == '-':
-				continue
-			if path is None:
-				path = arg
-
-		if path is None:
-			return None
-
-		if len( path ) < 1:
-			return None
-
-		path = os.path.expanduser( path )
-		path = os.path.abspath( path )
-
-		if os.path.isdir( path ):
-			if len( path ) < 1:
-				show_snapshots = False
-
-			if show_snapshots:
-				return ( os.path.dirname( path ), path, True )
-			else:
-				return ( path, '', False )
-
-		if os.path.isfile( path ):
-			return ( os.path.dirname( path ), path, show_snapshots )
-
-		return None
-
-	def get_startup_folder_and_file( self, cmd = None ):
-		startup_folder = self.get_cmd_startup_folder_and_file( cmd )
-		if startup_folder is None:
-			return self.get_default_startup_folder_and_file()
-		return startup_folder
-
-	def update_all( self, init ):
-		#fill lists
-		selected_file = None
-		show_snapshots = False
-		if init:
-			self.folder_path, selected_file, show_snapshots = self.get_startup_folder_and_file()
-		self.snapshot_id = '/'
-		self.snapshots_list = []
-
-		self.fill_places()
-		self.fill_time_line( False )
-		self.update_folder_view( 1, selected_file, show_snapshots )
-
-	def places_pix_renderer_function( self, column, renderer, model, iter, user_data ):
-		if len( model.get_value( iter, 1 ) ) == 0:
-			renderer.set_property( 'visible', False )
-		else:
-			renderer.set_property( 'visible', True )
-
-	def places_text_renderer_function( self, column, renderer, model, iter, user_data ):
-		if len( model.get_value( iter, 1 ) ) == 0:
-			renderer.set_property( 'cell-background-set', True )
-			renderer.set_property( 'cell-background', self.special_background_color )
-		else:
-			renderer.set_property( 'cell-background-set', False )
-
-	def places_select_function( self, info, store ):
-		if len( store.get_value( store.get_iter( info[0] ), 1 ) ) == 0:
-			return False
-		return True
-
-	def raise_application( self ):
-		raise_cmd = self.app_instance.raise_command()
-		if raise_cmd is None:
-			return True
-
-		print "Raise cmd: " + raise_cmd
-		self.window.present_with_time( int(time.time()) )
-		self.window.window.focus()
-		#self.window.present()
-
-		if len( raise_cmd ) == 0:
-			return True
-
-		print "Check if the main window is the only top level visible window"
-		for window in gtk.window_list_toplevels():
-			if window.get_property( 'visible' ):
-				if window != self.window:
-					print "Failed"
-					return True
-
-		print "OK"
-
-		folder_and_file = self.get_cmd_startup_folder_and_file( raise_cmd )
-		if folder_and_file is None:
-			return True
-
-		folder_path, file_name, show_snapshots = folder_and_file
-
-		#select now
-		self.snapshot_id = '/'
-		self.list_time_line.get_selection().select_iter( self.store_time_line.get_iter_first() )
-
-		#select the specified file
-		self.folder_path = folder_path
-		self.update_folder_view( 1, file_name, show_snapshots )
-
-		return True
-
-	def update_backup_info( self, force_wait_lock = False ):
-		if None is self.glade.get_widget( 'btn_backup' ):
-			return True
-
-		#print "forceWaitLock: %s" % forceWaitLock
-
-		if force_wait_lock:
-			self.force_wait_lock_counter = 10
-		
-		busy = self.snapshots.is_busy()
-		if busy:
-			self.force_wait_lock_counter = 0
-
-		if self.force_wait_lock_counter > 0:
-			self.force_wait_lock_counter = self.force_wait_lock_counter - 1
-
-		fake_busy = busy or self.force_wait_lock_counter > 0
-		self.glade.get_widget( 'btn_backup' ).set_sensitive( not fake_busy )
-
-		if fake_busy:
-			take_snapshot_message = None
-
-			if busy:
-				take_snapshot_message = self.snapshots.get_take_snapshot_message()
-
-			if take_snapshot_message is None:
-				take_snapshot_message = ( 0, '...' )
-
-			if take_snapshot_message != self.last_take_snapshot_message:
-				self.last_take_snapshot_message = take_snapshot_message
-				self.status_bar.push( 0, _('Working:') + ' ' + self.last_take_snapshot_message[1].replace( '\n', ' ' ) )
-
-			if not self.update_time_line:
-				self.update_time_line = True
-		elif self.update_time_line:
-			self.update_time_line = False
-			snapshots_list = self.snapshots_list
-
-			self.fill_time_line()
-
-			#print "New backup: %s" % self.lastBackupList
-			#print "Last backup: %s" % lastBackupList
-
-			if snapshots_list != self.snapshots_list:
-				self.status_bar.push( 0, _('Done') )
-			else:
-				self.status_bar.push( 0, _('Done, no backup needed') )
-
-		if not fake_busy:
-			self.last_take_snapshot_message = None
-
-		return True
-
-	def fill_places( self ):
-		self.store_places.clear()
-
-		#add global places
-		self.store_places.append( [ "<b>%s</b>" % _('Global'), '', '' ] )
-		self.store_places.append( [ _('Root'), '/', gtk.STOCK_HARDDISK ] )
-		self.store_places.append( [ _('Home'), os.path.expanduser( '~' ), gtk.STOCK_HOME ] )
-
-		#add bookmarks
-		rawbookmarks = ''
-		
-		try:
-			file = open( os.path.expanduser('~/.gtk-bookmarks') )
-			rawbookmarks = file.read()
-			file.close()
-		except:
-			pass
-
-		bookmarks = []
-		for rawbookmark in rawbookmarks.split( '\n' ):
-			if rawbookmark.startswith( 'file://' ):
-				index = rawbookmark.find( ' ' )
-				if index > 0:
-					bookmarks.append( ( gnomevfs.unescape_string_for_display( rawbookmark[ 7 : index ] ), rawbookmark[ index + 1 : ] ) )
-				elif index < 0:
-					index = rawbookmark.rfind( '/' )
-					if index > 0:
-						bookmarks.append( ( gnomevfs.unescape_string_for_display( rawbookmark[ 7 : ] ), gnomevfs.unescape_string_for_display( rawbookmark[ index + 1 : ] ) ) )
-
-		if len( bookmarks ) > 0:
-			self.store_places.append( [ "<b>%s</b>" % _('Bookmarks'), '', '' ] )
-			for bookmark in bookmarks:
-				self.store_places.append( [ bookmark[1], bookmark[0], self.icon_names.get_icon(bookmark[0]) ] )
-
-		#add backup folders
-		include_folders = self.config.get_include_folders()
-		if len( include_folders ) > 0:
-			if len( include_folders ) > 0:
-				self.store_places.append( [ "<b>%s</b>" % _('Backup folders'), '', '' ] )
-				for folder in include_folders:
-					self.store_places.append( [ folder[0], folder[0], gtk.STOCK_SAVE ] )
-
-	def fill_time_line( self, update_folder_view = True ):
-		current_selection = '/'
-		iter = self.list_time_line.get_selection().get_selected()[1]
-		if not iter is None:
-			current_selection = self.store_time_line.get_value( iter, 1 )
-
-		self.store_time_line.clear()
-		self.store_time_line.append( [ gnometools.get_snapshot_display_markup( self.snapshots, '/' ), '/' ] )
-
-		self.snapshots_list = self.snapshots.get_snapshots_list() 
-
-		groups = []
-		now = datetime.date.today()
-
-		#today
-		date = now
-		groups.append( (_('Today'), self.snapshots.get_snapshot_id( date ), []) )
-
-		#yesterday
-		date = now - datetime.timedelta( days = 1 )
-		groups.append( (_('Yesterday'), self.snapshots.get_snapshot_id( date ), []) )
-
-		#this week
-		date = now - datetime.timedelta( days = now.weekday() )
-		groups.append( (_('This week'), self.snapshots.get_snapshot_id( date ), []) )
-
-		#last week
-		date = now - datetime.timedelta( days = now.weekday() + 7 )
-		groups.append( (_('Last week'), self.snapshots.get_snapshot_id( date ), []) )
-
-		#fill groups
-		for snapshot_id in self.snapshots_list:
-			found = False
-
-			for group in groups:
-				if snapshot_id >= group[1]:
-					group[2].append( snapshot_id )
-					found = True
-					break
-
-			if not found:
-				year = int( snapshot_id[ 0 : 4 ] )
-				month = int( snapshot_id[ 4 : 6 ] )
-				date = datetime.date( year, month, 1 )
-
-				group_name = ''
-				if year == now.year:
-					group_name = date.strftime( '%B' ).capitalize()
-				else:
-					group_name = date.strftime( '%B, %Y' ).capitalize()
-
-				groups.append( ( group_name, self.snapshots.get_snapshot_id( date ), [ snapshot_id ]) )
-
-		#fill time_line list
-		for group in groups:
-			if len( group[2] ) > 0:
-				self.store_time_line.append( [ "<b>%s</b>" % group[0], '' ] );
-				for snapshot_id in group[2]:
-					self.store_time_line.append( [ gnometools.get_snapshot_display_markup( self.snapshots, snapshot_id ), snapshot_id ] )
-
-		#select previous item
-		iter = self.store_time_line.get_iter_first()
-		while not iter is None:
-			if current_selection == self.store_time_line.get_value( iter, 1 ):
-				break
-			iter = self.store_time_line.iter_next( iter )
-
-		changed = False
-		if iter is None:
-			changed = True
-			iter = self.store_time_line.get_iter_first()
-
-		self.list_time_line.get_selection().select_iter( iter )
-
-		if changed and update_folder_view:
-			self.update_folder_view( 2 )
-
-	def on_close( self, *params ):
-		main_window_x, main_window_y = self.window.get_position()
-		main_window_width, main_window_height = self.window.get_size()
-		main_window_hpaned1 = self.glade.get_widget('hpaned1').get_position()
-		main_window_hpaned2 = self.glade.get_widget('hpaned2').get_position()
-
-		self.config.set_int_value( 'gnome.main_window.x', main_window_x )
-		self.config.set_int_value( 'gnome.main_window.y', main_window_y )
-		self.config.set_int_value( 'gnome.main_window.width', main_window_width )
-		self.config.set_int_value( 'gnome.main_window.height', main_window_height )
-		self.config.set_int_value( 'gnome.main_window.hpaned1', main_window_hpaned1 )
-		self.config.set_int_value( 'gnome.main_window.hpaned2', main_window_hpaned2 )
-		self.config.set_str_value( 'gnome.last_path', self.folder_path )
-		self.config.set_bool_value( 'gnome.show_hidden_files', self.show_hidden_files )
-
-		self.config.save()
-		self.window.destroy()
-		return True
-
-	def on_list_time_line_cursor_changed( self, list ):
-		if list.get_selection().path_is_selected( list.get_cursor()[ 0 ] ):
-			self.update_folder_view( 2 )
-
-	def on_list_places_cursor_changed( self, list ):
-		if list.get_selection().path_is_selected( list.get_cursor()[ 0 ] ):
-			iter = list.get_selection().get_selected()[1]
-			folder_path = self.store_places.get_value( iter, 1 )
-			if folder_path != self.folder_path:
-				self.folder_path = folder_path
-				self.update_folder_view( 0 )
-
-	def on_list_folder_view_drag_data_get( self, widget, drag_context, selection_data, info, timestamp, user_param1 = None ):
-		iter = self.list_folder_view.get_selection().get_selected()[1]
-		if not iter is None:
-			path = self.store_folder_view.get_value( iter, 1 )
-			path = self.snapshots.get_snapshot_path_to( self.snapshot_id, path )
-			path = gnomevfs.escape_path_string( path )
-			selection_data.set_uris( [ 'file://' + path ] )
-
-	def on_list_folder_view_button_press_event( self, list, event ):
-		if event.button != 3:
-			return
-
-		if len( self.store_folder_view ) <= 0:
-			return
-
-		path = self.list_folder_view.get_path_at_pos( int( event.x ), int( event.y ) )
-		if path is None:
-			return
-		path = path[0]
-	
-		self.list_folder_view.get_selection().select_path( path )
-		self.show_folder_view_menu_popup( self.list_folder_view, event.button, event.time )
-
-	def on_list_folder_view_popup_menu( self, list ):
-		self.show_folder_view_menu_popup( list, 1, gtk.get_current_event_time() )
-
-	def show_folder_view_menu_popup( self, list, button, time ):
-		iter = list.get_selection().get_selected()[1]
-		if iter is None:
-			return
-
-		#print "popup-menu"
-		self.popup_menu = gtk.Menu()
-
-		menu_item = gtk.ImageMenuItem( 'backintime.open' )
-		menu_item.set_image( gtk.image_new_from_icon_name( self.store_folder_view.get_value( iter, 2 ), gtk.ICON_SIZE_MENU ) )
-		menu_item.connect( 'activate', self.on_list_folder_view_open_item )
-		self.popup_menu.append( menu_item )
-
-		self.popup_menu.append( gtk.SeparatorMenuItem() )
-
-		menu_item = gtk.ImageMenuItem( 'backintime.copy' )
-		menu_item.set_image( gtk.image_new_from_stock( gtk.STOCK_COPY, gtk.ICON_SIZE_MENU ) )
-		menu_item.connect( 'activate', self.on_list_folder_view_copy_item )
-		self.popup_menu.append( menu_item )
-
-		menu_item = gtk.ImageMenuItem( 'backintime.snapshots' )
-		menu_item.set_image( gtk.image_new_from_stock( gtk.STOCK_INDEX, gtk.ICON_SIZE_MENU ) )
-		menu_item.connect( 'activate', self.on_list_folder_view_snapshots_item )
-		self.popup_menu.append( menu_item )
-
-		if len( self.snapshot_id ) > 1:
-			menu_item = gtk.ImageMenuItem( 'backintime.restore' )
-			menu_item.set_image( gtk.image_new_from_stock( gtk.STOCK_UNDELETE, gtk.ICON_SIZE_MENU ) )
-			menu_item.connect( 'activate', self.on_list_folder_view_restore_item )
-			self.popup_menu.append( menu_item )
-
-		self.popup_menu.show_all()
-		self.popup_menu.popup( None, None, None, button, time )
-
-	def on_list_folder_view_restore_item( self, widget, data = None ):
-		self.on_btn_restore_clicked( self.glade.get_widget( 'btn_restore' ) )
-
-	def on_list_folder_view_copy_item( self, widget, data = None ):
-		self.on_btn_copy_clicked( self.glade.get_widget( 'btn_copy' ) )
-
-	def on_list_folder_view_snapshots_item( self, widget, data = None ):
-		self.on_btn_snapshots_clicked( self.glade.get_widget( 'btn_snapshots' ) )
-
-	def on_list_folder_view_open_item( self, widget, data = None ):
-		iter = self.list_folder_view.get_selection().get_selected()[1]
-		if iter is None:
-			return
-
-		path = self.store_folder_view.get_value( iter, 1 )
-		path = self.snapshots.get_snapshot_path_to( self.snapshot_id, path )
-		cmd = "gnome-open \"%s\" &" % path
-		print cmd
-		os.system( cmd )
-
-	def on_list_folder_view_row_activated( self, list, path, column ):
-		iter = list.get_selection().get_selected()[1]
-		path = self.store_folder_view.get_value( iter, 1 )
-
-		#directory
-		if 0 == self.store_folder_view.get_value( iter, 3 ):
-			self.folder_path = path
-			self.update_folder_view( 1 )
-			return
-
-		#file
-		path = self.snapshots.get_snapshot_path_to( self.snapshot_id, path )
-		cmd = "gnome-open \"%s\" &" % path
-		print cmd
-		os.system( cmd )
-
-	def on_btn_fodler_up_clicked( self, button ):
-		if len( self.folder_path ) <= 1:
-			return
-
-		index = self.folder_path.rfind( '/' )
-		if index < 1:
-			parent_path = "/"
-		else:
-			parent_path = self.folder_path[ : index ]
-
-		self.folder_path = parent_path
-		self.update_folder_view( 1 )
-
-	def on_btn_restore_clicked( self, button ):
-		iter = self.list_folder_view.get_selection().get_selected()[1]
-		if not iter is None:
-			button.set_sensitive( False )
-			gnometools.run_gtk_update_loop()
-			self.snapshots.restore( self.snapshot_id, self.store_folder_view.get_value( iter, 1 ) )
-			button.set_sensitive( True )
-	
-	def on_btn_copy_clicked( self, button ):
-		iter = self.list_folder_view.get_selection().get_selected()[1]
-		if iter is None:
-			return
-
-		path = self.store_folder_view.get_value( iter, 1 )
-		path = self.snapshots.get_snapshot_path_to( self.snapshot_id, path )
-
-		clipboardtools.clipboard_copy_path( path )
-
-	def on_btn_hidden_files_toggled( self, button ):
-		if self.folder_path is None:
-			return
-
-		self.show_hidden_files = button.get_active()
-		self.update_folder_view( 0 )
-
-	def on_btn_snapshots_clicked( self, button ):
-		iter = self.list_folder_view.get_selection().get_selected()[1]
-		if iter is None:
-			return
-
-		path = self.store_folder_view.get_value( iter, 1 )
-		icon_name = self.store_folder_view.get_value( iter, 2 )
-
-		retVal = snapshotsdialog.SnapshotsDialog( self.snapshots, self.window, path, self.snapshots_list, self.snapshot_id, icon_name ).run()
-		
-		#select the specified file
-		if not retVal is None:
-			iter = self.store_time_line.get_iter_first()
-			while not iter is None:
-				snapshot_id = self.store_time_line.get_value( iter, 1 )
-				if snapshot_id == retVal:
-					break
-				iter = self.store_time_line.iter_next( iter )
-
-			if not iter is None:
-				self.list_time_line.get_selection().select_iter( iter )
-				self.update_folder_view( 2 )
-
-	def on_btn_about_clicked( self, button ):
-		AboutDialog( self.config, self.window ).run()
-
-	def on_help( self ):
-		gnome.help_display('backintime')
-
-	def on_btn_help_clicked( self, button ):
-		self.on_help()
-
-	def on_btn_link_clicked( self, button ):
-		os.system( "gnome-open http://backintime.le-web.org &" )
-
-	def on_key_release_event( self, widget, event ):
-		if 'F1' == gtk.gdk.keyval_name( event.keyval ) and ( event.state & (gtk.gdk.CONTROL_MASK | gtk.gdk.MOD1_MASK) ) == 0:
-			self.on_help()
-
-	def on_btn_settings_clicked( self, button ):
-		snapshots_path = self.config.get_snapshots_path()
-		include_folders = self.config.get_include_folders()
-
-		settingsdialog.SettingsDialog( self.config, self ).run()
-
-		if snapshots_path != self.config.get_snapshots_path() or include_folders != self.config.get_include_folders():
-			self.update_all( False )
-
-	def on_btn_snapshot_name_clicked( self, button ):
-		iter = self.list_time_line.get_selection().get_selected()[1]
-		if iter is None:
-			return
-
-		snapshot_id = self.store_time_line.get_value( iter, 1 )
-		if len( snapshot_id ) <= 1:
-			return
-
-		old_name = self.snapshots.get_snapshot_name( snapshot_id )
-		new_name = messagebox.text_input_dialog( self.window, self.config, _('Snapshot Name'), old_name )
-		if new_name is None:
-			return
-
-		if old_name == new_name:
-			return
-
-		self.snapshots.set_snapshot_name( snapshot_id, new_name )
-		self.store_time_line.set_value( iter, 0, gnometools.get_snapshot_display_markup( self.snapshots, snapshot_id ) )
-
-	def on_btn_remove_snapshot_clicked( self, button ):
-		iter = self.list_time_line.get_selection().get_selected()[1]
-		if iter is None:
-			return
-
-		snapshot_id = self.store_time_line.get_value( iter, 1 )
-		if len( snapshot_id ) <= 1:
-			return
-
-		if gtk.RESPONSE_YES == messagebox.show_question( self.window, self.config, _('Are you sure you want to remove the snapshot:\n<b>%s</b>') % self.snapshots.get_snapshot_display_name( snapshot_id ) ):
-			print "Remove Snapshot: %s" % snapshot_id
-			self.snapshots.remove_snapshot( snapshot_id )
-			self.fill_time_line()
-
-	def on_btn_backup_clicked( self, button ):
-		button.set_sensitive( False )
-		self.updatetime_line = True
-		
-		if self.snapshots.is_busy():
-			self.update_backup_info()
-			return
-
-		backintime.take_snapshot_now_async( self.config )
-		self.update_backup_info( True )
-
-	def on_btn_update_snapshots_clicked( self, button ):
-		self.fill_time_line( False )
-		self.update_folder_view( 2 )
-
-	def update_folder_view( self, changed_from, selected_file = None, show_snapshots = False ): #0 - places, 1 - folder view, 2 - time_line
-		#update backup time
-		if 2 == changed_from:
-			iter = self.list_time_line.get_selection().get_selected()[1]
-			self.snapshot_id = self.store_time_line.get_value( iter, 1 )
-			#self.lblTime.set_markup( "<b>%s</b>" % backupTime )
-
-		tooltip = ''
-		text = ''
-		if len( self.snapshot_id ) > 1:
-			name = self.snapshots.get_snapshot_display_id( self.snapshot_id )
-			text = _('Snapshot: %s') % name
-			tooltip = _('View the snapshot made at %s') % name
-		else:
-			tooltip = _('View the current disk content')
-			text = _('Now')
-
-		self.lbl_snapshot.set_markup( ' <b>' + text + '</b> ' )
-		self.lbl_snapshot.set_tooltip_text( tooltip )
-
-		#update selected places item
-		if 1 == changed_from:
-			iter = self.store_places.get_iter_first()
-			while not iter is None:
-				place_path = self.store_places.get_value( iter, 1 )
-				if place_path == self.folder_path:
-					break
-				iter = self.store_places.iter_next( iter )
-
-			if iter is None:
-				self.list_places.get_selection().unselect_all()
-			else:
-				self.list_places.get_selection().select_iter( iter )
-
-		#update folder view
-		
-		full_path = self.snapshots.get_snapshot_path_to( self.snapshot_id, self.folder_path )
-		all_files = []
-		files = []
-		folder_exists = os.path.isdir( full_path )
-
-		if folder_exists:
-			try:
-				all_files = os.listdir( full_path )
-				all_files.sort()
-			except:
-				pass
-
-			files = []
-			for file in all_files:
-				if len( file ) == 0:
-					continue
-
-				if not self.show_hidden_files:
-					if file[ 0 ] == '.':
-						continue
-					if file[ -1 ] == '~':
-						continue
-
-				path = os.path.join( full_path, file )
-
-				file_size = -1
-				file_date = -1
-
-				try:
-					file_stat = os.stat( path )
-					file_size = file_stat[stat.ST_SIZE]
-					file_date = file_stat[stat.ST_MTIME]
-				except:
-					pass
-
-				#format size
-				file_size_int = file_size
-				if file_size_int < 0:
-					file_size_int = 0
-
-				if file_size < 0:
-					file_size = 'unknown'
-				elif file_size < 1024:
-					file_size = str( file_size ) + ' bytes'
-				elif file_size < 1024 * 1024:
-					file_size = file_size / 1024
-					file_size = str( file_size ) + ' KB'
-				elif file_size < 1024 * 1024 * 1024:
-					file_size = file_size / ( 1024 * 1024 )
-					file_size = str( file_size ) + ' MB'
-				else:
-					file_size = file_size / ( 1024 * 1024 * 1024 )
-					file_size = str( file_size ) + ' GB'
-
-				#format date
-				if file_date < 0:
-					file_date = 'unknown'
-				else:
-					file_date = datetime.datetime.fromtimestamp(file_date).isoformat(' ')
-
-				if os.path.isdir( path ):
-					files.append( [ file, file_size, file_date, self.icon_names.get_icon(path), file_size_int, 0 ] )
-				else:
-					files.append( [ file, file_size, file_date, self.icon_names.get_icon(path), file_size_int, 1 ] )
-
-			#try to keep old selected file
-			if selected_file is None:
-				selected_file = ''
-				iter = self.list_folder_view.get_selection().get_selected()[1]
-				if not iter is None:
-					selected_file = self.store_folder_view.get_value( iter, 1 )
-
-			self.list_folder_view_widget.show()
-			self.list_folder_view_shadow.hide()
-		else:
-			self.list_folder_view_widget.hide()
-			self.list_folder_view_shadow.show()
-
-		#populate the list
-		self.store_folder_view.clear()
-
-		selected_iter = None
-		for item in files:
-			rel_path = os.path.join( self.folder_path, item[0] )
-			new_iter = self.store_folder_view.append( [ item[0], rel_path, item[3], item[5], item[1], item[2], item[4] ] )
-			if selected_file == rel_path:
-				selected_iter = new_iter 
-
-		#select old item or the first item
-		if len( files ) > 0:
-			if selected_iter is None:
-				selected_iter = self.store_folder_view.get_iter_first()
-			self.list_folder_view.get_selection().select_iter( selected_iter )
-			self.list_folder_view.drag_source_set( gtk.gdk.BUTTON1_MASK | gtk.gdk.BUTTON3_MASK, gtk.target_list_add_uri_targets(), gtk.gdk.ACTION_COPY )
-		else:
-			self.list_folder_view.drag_source_unset()
-
-		#update folderup button state
-		self.glade.get_widget( 'btn_folder_up' ).set_sensitive( len( self.folder_path ) > 1 )
-
-		#update restore button state
-		self.glade.get_widget( 'btn_restore' ).set_sensitive( len( self.snapshot_id ) > 1 and len( self.store_folder_view ) > 0 )
-
-		#update remove/name snapshot buttons
-		self.glade.get_widget( 'btn_snapshot_name' ).set_sensitive( len( self.snapshot_id ) > 1 )
-		self.glade.get_widget( 'btn_remove_snapshot' ).set_sensitive( len( self.snapshot_id ) > 1 )
-
-		#update copy button state
-		self.glade.get_widget( 'btn_copy' ).set_sensitive( len( self.store_folder_view ) > 0 )
-
-		#update snapshots button state
-		self.glade.get_widget( 'btn_snapshots' ).set_sensitive( len( self.store_folder_view ) > 0 )
-
-		#display current folder
-		self.glade.get_widget( 'edit_current_path' ).set_text( self.folder_path )
-
-		#show snapshots
-		if show_snapshots:
-			self.on_btn_snapshots_clicked( None )
+class AboutDialog(gtk.AboutDialog):
+
+    def __init__( self, config, parent ):
+
+        gtk.AboutDialog.__init__( self )
+    
+        self.connect( 'close', self.on_close )
+        self.connect( 'response', self.on_close )
+
+        self.set_transient_for( parent )
+
+        self.set_name( config.APP_NAME )
+        self.set_version( config.VERSION )
+        self.set_copyright( 'Copyright (C) 2008-2009 Oprea Dan' )
+        self.set_website( 'http://backintime.le-web.org' )
+        self.set_website_label( 'http://backintime.le-web.org' )
+        self.set_license( config.get_license() )
+        authors = config.get_authors()
+        if not authors is None:
+            self.set_authors( authors.split( '\n' ) )
+
+        #extra_translations = _('about-translators').strip()
+        #if extra_translations is None:
+        #   extra_translations = ''
+        #elif extra_translations == 'about-translators':
+        #   extra_translations = ''
+        #
+        #self.set_translator_credits( config.get_translations() + extra_translations )
+        self.set_translator_credits( config.get_translations() )
+
+    def on_close( self, *params ):
+        self.destroy()
+
+
+class MainWindow(object):
+
+    def __init__( self, config, app_instance ):
+
+        self.config = config
+        self.app_instance = app_instance
+        self.snapshots = snapshots.Snapshots( config )
+        self.special_background_color = 'lightblue'
+        self.popup_menu = None
+
+        self.folder_path = None
+        self.snapshot_id = ''
+
+        self.last_take_snapshot_message = None
+
+        
+        builder = gtk.Builder()
+        self.builder = builder
+
+        glade_file = os.path.join(self.config.get_app_path(), 'gnome',
+                'mainwindow.glade')
+
+        builder.add_from_file(glade_file)
+
+        signals = { 
+                'on_MainWindow_destroy' : gtk.main_quit,
+                'on_MainWindow_delete_event' : self.on_close,
+                'on_MainWindow_key_release_event': self.on_key_release_event,
+                'on_btn_exit_clicked' : self.on_close,
+                'on_btn_link_clicked' : self.on_btn_link_clicked,
+                'on_btn_help_clicked' : self.on_btn_help_clicked,
+                'on_btn_about_clicked' : self.on_btn_about_clicked,
+                'on_btn_settings_clicked' : self.on_btn_settings_clicked,
+                'on_btn_backup_clicked' : self.on_btn_backup_clicked,
+                'on_btn_update_snapshots_clicked' : self.on_btn_update_snapshots_clicked,
+                'on_btn_snapshot_name_clicked' : self.on_btn_snapshot_name_clicked,
+                'on_btn_remove_snapshot_clicked' : self.on_btn_remove_snapshot_clicked,
+                'on_btn_restore_clicked' : self.on_btn_restore_clicked,
+                'on_btn_copy_clicked' : self.on_btn_copy_clicked,
+                'on_btn_snapshots_clicked' : self.on_btn_snapshots_clicked,
+                'on_btn_hidden_files_toggled' : self.on_btn_hidden_files_toggled,
+                'on_list_places_cursor_changed' : self.on_list_places_cursor_changed,
+                'on_list_time_line_cursor_changed' : self.on_list_time_line_cursor_changed,
+                'on_btn_folder_up_clicked' : self.on_btn_fodler_up_clicked,
+                'on_list_folder_view_row_activated' : self.on_list_folder_view_row_activated,
+                'on_list_folder_view_popup_menu' : self.on_list_folder_view_popup_menu,
+                'on_list_folder_view_button_press_event': self.on_list_folder_view_button_press_event,
+                'on_list_folder_view_drag_data_get': self.on_list_folder_view_drag_data_get,
+                'on_combo_profiles_changed': self.on_combo_profiles_changed,
+            }
+
+        builder.connect_signals(signals)
+
+        self.window = self.builder.get_object( 'MainWindow' )
+        self.window.set_title( self.config.APP_NAME )
+
+        #icons
+        self.icon_names = fileicons.GnomeFileIcons()
+
+        #fix a glade bug
+        self.builder.get_object( 'btn_current_path' ).set_expand( True )
+        #self.builder.get_object( 'tb_sep_item' ).set_expand( True )
+
+        #profiles
+        self.disable_combo_changed = True
+        self.first_update_all = True
+
+        self.store_profiles = gtk.ListStore( str, str )
+        
+        self.combo_profiles = self.builder.get_object( 'combo_profiles' )
+
+        text_renderer = gtk.CellRendererText()
+        self.combo_profiles.pack_start( text_renderer, True )
+        self.combo_profiles.add_attribute( text_renderer, 'text', 0 )
+
+        self.combo_profiles.set_model( self.store_profiles )
+        
+        self.disable_combo_changed = False
+
+        #lbl snapshot
+        self.lbl_snapshot = self.builder.get_object( 'lbl_snapshot' )
+
+        #status bar
+        self.status_bar = self.builder.get_object( 'status_bar' )
+        self.status_bar.push( 0, _('Done') )
+
+        #show hidden files
+        self.show_hidden_files = self.config.get_bool_value( 'gnome.show_hidden_files', False )
+        self.btn_hidden_files = self.builder.get_object( 'btn_hidden_files' )
+        self.btn_hidden_files.set_active( self.show_hidden_files )
+        #self.btn_hidden_files.set_label( _('Hidden files') ) #!!!
+
+        #setup places view
+        self.list_places = self.builder.get_object( 'list_places' )
+
+        pix_renderer = gtk.CellRendererPixbuf()
+        text_renderer = gtk.CellRendererText()
+        
+        column = gtk.TreeViewColumn( _('Shortcuts') )
+        column.pack_start( pix_renderer, False )
+        column.pack_end( text_renderer, True )
+        column.add_attribute( pix_renderer, 'icon-name', 2 )
+        column.add_attribute( text_renderer, 'markup', 0 )
+        column.set_cell_data_func( pix_renderer, self.places_pix_renderer_function, None )
+        column.set_cell_data_func( text_renderer, self.places_text_renderer_function, None )
+        #column.set_alignment( 0.5 )
+        self.list_places.append_column( column )
+
+        #name, icon, path
+        self.store_places = gtk.ListStore( str, str, str )
+        self.list_places.set_model( self.store_places )
+        self.list_places.get_selection().set_select_function( self.places_select_function, self.store_places )
+
+        #setup folder view
+        self.list_folder_view_widget = self.builder.get_object( 'list_folder_view_widget' )
+        self.list_folder_view_shadow = self.builder.get_object( 'list_folder_view_shadow' )
+        self.list_folder_view = self.builder.get_object( 'list_folder_view' )
+
+        pix_renderer = gtk.CellRendererPixbuf()
+        text_renderer = gtk.CellRendererText()
+
+        column = gtk.TreeViewColumn( _('Name') )
+        column.pack_start( pix_renderer, False )
+        column.pack_end( text_renderer, True )
+        column.add_attribute( pix_renderer, 'icon-name', 2 )
+        column.add_attribute( text_renderer, 'markup', 0 )
+        column.set_expand( True )
+        column.set_sizing( gtk.TREE_VIEW_COLUMN_AUTOSIZE )
+        column.set_sort_column_id( 0 )
+        self.list_folder_view.append_column( column )
+
+        text_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn( _('Size') )
+        column.pack_end( text_renderer, True )
+        column.add_attribute( text_renderer, 'markup', 4 )
+        column.set_sort_column_id( 1 )
+        self.list_folder_view.append_column( column )
+
+        text_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn( _('Date') )
+        column.pack_end( text_renderer, True )
+        column.add_attribute( text_renderer, 'markup', 5 )
+        column.set_sort_column_id( 2 )
+        self.list_folder_view.append_column( column )
+
+        # display name, relative path, icon_name, type (0 - directory, 1 - file), size (str), date, size (int)
+        self.store_folder_view = gtk.ListStore( str, str, str, int, str, str, int )
+        self.store_folder_view.set_sort_func( 0, self.sort_folder_view_by_column, 0 ) #name
+        self.store_folder_view.set_sort_func( 1, self.sort_folder_view_by_column, 6 ) #size
+        self.store_folder_view.set_sort_func( 2, self.sort_folder_view_by_column, 5 )   #date
+        self.store_folder_view.set_sort_column_id( 0, gtk.SORT_ASCENDING )
+
+        self.list_folder_view.set_model( self.store_folder_view )
+
+        #setup time line view
+        self.list_time_line = self.builder.get_object( 'list_time_line' )
+
+        text_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn( _('Snapshots'), text_renderer, markup = 0 )
+        column.set_cell_data_func( text_renderer, self.places_text_renderer_function, None )
+        self.list_time_line.append_column( column )
+
+        #display name, id
+        self.store_time_line = gtk.ListStore( str, str )
+        self.list_time_line.set_model( self.store_time_line )
+        self.list_time_line.get_selection().set_select_function( self.places_select_function, self.store_time_line )
+        self.update_time_line = False
+
+        #calculate specialBackgroundColor
+        style = self.list_time_line.get_style()
+        bg1 = style.bg[gtk.STATE_NORMAL]
+        bg2 = style.bg[gtk.STATE_SELECTED]
+        self.special_background_color = gtk.gdk.Color( (2 * bg1.red + bg2.red) / 3, (2 * bg1.green + bg2.green) / 3,(2 * bg1.blue + bg2.blue) / 3 ).to_string()
+
+        #restore size & position
+        main_window_x = self.config.get_int_value( 'gnome.main_window.x', -1 )
+        main_window_y = self.config.get_int_value( 'gnome.main_window.y', -1 )
+        if main_window_x >= 0 and main_window_y >= 0:
+            self.window.move( main_window_x, main_window_y )
+
+        main_window_width = self.config.get_int_value( 'gnome.main_window.width', -1 )
+        main_window_height = self.config.get_int_value( 'gnome.main_window.height', -1 )
+        if main_window_width > 0 and main_window_height > 0:
+            self.window.resize( main_window_width, main_window_height )
+
+        main_window_hpaned1 = self.config.get_int_value( 'gnome.main_window.hpaned1', -1 )
+        main_window_hpaned2 = self.config.get_int_value( 'gnome.main_window.hpaned2', -1 )
+        if main_window_hpaned1 > 0 and main_window_hpaned2 > 0:
+            self.builder.get_object('hpaned1').set_position( main_window_hpaned1 )
+            self.builder.get_object('hpaned2').set_position( main_window_hpaned2 )
+
+        #prepare popup menu ids
+        gtk.stock_add( 
+                [ ('backintime.open', _('Open'), 0, 0, 'backintime' ),
+                  ('backintime.copy', _('Copy'), 0, 0, 'backintime' ),
+                  ('backintime.snapshots', _('Snapshots'), 0, 0, 'backintime' ),
+                  ('backintime.diff', _('Diff'), 0, 0, 'backintime' ),
+                  ('backintime.restore', _('Restore'), 0, 0, 'backintime' ) ] )
+
+        #show main window
+        self.window.show()
+        gnometools.run_gtk_update_loop()
+
+        self.force_wait_lock_counter = 0
+        gobject.timeout_add( 1000, self.raise_application )
+
+        if not self.config.is_configured():
+            settingsdialog.SettingsDialog( self.config, self ).run()
+
+            if not self.config.is_configured():
+                return 
+
+        if not self.config.can_backup():
+            messagebox.show_error( self.window, self.config, _('Can\'t find snapshots folder.\nIf it is on a removable drive please plug it and then press OK') )
+
+        self.update_profiles()
+        self.update_backup_info()
+        gobject.timeout_add( 1000, self.update_backup_info )
+
+    def on_combo_profiles_changed( self, *params ):
+        if self.disable_combo_changed:
+            return
+
+        iter = self.combo_profiles.get_active_iter()
+        if iter is None:
+            return
+
+        first_update_all = self.first_update_all
+
+        profile_id = self.store_profiles.get_value( iter, 1 )
+        if not first_update_all and profile_id == self.config.get_current_profile():
+            return
+
+        self.config.set_current_profile( profile_id )
+        self.first_update_all = False
+        self.update_all( first_update_all )
+
+    def update_profiles( self ):
+        self.disable_combo_changed = True
+
+        profiles = self.config.get_profiles_sorted_by_name()
+
+        select_iter = None
+        self.store_profiles.clear()
+
+        for profile_id in profiles:
+            iter = self.store_profiles.append( [ self.config.get_profile_name( profile_id ), profile_id ] )
+            if profile_id == self.config.get_current_profile():
+                select_iter = iter
+            
+
+        self.disable_combo_changed = False
+
+        if not select_iter is None:
+            self.combo_profiles.set_active_iter( select_iter )
+
+        #self.update_all( True )
+
+    def sort_folder_view_by_column( self, treemodel, iter1, iter2, column ):
+        if 0 == column:
+            ascending = 1
+            if self.store_folder_view.get_sort_column_id()[1] != gtk.SORT_ASCENDING:
+                ascending = -1
+
+            type1 = self.store_folder_view.get_value( iter1, 3 )
+            type2 = self.store_folder_view.get_value( iter2, 3 )
+
+            if type1 == 0 and type2 != 0:
+                return -1 * ascending
+
+            if type1 != 0 and type2 == 0:
+                return 1 * ascending
+
+        data1 = self.store_folder_view.get_value( iter1, column )
+        data2 = self.store_folder_view.get_value( iter2, column )
+
+        if type(data1) is str:
+            data1 = data1.upper()
+
+        if type(data2) is str:
+            data2 = data2.upper()
+
+        #print "sort_folder_view_by_column: " + str( data1 ) + " - " + str( data2 )
+
+        if data1 < data2:
+            return -1
+
+        if data1 > data2:
+            return 1
+
+        return 0
+
+
+    def get_default_startup_folder_and_file( self ):
+        last_path = self.config.get_str_value( 'gnome.last_path', '' )
+        if len(last_path) > 0 and os.path.isdir(last_path):
+            return ( last_path, None, False )
+        return ( '/', None, False )
+
+    def get_cmd_startup_folder_and_file( self, cmd ):
+        if cmd is None:
+            cmd = self.app_instance.raise_cmd
+
+        if len( cmd ) < 1:
+            return None
+
+        path = None
+        show_snapshots = False
+
+        for arg in cmd.split( '\n' ):
+            if len( arg ) < 1:
+                continue
+            if arg == '-s' or arg == '--snapshots':
+                show_snapshots = True
+                continue
+            if arg[0] == '-':
+                continue
+            if path is None:
+                path = arg
+
+        if path is None:
+            return None
+
+        if len( path ) < 1:
+            return None
+
+        path = os.path.expanduser( path )
+        path = os.path.abspath( path )
+
+        if os.path.isdir( path ):
+            if len( path ) < 1:
+                show_snapshots = False
+
+            if show_snapshots:
+                return ( os.path.dirname( path ), path, True )
+            else:
+                return ( path, '', False )
+
+        if os.path.isfile( path ):
+            return ( os.path.dirname( path ), path, show_snapshots )
+
+        return None
+
+    def get_startup_folder_and_file( self, cmd = None ):
+        startup_folder = self.get_cmd_startup_folder_and_file( cmd )
+        if startup_folder is None:
+            return self.get_default_startup_folder_and_file()
+        return startup_folder
+
+    def update_all( self, init ):
+        #fill lists
+        selected_file = None
+        show_snapshots = False
+        if init:
+            self.folder_path, selected_file, show_snapshots = self.get_startup_folder_and_file()
+        self.snapshot_id = '/'
+        self.snapshots_list = []
+
+        self.fill_places()
+        self.fill_time_line( False )
+        self.update_folder_view( 1, selected_file, show_snapshots )
+
+    def places_pix_renderer_function( self, column, renderer, model, iter, user_data ):
+        if len( model.get_value( iter, 1 ) ) == 0:
+            renderer.set_property( 'visible', False )
+        else:
+            renderer.set_property( 'visible', True )
+
+    def places_text_renderer_function( self, column, renderer, model, iter, user_data ):
+        if len( model.get_value( iter, 1 ) ) == 0:
+            renderer.set_property( 'cell-background-set', True )
+            renderer.set_property( 'cell-background', self.special_background_color )
+        else:
+            renderer.set_property( 'cell-background-set', False )
+
+    def places_select_function( self, info, store ):
+        if len( store.get_value( store.get_iter( info[0] ), 1 ) ) == 0:
+            return False
+        return True
+
+    def raise_application( self ):
+        raise_cmd = self.app_instance.raise_command()
+        if raise_cmd is None:
+            return True
+
+        print "Raise cmd: " + raise_cmd
+        self.window.present_with_time( int(time.time()) )
+        self.window.window.focus()
+        #self.window.present()
+
+        if len( raise_cmd ) == 0:
+            return True
+
+        print "Check if the main window is the only top level visible window"
+        for window in gtk.window_list_toplevels():
+            if window.get_property( 'visible' ):
+                if window != self.window:
+                    print "Failed"
+                    return True
+
+        print "OK"
+
+        folder_and_file = self.get_cmd_startup_folder_and_file( raise_cmd )
+        if folder_and_file is None:
+            return True
+
+        folder_path, file_name, show_snapshots = folder_and_file
+
+        #select now
+        self.snapshot_id = '/'
+        self.list_time_line.get_selection().select_iter( self.store_time_line.get_iter_first() )
+
+        #select the specified file
+        self.folder_path = folder_path
+        self.update_folder_view( 1, file_name, show_snapshots )
+
+        return True
+
+    def update_backup_info( self, force_wait_lock = False ):
+        if None is self.builder.get_object( 'btn_backup' ):
+            return True
+
+        #print "forceWaitLock: %s" % forceWaitLock
+
+        if force_wait_lock:
+            self.force_wait_lock_counter = 10
+        
+        busy = self.snapshots.is_busy()
+        if busy:
+            self.force_wait_lock_counter = 0
+
+        if self.force_wait_lock_counter > 0:
+            self.force_wait_lock_counter = self.force_wait_lock_counter - 1
+
+        fake_busy = busy or self.force_wait_lock_counter > 0
+        self.builder.get_object( 'btn_backup' ).set_sensitive( not fake_busy )
+
+        if fake_busy:
+            take_snapshot_message = None
+
+            if busy:
+                take_snapshot_message = self.snapshots.get_take_snapshot_message()
+
+            if take_snapshot_message is None:
+                take_snapshot_message = ( 0, '...' )
+
+            if take_snapshot_message != self.last_take_snapshot_message:
+                self.last_take_snapshot_message = take_snapshot_message
+                self.status_bar.push( 0, _('Working:') + ' ' + self.last_take_snapshot_message[1].replace( '\n', ' ' ) )
+
+            if not self.update_time_line:
+                self.update_time_line = True
+        elif self.update_time_line:
+            self.update_time_line = False
+            snapshots_list = self.snapshots_list
+
+            self.fill_time_line()
+
+            #print "New backup: %s" % self.lastBackupList
+            #print "Last backup: %s" % lastBackupList
+
+            if snapshots_list != self.snapshots_list:
+                self.status_bar.push( 0, _('Done') )
+            else:
+                self.status_bar.push( 0, _('Done, no backup needed') )
+
+        if not fake_busy:
+            self.last_take_snapshot_message = None
+
+        return True
+
+    def fill_places( self ):
+        self.store_places.clear()
+
+        #add global places
+        self.store_places.append( [ "<b>%s</b>" % _('Global'), '', '' ] )
+        self.store_places.append( [ _('Root'), '/', gtk.STOCK_HARDDISK ] )
+        self.store_places.append( [ _('Home'), os.path.expanduser( '~' ), gtk.STOCK_HOME ] )
+
+        #add bookmarks
+        rawbookmarks = ''
+        
+        try:
+            file = open( os.path.expanduser('~/.gtk-bookmarks') )
+            rawbookmarks = file.read()
+            file.close()
+        except:
+            pass
+
+        bookmarks = []
+        for rawbookmark in rawbookmarks.split( '\n' ):
+            if rawbookmark.startswith( 'file://' ):
+                index = rawbookmark.find( ' ' )
+                if index > 0:
+                    bookmarks.append( ( gnomevfs.unescape_string_for_display( rawbookmark[ 7 : index ] ), rawbookmark[ index + 1 : ] ) )
+                elif index < 0:
+                    index = rawbookmark.rfind( '/' )
+                    if index > 0:
+                        bookmarks.append( ( gnomevfs.unescape_string_for_display( rawbookmark[ 7 : ] ), gnomevfs.unescape_string_for_display( rawbookmark[ index + 1 : ] ) ) )
+
+        if len( bookmarks ) > 0:
+            self.store_places.append( [ "<b>%s</b>" % _('Bookmarks'), '', '' ] )
+            for bookmark in bookmarks:
+                self.store_places.append( [ bookmark[1], bookmark[0], self.icon_names.get_icon(bookmark[0]) ] )
+
+        #add backup folders
+        include_folders = self.config.get_include_folders()
+        if len( include_folders ) > 0:
+            if len( include_folders ) > 0:
+                self.store_places.append( [ "<b>%s</b>" % _('Backup folders'), '', '' ] )
+                for folder in include_folders:
+                    self.store_places.append( [ folder[0], folder[0], gtk.STOCK_SAVE ] )
+
+    def fill_time_line( self, update_folder_view = True ):
+        current_selection = '/'
+        iter = self.list_time_line.get_selection().get_selected()[1]
+        if not iter is None:
+            current_selection = self.store_time_line.get_value( iter, 1 )
+
+        self.store_time_line.clear()
+        self.store_time_line.append( [ gnometools.get_snapshot_display_markup( self.snapshots, '/' ), '/' ] )
+
+        self.snapshots_list = self.snapshots.get_snapshots_list() 
+
+        groups = []
+        now = datetime.date.today()
+
+        #today
+        date = now
+        groups.append( (_('Today'), self.snapshots.get_snapshot_id( date ), []) )
+
+        #yesterday
+        date = now - datetime.timedelta( days = 1 )
+        groups.append( (_('Yesterday'), self.snapshots.get_snapshot_id( date ), []) )
+
+        #this week
+        date = now - datetime.timedelta( days = now.weekday() )
+        groups.append( (_('This week'), self.snapshots.get_snapshot_id( date ), []) )
+
+        #last week
+        date = now - datetime.timedelta( days = now.weekday() + 7 )
+        groups.append( (_('Last week'), self.snapshots.get_snapshot_id( date ), []) )
+
+        #fill groups
+        for snapshot_id in self.snapshots_list:
+            found = False
+
+            for group in groups:
+                if snapshot_id >= group[1]:
+                    group[2].append( snapshot_id )
+                    found = True
+                    break
+
+            if not found:
+                year = int( snapshot_id[ 0 : 4 ] )
+                month = int( snapshot_id[ 4 : 6 ] )
+                date = datetime.date( year, month, 1 )
+
+                group_name = ''
+                if year == now.year:
+                    group_name = date.strftime( '%B' ).capitalize()
+                else:
+                    group_name = date.strftime( '%B, %Y' ).capitalize()
+
+                groups.append( ( group_name, self.snapshots.get_snapshot_id( date ), [ snapshot_id ]) )
+
+        #fill time_line list
+        for group in groups:
+            if len( group[2] ) > 0:
+                self.store_time_line.append( [ "<b>%s</b>" % group[0], '' ] );
+                for snapshot_id in group[2]:
+                    self.store_time_line.append( [ gnometools.get_snapshot_display_markup( self.snapshots, snapshot_id ), snapshot_id ] )
+
+        #select previous item
+        iter = self.store_time_line.get_iter_first()
+        while not iter is None:
+            if current_selection == self.store_time_line.get_value( iter, 1 ):
+                break
+            iter = self.store_time_line.iter_next( iter )
+
+        changed = False
+        if iter is None:
+            changed = True
+            iter = self.store_time_line.get_iter_first()
+
+        self.list_time_line.get_selection().select_iter( iter )
+
+        if changed and update_folder_view:
+            self.update_folder_view( 2 )
+
+    def on_close( self, *params ):
+        main_window_x, main_window_y = self.window.get_position()
+        main_window_width, main_window_height = self.window.get_size()
+        main_window_hpaned1 = self.builder.get_object('hpaned1').get_position()
+        main_window_hpaned2 = self.builder.get_object('hpaned2').get_position()
+
+        self.config.set_int_value( 'gnome.main_window.x', main_window_x )
+        self.config.set_int_value( 'gnome.main_window.y', main_window_y )
+        self.config.set_int_value( 'gnome.main_window.width', main_window_width )
+        self.config.set_int_value( 'gnome.main_window.height', main_window_height )
+        self.config.set_int_value( 'gnome.main_window.hpaned1', main_window_hpaned1 )
+        self.config.set_int_value( 'gnome.main_window.hpaned2', main_window_hpaned2 )
+        self.config.set_str_value( 'gnome.last_path', self.folder_path )
+        self.config.set_bool_value( 'gnome.show_hidden_files', self.show_hidden_files )
+
+        self.config.save()
+        self.window.destroy()
+        return True
+
+    def on_list_time_line_cursor_changed( self, list ):
+        if list.get_selection().path_is_selected( list.get_cursor()[ 0 ] ):
+            self.update_folder_view( 2 )
+
+    def on_list_places_cursor_changed( self, list ):
+        if list.get_selection().path_is_selected( list.get_cursor()[ 0 ] ):
+            iter = list.get_selection().get_selected()[1]
+            folder_path = self.store_places.get_value( iter, 1 )
+            if folder_path != self.folder_path:
+                self.folder_path = folder_path
+                self.update_folder_view( 0 )
+
+    def on_list_folder_view_drag_data_get( self, widget, drag_context, selection_data, info, timestamp, user_param1 = None ):
+        iter = self.list_folder_view.get_selection().get_selected()[1]
+        if not iter is None:
+            path = self.store_folder_view.get_value( iter, 1 )
+            path = self.snapshots.get_snapshot_path_to( self.snapshot_id, path )
+            path = gnomevfs.escape_path_string( path )
+            selection_data.set_uris( [ 'file://' + path ] )
+
+    def on_list_folder_view_button_press_event( self, list, event ):
+        if event.button != 3:
+            return
+
+        if len( self.store_folder_view ) <= 0:
+            return
+
+        path = self.list_folder_view.get_path_at_pos( int( event.x ), int( event.y ) )
+        if path is None:
+            return
+        path = path[0]
+    
+        self.list_folder_view.get_selection().select_path( path )
+        self.show_folder_view_menu_popup( self.list_folder_view, event.button, event.time )
+
+    def on_list_folder_view_popup_menu( self, list ):
+        self.show_folder_view_menu_popup( list, 1, gtk.get_current_event_time() )
+
+    def show_folder_view_menu_popup( self, list, button, time ):
+        iter = list.get_selection().get_selected()[1]
+        if iter is None:
+            return
+
+        #print "popup-menu"
+        self.popup_menu = gtk.Menu()
+
+        menu_item = gtk.ImageMenuItem( 'backintime.open' )
+        menu_item.set_image( gtk.image_new_from_icon_name( self.store_folder_view.get_value( iter, 2 ), gtk.ICON_SIZE_MENU ) )
+        menu_item.connect( 'activate', self.on_list_folder_view_open_item )
+        self.popup_menu.append( menu_item )
+
+        self.popup_menu.append( gtk.SeparatorMenuItem() )
+
+        menu_item = gtk.ImageMenuItem( 'backintime.copy' )
+        menu_item.set_image( gtk.image_new_from_stock( gtk.STOCK_COPY, gtk.ICON_SIZE_MENU ) )
+        menu_item.connect( 'activate', self.on_list_folder_view_copy_item )
+        self.popup_menu.append( menu_item )
+
+        menu_item = gtk.ImageMenuItem( 'backintime.snapshots' )
+        menu_item.set_image( gtk.image_new_from_stock( gtk.STOCK_INDEX, gtk.ICON_SIZE_MENU ) )
+        menu_item.connect( 'activate', self.on_list_folder_view_snapshots_item )
+        self.popup_menu.append( menu_item )
+
+        if len( self.snapshot_id ) > 1:
+            menu_item = gtk.ImageMenuItem( 'backintime.restore' )
+            menu_item.set_image( gtk.image_new_from_stock( gtk.STOCK_UNDELETE, gtk.ICON_SIZE_MENU ) )
+            menu_item.connect( 'activate', self.on_list_folder_view_restore_item )
+            self.popup_menu.append( menu_item )
+
+        self.popup_menu.show_all()
+        self.popup_menu.popup( None, None, None, button, time )
+
+    def on_list_folder_view_restore_item( self, widget, data = None ):
+        self.on_btn_restore_clicked( self.builder.get_object( 'btn_restore' ) )
+
+    def on_list_folder_view_copy_item( self, widget, data = None ):
+        self.on_btn_copy_clicked( self.builder.get_object( 'btn_copy' ) )
+
+    def on_list_folder_view_snapshots_item( self, widget, data = None ):
+        self.on_btn_snapshots_clicked( self.builder.get_object( 'btn_snapshots' ) )
+
+    def on_list_folder_view_open_item( self, widget, data = None ):
+        iter = self.list_folder_view.get_selection().get_selected()[1]
+        if iter is None:
+            return
+
+        path = self.store_folder_view.get_value( iter, 1 )
+        path = self.snapshots.get_snapshot_path_to( self.snapshot_id, path )
+        cmd = "gnome-open \"%s\" &" % path
+        print cmd
+        os.system( cmd )
+
+    def on_list_folder_view_row_activated( self, list, path, column ):
+        iter = list.get_selection().get_selected()[1]
+        path = self.store_folder_view.get_value( iter, 1 )
+
+        #directory
+        if 0 == self.store_folder_view.get_value( iter, 3 ):
+            self.folder_path = path
+            self.update_folder_view( 1 )
+            return
+
+        #file
+        path = self.snapshots.get_snapshot_path_to( self.snapshot_id, path )
+        cmd = "gnome-open \"%s\" &" % path
+        print cmd
+        os.system( cmd )
+
+    def on_btn_fodler_up_clicked( self, button ):
+        if len( self.folder_path ) <= 1:
+            return
+
+        index = self.folder_path.rfind( '/' )
+        if index < 1:
+            parent_path = "/"
+        else:
+            parent_path = self.folder_path[ : index ]
+
+        self.folder_path = parent_path
+        self.update_folder_view( 1 )
+
+    def on_btn_restore_clicked( self, button ):
+        iter = self.list_folder_view.get_selection().get_selected()[1]
+        if not iter is None:
+            button.set_sensitive( False )
+            gnometools.run_gtk_update_loop()
+            self.snapshots.restore( self.snapshot_id, self.store_folder_view.get_value( iter, 1 ) )
+            button.set_sensitive( True )
+    
+    def on_btn_copy_clicked( self, button ):
+        iter = self.list_folder_view.get_selection().get_selected()[1]
+        if iter is None:
+            return
+
+        path = self.store_folder_view.get_value( iter, 1 )
+        path = self.snapshots.get_snapshot_path_to( self.snapshot_id, path )
+
+        clipboardtools.clipboard_copy_path( path )
+
+    def on_btn_hidden_files_toggled( self, button ):
+        if self.folder_path is None:
+            return
+
+        self.show_hidden_files = button.get_active()
+        self.update_folder_view( 0 )
+
+    def on_btn_snapshots_clicked( self, button ):
+        iter = self.list_folder_view.get_selection().get_selected()[1]
+        if iter is None:
+            return
+
+        path = self.store_folder_view.get_value( iter, 1 )
+        icon_name = self.store_folder_view.get_value( iter, 2 )
+
+        retVal = snapshotsdialog.SnapshotsDialog( self.snapshots, self.window, path, self.snapshots_list, self.snapshot_id, icon_name ).run()
+        
+        #select the specified file
+        if not retVal is None:
+            iter = self.store_time_line.get_iter_first()
+            while not iter is None:
+                snapshot_id = self.store_time_line.get_value( iter, 1 )
+                if snapshot_id == retVal:
+                    break
+                iter = self.store_time_line.iter_next( iter )
+
+            if not iter is None:
+                self.list_time_line.get_selection().select_iter( iter )
+                self.update_folder_view( 2 )
+
+    def on_btn_about_clicked( self, button ):
+        AboutDialog( self.config, self.window ).run()
+
+    def on_help( self ):
+        gnome.help_display('backintime')
+
+    def on_btn_help_clicked( self, button ):
+        self.on_help()
+
+    def on_btn_link_clicked( self, button ):
+        os.system( "gnome-open http://backintime.le-web.org &" )
+
+    def on_key_release_event( self, widget, event ):
+        if 'F1' == gtk.gdk.keyval_name( event.keyval ) and ( event.state & (gtk.gdk.CONTROL_MASK | gtk.gdk.MOD1_MASK) ) == 0:
+            self.on_help()
+
+    def on_btn_settings_clicked( self, button ):
+        snapshots_path = self.config.get_snapshots_path()
+        include_folders = self.config.get_include_folders()
+
+        settingsdialog.SettingsDialog( self.config, self ).run()
+
+        if snapshots_path != self.config.get_snapshots_path() or include_folders != self.config.get_include_folders():
+            self.update_all( False )
+
+    def on_btn_snapshot_name_clicked( self, button ):
+        iter = self.list_time_line.get_selection().get_selected()[1]
+        if iter is None:
+            return
+
+        snapshot_id = self.store_time_line.get_value( iter, 1 )
+        if len( snapshot_id ) <= 1:
+            return
+
+        old_name = self.snapshots.get_snapshot_name( snapshot_id )
+        new_name = messagebox.text_input_dialog( self.window, self.config, _('Snapshot Name'), old_name )
+        if new_name is None:
+            return
+
+        if old_name == new_name:
+            return
+
+        self.snapshots.set_snapshot_name( snapshot_id, new_name )
+        self.store_time_line.set_value( iter, 0, gnometools.get_snapshot_display_markup( self.snapshots, snapshot_id ) )
+
+    def on_btn_remove_snapshot_clicked( self, button ):
+        iter = self.list_time_line.get_selection().get_selected()[1]
+        if iter is None:
+            return
+
+        snapshot_id = self.store_time_line.get_value( iter, 1 )
+        if len( snapshot_id ) <= 1:
+            return
+
+        if gtk.RESPONSE_YES == messagebox.show_question( self.window, self.config, _('Are you sure you want to remove the snapshot:\n<b>%s</b>') % self.snapshots.get_snapshot_display_name( snapshot_id ) ):
+            print "Remove Snapshot: %s" % snapshot_id
+            self.snapshots.remove_snapshot( snapshot_id )
+            self.fill_time_line()
+
+    def on_btn_backup_clicked( self, button ):
+        button.set_sensitive( False )
+        self.updatetime_line = True
+        
+        if self.snapshots.is_busy():
+            self.update_backup_info()
+            return
+
+        backintime.take_snapshot_now_async( self.config )
+        self.update_backup_info( True )
+
+    def on_btn_update_snapshots_clicked( self, button ):
+        self.fill_time_line( False )
+        self.update_folder_view( 2 )
+
+    def update_folder_view( self, changed_from, selected_file = None, show_snapshots = False ): #0 - places, 1 - folder view, 2 - time_line
+        #update backup time
+        if 2 == changed_from:
+            iter = self.list_time_line.get_selection().get_selected()[1]
+            self.snapshot_id = self.store_time_line.get_value( iter, 1 )
+            #self.lblTime.set_markup( "<b>%s</b>" % backupTime )
+
+        tooltip = ''
+        text = ''
+        if len( self.snapshot_id ) > 1:
+            name = self.snapshots.get_snapshot_display_id( self.snapshot_id )
+            text = _('Snapshot: %s') % name
+            tooltip = _('View the snapshot made at %s') % name
+        else:
+            tooltip = _('View the current disk content')
+            text = _('Now')
+
+        self.lbl_snapshot.set_markup( ' <b>' + text + '</b> ' )
+        self.lbl_snapshot.set_tooltip_text( tooltip )
+
+        #update selected places item
+        if 1 == changed_from:
+            iter = self.store_places.get_iter_first()
+            while not iter is None:
+                place_path = self.store_places.get_value( iter, 1 )
+                if place_path == self.folder_path:
+                    break
+                iter = self.store_places.iter_next( iter )
+
+            if iter is None:
+                self.list_places.get_selection().unselect_all()
+            else:
+                self.list_places.get_selection().select_iter( iter )
+
+        #update folder view
+        
+        full_path = self.snapshots.get_snapshot_path_to( self.snapshot_id, self.folder_path )
+        all_files = []
+        files = []
+        folder_exists = os.path.isdir( full_path )
+
+        if folder_exists:
+            try:
+                all_files = os.listdir( full_path )
+                all_files.sort()
+            except:
+                pass
+
+            files = []
+            for file in all_files:
+                if len( file ) == 0:
+                    continue
+
+                if not self.show_hidden_files:
+                    if file[ 0 ] == '.':
+                        continue
+                    if file[ -1 ] == '~':
+                        continue
+
+                path = os.path.join( full_path, file )
+
+                file_size = -1
+                file_date = -1
+
+                try:
+                    file_stat = os.stat( path )
+                    file_size = file_stat[stat.ST_SIZE]
+                    file_date = file_stat[stat.ST_MTIME]
+                except:
+                    pass
+
+                #format size
+                file_size_int = file_size
+                if file_size_int < 0:
+                    file_size_int = 0
+
+                if file_size < 0:
+                    file_size = 'unknown'
+                elif file_size < 1024:
+                    file_size = str( file_size ) + ' bytes'
+                elif file_size < 1024 * 1024:
+                    file_size = file_size / 1024
+                    file_size = str( file_size ) + ' KB'
+                elif file_size < 1024 * 1024 * 1024:
+                    file_size = file_size / ( 1024 * 1024 )
+                    file_size = str( file_size ) + ' MB'
+                else:
+                    file_size = file_size / ( 1024 * 1024 * 1024 )
+                    file_size = str( file_size ) + ' GB'
+
+                #format date
+                if file_date < 0:
+                    file_date = 'unknown'
+                else:
+                    file_date = datetime.datetime.fromtimestamp(file_date).isoformat(' ')
+
+                if os.path.isdir( path ):
+                    files.append( [ file, file_size, file_date, self.icon_names.get_icon(path), file_size_int, 0 ] )
+                else:
+                    files.append( [ file, file_size, file_date, self.icon_names.get_icon(path), file_size_int, 1 ] )
+
+            #try to keep old selected file
+            if selected_file is None:
+                selected_file = ''
+                iter = self.list_folder_view.get_selection().get_selected()[1]
+                if not iter is None:
+                    selected_file = self.store_folder_view.get_value( iter, 1 )
+
+            self.list_folder_view_widget.show()
+            self.list_folder_view_shadow.hide()
+        else:
+            self.list_folder_view_widget.hide()
+            self.list_folder_view_shadow.show()
+
+        #populate the list
+        self.store_folder_view.clear()
+
+        selected_iter = None
+        for item in files:
+            rel_path = os.path.join( self.folder_path, item[0] )
+            new_iter = self.store_folder_view.append( [ item[0], rel_path, item[3], item[5], item[1], item[2], item[4] ] )
+            if selected_file == rel_path:
+                selected_iter = new_iter 
+
+        #select old item or the first item
+        if len( files ) > 0:
+            if selected_iter is None:
+                selected_iter = self.store_folder_view.get_iter_first()
+            self.list_folder_view.get_selection().select_iter( selected_iter )
+            self.list_folder_view.drag_source_set( gtk.gdk.BUTTON1_MASK | gtk.gdk.BUTTON3_MASK, gtk.target_list_add_uri_targets(), gtk.gdk.ACTION_COPY )
+        else:
+            self.list_folder_view.drag_source_unset()
+
+        #update folderup button state
+        self.builder.get_object( 'btn_folder_up' ).set_sensitive( len( self.folder_path ) > 1 )
+
+        #update restore button state
+        self.builder.get_object( 'btn_restore' ).set_sensitive( len( self.snapshot_id ) > 1 and len( self.store_folder_view ) > 0 )
+
+        #update remove/name snapshot buttons
+        self.builder.get_object( 'btn_snapshot_name' ).set_sensitive( len( self.snapshot_id ) > 1 )
+        self.builder.get_object( 'btn_remove_snapshot' ).set_sensitive( len( self.snapshot_id ) > 1 )
+
+        #update copy button state
+        self.builder.get_object( 'btn_copy' ).set_sensitive( len( self.store_folder_view ) > 0 )
+
+        #update snapshots button state
+        self.builder.get_object( 'btn_snapshots' ).set_sensitive( len( self.store_folder_view ) > 0 )
+
+        #display current folder
+        self.builder.get_object( 'edit_current_path' ).set_text( self.folder_path )
+
+        #show snapshots
+        if show_snapshots:
+            self.on_btn_snapshots_clicked( None )
 
 
 def open_url( dialog, link, user_data ):
-	os.system( "gnome-open \"%s\" &" % link )
+    os.system( "gnome-open \"%s\" &" % link )
 
 
 if __name__ == '__main__':
-	cfg = backintime.start_app( 'backintime-gnome', ['-s', '--snapshots'] )
-
-	raise_cmd = ''
-	if len( sys.argv ) > 1:
-		raise_cmd = '\n'.join( sys.argv[ 1 : ] )
-
-	app_instance = guiapplicationinstance.GUIApplicationInstance( cfg.get_app_instance_file(), raise_cmd )
-
-	gnome_props = { gnome.PARAM_APP_DATADIR : '/usr/share' }
-	gnome.program_init( 'backintime', cfg.VERSION, properties = gnome_props )
-
-	gtk.about_dialog_set_url_hook( open_url, None )
-
-	logger.openlog()
-	main_window = MainWindow( cfg, app_instance )
-	if cfg.is_configured():
-		gtk.main()
-	logger.closelog()
-
-	app_instance.exit_application()
+    cfg = backintime.start_app( 'backintime-gnome', ['-s', '--snapshots'] )
+
+    raise_cmd = ''
+    if len( sys.argv ) > 1:
+        raise_cmd = '\n'.join( sys.argv[ 1 : ] )
+
+    app_instance = guiapplicationinstance.GUIApplicationInstance( cfg.get_app_instance_file(), raise_cmd )
+
+    gnome_props = { gnome.PARAM_APP_DATADIR : '/usr/share' }
+    gnome.program_init( 'backintime', cfg.VERSION, properties = gnome_props )
+
+    gtk.about_dialog_set_url_hook( open_url, None )
+
+    logger.openlog()
+    main_window = MainWindow( cfg, app_instance )
+    if cfg.is_configured():
+        gtk.main()
+    logger.closelog()
+
+    app_instance.exit_application()
 

=== modified file 'gnome/mainwindow.glade'
--- gnome/mainwindow.glade	2009-05-27 08:45:25 +0000
+++ gnome/mainwindow.glade	2009-10-01 16:35:20 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
+<interface>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="MainWindow">
+  <object class="GtkWindow" id="MainWindow">
     <property name="title" translatable="yes">Back In Time</property>
     <property name="window_position">center</property>
     <property name="icon_name">gtk-save</property>
@@ -10,173 +10,173 @@
     <signal name="key_release_event" handler="on_MainWindow_key_release_event"/>
     <signal name="delete_event" handler="on_MainWindow_delete_event"/>
     <child>
-      <widget class="GtkVBox" id="vbox1">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkToolbar" id="toolbar1">
+          <object class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkToolButton" id="btn_backup">
+              <object class="GtkToolButton" id="btn_backup">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Take snapshot</property>
+                <property name="tooltip_text" translatable="yes">Take snapshot</property>
                 <property name="label" translatable="yes">Backup Now</property>
                 <property name="stock_id">gtk-save</property>
                 <signal name="clicked" handler="on_btn_backup_clicked"/>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="btn_update_snapshots">
+              <object class="GtkToolButton" id="btn_update_snapshots">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Update snapshots</property>
+                <property name="tooltip_text" translatable="yes">Update snapshots</property>
                 <property name="label" translatable="yes">Update snapshots</property>
                 <property name="stock_id">gtk-refresh</property>
                 <signal name="clicked" handler="on_btn_update_snapshots_clicked"/>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="btn_snapshot_name">
+              <object class="GtkToolButton" id="btn_snapshot_name">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Snapshot Name</property>
+                <property name="tooltip_text" translatable="yes">Snapshot Name</property>
                 <property name="label" translatable="yes">Snapshot Name</property>
                 <property name="stock_id">gtk-edit</property>
                 <signal name="clicked" handler="on_btn_snapshot_name_clicked"/>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="btn_remove_snapshot">
+              <object class="GtkToolButton" id="btn_remove_snapshot">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Remove Snapshot</property>
+                <property name="tooltip_text" translatable="yes">Remove Snapshot</property>
                 <property name="label" translatable="yes">Remove Snapshot</property>
                 <property name="stock_id">gtk-delete</property>
                 <signal name="clicked" handler="on_btn_remove_snapshot_clicked"/>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton1">
+              <object class="GtkSeparatorToolItem" id="toolbutton1">
                 <property name="visible">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="btn_settings">
+              <object class="GtkToolButton" id="btn_settings">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Settings</property>
+                <property name="tooltip_text" translatable="yes">Settings</property>
                 <property name="label" translatable="yes">Settings</property>
                 <property name="stock_id">gtk-preferences</property>
                 <signal name="clicked" handler="on_btn_settings_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton5">
-                <property name="visible">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="btn_about">
-                <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">About</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton5">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="btn_about">
+                <property name="visible">True</property>
+                <property name="tooltip_text" translatable="yes">About</property>
                 <property name="label" translatable="yes">About</property>
                 <property name="stock_id">gtk-about</property>
                 <signal name="clicked" handler="on_btn_about_clicked"/>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="btn_help">
+              <object class="GtkToolButton" id="btn_help">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Help</property>
+                <property name="tooltip_text" translatable="yes">Help</property>
                 <property name="label" translatable="yes">Help</property>
                 <property name="stock_id">gtk-help</property>
                 <signal name="clicked" handler="on_btn_help_clicked"/>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton2">
+              <object class="GtkSeparatorToolItem" id="toolbutton2">
                 <property name="visible">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="btn_exit">
+              <object class="GtkToolButton" id="btn_exit">
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Exit</property>
+                <property name="tooltip_text" translatable="yes">Exit</property>
                 <property name="label" translatable="yes">Exit</property>
                 <property name="stock_id">gtk-quit</property>
                 <signal name="clicked" handler="on_btn_exit_clicked"/>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton8">
+              <object class="GtkSeparatorToolItem" id="toolbutton8">
                 <property name="visible">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="vbox2">
+          <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">2</property>
             <child>
-              <widget class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
                 <property name="spacing">5</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox2">
+                  <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkLabel" id="label1">
+                      <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Profile:</property>
                         <property name="single_line_mode">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">5</property>
@@ -184,16 +184,16 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkComboBox" id="combo_profiles">
+                      <object class="GtkComboBox" id="combo_profiles">
                         <property name="visible">True</property>
                         <signal name="changed" handler="on_combo_profiles_changed"/>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="pack_type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">0</property>
                   </packing>
@@ -202,7 +202,7 @@
                   <placeholder/>
                 </child>
                 <child>
-                  <widget class="GtkLinkButton" id="linkbutton1">
+                  <object class="GtkLinkButton" id="linkbutton1">
                     <property name="label">backintime.le-web.org</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -210,28 +210,28 @@
                     <property name="relief">none</property>
                     <property name="xalign">1</property>
                     <property name="uri">http://backintime.le-web.org</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHSeparator" id="hseparator1">
+              <object class="GtkHSeparator" id="hseparator1">
                 <property name="visible">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="padding">2</property>
@@ -239,11 +239,11 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkHPaned" id="hpaned1">
+          <object class="GtkHPaned" id="hpaned1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow1">
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="width_request">200</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -251,131 +251,131 @@
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">in</property>
                 <child>
-                  <widget class="GtkTreeView" id="list_time_line">
+                  <object class="GtkTreeView" id="list_time_line">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="search_column">0</property>
                     <signal name="cursor_changed" handler="on_list_time_line_cursor_changed"/>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="resize">False</property>
                 <property name="shrink">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame5">
+              <object class="GtkFrame" id="frame5">
                 <property name="visible">True</property>
                 <property name="border_width">3</property>
                 <property name="label_xalign">0</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox6">
+                  <object class="GtkVBox" id="vbox6">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <child>
-                      <widget class="GtkToolbar" id="toolbar3">
+                      <object class="GtkToolbar" id="toolbar3">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkToolButton" id="btn_folder_up">
+                          <object class="GtkToolButton" id="btn_folder_up">
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Parent folder</property>
+                            <property name="tooltip_text" translatable="yes">Parent folder</property>
                             <property name="label" translatable="yes">Up</property>
                             <property name="stock_id">gtk-go-up</property>
                             <signal name="clicked" handler="on_btn_folder_up_clicked"/>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkToolItem" id="btn_current_path">
+                          <object class="GtkToolItem" id="btn_current_path">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkEntry" id="edit_current_path">
+                              <object class="GtkEntry" id="edit_current_path">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkToggleToolButton" id="btn_hidden_files">
+                          <object class="GtkToggleToolButton" id="btn_hidden_files">
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Show hidden files</property>
+                            <property name="tooltip_text" translatable="yes">Show hidden files</property>
                             <property name="label" translatable="yes">Hidden files</property>
                             <property name="stock_id">gtk-add</property>
                             <signal name="toggled" handler="on_btn_hidden_files_toggled"/>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSeparatorToolItem" id="toolbutton3">
+                          <object class="GtkSeparatorToolItem" id="toolbutton3">
                             <property name="visible">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkToolButton" id="btn_restore">
+                          <object class="GtkToolButton" id="btn_restore">
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Restore</property>
+                            <property name="tooltip_text" translatable="yes">Restore</property>
                             <property name="label" translatable="yes">Restore</property>
                             <property name="stock_id">gtk-undelete</property>
                             <signal name="clicked" handler="on_btn_restore_clicked"/>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkToolButton" id="btn_copy">
+                          <object class="GtkToolButton" id="btn_copy">
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Copy</property>
+                            <property name="tooltip_text" translatable="yes">Copy</property>
                             <property name="label" translatable="yes">Copy</property>
                             <property name="stock_id">gtk-copy</property>
                             <signal name="clicked" handler="on_btn_copy_clicked"/>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkToolButton" id="btn_snapshots">
+                          <object class="GtkToolButton" id="btn_snapshots">
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Snapshots</property>
+                            <property name="tooltip_text" translatable="yes">Snapshots</property>
                             <property name="label" translatable="yes">Snapshots</property>
                             <property name="stock_id">gtk-index</property>
                             <signal name="clicked" handler="on_btn_snapshots_clicked"/>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHPaned" id="hpaned2">
+                      <object class="GtkHPaned" id="hpaned2">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow">
+                          <object class="GtkScrolledWindow" id="scrolledwindow">
                             <property name="width_request">200</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -383,25 +383,25 @@
                             <property name="vscrollbar_policy">automatic</property>
                             <property name="shadow_type">in</property>
                             <child>
-                              <widget class="GtkTreeView" id="list_places">
+                              <object class="GtkTreeView" id="list_places">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="search_column">0</property>
                                 <signal name="cursor_changed" handler="on_list_places_cursor_changed"/>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="resize">False</property>
                             <property name="shrink">True</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox5">
+                          <object class="GtkHBox" id="hbox5">
                             <property name="visible">True</property>
                             <property name="homogeneous">True</property>
                             <child>
-                              <widget class="GtkScrolledWindow" id="list_folder_view_widget">
+                              <object class="GtkScrolledWindow" id="list_folder_view_widget">
                                 <property name="width_request">350</property>
                                 <property name="height_request">400</property>
                                 <property name="visible">True</property>
@@ -410,7 +410,7 @@
                                 <property name="vscrollbar_policy">automatic</property>
                                 <property name="shadow_type">in</property>
                                 <child>
-                                  <widget class="GtkTreeView" id="list_folder_view">
+                                  <object class="GtkTreeView" id="list_folder_view">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="has_focus">True</property>
@@ -418,84 +418,78 @@
                                     <signal name="row_activated" handler="on_list_folder_view_row_activated"/>
                                     <signal name="popup_menu" handler="on_list_folder_view_popup_menu"/>
                                     <signal name="drag_data_get" handler="on_list_folder_view_drag_data_get"/>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkFrame" id="list_folder_view_shadow">
+                              <object class="GtkFrame" id="list_folder_view_shadow">
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">in</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label17">
+                                  <object class="GtkLabel" id="label17">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;This folder don't exist
+                                    <property name="label" translatable="yes">&lt;b&gt;This folder does not exist
 in current snapshot !&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
                                     <property name="justify">center</property>
-                                  </widget>
+                                  </object>
                                 </child>
-                                <child>
+                                <child type="label_item">
                                   <placeholder/>
-                                  <packing>
-                                    <property name="type">label_item</property>
-                                  </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="resize">True</property>
                             <property name="shrink">True</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="lbl_snapshot">
+                <child type="label">
+                  <object class="GtkLabel" id="lbl_snapshot">
                     <property name="visible">True</property>
                     <property name="has_tooltip">True</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="resize">True</property>
                 <property name="shrink">True</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">3</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkStatusbar" id="status_bar">
+          <object class="GtkStatusbar" id="status_bar">
             <property name="visible">True</property>
             <property name="has_tooltip">True</property>
             <property name="spacing">5</property>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">end</property>
             <property name="position">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>

=== modified file 'gnome/messagebox.py'
--- gnome/messagebox.py	2009-06-10 10:16:27 +0000
+++ gnome/messagebox.py	2009-10-01 16:35:20 +0000
@@ -31,40 +31,47 @@
 
 
 def show_question( parent, config, message ):
-	dialog = gtk.MessageDialog( parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO )
-	dialog.set_markup( message )
-	dialog.set_title( config.APP_NAME )
-	retVal = dialog.run()
-	dialog.destroy()
-	return retVal
+    dialog = gtk.MessageDialog( parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO )
+    dialog.set_markup( message )
+    dialog.set_title( config.APP_NAME )
+    retVal = dialog.run()
+    dialog.destroy()
+    return retVal
 
 def show_error( parent, config, message ):
-	dialog = gtk.MessageDialog( parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK )
-	dialog.set_markup( message )
-	dialog.set_title( config.APP_NAME )
-	retVal = dialog.run()
-	dialog.destroy()
-	return retVal
+    dialog = gtk.MessageDialog( parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK )
+    dialog.set_markup( message )
+    dialog.set_title( config.APP_NAME )
+    retVal = dialog.run()
+    dialog.destroy()
+    return retVal
 
 def text_input_dialog( parent, config, title, default_value = '' ):
-	glade = gtk.glade.XML( os.path.join( config.get_app_path(), 'gnome', 'textinputdialog.glade' ), None, 'backintime' )
-	dialog = glade.get_widget( 'TextInputDialog' )
-	dialog.set_title( title )
-	dialog.set_transient_for( parent )
-
-	edit = glade.get_widget( 'edit_text' )
-
-	if not default_value is None:
-		edit.set_text( default_value )
-
-	edit.grab_focus()
-	
-	text = None
-	if gtk.RESPONSE_OK == dialog.run():
-		text = edit.get_text()
-	else:
-		text = default_value
-
-	dialog.destroy()
-	return text  
+    
+    builder = gtk.Builder()
+
+    glade_file = os.path.join(config.get_app_path(), 'gnome',
+            'textinputdialog.glade')
+
+    builder.add_from_file(glade_file)
+
+    dialog = builder.get_object( 'TextInputDialog' )
+    dialog.set_title( title )
+    dialog.set_transient_for( parent )
+    
+    edit = builder.get_object( 'edit_text' )
+
+    if not default_value is None:
+        edit.set_text( default_value )
+
+    edit.grab_focus()
+    
+    text = None
+    if gtk.RESPONSE_OK == dialog.run():
+        text = edit.get_text()
+    else:
+        text = default_value
+
+    dialog.destroy()
+    return text  
 

=== modified file 'gnome/settingsdialog.glade'
--- gnome/settingsdialog.glade	2009-05-27 12:43:59 +0000
+++ gnome/settingsdialog.glade	2009-10-01 16:35:20 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
+<interface>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkDialog" id="SettingsDialog">
+  <object class="GtkDialog" id="SettingsDialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Settings</property>
     <property name="modal">True</property>
@@ -11,213 +11,206 @@
     <property name="icon_name">gtk-preferences</property>
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
-    <signal name="response" handler="on_SettingsDialog_response"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkHBox" id="hbox5">
+          <object class="GtkHBox" id="hbox5">
             <property name="visible">True</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Profile:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBox" id="combo_profiles">
+              <object class="GtkComboBox" id="combo_profiles">
                 <property name="visible">True</property>
                 <signal name="changed" handler="on_combo_profiles_changed"/>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox6">
+              <object class="GtkHBox" id="hbox6">
                 <property name="visible">True</property>
                 <property name="spacing">5</property>
                 <property name="homogeneous">True</property>
                 <child>
-                  <widget class="GtkButton" id="btn_edit_profile">
+                  <object class="GtkButton" id="btn_edit_profile">
                     <property name="label" translatable="yes">gtk-edit</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_btn_edit_profile_clicked"/>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="btn_add_profile">
+                  <object class="GtkButton" id="btn_add_profile">
                     <property name="label" translatable="yes">gtk-new</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_btn_add_profile_clicked"/>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="btn_remove_profile">
+                  <object class="GtkButton" id="btn_remove_profile">
                     <property name="label" translatable="yes">gtk-delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_btn_remove_profile_clicked"/>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkHSeparator" id="hseparator1">
+          <object class="GtkHSeparator" id="hseparator1">
             <property name="visible">True</property>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkNotebook" id="notebook1">
+          <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <widget class="GtkVBox" id="vbox2">
+              <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="spacing">5</property>
                 <child>
-                  <widget class="GtkFrame" id="frame1">
+                  <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment1">
+                      <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox4">
+                          <object class="GtkHBox" id="hbox4">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkEntry" id="edit_where">
+                              <object class="GtkEntry" id="edit_where">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
                                 <property name="invisible_char">&#x25CF;</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="btn_where">
+                              <object class="GtkButton" id="btn_where">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <signal name="clicked" handler="on_btn_where_clicked"/>
                                 <child>
-                                  <widget class="GtkImage" id="image1">
+                                  <object class="GtkImage" id="image1">
                                     <property name="visible">True</property>
                                     <property name="stock">gtk-directory</property>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
+                    <child type="label">
+                      <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Where to save snapshots&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame2">
+                  <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment2">
+                      <object class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkComboBox" id="cb_backup_mode">
+                          <object class="GtkComboBox" id="cb_backup_mode">
                             <property name="visible">True</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="lbl_schedule">
+                    <child type="label">
+                      <object class="GtkLabel" id="lbl_schedule">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Schedule&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox1">
+                  <object class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkLabel" id="label3">
+                      <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0.49000000953674316</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">0</property>
@@ -226,30 +219,29 @@
                     <child>
                       <placeholder/>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label11">
+            <child type="tab">
+              <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">General</property>
-              </widget>
+              </object>
               <packing>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox7">
+              <object class="GtkVBox" id="vbox7">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="spacing">5</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow4">
+                  <object class="GtkScrolledWindow" id="scrolledwindow4">
                     <property name="width_request">300</property>
                     <property name="height_request">250</property>
                     <property name="visible">True</property>
@@ -258,78 +250,77 @@
                     <property name="vscrollbar_policy">automatic</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <widget class="GtkTreeView" id="list_include">
+                      <object class="GtkTreeView" id="list_include">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox2">
+                  <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
                     <property name="spacing">5</property>
                     <property name="homogeneous">True</property>
                     <child>
-                      <widget class="GtkButton" id="btn_add_include">
+                      <object class="GtkButton" id="btn_add_include">
                         <property name="label" translatable="yes">gtk-add</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_btn_add_include_clicked"/>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="btn_remove_include">
+                      <object class="GtkButton" id="btn_remove_include">
                         <property name="label" translatable="yes">gtk-remove</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_btn_remove_include_clicked"/>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label12">
+            <child type="tab">
+              <object class="GtkLabel" id="label12">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Include</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox8">
+              <object class="GtkVBox" id="vbox8">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="spacing">5</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow5">
+                  <object class="GtkScrolledWindow" id="scrolledwindow5">
                     <property name="width_request">180</property>
                     <property name="height_request">120</property>
                     <property name="visible">True</property>
@@ -338,97 +329,96 @@
                     <property name="vscrollbar_policy">automatic</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <widget class="GtkTreeView" id="list_exclude">
+                      <object class="GtkTreeView" id="list_exclude">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox3">
+                  <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
                     <property name="spacing">5</property>
                     <property name="homogeneous">True</property>
                     <child>
-                      <widget class="GtkButton" id="btn_add_exclude">
+                      <object class="GtkButton" id="btn_add_exclude">
                         <property name="label" translatable="yes">gtk-add</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_btn_add_exclude_clicked"/>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="btn_add_exclude_file">
+                      <object class="GtkButton" id="btn_add_exclude_file">
                         <property name="label" translatable="yes">Add file</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <signal name="clicked" handler="on_btn_add_exclude_file_clicked"/>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="btn_add_exclude_folder">
+                      <object class="GtkButton" id="btn_add_exclude_folder">
                         <property name="label" translatable="yes">Add folder</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <signal name="clicked" handler="on_btn_add_exclude_folder_clicked"/>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="btn_remove_exclude">
+                      <object class="GtkButton" id="btn_remove_exclude">
                         <property name="label" translatable="yes">gtk-remove</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_btn_remove_exclude_clicked"/>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label13">
+            <child type="tab">
+              <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Exclude</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkTable" id="table2">
+              <object class="GtkTable" id="table2">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="n_rows">5</property>
@@ -436,13 +426,13 @@
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <widget class="GtkCheckButton" id="cb_dont_remove_named_snapshots">
+                  <object class="GtkCheckButton" id="cb_dont_remove_named_snapshots">
                     <property name="label" translatable="yes">Don't remove named snapshots</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="right_attach">3</property>
                     <property name="top_attach">4</property>
@@ -451,77 +441,77 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="cb_min_free_space_unit">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkComboBox" id="cb_remove_old_backup_unit">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSpinButton" id="edit_remove_old_backup_value">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="adjustment">1 1 1000 1 0 0</property>
-                    <property name="numeric">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSpinButton" id="edit_min_free_space_value">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="adjustment">1 1 1000 1 0 0</property>
-                    <property name="numeric">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkCheckButton" id="cb_remove_old_backup">
+                  <object class="GtkComboBox" id="cb_min_free_space_unit">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="cb_remove_old_backup_unit">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="edit_remove_old_backup_value">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="adjustment">adjustment2</property>
+                    <property name="numeric">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="edit_min_free_space_value">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="numeric">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="cb_remove_old_backup">
                     <property name="label" translatable="yes">Older than:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_cb_remove_old_backup_toggled"/>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cb_min_free_space">
+                  <object class="GtkCheckButton" id="cb_min_free_space">
                     <property name="label" translatable="yes">If free space is less than:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_cb_min_free_space_toggled"/>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
@@ -529,13 +519,13 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cb_smart_remove">
+                  <object class="GtkCheckButton" id="cb_smart_remove">
                     <property name="label" translatable="yes">Smart remove</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="right_attach">3</property>
                     <property name="top_attach">2</property>
@@ -544,14 +534,14 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label10">
+                  <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">- keep all snapshots from today and yesterday
 - keep one snapshot for the last week and one for two weeks ago
 - keep one snapshot per month for all previous months of this year
 - keep one snapshot per year for all previous years</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="right_attach">3</property>
                     <property name="top_attach">3</property>
@@ -560,35 +550,34 @@
                     <property name="x_padding">20</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label14">
+            <child type="tab">
+              <object class="GtkLabel" id="label14">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Auto-remove</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox5">
+              <object class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="spacing">5</property>
                 <child>
-                  <widget class="GtkCheckButton" id="cb_enable_notifications">
+                  <object class="GtkCheckButton" id="cb_enable_notifications">
                     <property name="label" translatable="yes">Enable notifications</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">0</property>
@@ -597,33 +586,32 @@
                 <child>
                   <placeholder/>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">4</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label1">
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Options</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">4</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox9">
+              <object class="GtkVBox" id="vbox9">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="spacing">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label15">
+                  <object class="GtkLabel" id="label15">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Change this options only if you really know what you are doing !&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="padding">10</property>
@@ -631,102 +619,115 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cb_per_directory_schedule">
+                  <object class="GtkCheckButton" id="cb_per_directory_schedule">
                     <property name="label" translatable="yes">Enable schedule per included folder (see Include tab; default: disabled)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
                     <signal name="toggled" handler="on_cb_per_directory_schedule_toggled"/>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cb_run_nice_from_cron">
+                  <object class="GtkCheckButton" id="cb_run_nice_from_cron">
                     <property name="label" translatable="yes">Run 'nice' as cron job (default: enabled)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label16">
+                  <object class="GtkLabel" id="label16">
                     <property name="visible">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">5</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label6">
+            <child type="tab">
+              <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Expert Options</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">5</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">3</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="btn_ok">
+              <object class="GtkButton" id="btn_cancel">
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="btn_ok">
                 <property name="label" translatable="yes">gtk-ok</property>
-                <property name="response_id">-5</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="btn_cancel">
-                <property name="label" translatable="yes">gtk-cancel</property>
-                <property name="response_id">-6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </widget>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">btn_cancel</action-widget>
+      <action-widget response="-5">btn_ok</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="value">1</property>
+    <property name="lower">1</property>
+    <property name="upper">1000</property>
+    <property name="step_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="value">1</property>
+    <property name="lower">1</property>
+    <property name="upper">1000</property>
+    <property name="step_increment">1</property>
+  </object>
+</interface>

=== modified file 'gnome/settingsdialog.py'
--- gnome/settingsdialog.py	2009-06-10 11:33:16 +0000
+++ gnome/settingsdialog.py	2009-10-01 16:35:20 +0000
@@ -24,7 +24,6 @@
 pygtk.require("2.0")
 import gtk
 import gobject
-import gtk.glade
 import datetime
 import gettext
 
@@ -36,546 +35,558 @@
 _=gettext.gettext
 
 
-class SettingsDialog:
-	def __init__( self, config, parent ):
-		self.config = config
-		self.parent = parent
-
-		self.glade = gtk.glade.XML( os.path.join( self.config.get_app_path(), 'gnome', 'settingsdialog.glade' ), None, 'backintime' )
-		self.dialog = self.glade.get_widget( 'SettingsDialog' )
-		self.dialog.set_transient_for( parent.window )
-
-		signals = { 
-				'on_btn_add_profile_clicked' : self.on_add_profile,
-				'on_btn_edit_profile_clicked' : self.on_edit_profile,
-				'on_btn_remove_profile_clicked' : self.on_remove_profile,
-				'on_btn_add_include_clicked' : self.on_add_include,
-				'on_btn_remove_include_clicked' : self.on_remove_include,
-				'on_btn_add_exclude_clicked' : self.on_add_exclude,
-				'on_btn_add_exclude_file_clicked' : self.on_add_exclude_file,
-				'on_btn_add_exclude_folder_clicked' : self.on_add_exclude_folder,
-				'on_btn_remove_exclude_clicked' : self.on_remove_exclude,
-				'on_cb_remove_old_backup_toggled' : self.update_remove_old_backups,
-				'on_cb_min_free_space_toggled' : self.update_min_free_space,
-				'on_cb_per_directory_schedule_toggled' : self.on_cb_per_directory_schedule_toggled,
-				'on_combo_profiles_changed': self.on_combo_profiles_changed,
-				'on_btn_where_clicked': self.on_btn_where_clicked,
-			}
-
-		self.glade.signal_autoconnect( signals )
-
-		#profiles
-		self.btn_edit_profile = self.glade.get_widget( 'btn_edit_profile' )
-		self.btn_add_profile = self.glade.get_widget( 'btn_add_profile' )
-		self.btn_remove_profile = self.glade.get_widget( 'btn_remove_profile' )
-		self.combo_profiles = self.glade.get_widget( 'combo_profiles' )
-
-		self.disable_combo_changed = True
-
-		self.store_profiles = gtk.ListStore( str, str )
-		
-		self.combo_profiles = self.glade.get_widget( 'combo_profiles' )
-
-		text_renderer = gtk.CellRendererText()
-		self.combo_profiles.pack_start( text_renderer, True )
-		self.combo_profiles.add_attribute( text_renderer, 'text', 0 )
-
-		self.combo_profiles.set_model( self.store_profiles )
-		
-		self.disable_combo_changed = False
-
-		#set current folder
-		#self.fcb_where = self.glade.get_widget( 'fcb_where' )
-		#self.fcb_where.set_show_hidden( self.parent.show_hidden_files )
-		self.edit_where = self.glade.get_widget( 'edit_where' )
-		
-		#automatic backup mode store
-		self.store_backup_mode = gtk.ListStore( str, int )
-		default_automatic_backup_mode_index = 0
-		map = self.config.AUTOMATIC_BACKUP_MODES
-		self.rev_automatic_backup_modes = {}
-		keys = map.keys()
-		keys.sort()
-		for key in keys:
-			self.rev_automatic_backup_modes[ map[key] ] = key
-			self.store_backup_mode.append( [ map[key], key ] )
-
-		#per directory schedule
-		self.cb_per_directory_schedule = self.glade.get_widget( 'cb_per_directory_schedule' )
-		self.lbl_schedule = self.glade.get_widget( 'lbl_schedule' )
-
-		#setup include folders
-		self.list_include = self.glade.get_widget( 'list_include' )
-
-		pix_renderer = gtk.CellRendererPixbuf()
-		text_renderer = gtk.CellRendererText()
-
-		column = gtk.TreeViewColumn( _('Include folders') )
-		column.pack_start( pix_renderer, False )
-		column.pack_end( text_renderer, True )
-		column.add_attribute( pix_renderer, 'stock-id', 1 )
-		column.add_attribute( text_renderer, 'markup', 0 )
-		self.list_include.append_column( column )
-
-		column = gtk.TreeViewColumn( _('Schedule') )
-		combo_renderer = gtk.CellRendererCombo()
-		combo_renderer.set_property( 'editable', True )
-		combo_renderer.set_property( 'has-entry', False )
-		combo_renderer.set_property( 'model', self.store_backup_mode )
-		combo_renderer.set_property( 'text-column', 0 )
-		combo_renderer.connect( 'edited', self.on_automatic_backup_mode_changed )
-		column.pack_end( combo_renderer, True )
-		column.add_attribute( combo_renderer, 'text', 2 )
-
-		self.include_schedule_column = column
-
-		self.store_include = gtk.ListStore( str, str, str, int )
-		self.list_include.set_model( self.store_include )
-
-		#setup exclude patterns
-		self.list_exclude = self.glade.get_widget( 'list_exclude' )
-
-		pix_renderer = gtk.CellRendererPixbuf()
-		text_renderer = gtk.CellRendererText()
-
-		column = gtk.TreeViewColumn( _('Patterns, files or folders') )
-		column.pack_start( pix_renderer, False )
-		column.pack_end( text_renderer, True )
-		column.add_attribute( pix_renderer, 'stock-id', 1 )
-		column.add_attribute( text_renderer, 'markup', 0 )
-		self.list_exclude.append_column( column )
-
-		self.store_exclude = gtk.ListStore( str, str )
-		self.list_exclude.set_model( self.store_exclude )
-
-		#setup automatic backup mode
-		self.cb_backup_mode = self.glade.get_widget( 'cb_backup_mode' )
-		self.cb_backup_mode.set_model( self.store_backup_mode )
-
-		self.cb_backup_mode.clear()
-		renderer = gtk.CellRendererText()
-		self.cb_backup_mode.pack_start( renderer, True )
-		self.cb_backup_mode.add_attribute( renderer, 'text', 0 )
-
-		#setup remove old backups older than
-		self.edit_remove_old_backup_value = self.glade.get_widget( 'edit_remove_old_backup_value' )
-		self.cb_remove_old_backup_unit = self.glade.get_widget( 'cb_remove_old_backup_unit' )
-
-		self.store_remove_old_backup_unit = gtk.ListStore( str, int )
-		self.cb_remove_old_backup_unit.set_model( self.store_remove_old_backup_unit )
-
-		renderer = gtk.CellRendererText()
-		self.cb_remove_old_backup_unit.pack_start( renderer, True )
-		self.cb_remove_old_backup_unit.add_attribute( renderer, 'text', 0 )
-
-		self.store_remove_old_backup_unit.clear()
-		map = self.config.REMOVE_OLD_BACKUP_UNITS
-		keys = map.keys()
-		keys.sort()
-		for key in keys:
-			self.store_remove_old_backup_unit.append( [ map[ key ], key ] )
-				
-		self.cb_remove_old_backup = self.glade.get_widget( 'cb_remove_old_backup' )
-
-		#setup min free space
-		self.edit_min_free_space_value = self.glade.get_widget( 'edit_min_free_space_value' )
-		self.cb_min_free_space_unit = self.glade.get_widget( 'cb_min_free_space_unit' )
-
-		self.store_min_free_space_unit = gtk.ListStore( str, int )
-		self.cb_min_free_space_unit.set_model( self.store_min_free_space_unit )
-
-		renderer = gtk.CellRendererText()
-		self.cb_min_free_space_unit.pack_start( renderer, True )
-		self.cb_min_free_space_unit.add_attribute( renderer, 'text', 0 )
-
-		self.store_min_free_space_unit.clear()
-		map = self.config.MIN_FREE_SPACE_UNITS
-		keys = map.keys()
-		keys.sort()
-		for key in keys:
-			self.store_min_free_space_unit.append( [ map[ key ], key ] )
-				
-		self.cb_min_free_space = self.glade.get_widget( 'cb_min_free_space' )
-
-		#don't remove named snapshots
-		self.cb_dont_remove_named_snapshots = self.glade.get_widget( 'cb_dont_remove_named_snapshots' )
-		self.cb_dont_remove_named_snapshots.set_active( self.config.get_dont_remove_named_snapshots() )
-
-		#smart remove
-		self.cb_smart_remove = self.glade.get_widget( 'cb_smart_remove' )
-
-		#enable notifications
-		self.cb_enable_notifications = self.glade.get_widget( 'cb_enable_notifications' )
-
-		self.update_profiles()
-
-	def error_handler( self, message ):
-		messagebox.show_error( self.dialog, self.config, message )
-
-	def question_handler( self, message ):
-		return gtk.RESPONSE_YES == messagebox.show_question( self.dialog, self.config, message )
-
-	def on_automatic_backup_mode_changed( self, renderer, path, new_text ):
-		iter = self.store_include.get_iter(path)
-		self.store_include.set_value( iter, 2, new_text )
-		self.store_include.set_value( iter, 3, self.rev_automatic_backup_modes[new_text] )
-
-	def on_btn_where_clicked( self, button ):
-		path = self.edit_where.get_text()
-
-		fcd = gtk.FileChooserDialog( _('Snapshots folder'), self.dialog, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK) )
-		if len( path ) > 0:
-			fcd.set_filename( path )
-
-		if fcd.run() == gtk.RESPONSE_OK:
-			new_path = tools.prepare_path( fcd.get_filename() )
-			fcd.destroy()
-			if len( path ) > 0 and new_path != path:
-				if not self.question_handler( _('Are you sure you want to change snapshots folder ?') ):
-					return
-			self.edit_where.set_text( new_path )
-		else:
-			fcd.destroy()
-
-	def on_combo_profiles_changed( self, *params ):
-		if self.disable_combo_changed:
-			return
-
-		iter = self.combo_profiles.get_active_iter()
-		if iter is None:
-			return
-
-		profile_id = self.store_profiles.get_value( iter, 1 )
-		if profile_id != self.config.get_current_profile():
-			self.save_profile()
-			self.config.set_current_profile( profile_id )
-
-		self.update_profile()
-
-	def update_profiles( self ):
-		self.disable_combo_changed = True
-
-		profiles = self.config.get_profiles_sorted_by_name()
-
-		select_iter = None
-		self.store_profiles.clear()
-
-		for profile_id in profiles:
-			iter = self.store_profiles.append( [ self.config.get_profile_name( profile_id ), profile_id ] )
-			if profile_id == self.config.get_current_profile():
-				select_iter = iter
-
-		self.disable_combo_changed = False
-
-		if not select_iter is None:
-			self.combo_profiles.set_active_iter( select_iter )
-
-	def update_profile( self ):
-		if self.config.get_current_profile() == '1':
-			self.btn_edit_profile.set_sensitive( False )
-			self.btn_remove_profile.set_sensitive( False )
-		else:
-			self.btn_edit_profile.set_sensitive( True )
-			self.btn_remove_profile.set_sensitive( True )
-
-		#set current folder
-		#self.fcb_where.set_filename( self.config.get_snapshots_path() )
-		self.edit_where.set_text( self.config.get_snapshots_path() )
-		
-		#per directory schedule
-		self.cb_per_directory_schedule.set_active( self.config.get_per_directory_schedule() )
-
-		#setup include folders
-		self.update_per_directory_option()
-
-		self.store_include.clear()
-		include_folders = self.config.get_include_folders()
-		if len( include_folders ) > 0:
-			for include_folder in include_folders:
-				self.store_include.append( [include_folder[0], gtk.STOCK_DIRECTORY, self.config.AUTOMATIC_BACKUP_MODES[include_folder[1]], include_folder[1] ] )
-		
-		#setup exclude patterns
-		self.store_exclude.clear()
-		exclude_patterns = self.config.get_exclude_patterns()
-		if len( exclude_patterns ) > 0:
-			for exclude_pattern in exclude_patterns:
-				self.store_exclude.append( [exclude_pattern, gtk.STOCK_DELETE] )
-
-		#setup automatic backup mode
-		i = 0
-		iter = self.store_backup_mode.get_iter_first()
-		default_mode = self.config.get_automatic_backup_mode()
-		while not iter is None:
-			if self.store_backup_mode.get_value( iter, 1 ) == default_mode:
-				self.cb_backup_mode.set_active( i )
-				break
-			iter = self.store_backup_mode.iter_next( iter )
-			i = i + 1
-
-		#setup remove old backups older than
-		enabled, value, unit = self.config.get_remove_old_snapshots()
-
-		self.edit_remove_old_backup_value.set_value( float( value ) )
-
-		i = 0
-		iter = self.store_remove_old_backup_unit.get_iter_first()
-		while not iter is None:
-			if self.store_remove_old_backup_unit.get_value( iter, 1 ) == unit:
-				self.cb_remove_old_backup_unit.set_active( i )
-				break
-			iter = self.store_remove_old_backup_unit.iter_next( iter )
-			i = i + 1
-				
-		self.cb_remove_old_backup.set_active( enabled )
-		self.update_remove_old_backups( self.cb_remove_old_backup )
-
-		#setup min free space
-		enabled, value, unit = self.config.get_min_free_space()
-		
-		self.edit_min_free_space_value.set_value( float(value) )
-
-		i = 0
-		iter = self.store_min_free_space_unit.get_iter_first()
-		while not iter is None:
-			if self.store_min_free_space_unit.get_value( iter, 1 ) == unit:
-				self.cb_min_free_space_unit.set_active( i )
-				break
-			iter = self.store_min_free_space_unit.iter_next( iter )
-			i = i + 1
-
-		self.cb_min_free_space.set_active( enabled )
-		self.update_min_free_space( self.cb_min_free_space )
-
-		#don't remove named snapshots
-		self.cb_dont_remove_named_snapshots.set_active( self.config.get_dont_remove_named_snapshots() )
-
-		#smart remove
-		self.cb_smart_remove.set_active( self.config.get_smart_remove() )
-
-		#enable notifications
-		self.cb_enable_notifications.set_active( self.config.is_notify_enabled() )
-
-		#run 'nice' from cron
-		self.cb_run_nice_from_cron = self.glade.get_widget( 'cb_run_nice_from_cron' )
-		self.cb_run_nice_from_cron.set_active( self.config.is_run_nice_from_cron_enabled() )
-
-	def save_profile( self ):
-		#snapshots path
-		snapshots_path = self.edit_where.get_text()
-
-		#hack
-		if snapshots_path.startswith( '//' ):
-			snapshots_path = snapshots_path[ 1 : ]
-
-		#include list 
-		include_list = []
-		iter = self.store_include.get_iter_first()
-		while not iter is None:
-			include_list.append( ( self.store_include.get_value( iter, 0 ), self.store_include.get_value( iter, 3 ) ) )
-			iter = self.store_include.iter_next( iter )
-
-		#exclude patterns
-		exclude_list = []
-		iter = self.store_exclude.get_iter_first()
-		while not iter is None:
-			exclude_list.append( self.store_exclude.get_value( iter, 0 ) )
-			iter = self.store_exclude.iter_next( iter )
-
-		#check if back folder changed
-		#if len( self.config.get_snapshots_path() ) > 0 and self.config.get_snapshots_path() != snapshots_path:
-		#	if gtk.RESPONSE_YES != messagebox.show_question( self.dialog, self.config, _('Are you sure you want to change snapshots folder ?') ):
-		#		return False 
-
-		#ok let's save to config
-		self.config.set_snapshots_path( snapshots_path )
-		#if not msg is None:
-		#	messagebox.show_error( self.dialog, self.config, msg )
-		#	return False
-
-		self.config.set_include_folders( include_list )
-		self.config.set_exclude_patterns( exclude_list )
-
-		#global schedule
-		self.config.set_automatic_backup_mode( self.store_backup_mode.get_value( self.cb_backup_mode.get_active_iter(), 1 ) )
-
-		#auto-remove snapshots
-		self.config.set_remove_old_snapshots( 
-						self.cb_remove_old_backup.get_active(), 
-						int( self.edit_remove_old_backup_value.get_value() ),
-						self.store_remove_old_backup_unit.get_value( self.cb_remove_old_backup_unit.get_active_iter(), 1 ) )
-		self.config.set_min_free_space( 
-						self.cb_min_free_space.get_active(), 
-						int( self.edit_min_free_space_value.get_value() ),
-						self.store_min_free_space_unit.get_value( self.cb_min_free_space_unit.get_active_iter(), 1 ) )
-		self.config.set_dont_remove_named_snapshots( self.cb_dont_remove_named_snapshots.get_active() )
-		self.config.set_smart_remove( self.cb_smart_remove.get_active() )
-
-		#options
-		self.config.set_notify_enabled( self.cb_enable_notifications.get_active() )
-
-		#expert options
-		self.config.set_per_directory_schedule( self.cb_per_directory_schedule.get_active() )
-		self.config.set_run_nice_from_cron_enabled( self.cb_run_nice_from_cron.get_active() )
-
-	def update_remove_old_backups( self, button ):
-		enabled = self.cb_remove_old_backup.get_active()
-		self.edit_remove_old_backup_value.set_sensitive( enabled )
-		self.cb_remove_old_backup_unit.set_sensitive( enabled )
-
-	def update_min_free_space( self, button ):
-		enabled = self.cb_min_free_space.get_active()
-		self.edit_min_free_space_value.set_sensitive( enabled )
-		self.cb_min_free_space_unit.set_sensitive( enabled )
-
-	def on_cb_per_directory_schedule_toggled( self, button ):
-		self.update_per_directory_option()
-
-	def update_per_directory_option( self ):
-		if self.cb_per_directory_schedule.get_active():
-			if self.list_include.get_column(1) == None:
-				self.list_include.append_column( self.include_schedule_column )
-			self.cb_backup_mode.hide()
-			self.lbl_schedule.hide()
-		else:
-			if self.list_include.get_column(1) != None:
-				self.list_include.remove_column( self.include_schedule_column )
-			self.lbl_schedule.show()
-			self.cb_backup_mode.show()
-
-	def run( self ):
-		self.config.set_question_handler( self.question_handler )
-		self.config.set_error_handler( self.error_handler )
-
-		self.config_copy_dict = copy.copy( self.config.dict )
-		self.current_profile_org = self.config.get_current_profile()
-
-		while True:
-			if gtk.RESPONSE_OK == self.dialog.run():
-				if not self.validate():
-					continue
-			else:
-				self.config.dict = self.config_copy_dict
-
-			break
-
-		self.config.set_current_profile( self.current_profile_org )
-		self.config.clear_handlers()
-
-		self.dialog.destroy()
-
-	def on_add_profile( self, button ):
-		name = messagebox.text_input_dialog( self.dialog, self.config, _('New profile'), None )
-		if name is None:
-			return
-		if len( name ) <= 0:
-			return
-
-		if not self.config.add_profile( name ):
-			return
-
-		self.update_profiles()
-
-	def on_edit_profile( self, button ):
-		name = messagebox.text_input_dialog( self.dialog, self.config, _('Rename profile'), None )
-		if name is None:
-			return
-		if len( name ) <= 0:
-			return
-
-		if not self.config.set_profile_name( name ):
-			return
-
-		self.update_profiles()
-
-	def on_remove_profile( self, button ):
-		if gtk.RESPONSE_YES == messagebox.show_question( self.dialog, self.config, _('Are you sure you want to delete the profile "%s" ?') % self.config.get_profile_name() ):
-			self.config.remove_profile()
-			self.update_profiles()
-
-	def on_add_include( self, button ):
-		fcd = gtk.FileChooserDialog( _('Include folder'), self.dialog, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK) )
-		fcd.set_show_hidden( self.parent.show_hidden_files  )
-
-		if fcd.run() == gtk.RESPONSE_OK:
-			include_folder = tools.prepare_path( fcd.get_filename() )
-
-			iter = self.store_include.get_iter_first()
-			while not iter is None:
-				if self.store_include.get_value( iter, 0 ) == include_folder:
-					break
-				iter = self.store_include.iter_next( iter )
-
-			if iter is None:
-				self.store_include.append( [include_folder, gtk.STOCK_DIRECTORY, self.config.AUTOMATIC_BACKUP_MODES[self.config.NONE], self.config.NONE ] )
-
-		fcd.destroy()
-
-	def on_remove_include( self, button ):
-		store, iter = self.list_include.get_selection().get_selected()
-		if not iter is None:
-			store.remove( iter )
-
-	def add_exclude_( self, pattern ):
-		pattern = pattern.strip()
-		if len( pattern ) == 0:
-			return
-
-		iter = self.store_exclude.get_iter_first()
-		while not iter is None:
-			if self.store_exclude.get_value( iter, 0 ) == pattern:
-				return
-			iter = self.store_exclude.iter_next( iter )
-
-		self.store_exclude.append( [pattern, gtk.STOCK_DELETE] )
-
-	def on_add_exclude( self, button ):
-		pattern = messagebox.text_input_dialog( self.dialog, self.config, _('Exclude pattern') )
-		if pattern is None:
-			return
-
-		if pattern.find( ':' ) >= 0:
-			messagebox.show_error( self.dialog, self.config, _('Exclude patterns can\'t contain \':\' char !') )
-			return
-	
-		self.add_exclude_( pattern )
-
-	def on_add_exclude_file( self, button ):
-		fcd = gtk.FileChooserDialog( _('Exclude file'), self.dialog, gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK) )
-		fcd.set_show_hidden( self.parent.show_hidden_files  )
-
-		if fcd.run() == gtk.RESPONSE_OK:
-			pattern = tools.prepare_path( fcd.get_filename() )
-			self.add_exclude_( pattern )
-
-		fcd.destroy()
-
-	def on_add_exclude_folder( self, button ):
-		fcd = gtk.FileChooserDialog( _('Exclude folder'), self.dialog, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK) )
-		fcd.set_show_hidden( self.parent.show_hidden_files  )
-
-		if fcd.run() == gtk.RESPONSE_OK:
-			pattern = tools.prepare_path( fcd.get_filename() )
-			self.add_exclude_( pattern )
-
-		fcd.destroy()
-
-	def on_remove_exclude( self, button ):
-		store, iter = self.list_exclude.get_selection().get_selected()
-		if not iter is None:
-			store.remove( iter )
-
-	def on_cancel( self, button ):
-		self.dialog.destroy()
-
-	def validate( self ):
-		self.save_profile()
-
-		if not self.config.check_config():
-			return False
-
-		if not self.config.setup_cron():
-			return False
-
-		self.config.save()
-		return True
-	
+class SettingsDialog(object):
+
+    def __init__( self, config, parent ):
+
+        self.config = config
+        self.parent = parent
+
+        builder = gtk.Builder()
+        self.builder = builder
+
+        glade_file = os.path.join(self.config.get_app_path(),
+            'gnome', 'settingsdialog.glade')
+
+        builder.add_from_file(glade_file)
+
+        get = builder.get_object
+
+        self.dialog = get('SettingsDialog')
+        self.dialog.set_transient_for( parent.window )
+
+        signals = { 
+                'on_btn_add_profile_clicked' : self.on_add_profile,
+                'on_btn_edit_profile_clicked' : self.on_edit_profile,
+                'on_btn_remove_profile_clicked' : self.on_remove_profile,
+                'on_btn_add_include_clicked' : self.on_add_include,
+                'on_btn_remove_include_clicked' : self.on_remove_include,
+                'on_btn_add_exclude_clicked' : self.on_add_exclude,
+                'on_btn_add_exclude_file_clicked' : self.on_add_exclude_file,
+                'on_btn_add_exclude_folder_clicked' : self.on_add_exclude_folder,
+                'on_btn_remove_exclude_clicked' : self.on_remove_exclude,
+                'on_cb_remove_old_backup_toggled' : self.update_remove_old_backups,
+                'on_cb_min_free_space_toggled' : self.update_min_free_space,
+                'on_cb_per_directory_schedule_toggled' : self.on_cb_per_directory_schedule_toggled,
+                'on_combo_profiles_changed': self.on_combo_profiles_changed,
+                'on_btn_where_clicked': self.on_btn_where_clicked,
+            }
+
+        builder.connect_signals(signals)
+
+        #profiles
+        self.btn_edit_profile = get( 'btn_edit_profile' )
+        self.btn_add_profile = get( 'btn_add_profile' )
+        self.btn_remove_profile = get( 'btn_remove_profile' )
+        self.combo_profiles = get( 'combo_profiles' )
+
+        self.disable_combo_changed = True
+
+        self.store_profiles = gtk.ListStore( str, str )
+        
+        self.combo_profiles = get( 'combo_profiles' )
+
+        text_renderer = gtk.CellRendererText()
+        self.combo_profiles.pack_start( text_renderer, True )
+        self.combo_profiles.add_attribute( text_renderer, 'text', 0 )
+
+        self.combo_profiles.set_model( self.store_profiles )
+        
+        self.disable_combo_changed = False
+
+        #set current folder
+        #self.fcb_where = get( 'fcb_where' )
+        #self.fcb_where.set_show_hidden( self.parent.show_hidden_files )
+        self.edit_where = get( 'edit_where' )
+        
+        #automatic backup mode store
+        self.store_backup_mode = gtk.ListStore( str, int )
+        default_automatic_backup_mode_index = 0
+        map = self.config.AUTOMATIC_BACKUP_MODES
+        self.rev_automatic_backup_modes = {}
+        keys = map.keys()
+        keys.sort()
+        for key in keys:
+            self.rev_automatic_backup_modes[ map[key] ] = key
+            self.store_backup_mode.append( [ map[key], key ] )
+
+        #per directory schedule
+        self.cb_per_directory_schedule = get( 'cb_per_directory_schedule' )
+        self.lbl_schedule = get( 'lbl_schedule' )
+
+        #setup include folders
+        self.list_include = get( 'list_include' )
+
+        pix_renderer = gtk.CellRendererPixbuf()
+        text_renderer = gtk.CellRendererText()
+
+        column = gtk.TreeViewColumn( _('Include folders') )
+        column.pack_start( pix_renderer, False )
+        column.pack_end( text_renderer, True )
+        column.add_attribute( pix_renderer, 'stock-id', 1 )
+        column.add_attribute( text_renderer, 'markup', 0 )
+        self.list_include.append_column( column )
+
+        column = gtk.TreeViewColumn( _('Schedule') )
+        combo_renderer = gtk.CellRendererCombo()
+        combo_renderer.set_property( 'editable', True )
+        combo_renderer.set_property( 'has-entry', False )
+        combo_renderer.set_property( 'model', self.store_backup_mode )
+        combo_renderer.set_property( 'text-column', 0 )
+        combo_renderer.connect( 'edited', self.on_automatic_backup_mode_changed )
+        column.pack_end( combo_renderer, True )
+        column.add_attribute( combo_renderer, 'text', 2 )
+
+        self.include_schedule_column = column
+
+        self.store_include = gtk.ListStore( str, str, str, int )
+        self.list_include.set_model( self.store_include )
+
+        #setup exclude patterns
+        self.list_exclude = get( 'list_exclude' )
+
+        pix_renderer = gtk.CellRendererPixbuf()
+        text_renderer = gtk.CellRendererText()
+
+        column = gtk.TreeViewColumn( _('Patterns, files or folders') )
+        column.pack_start( pix_renderer, False )
+        column.pack_end( text_renderer, True )
+        column.add_attribute( pix_renderer, 'stock-id', 1 )
+        column.add_attribute( text_renderer, 'markup', 0 )
+        self.list_exclude.append_column( column )
+
+        self.store_exclude = gtk.ListStore( str, str )
+        self.list_exclude.set_model( self.store_exclude )
+
+        #setup automatic backup mode
+        self.cb_backup_mode = get( 'cb_backup_mode' )
+        self.cb_backup_mode.set_model( self.store_backup_mode )
+
+        self.cb_backup_mode.clear()
+        renderer = gtk.CellRendererText()
+        self.cb_backup_mode.pack_start( renderer, True )
+        self.cb_backup_mode.add_attribute( renderer, 'text', 0 )
+
+        #setup remove old backups older than
+        self.edit_remove_old_backup_value = get( 'edit_remove_old_backup_value' )
+        self.cb_remove_old_backup_unit = get( 'cb_remove_old_backup_unit' )
+
+        self.store_remove_old_backup_unit = gtk.ListStore( str, int )
+        self.cb_remove_old_backup_unit.set_model( self.store_remove_old_backup_unit )
+
+        renderer = gtk.CellRendererText()
+        self.cb_remove_old_backup_unit.pack_start( renderer, True )
+        self.cb_remove_old_backup_unit.add_attribute( renderer, 'text', 0 )
+
+        self.store_remove_old_backup_unit.clear()
+        map = self.config.REMOVE_OLD_BACKUP_UNITS
+        keys = map.keys()
+        keys.sort()
+        for key in keys:
+            self.store_remove_old_backup_unit.append( [ map[ key ], key ] )
+                
+        self.cb_remove_old_backup = get( 'cb_remove_old_backup' )
+
+        #setup min free space
+        self.edit_min_free_space_value = get( 'edit_min_free_space_value' )
+        self.cb_min_free_space_unit = get( 'cb_min_free_space_unit' )
+
+        self.store_min_free_space_unit = gtk.ListStore( str, int )
+        self.cb_min_free_space_unit.set_model( self.store_min_free_space_unit )
+
+        renderer = gtk.CellRendererText()
+        self.cb_min_free_space_unit.pack_start( renderer, True )
+        self.cb_min_free_space_unit.add_attribute( renderer, 'text', 0 )
+
+        self.store_min_free_space_unit.clear()
+        map = self.config.MIN_FREE_SPACE_UNITS
+        keys = map.keys()
+        keys.sort()
+        for key in keys:
+            self.store_min_free_space_unit.append( [ map[ key ], key ] )
+                
+        self.cb_min_free_space = get( 'cb_min_free_space' )
+
+        #don't remove named snapshots
+        self.cb_dont_remove_named_snapshots = get( 'cb_dont_remove_named_snapshots' )
+        self.cb_dont_remove_named_snapshots.set_active( self.config.get_dont_remove_named_snapshots() )
+
+        #smart remove
+        self.cb_smart_remove = get( 'cb_smart_remove' )
+
+        #enable notifications
+        self.cb_enable_notifications = get( 'cb_enable_notifications' )
+
+        self.update_profiles()
+
+    def error_handler( self, message ):
+        messagebox.show_error( self.dialog, self.config, message )
+
+    def question_handler( self, message ):
+        return gtk.RESPONSE_YES == messagebox.show_question( self.dialog, self.config, message )
+
+    def on_automatic_backup_mode_changed( self, renderer, path, new_text ):
+        iter = self.store_include.get_iter(path)
+        self.store_include.set_value( iter, 2, new_text )
+        self.store_include.set_value( iter, 3, self.rev_automatic_backup_modes[new_text] )
+
+    def on_btn_where_clicked( self, button ):
+        path = self.edit_where.get_text()
+
+        fcd = gtk.FileChooserDialog( _('Snapshots folder'), self.dialog, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK) )
+        if len( path ) > 0:
+            fcd.set_filename( path )
+
+        if fcd.run() == gtk.RESPONSE_OK:
+            new_path = tools.prepare_path( fcd.get_filename() )
+            fcd.destroy()
+            if len( path ) > 0 and new_path != path:
+                if not self.question_handler( _('Are you sure you want to change snapshots folder ?') ):
+                    return
+            self.edit_where.set_text( new_path )
+        else:
+            fcd.destroy()
+
+    def on_combo_profiles_changed( self, *params ):
+        if self.disable_combo_changed:
+            return
+
+        iter = self.combo_profiles.get_active_iter()
+        if iter is None:
+            return
+
+        profile_id = self.store_profiles.get_value( iter, 1 )
+        if profile_id != self.config.get_current_profile():
+            self.save_profile()
+            self.config.set_current_profile( profile_id )
+
+        self.update_profile()
+
+    def update_profiles( self ):
+        self.disable_combo_changed = True
+
+        profiles = self.config.get_profiles_sorted_by_name()
+
+        select_iter = None
+        self.store_profiles.clear()
+
+        for profile_id in profiles:
+            iter = self.store_profiles.append( [ self.config.get_profile_name( profile_id ), profile_id ] )
+            if profile_id == self.config.get_current_profile():
+                select_iter = iter
+
+        self.disable_combo_changed = False
+
+        if not select_iter is None:
+            self.combo_profiles.set_active_iter( select_iter )
+
+    def update_profile( self ):
+        if self.config.get_current_profile() == '1':
+            self.btn_edit_profile.set_sensitive( False )
+            self.btn_remove_profile.set_sensitive( False )
+        else:
+            self.btn_edit_profile.set_sensitive( True )
+            self.btn_remove_profile.set_sensitive( True )
+
+        #set current folder
+        #self.fcb_where.set_filename( self.config.get_snapshots_path() )
+        self.edit_where.set_text( self.config.get_snapshots_path() )
+        
+        #per directory schedule
+        self.cb_per_directory_schedule.set_active( self.config.get_per_directory_schedule() )
+
+        #setup include folders
+        self.update_per_directory_option()
+
+        self.store_include.clear()
+        include_folders = self.config.get_include_folders()
+        if len( include_folders ) > 0:
+            for include_folder in include_folders:
+                self.store_include.append( [include_folder[0], gtk.STOCK_DIRECTORY, self.config.AUTOMATIC_BACKUP_MODES[include_folder[1]], include_folder[1] ] )
+        
+        #setup exclude patterns
+        self.store_exclude.clear()
+        exclude_patterns = self.config.get_exclude_patterns()
+        if len( exclude_patterns ) > 0:
+            for exclude_pattern in exclude_patterns:
+                self.store_exclude.append( [exclude_pattern, gtk.STOCK_DELETE] )
+
+        #setup automatic backup mode
+        i = 0
+        iter = self.store_backup_mode.get_iter_first()
+        default_mode = self.config.get_automatic_backup_mode()
+        while not iter is None:
+            if self.store_backup_mode.get_value( iter, 1 ) == default_mode:
+                self.cb_backup_mode.set_active( i )
+                break
+            iter = self.store_backup_mode.iter_next( iter )
+            i = i + 1
+
+        #setup remove old backups older than
+        enabled, value, unit = self.config.get_remove_old_snapshots()
+
+        self.edit_remove_old_backup_value.set_value( float( value ) )
+
+        i = 0
+        iter = self.store_remove_old_backup_unit.get_iter_first()
+        while not iter is None:
+            if self.store_remove_old_backup_unit.get_value( iter, 1 ) == unit:
+                self.cb_remove_old_backup_unit.set_active( i )
+                break
+            iter = self.store_remove_old_backup_unit.iter_next( iter )
+            i = i + 1
+                
+        self.cb_remove_old_backup.set_active( enabled )
+        self.update_remove_old_backups( self.cb_remove_old_backup )
+
+        #setup min free space
+        enabled, value, unit = self.config.get_min_free_space()
+        
+        self.edit_min_free_space_value.set_value( float(value) )
+
+        i = 0
+        iter = self.store_min_free_space_unit.get_iter_first()
+        while not iter is None:
+            if self.store_min_free_space_unit.get_value( iter, 1 ) == unit:
+                self.cb_min_free_space_unit.set_active( i )
+                break
+            iter = self.store_min_free_space_unit.iter_next( iter )
+            i = i + 1
+
+        self.cb_min_free_space.set_active( enabled )
+        self.update_min_free_space( self.cb_min_free_space )
+
+        #don't remove named snapshots
+        self.cb_dont_remove_named_snapshots.set_active( self.config.get_dont_remove_named_snapshots() )
+
+        #smart remove
+        self.cb_smart_remove.set_active( self.config.get_smart_remove() )
+
+        #enable notifications
+        self.cb_enable_notifications.set_active( self.config.is_notify_enabled() )
+
+        #run 'nice' from cron
+        self.cb_run_nice_from_cron = self.builder.get_object('cb_run_nice_from_cron')
+        self.cb_run_nice_from_cron.set_active(self.config.is_run_nice_from_cron_enabled())
+
+    def save_profile( self ):
+        #snapshots path
+        snapshots_path = self.edit_where.get_text()
+
+        #hack
+        if snapshots_path.startswith( '//' ):
+            snapshots_path = snapshots_path[ 1 : ]
+
+        #include list 
+        include_list = []
+        iter = self.store_include.get_iter_first()
+        while not iter is None:
+            include_list.append( ( self.store_include.get_value( iter, 0 ), self.store_include.get_value( iter, 3 ) ) )
+            iter = self.store_include.iter_next( iter )
+
+        #exclude patterns
+        exclude_list = []
+        iter = self.store_exclude.get_iter_first()
+        while not iter is None:
+            exclude_list.append( self.store_exclude.get_value( iter, 0 ) )
+            iter = self.store_exclude.iter_next( iter )
+
+        #check if back folder changed
+        #if len( self.config.get_snapshots_path() ) > 0 and self.config.get_snapshots_path() != snapshots_path:
+        #   if gtk.RESPONSE_YES != messagebox.show_question( self.dialog, self.config, _('Are you sure you want to change snapshots folder ?') ):
+        #       return False 
+
+        #ok let's save to config
+        self.config.set_snapshots_path( snapshots_path )
+        #if not msg is None:
+        #   messagebox.show_error( self.dialog, self.config, msg )
+        #   return False
+
+        self.config.set_include_folders( include_list )
+        self.config.set_exclude_patterns( exclude_list )
+
+        #global schedule
+        self.config.set_automatic_backup_mode( self.store_backup_mode.get_value( self.cb_backup_mode.get_active_iter(), 1 ) )
+
+        #auto-remove snapshots
+        self.config.set_remove_old_snapshots( 
+                        self.cb_remove_old_backup.get_active(), 
+                        int( self.edit_remove_old_backup_value.get_value() ),
+                        self.store_remove_old_backup_unit.get_value( self.cb_remove_old_backup_unit.get_active_iter(), 1 ) )
+        self.config.set_min_free_space( 
+                        self.cb_min_free_space.get_active(), 
+                        int( self.edit_min_free_space_value.get_value() ),
+                        self.store_min_free_space_unit.get_value( self.cb_min_free_space_unit.get_active_iter(), 1 ) )
+        self.config.set_dont_remove_named_snapshots( self.cb_dont_remove_named_snapshots.get_active() )
+        self.config.set_smart_remove( self.cb_smart_remove.get_active() )
+
+        #options
+        self.config.set_notify_enabled( self.cb_enable_notifications.get_active() )
+
+        #expert options
+        self.config.set_per_directory_schedule( self.cb_per_directory_schedule.get_active() )
+        self.config.set_run_nice_from_cron_enabled( self.cb_run_nice_from_cron.get_active() )
+
+    def update_remove_old_backups( self, button ):
+        enabled = self.cb_remove_old_backup.get_active()
+        self.edit_remove_old_backup_value.set_sensitive( enabled )
+        self.cb_remove_old_backup_unit.set_sensitive( enabled )
+
+    def update_min_free_space( self, button ):
+        enabled = self.cb_min_free_space.get_active()
+        self.edit_min_free_space_value.set_sensitive( enabled )
+        self.cb_min_free_space_unit.set_sensitive( enabled )
+
+    def on_cb_per_directory_schedule_toggled( self, button ):
+        self.update_per_directory_option()
+
+    def update_per_directory_option( self ):
+        if self.cb_per_directory_schedule.get_active():
+            if self.list_include.get_column(1) == None:
+                self.list_include.append_column( self.include_schedule_column )
+            self.cb_backup_mode.hide()
+            self.lbl_schedule.hide()
+        else:
+            if self.list_include.get_column(1) != None:
+                self.list_include.remove_column( self.include_schedule_column )
+            self.lbl_schedule.show()
+            self.cb_backup_mode.show()
+
+    def run( self ):
+        self.config.set_question_handler( self.question_handler )
+        self.config.set_error_handler( self.error_handler )
+
+        self.config_copy_dict = copy.copy( self.config.dict )
+        self.current_profile_org = self.config.get_current_profile()
+
+        while True:
+            if gtk.RESPONSE_OK == self.dialog.run():
+                if not self.validate():
+                    continue
+            else:
+                self.config.dict = self.config_copy_dict
+
+            break
+
+        self.config.set_current_profile( self.current_profile_org )
+        self.config.clear_handlers()
+
+        self.dialog.destroy()
+
+    def on_add_profile(self, button, data=None):
+
+        name = messagebox.text_input_dialog( self.dialog, self.config, _('New profile'), None )
+        if name is None:
+            return
+        if len( name ) <= 0:
+            return
+
+        if not self.config.add_profile( name ):
+            return
+
+        self.update_profiles()
+
+    def on_edit_profile( self, button ):
+        name = messagebox.text_input_dialog( self.dialog, self.config, _('Rename profile'), None )
+        if name is None:
+            return
+        if len( name ) <= 0:
+            return
+
+        if not self.config.set_profile_name( name ):
+            return
+
+        self.update_profiles()
+
+    def on_remove_profile( self, button ):
+        if gtk.RESPONSE_YES == messagebox.show_question( self.dialog, self.config, _('Are you sure you want to delete the profile "%s" ?') % self.config.get_profile_name() ):
+            self.config.remove_profile()
+            self.update_profiles()
+
+    def on_add_include( self, button ):
+        fcd = gtk.FileChooserDialog( _('Include folder'), self.dialog, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK) )
+        fcd.set_show_hidden( self.parent.show_hidden_files  )
+
+        if fcd.run() == gtk.RESPONSE_OK:
+            include_folder = tools.prepare_path( fcd.get_filename() )
+
+            iter = self.store_include.get_iter_first()
+            while not iter is None:
+                if self.store_include.get_value( iter, 0 ) == include_folder:
+                    break
+                iter = self.store_include.iter_next( iter )
+
+            if iter is None:
+                self.store_include.append( [include_folder, gtk.STOCK_DIRECTORY, self.config.AUTOMATIC_BACKUP_MODES[self.config.NONE], self.config.NONE ] )
+
+        fcd.destroy()
+
+    def on_remove_include( self, button ):
+        store, iter = self.list_include.get_selection().get_selected()
+        if not iter is None:
+            store.remove( iter )
+
+    def add_exclude_( self, pattern ):
+        pattern = pattern.strip()
+        if len( pattern ) == 0:
+            return
+
+        iter = self.store_exclude.get_iter_first()
+        while not iter is None:
+            if self.store_exclude.get_value( iter, 0 ) == pattern:
+                return
+            iter = self.store_exclude.iter_next( iter )
+
+        self.store_exclude.append( [pattern, gtk.STOCK_DELETE] )
+
+    def on_add_exclude( self, button ):
+        pattern = messagebox.text_input_dialog( self.dialog, self.config, _('Exclude pattern') )
+        if pattern is None:
+            return
+
+        if pattern.find( ':' ) >= 0:
+            messagebox.show_error( self.dialog, self.config, _('Exclude patterns can\'t contain \':\' char !') )
+            return
+    
+        self.add_exclude_( pattern )
+
+    def on_add_exclude_file( self, button ):
+        fcd = gtk.FileChooserDialog( _('Exclude file'), self.dialog, gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK) )
+        fcd.set_show_hidden( self.parent.show_hidden_files  )
+
+        if fcd.run() == gtk.RESPONSE_OK:
+            pattern = tools.prepare_path( fcd.get_filename() )
+            self.add_exclude_( pattern )
+
+        fcd.destroy()
+
+    def on_add_exclude_folder( self, button ):
+        fcd = gtk.FileChooserDialog( _('Exclude folder'), self.dialog, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK) )
+        fcd.set_show_hidden( self.parent.show_hidden_files  )
+
+        if fcd.run() == gtk.RESPONSE_OK:
+            pattern = tools.prepare_path( fcd.get_filename() )
+            self.add_exclude_( pattern )
+
+        fcd.destroy()
+
+    def on_remove_exclude( self, button ):
+        store, iter = self.list_exclude.get_selection().get_selected()
+        if not iter is None:
+            store.remove( iter )
+
+    def on_cancel( self, button ):
+        self.dialog.destroy()
+
+    def validate( self ):
+        self.save_profile()
+
+        if not self.config.check_config():
+            return False
+
+        if not self.config.setup_cron():
+            return False
+
+        self.config.save()
+        return True
+    

=== modified file 'gnome/snapshotsdialog.glade'
--- gnome/snapshotsdialog.glade	2009-04-27 13:43:00 +0000
+++ gnome/snapshotsdialog.glade	2009-10-01 16:35:20 +0000
@@ -1,176 +1,176 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Apr 27 12:51:19 2009 -->
-<glade-interface>
-  <widget class="GtkDialog" id="SnapshotsDialog">
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkDialog" id="SnapshotsDialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Snapshots</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
-    <property name="transient_for">MainWindow</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox3">
+          <object class="GtkVBox" id="vbox3">
             <property name="visible">True</property>
             <property name="spacing">2</property>
             <child>
-              <widget class="GtkEntry" id="edit_path">
+              <object class="GtkEntry" id="edit_path">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="editable">False</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="padding">2</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolbar" id="toolbar2">
+              <object class="GtkToolbar" id="toolbar2">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkToolButton" id="btn_copy_snapshot">
+                  <object class="GtkToolButton" id="btn_copy_snapshot">
                     <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Copy</property>
+                    <property name="tooltip_text" translatable="yes">Copy</property>
                     <property name="label" translatable="yes">Copy</property>
                     <property name="stock_id">gtk-copy</property>
                     <signal name="clicked" handler="on_btn_copy_snapshot_clicked"/>
-                  </widget>
+                  </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_restore_snapshot">
+                  <object class="GtkToolButton" id="btn_restore_snapshot">
                     <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Restore</property>
+                    <property name="tooltip_text" translatable="yes">Restore</property>
                     <property name="label" translatable="yes">Restore</property>
                     <property name="stock_id">gtk-undelete</property>
                     <signal name="clicked" handler="on_btn_restore_snapshot_clicked"/>
-                  </widget>
+                  </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>