Merge lp:~ryan-c-ahearn/backintime/command_line_interface into lp:backintime/1.0

[Ryan Ahearn]

[Ryan Ahearn (ryan-c-ahearn)]

Here's my first cut of a command line interface for back in time configuration and restore.

It's not the prettiest interface right now, but it seems functionally solid. All of the displayed strings have the gettext call around them, but I don't speak any other languages so I have left the language files alone.

I tried to leave common alone as much as possible, but I had to suppress a couple of print calls to clean up the display when a user kicked off taking a snapshot from inside of backintime-restore.

Let me know what you think.

[lp:~ryan-c-ahearn/backintime/command_line_interface]

691. By Ryan Ahearn on 2010-03-02

Fixed bug in setting the hour to run backintime for daily/weekly/monthly backups

Unmerged revisions

691. By Ryan Ahearn on 2010-03-02

Fixed bug in setting the hour to run backintime for daily/weekly/monthly backups

690. By Ryan Ahearn on 2010-03-02

Added gettext calls to all strings that will be displayed to the user

689. By Ryan Ahearn on 2010-03-02

Added cli entries to the updateversion script

688. By Ryan Ahearn on 2010-03-02

Added myself to the AUTHORS file

687. By Ryan Ahearn on 2010-03-02

Added sections on cli to the README

686. By Ryan Ahearn on 2010-03-02

Added simple packaging files for backintime-cli

685. By Ryan Ahearn on 2010-03-02

Uncommented the man page install lines from Makefile.template to get them installed

684. By Ryan Ahearn on 2010-03-02

Added backintime-config and backintime-restore man pages

683. By Ryan Ahearn on 2010-03-02

Can now set the backup time for daily, weekly, and monthly backups

682. By Ryan Ahearn on 2010-02-26

Added ability to name and delete snapshots from restore window

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-03-02 06:06:17 +0000
@@ -0,0 +1,2 @@
+Makefile
+common/po/*.mo
 
=== modified file 'AUTHORS'
--- AUTHORS	2009-11-06 13:00:42 +0000
+++ AUTHORS	2010-03-02 06:06:17 +0000
@@ -1,3 +1,4 @@
 Oprea Dan (<[e-mail]>)
 Bart de Koning (<[e-mail]>)
 Richard Bailey (<[e-mail]>)
+Ryan Ahearn (<[e-mail]>)
 
=== modified file 'README'
--- README	2009-11-02 13:52:00 +0000
+++ README	2010-03-02 06:06:17 +0000
@@ -39,6 +39,12 @@
 		sudo dpkg -i backintime-common-<version>.deb
 		sudo dpkg -i backintime-kde4-<version>.deb
 
+	Command Line Interface: (python-urwid >= 0.9.9)
+
+		./makedeb.sh
+		sudo dpkg -i backintime-common-<version>.deb
+		sudo dpkg -i backintime-cli-<version>.deb
+
 	NOTE:
 	Ubuntu 8.04: to install KDE4 4.1 check this link:
 		http://news.softpedia.com/news/How-To-Install-KDE-4-1-On-Ubuntu-8-04-91034.shtml
@@ -50,6 +56,12 @@
 		./configure
 		make
 		sudo make install
+	
+	Command Line Interface (dependencies: python-urwid (> 0.9.9)):
+		cd cli
+		./configure
+		make
+		sudo make install
 
 	GNOME (dependencies: python-glade2, python-gnome2, meld):
 		cd gnome
 
=== added directory 'cli'
=== added file 'cli/Makefile.template'
--- cli/Makefile.template	1970-01-01 00:00:00 +0000
+++ cli/Makefile.template	2010-03-02 06:06:17 +0000
@@ -0,0 +1,25 @@
+PREFIX=/usr
+DEST=$(DESTDIR)$(PREFIX)
+
+all:
+
+clean:
+
+install: 
+	#install python
+	install -d $(DEST)/share/backintime/cli
+	install --mode=644 *.py $(DEST)/share/backintime/cli
+	
+	#install copyright file
+	install -d $(DEST)/share/doc/backintime-cli
+	install --mode=644 ../common/debian_specific/copyright $(DEST)/share/doc/backintime-cli
+	
+	#install man file(s)
+	install -d $(DEST)/share/man/man1
+	install --mode=644 man/C/*.gz $(DEST)/share/man/man1
+	
+	#install application
+	install -d $(DEST)/bin
+	install backintime-config $(DEST)/bin
+	install backintime-restore $(DEST)/bin
+	
 
=== added file 'cli/backintime-config'
--- cli/backintime-config	1970-01-01 00:00:00 +0000
+++ cli/backintime-config	2010-03-02 06:06:17 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+if [ -f bitconfig.py ]; then
+	APP_PATH="."
+else
+	APP_PATH="/usr/share/backintime/cli"
+fi
+
+python ${APP_PATH}/bitconfig.py "$@"
+
 
=== added file 'cli/backintime-restore'
--- cli/backintime-restore	1970-01-01 00:00:00 +0000
+++ cli/backintime-restore	2010-03-02 06:06:17 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+if [ -f bitrestore.py ]; then
+	APP_PATH="."
+else
+	APP_PATH="/usr/share/backintime/cli"
+fi
+
+python ${APP_PATH}/bitrestore.py "$@"
+
 
=== added file 'cli/bitconfig.py'
--- cli/bitconfig.py	1970-01-01 00:00:00 +0000
+++ cli/bitconfig.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,142 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+	
+
+import os.path
+import sys
+import urwid
+import gettext
+
+sys.path = [os.path.join( os.path.dirname( os.path.abspath( os.path.dirname( __file__ ) ) ), 'common' )] + sys.path
+
+import backintime
+import config
+import logger
+import guiapplicationinstance
+import profilewidget
+import generalwidget
+import includewidget
+import excludewidget
+import removewidget
+import optionswidget
+import expertwidget
+
+_=gettext.gettext
+
+class MainWindow(object):
+
+    def __init__( self, config ):
+        self._config = config
+
+        self._header = _('Back in Time Configuration') + '.  ' + _('F6 exits')
+        setting_sections = [ "Profiles", "General", "Include", "Exclude", "Auto-remove", "Options", "Expert Options" ]
+        self._listbox_content = [
+            urwid.Divider(),                                                # position 0
+            urwid.Text( _("Profile") + ": " + config.get_profile_name() ),  # position 1
+            urwid.Divider(),                                                # position 2
+            urwid.GridFlow( [ urwid.AttrWrap( urwid.Button( _(txt), self.sections_button_press, txt ), 'button', 'button_focus' ) for txt in setting_sections ],
+                           18, 2, 1, 'center' ),                            # position 3
+            urwid.Divider(),                                                # position 4
+            profilewidget.ProfileWidget( self, config ),                    # position 5
+            ]
+
+    def sections_button_press( self, button, user_data ):
+        if user_data == 'Profiles':
+            widget = profilewidget.ProfileWidget( self, self._config )
+        elif user_data == 'General':
+            widget = generalwidget.GeneralWidget( self, self._config )
+        elif user_data == 'Include':
+            widget = includewidget.IncludeWidget( self, self._config )
+        elif user_data == 'Exclude':
+            widget = excludewidget.ExcludeWidget( self, self._config )
+        elif user_data == 'Auto-remove':
+            widget = removewidget.RemoveWidget( self._config )
+        elif user_data == 'Options':
+            widget = optionswidget.OptionsWidget( self._config )
+        elif user_data == 'Expert Options':
+            widget = expertwidget.ExpertOptionsWidget( self._config )
+        self.update_content( widget, 5 )
+
+    def show( self ):
+        header = urwid.AttrWrap( urwid.Text( self._header, align='center' ), 'header' )
+        self._content = urwid.SimpleListWalker( self._listbox_content )
+        self._listbox = urwid.ListBox( self._content )
+        frame = urwid.Frame( urwid.AttrWrap( self._listbox, 'body' ), header=header )
+
+        palette = [
+            ( 'body', 'black', 'light gray', 'standout' ),
+            ( 'error', 'dark red', 'light gray', 'bold' ),
+            ( 'header', 'white', 'dark red', 'bold' ),
+            ( 'button', 'black', 'dark cyan' ),
+            ( 'button_focus', 'white', 'dark blue', 'bold' ),
+            ( 'edit_box', 'light gray', 'dark blue' ),
+            ( 'edit_focus', 'white', 'dark blue', 'bold' )
+            ]
+
+        urwid.MainLoop( frame, palette, unhandled_input=self.unhandled_input ).run()
+
+    def update_content( self, widget, position ):
+        self._content[position] = widget
+
+    def update_profile_name( self ):
+        self.update_content( urwid.Text( _('Profile') + ': ' + self._config.get_profile_name() ), 1 )
+        
+    def unhandled_input( self, key ):
+        if key == 'f6':
+            self.on_close()
+
+    def on_close( self ):
+        self.update_content( ConfirmSave( self._config ), 5 )
+
+class ConfirmSave(urwid.WidgetWrap):
+
+    def __init__( self, config ):
+        self._config = config
+
+        pile_list = [
+            urwid.Padding( urwid.Text( _('Save configuration?') ), 'center' ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('Yes'), self.save ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('No'), self.close ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'center' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def save( self, button ):
+        self._config.save()
+        self._config.setup_cron()
+        self.close()
+
+    def close( self, button=None ):
+        raise urwid.ExitMainLoop()
+        
+if __name__ == '__main__':
+    cfg = backintime.start_app( 'backintime-config' )
+    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 )
+
+    logger.openlog()
+    main_window = MainWindow( cfg )
+    main_window.show()
+    logger.closelog()
+
+    app_instance.exit_application()
 
=== added file 'cli/bitrestore.py'
--- cli/bitrestore.py	1970-01-01 00:00:00 +0000
+++ cli/bitrestore.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,131 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+	
+
+import os.path
+import sys
+import urwid
+import gettext
+
+sys.path = [os.path.join( os.path.dirname( os.path.abspath( os.path.dirname( __file__ ) ) ), 'common' )] + sys.path
+
+import backintime
+import config
+import logger
+import guiapplicationinstance
+import profilewidget
+import restorewidget
+import removesnapshot
+import snapshotname
+
+_=gettext.gettext
+
+class MainWindow(object):
+
+    def __init__( self, config ):
+        self._config = config
+        self.selected_snapshot = ''
+        self.selected_snapshot_name = ''
+        self.current_directory = config.get_str_value( 'cli.last_path', '/' )
+        self.show_hidden = False
+        
+        self._header = _('Back in Time Restore Utility') + '.  ' + _('F6 exits')
+        self._profile_button = urwid.Button( config.get_profile_name(), self.change_profile )
+        buttons = [ 'Take Snapshot', 'Update Snapshots', 'Snapshot Name', 'Remove Snapshot' ]
+        self._listbox_content = [
+            urwid.Divider(),                                                    # position 0
+            urwid.AttrWrap( self._profile_button, 'button', 'button_focus' ),   # position 1
+            urwid.Divider(),                                                    # position 2
+            urwid.GridFlow( [ urwid.AttrWrap( urwid.Button( _(txt), self.button_press, txt ), 'button', 'button_focus' ) for txt in buttons ],
+                           20, 2, 1, 'center' ),                                # position 3
+            urwid.Divider(),                                                    # position 4
+            restorewidget.RestoreWidget( self, config ),                        # position 5
+            ]
+
+    def change_profile( self, button ):
+        self.update_content( profilewidget.ProfileWidget( self, self._config, False ), 5 )
+
+    def button_press( self, button, user_data ):
+        if user_data == 'Take Snapshot':
+            backintime.take_snapshot_now_async( self._config )
+        elif user_data == 'Update Snapshots':
+            self.update_content( restorewidget.RestoreWidget( self, self._config ), 5 )
+        elif user_data == 'Snapshot Name' and self.selected_snapshot != '':
+            self.update_content( snapshotname.SnapshotName( self, self._config ), 5 )
+        elif user_data == 'Remove Snapshot' and self.selected_snapshot != '':
+            self.update_content( removesnapshot.RemoveSnapshot( self, self._config ), 5 )
+
+    def show( self ):
+        header = urwid.AttrWrap( urwid.Text( self._header, align='center' ), 'header' )
+        self._content = urwid.SimpleListWalker( self._listbox_content )
+        self._listbox = urwid.ListBox( self._content )
+        frame = urwid.Frame( urwid.AttrWrap( self._listbox, 'body' ), header=header )
+
+        palette = [
+            ( 'body', 'black', 'light gray', 'standout' ),
+            ( 'error', 'dark red', 'light gray', 'bold' ),
+            ( 'header', 'white', 'dark red', 'bold' ),
+            ( 'button', 'black', 'dark cyan' ),
+            ( 'button_focus', 'white', 'dark blue', 'bold' ),
+            ( 'edit_box', 'light gray', 'dark blue' ),
+            ( 'edit_focus', 'white', 'dark blue', 'bold' )
+            ]
+
+        self.main_loop = urwid.MainLoop( frame, palette, unhandled_input=self.unhandled_input )
+        self.main_loop.run()
+
+    def update_content( self, widget, position ):
+        self._content[position] = widget
+
+    def update_profile_name( self ):
+        self._profile_button.set_label( self._config.get_profile_name() )
+        self.selected_snapshot = ''
+        self.update_content( restorewidget.RestoreWidget( self, self._config ), 5 )
+
+    def update_current_directory( self, new_directory ):
+        self.current_directory = new_directory
+        self._config.set_str_value( 'cli.last_path', new_directory )
+        self.update_content( restorewidget.RestoreWidget( self, self._config ), 5 )
+
+    def is_selected_snapshot( self, snapshot ):
+        if self.selected_snapshot == snapshot:
+            return True
+        else:
+            return False
+
+    def unhandled_input( self, key ):
+        if key == 'f6':
+            self.on_close()
+
+    def on_close( self ):
+        self._config.save()
+        raise urwid.ExitMainLoop()
+
+        
+if __name__ == '__main__':
+    cfg = backintime.start_app( 'backintime-restore' )
+    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 )
+
+    logger.openlog()
+    main_window = MainWindow( cfg )
+    main_window.show()
+    logger.closelog()
+
+    app_instance.exit_application()
 
=== added file 'cli/configure'
--- cli/configure	1970-01-01 00:00:00 +0000
+++ cli/configure	2010-03-02 06:06:17 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ -e Makefile ]; then
+	rm Makefile;
+fi
+
+cp Makefile.template Makefile
+
+echo "All OK. Now run:"
+echo "    make"
+echo "    sudo make install"
+
 
=== added file 'cli/copywidget.py'
--- cli/copywidget.py	1970-01-01 00:00:00 +0000
+++ cli/copywidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,67 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+import os.path
+import shutil
+import urwid
+import gettext
+
+import logger
+import restorewidget
+
+_=gettext.gettext
+
+class CopyWidget(urwid.WidgetWrap):
+
+    def __init__( self, main_win, config, to_copy ):
+        self._main_win = main_win
+        self._config = config
+        self._to_copy = to_copy
+
+        self._edit_box = urwid.Edit(( 'body', _('Enter destination') + ': ' ))
+        pile_list = [
+            urwid.AttrWrap( self._edit_box, 'edit_box', 'edit_focus' ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('OK'), self.ok_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Cancel'), self.go_home ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def ok_pressed( self, button ):
+	destination = self._edit_box.get_edit_text().strip()
+        logger.info( 'copying %s to %s' % ( self._to_copy, destination ) )
+        if os.path.isdir( self._to_copy ):
+            self._copy_directory( destination )
+        else:
+            self._copy_file( destination )
+        self.go_home()
+
+    def _copy_directory( self, destination ):
+        while os.path.exists( destination ):
+            destination = os.path.join( destination, os.path.basename( self._to_copy ) )
+        shutil.copytree( self._to_copy, destination, True )
+
+    def _copy_file( self, destination ):
+        shutil.copy2( self._to_copy, destination )
+
+    def go_home( self, button=None ):
+        self._main_win.update_content( restorewidget.RestoreWidget( self._main_win, self._config ), 5 )
 
=== added directory 'cli/debian_specific'
=== added file 'cli/debian_specific/control'
--- cli/debian_specific/control	1970-01-01 00:00:00 +0000
+++ cli/debian_specific/control	2010-03-02 06:06:17 +0000
@@ -0,0 +1,10 @@
+Package: backintime-cli
+Version: 0.9.99.18
+Priority: optional
+Section: utils
+Maintainer: BIT Team <[e-mail]>
+Architecture: all
+Homepage: http://backintime.le-web.org
+Depends: python-urwid (>> 0.9.9), backintime-common (= 0.9.99.18)
+Description: Simple backup system for command line use.
+ This is a command line interface frontend for backintime-common.
 
=== added file 'cli/debian_specific/control.source'
--- cli/debian_specific/control.source	1970-01-01 00:00:00 +0000
+++ cli/debian_specific/control.source	2010-03-02 06:06:17 +0000
@@ -0,0 +1,14 @@
+Source: backintime-cli
+Maintainer: BIT Team <[e-mail]>
+Section: utils
+Priority: optional
+Standards-Version: 3.7.3
+Homepage: http://backintime.le-web.org
+
+Package: backintime-cli
+Architecture: all
+Section: utils
+Priority: optional
+Depends: python-urwid (>> 0.9.9), backintime-common (= 0.9.99.18)
+Description: Simple backup system for command line use.
+ This is a command line interface frontend for backintime-common.
 
=== added file 'cli/debian_specific/postrm'
--- cli/debian_specific/postrm	1970-01-01 00:00:00 +0000
+++ cli/debian_specific/postrm	2010-03-02 06:06:17 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf /usr/share/backintime/cli/*.pyc
+exit 0
 
=== added file 'cli/debian_specific/rules'
--- cli/debian_specific/rules	1970-01-01 00:00:00 +0000
+++ cli/debian_specific/rules	2010-03-02 06:06:17 +0000
@@ -0,0 +1,50 @@
+#!/usr/bin/make -f
+
+package = backintime-cli
+
+clean:
+	dh_testdir
+	dh_clean
+	rm -f build
+
+install: build
+	#install python
+	#dh_installdirs /usr/share/backintime/gnome
+	dh_install *.py /usr/share/backintime/cli
+	
+	#install copyright file
+	#dh_installdirs /usr/share/doc/backintime-gnome
+	dh_install debian/copyright /usr/share/doc/backintime-cli
+	
+	#install man file(s)
+	#dh_installdirs /usr/share/man/man1
+	dh_install man/C/*.gz /usr/share/man/man1
+	
+	#install application
+	#dh_installdirs /usr/bin
+	dh_install backintime-config /usr/bin
+	dh_install backintime-restore /usr/bin
+	
+build:
+	touch build
+
+binary-indep: install
+	dh_testdir -i
+	dh_testroot -i
+	#dh_installdocs -i NEWS
+	#dh_installchangelogs -i ChangeLog
+	#dh_strip -i
+	#dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	#dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: install
+
+binary: binary-indep
+
+.PHONY: binary binary-arch binary-indep clean
+
 
=== added file 'cli/excludewidget.py'
--- cli/excludewidget.py	1970-01-01 00:00:00 +0000
+++ cli/excludewidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,118 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+
+_=gettext.gettext
+
+class ExcludeWidget(urwid.WidgetWrap):
+    
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+        self._to_delete = None
+
+        all_patterns = config.get_exclude_patterns()
+        if len( all_patterns ) == 0:
+            chooser = urwid.Divider()
+        else:
+            excluded_patterns = []
+            for pattern in all_patterns:
+                urwid.RadioButton( excluded_patterns, pattern, False, self.pattern_selected )
+            chooser = urwid.Pile( excluded_patterns )
+
+        pile_list = [
+            urwid.Text( _('Patterns, files or folders') ),
+            urwid.Divider(),
+            chooser,
+            urwid.Divider(),
+            urwid.GridFlow([
+                urwid.AttrWrap( urwid.Button( _('Add'), self.add_pattern ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Delete'), self.delete_pattern ), 'button', 'button_focus' ),
+                ], 10, 2, 1, 'center' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def pattern_selected( self, button, new_state ):
+        if new_state:
+            self._to_delete = button.get_label()
+
+    def add_pattern( self, button ):
+        self._main_win.update_content( AddExcludeWidget( self._main_win, self._config ), 5 )
+
+    def delete_pattern( self, button ):
+        if self._to_delete is not None:
+            self._main_win.update_content( DeleteExcludeWidget( self._main_win, self._config, self._to_delete ), 5 )
+
+    def go_to_exclude_patterns( self, button=None ):
+        self._main_win.update_content( ExcludeWidget( self._main_win, self._config ), 5 )
+
+
+class AddExcludeWidget(ExcludeWidget):
+
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+
+        self._edit_box = urwid.Edit(( 'body', _('Enter pattern, file, or folder to exclude') + ': ' ))
+        pile_list = [
+            urwid.AttrWrap( self._edit_box, 'edit_box', 'edit_focus' ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('OK'), self.ok_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Cancel'), self.go_to_exclude_patterns ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def ok_pressed( self, button ):
+        all_patterns = self._config.get_exclude_patterns()
+        all_patterns.append( self._edit_box.get_edit_text().strip() )
+        self._config.set_exclude_patterns( all_patterns )
+        self.go_to_exclude_patterns()
+
+class DeleteExcludeWidget(ExcludeWidget):
+    
+    def __init__( self, main_win, config, to_delete ):
+        self._main_win = main_win
+        self._config = config
+        self._to_delete = to_delete
+
+        pile_list = [
+            urwid.Text( _('Are you sure you want to remove') + ' "' + to_delete + '" ' + _('from the excluded patterns?') ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('Yes'), self.yes_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('No'), self.go_to_exclude_patterns ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def yes_pressed( self, button ):
+        all_patterns = self._config.get_exclude_patterns()
+        all_patterns.remove( self._to_delete )
+        self._config.set_exclude_patterns( all_patterns )
+        self.go_to_exclude_patterns()
 
=== added file 'cli/expertwidget.py'
--- cli/expertwidget.py	1970-01-01 00:00:00 +0000
+++ cli/expertwidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,47 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+
+_=gettext.gettext
+
+class ExpertOptionsWidget(urwid.WidgetWrap):
+
+    def __init__( self, config ):
+        self._config = config
+
+        pile_list = [
+            urwid.Padding( urwid.Text(( 'error', _('Change these options only if you really know what you are doing!') )), 'center' ),
+            urwid.Divider(),
+            urwid.CheckBox( _("Run 'nice' as cron job (default: enabled)"), config.is_run_nice_from_cron_enabled(), on_state_change=self.flip_nice_cron ),
+            urwid.CheckBox( _("Run 'ionice' as cron job (default: enabled)"), config.is_run_ionice_from_cron_enabled(), on_state_change=self.flip_ionice_cron ),
+            urwid.CheckBox( _("Run 'ionice' when taking a manual snapshot (default: disabled)"), config.is_run_ionice_from_user_enabled(), on_state_change=self.flip_ionice_user )
+            ]
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def flip_nice_cron( self, check_box, new_state ):
+        self._config.set_run_nice_from_cron_enabled( new_state )
+
+    def flip_ionice_cron( self, check_box, new_state ):
+        self._config.set_run_ionice_from_cron_enabled( new_state )
+
+    def flip_ionice_user( self, check_box, new_state ):
+        self._config.set_run_ionice_from_user_enabled( new_state )
 
=== added file 'cli/generalwidget.py'
--- cli/generalwidget.py	1970-01-01 00:00:00 +0000
+++ cli/generalwidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,93 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+
+_=gettext.gettext
+
+class GeneralWidget(urwid.WidgetWrap):
+
+    def __init__( self, main_win, config ):
+        self._config = config
+        self._main_win = main_win
+
+        backup_mode = config.get_automatic_backup_mode()
+        backup_modes = []
+        for key, value in sorted( config.AUTOMATIC_BACKUP_MODES.items() ):
+            if backup_mode == key:
+                urwid.RadioButton( backup_modes, value, True, self.schedule_changed, key )
+            else:
+                urwid.RadioButton( backup_modes, value, False, self.schedule_changed, key )
+        schedule_chooser = urwid.Pile( backup_modes )
+
+        location = urwid.Edit(( 'body', _('Where to save snapshots') + ': ' ), config.get_snapshots_path() )
+        urwid.connect_signal( location, 'change', self.location_changed )
+        self._error = urwid.Text( '' )
+        pile_list = [
+            urwid.AttrWrap( location, 'edit_box', 'edit_focus' ),
+            urwid.AttrWrap( self._error, 'error' ),
+            urwid.Divider()
+            ]
+        
+        if backup_mode > config.HOUR:
+            # display chooser to set hour of the day to run the cron job
+            set_hour = config.get_automatic_backup_time() / 100
+            hour_choices = []
+            for i in range( 24 ):
+                if set_hour == i:
+                    urwid.RadioButton( hour_choices, ( "%2d:00" % i ), True, self.time_changed, i )
+                else:
+                    urwid.RadioButton( hour_choices, ( "%2d:00" % i ), False, self.time_changed, i )
+            hour_chooser = urwid.Pile( hour_choices )
+            pile_list.append(
+                urwid.Columns( [
+                    urwid.Pile( [
+                        urwid.Text( _('Schedule') ),
+                        schedule_chooser
+                        ] ),
+                    urwid.Pile( [
+                        urwid.Text( _('Hour') ),
+                        hour_chooser
+                        ] )
+                    ], 1 )
+                )
+        else:
+            pile_list.extend( [
+                urwid.Text( _('Schedule') ),
+                schedule_chooser
+                ] )
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def schedule_changed( self, check_box, new_state, user_data ):
+        if new_state:
+            self._config.set_automatic_backup_mode( user_data )
+            self._main_win.update_content( GeneralWidget( self._main_win, self._config ), 5 )
+
+    def time_changed( self, check_box, new_state, user_data ):
+        if new_state:
+            self._config.set_automatic_backup_time( user_data * 100 )
+
+    def location_changed( self, edit, new_edit_text ):
+        if not self._config.set_snapshots_path( new_edit_text.strip() ):
+            self._error.set_text( _('Could not use this path, are you sure it exists and you have write access?') )
+        else:
+            self._error.set_text( '' )
 
=== added file 'cli/includewidget.py'
--- cli/includewidget.py	1970-01-01 00:00:00 +0000
+++ cli/includewidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,118 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+
+_=gettext.gettext
+
+class IncludeWidget(urwid.WidgetWrap):
+    
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+        self._to_delete = None
+
+        all_folders = config.get_include_folders()
+        if len( all_folders ) == 0:
+            chooser = urwid.Divider()
+        else:
+            included_folders = []
+            for folder in all_folders:
+                urwid.RadioButton( included_folders, folder, False, self.folder_selected )
+            chooser = urwid.Pile( included_folders )
+
+        pile_list = [
+            urwid.Text( _('Include Folders') ),
+            urwid.Divider(),
+            chooser,
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('Add'), self.add_folder ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Delete'), self.delete_folder ), 'button', 'button_focus' ),
+                ], 10, 2, 1, 'center' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def folder_selected( self, button, new_state ):
+        if new_state:
+            self._to_delete = button.get_label()
+
+    def add_folder( self, button ):
+        self._main_win.update_content( AddIncludeWidget( self._main_win, self._config ), 5 )
+
+    def delete_folder( self, button ):
+        if self._to_delete is not None:
+            self._main_win.update_content( DeleteIncludeWidget( self._main_win, self._config, self._to_delete ), 5 )
+
+    def go_to_include_folders( self, button=None ):
+        self._main_win.update_content( IncludeWidget( self._main_win, self._config ), 5 )
+
+
+class AddIncludeWidget(IncludeWidget):
+
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+
+        self._edit_box = urwid.Edit(( 'body', _('Enter path for folder to backup') + ': ' ))
+        pile_list = [
+            urwid.AttrWrap( self._edit_box, 'edit_box', 'edit_focus' ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('OK'), self.ok_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Cancel'), self.go_to_include_folders ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def ok_pressed( self, button ):
+        all_folders = self._config.get_include_folders()
+        all_folders.append( self._edit_box.get_edit_text().strip() )
+        self._config.set_include_folders( all_folders )
+        self.go_to_include_folders()
+
+class DeleteIncludeWidget(IncludeWidget):
+    
+    def __init__( self, main_win, config, to_delete ):
+        self._main_win = main_win
+        self._config = config
+        self._to_delete = to_delete
+
+        pile_list = [
+            urwid.Text( _('Are you sure you want to remove') + ' "' + to_delete + '" ' + _('from the backed up folders?') ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('Yes'), self.yes_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('No'), self.go_to_include_folders ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def yes_pressed( self, button ):
+        all_folders = self._config.get_include_folders()
+        all_folders.remove( self._to_delete )
+        self._config.set_include_folders( all_folders )
+        self.go_to_include_folders()
 
=== added directory 'cli/man'
=== added directory 'cli/man/C'
=== added file 'cli/man/C/backintime-config.1.gz'
 Binary files cli/man/C/backintime-config.1.gz	1970-01-01 00:00:00 +0000 and cli/man/C/backintime-config.1.gz	2010-03-02 06:06:18 +0000 differ
=== added file 'cli/man/C/backintime-restore.1.gz'
 Binary files cli/man/C/backintime-restore.1.gz	1970-01-01 00:00:00 +0000 and cli/man/C/backintime-restore.1.gz	2010-03-02 06:06:18 +0000 differ
=== added file 'cli/optionswidget.py'
--- cli/optionswidget.py	1970-01-01 00:00:00 +0000
+++ cli/optionswidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,45 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+
+_=gettext.gettext
+
+class OptionsWidget(urwid.WidgetWrap):
+
+    def __init__( self, config ):
+        self._config = config
+
+        pile_list = [
+            urwid.CheckBox( _('Enable notifications'), config.is_notify_enabled(), on_state_change=self.flip_notify ),
+            urwid.CheckBox( _('Disable snapshots when on battery'), config.is_no_on_battery_enabled(), on_state_change=self.flip_battery ),
+            urwid.CheckBox( _('Backup files on restore'), config.is_backup_on_restore_enabled(), on_state_change=self.flip_backup_on_restore )
+            ]
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def flip_notify( self, check_box, new_state ):
+        self._config.set_notify_enabled( new_state )
+
+    def flip_battery( self, check_box, new_state ):
+        self._config.set_no_on_battery_enabled( new_state )
+
+    def flip_backup_on_restore( self, check_box, new_state ):
+        self._config.set_backup_on_restore( new_state )
 
=== added file 'cli/profilewidget.py'
--- cli/profilewidget.py	1970-01-01 00:00:00 +0000
+++ cli/profilewidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,162 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+
+_=gettext.gettext
+
+class ProfileWidget(urwid.WidgetWrap):
+    
+    def __init__( self, main_win, config, display_buttons=True ):
+        self._main_win = main_win
+        self._config = config
+
+        current_profile = config.get_current_profile()
+        profile_ids = config.get_profiles()
+        profiles = []
+        for profile_id in profile_ids:
+            profile_name = config.get_profile_name( profile_id )
+            if profile_id == current_profile:
+                urwid.RadioButton( profiles, profile_name, True, self.profile_changed, profile_id )
+            else:
+                urwid.RadioButton( profiles, profile_name, False, self.profile_changed, profile_id )
+        chooser = urwid.Pile( profiles )
+
+        pile_list = [
+            urwid.Text( _('Choose a profile') ),
+            urwid.Divider(),
+            chooser,
+            urwid.Divider()
+            ]
+
+        if display_buttons:
+            buttons = [
+                urwid.Button( _('Edit'), self.edit_profile ),
+                urwid.Button( _('New'), self.add_profile )
+                ]
+            if len( profile_ids ) > 1:
+                buttons.append( urwid.Button( _('Delete'), self.delete_profile ) )
+            pile_list.append( urwid.GridFlow( [ urwid.AttrWrap( button, 'button', 'button_focus' ) for button in buttons ], 10, 2, 1, 'center' ) )
+            
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def profile_changed( self, button, new_state, user_data ):
+        if new_state:
+            self._config.set_current_profile( user_data )
+            self._main_win.update_profile_name()
+
+    def add_profile( self, button ):
+        self._main_win.update_content( AddProfileWidget( self._main_win, self._config ), 5 )
+
+    def edit_profile( self, button ):
+        self._main_win.update_content( EditProfileWidget( self._main_win, self._config ), 5 )
+        
+    def delete_profile( self, button ):
+        self._main_win.update_content( DeleteProfileWidget( self._main_win, self._config ), 5 )
+
+    def go_to_profile_list( self, button=None ):
+        self._main_win.update_profile_name()
+        self._main_win.update_content( ProfileWidget( self._main_win, self._config ), 5 )
+
+
+class EditProfileWidget(ProfileWidget):
+
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+
+        self._edit_box = urwid.Edit(( 'body', _('Enter new name for profile') + ' ' + config.get_profile_name() + ': ' ))
+        self._error = urwid.Text( '' )
+        pile_list = [
+            urwid.AttrWrap( self._edit_box, 'edit_box', 'edit_focus' ),
+            urwid.AttrWrap( self._error, 'error' ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('OK'), self.ok_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Cancel'), self.go_to_profile_list ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def ok_pressed( self, button ):
+        name = self._edit_box.get_edit_text().strip()
+        if name == '':
+            self._error.set_text( _('Profile must be given a name') )
+        elif self._config.set_profile_name( name ):
+            self.go_to_profile_list()
+        else:
+            self._error.set_text( _('Profile name already exists, choose another') )
+
+            
+class AddProfileWidget(ProfileWidget):
+
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+        
+        self._edit_box = urwid.Edit(( 'body', _('Enter name for new profile') + ': ' ))
+        self._error = urwid.Text( '' )
+        pile_list = [
+            urwid.AttrWrap( self._edit_box, 'edit_box', 'edit_focus' ),
+            urwid.AttrWrap( self._error, 'error' ),
+            urwid.Divider(),
+            urwid.GridFlow([
+                urwid.AttrWrap( urwid.Button( _('OK'), self.ok_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Cancel'), self.go_to_profile_list ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def ok_pressed( self, button ):
+        name = self._edit_box.get_edit_text().strip()
+        if name == '':
+            self._error.set_text( _('Profile must be given a name') )
+        elif self._config.add_profile( name ):
+            self.go_to_profile_list()
+        else:
+            self._error.set_text( _('Profile name already exists, choose another') )
+
+        
+class DeleteProfileWidget(ProfileWidget):
+
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+
+        pile_list = [
+            urwid.Text( _('Are You Sure you want to delete profile') + ' "' + config.get_profile_name() + '"' ),
+            urwid.Divider(),
+            urwid.GridFlow([
+                urwid.AttrWrap( urwid.Button( _('Yes'), self.yes_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('No'), self.go_to_profile_list ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def yes_pressed( self, button ):
+        self._config.remove_profile()
+        self.go_to_profile_list()
 
=== added file 'cli/removesnapshot.py'
--- cli/removesnapshot.py	1970-01-01 00:00:00 +0000
+++ cli/removesnapshot.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,51 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+import restorewidget
+import snapshots
+
+_=gettext.gettext
+
+class RemoveSnapshot(urwid.WidgetWrap):
+
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+        self._snapshots = snapshots.Snapshots( config )
+
+        pile_list = [
+            urwid.Text( _('Are you sure you want to remove snapshot') + ' "' + main_win.selected_snapshot_name + '"' ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('Yes'), self.yes_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('No'), self.go_home ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def yes_pressed( self, button ):
+        self._snapshots.remove_snapshot( self._main_win.selected_snapshot )
+        self.go_home()
+
+    def go_home( self, button=None ):
+        self._main_win.update_content( restorewidget.RestoreWidget( self._main_win, self._config ), 5 )
 
=== added file 'cli/removewidget.py'
--- cli/removewidget.py	1970-01-01 00:00:00 +0000
+++ cli/removewidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,114 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+
+_=gettext.gettext
+
+class RemoveWidget(urwid.WidgetWrap):
+
+    def __init__( self, config ):
+        self._config = config
+
+        old_enabled, self._remove_old_value, self._remove_old_unit = config.get_remove_old_snapshots()
+        self._remove_old_enabled = urwid.CheckBox( _('Older than:'), old_enabled, on_state_change=self.flip_old_enabled )
+        remove_old_value_box = urwid.IntEdit( '', self._remove_old_value )
+        urwid.connect_signal( remove_old_value_box, 'change', self.remove_old_value_changed )
+        remove_units = []
+        for key, value in sorted( config.REMOVE_OLD_BACKUP_UNITS.items() ):
+            if self._remove_old_unit == key:
+                urwid.RadioButton( remove_units, value, True, self.remove_old_unit_changed, key )
+            else:
+                urwid.RadioButton( remove_units, value, False, self.remove_old_unit_changed, key )
+        remove_unit_chooser = urwid.Pile( remove_units )
+        age_columns = urwid.Columns( [
+            self._remove_old_enabled,
+            urwid.AttrWrap( remove_old_value_box, 'edit_box', 'edit_focus' ),
+            remove_unit_chooser
+            ], 1 )
+
+        space_enabled, self._free_space_value, self._free_space_unit = config.get_min_free_space()
+        self._free_space_enabled = urwid.CheckBox( _('If free space is less than:'), space_enabled, on_state_change=self.flip_free_space_enabled )
+        free_space_value_box = urwid.IntEdit( '', self._free_space_value )
+        urwid.connect_signal( free_space_value_box, 'change', self.free_space_value_changed )
+        free_space_units = []
+        for key, value in sorted( config.MIN_FREE_SPACE_UNITS.items() ):
+            if self._free_space_unit == key:
+                urwid.RadioButton( free_space_units, value, True, self.free_space_unit_changed, key )
+            else:
+                urwid.RadioButton( free_space_units, value, False, self.free_space_unit_changed, key )
+        space_unit_chooser = urwid.Pile( free_space_units )
+        space_columns = urwid.Columns( [
+            self._free_space_enabled,
+            urwid.AttrWrap( free_space_value_box, 'edit_box', 'edit_focus' ),
+            space_unit_chooser
+            ], 1 )
+
+        pile_list = [
+            age_columns,
+            urwid.Divider(),
+            space_columns,
+            urwid.Divider(),
+            urwid.CheckBox( _('Smart remove'), config.get_smart_remove(), on_state_change=self.flip_smart_remove ),
+            urwid.Padding( urwid.Text( _('- keep all snapshots from today and yesterday') ), left=4 ),
+            urwid.Padding( urwid.Text( _('- keep one snapshot for the last week and one for two weeks ago') ), left=4 ),
+            urwid.Padding( urwid.Text( _('- keep one snapshot per month for all previous months of this year and all months of the last year') ), left=4 ),
+            urwid.Padding( urwid.Text( _('- keep one snapshot per year for all other years') ), left=4 ),
+            urwid.Divider(),
+            urwid.CheckBox( _("Don't remove named snapshots"), config.get_dont_remove_named_snapshots(), on_state_change=self.flip_remove_named )
+            ]
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def flip_remove_named( self, check_box, new_state ):
+        self._config.set_dont_remove_named_snapshots( new_state )
+        
+    def flip_smart_remove( self, check_box, new_state ):
+        self._config.set_smart_remove( new_state )
+        
+    def flip_free_space_enabled( self, check_box, new_state ):
+        self._config.set_min_free_space( new_state, self._free_space_value, self._free_space_unit )
+        
+    def free_space_value_changed( self, edit, new_edit_text ):
+        if new_edit_text == '':
+            self._free_space_value = 0
+        else:
+            self._free_space_value = new_edit_text.strip()
+        self._config.set_min_free_space( self._free_space_enabled.get_state(), self._free_space_value, self._free_space_unit )
+        
+    def free_space_unit_changed( self, check_box, new_state, user_data ):
+        if new_state:
+            self._free_space_unit = user_data
+            self._config.set_min_free_space( self._free_space_enabled.get_state(), self._free_space_value, self._free_space_unit )
+        
+    def flip_old_enabled( self, check_box, new_state ):
+        self._config.set_remove_old_snapshots( new_state, self._remove_old_value, self._remove_old_unit )
+
+    def remove_old_value_changed( self, edit, new_edit_text ):
+        if new_edit_text == '':
+            self._remove_old_value = 0
+        else:
+            self._remove_old_value = new_edit_text.strip()
+        self._config.set_remove_old_snapshots( self._remove_old_enabled.get_state(), self._remove_old_value, self._remove_old_unit )
+
+    def remove_old_unit_changed( self, check_box, new_state, user_data ):
+        if new_state:
+            self._remove_old_unit = user_data
+            self._config.set_remove_old_snapshots( self._remove_old_enabled.get_state(), self._remove_old_value, self._remove_old_unit )
 
=== added file 'cli/restorewidget.py'
--- cli/restorewidget.py	1970-01-01 00:00:00 +0000
+++ cli/restorewidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,107 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+	
+
+import urwid
+import datetime
+import gettext
+
+import logger
+import snapshots
+import viewerwidget
+
+_=gettext.gettext
+
+class RestoreWidget(urwid.WidgetWrap):
+
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+
+        self._snapshots = snapshots.Snapshots( config )
+        snapshots_pile = [
+            urwid.Text( _('Snapshots') ),
+            urwid.Divider(),
+            ]
+        snapshots_pile.extend( self.build_snapshots_pile() )
+
+        display_widget = urwid.Columns( [
+            urwid.Pile( snapshots_pile ),
+            ( 'weight', 3, viewerwidget.ViewerWidget( main_win, config, self._snapshots ) )
+            ], 1 )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def build_snapshots_pile( 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 ), [] ) )
+        #any other groups
+        for snapshot_id in 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 ] ) )
+
+        snapshots_buttons = []
+        pile_list = [
+            urwid.RadioButton( snapshots_buttons, _('Now'), self._main_win.is_selected_snapshot( '' ), self.change_snapshot, '' )
+            ]
+        for group in groups:
+            if len( group[2] ) > 0:
+                pile_list.append( urwid.Text( group[0] ) )
+                for snapshot_id in group[2]:
+                    display_name = self._snapshots.get_snapshot_display_id( snapshot_id )
+                    user_name = self._snapshots.get_snapshot_name( snapshot_id )
+                    if len( user_name ) > 0:
+                        display_name += ' - ' + user_name
+                    pile_list.append( urwid.RadioButton( snapshots_buttons, display_name, self._main_win.is_selected_snapshot( snapshot_id ), self.change_snapshot, snapshot_id ) )
+
+        return pile_list
+
+    def change_snapshot( self, check_box, new_state, user_data ):
+        if new_state:
+            self._main_win.selected_snapshot = user_data
+            self._main_win.selected_snapshot_name = check_box.get_label()
+            self._main_win.update_content( RestoreWidget( self._main_win, self._config ), 5 )
 
=== added file 'cli/snapshotname.py'
--- cli/snapshotname.py	1970-01-01 00:00:00 +0000
+++ cli/snapshotname.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,52 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import urwid
+import gettext
+
+import logger
+import restorewidget
+import snapshots
+
+_=gettext.gettext
+
+class SnapshotName(urwid.WidgetWrap):
+
+    def __init__( self, main_win, config ):
+        self._main_win = main_win
+        self._config = config
+        self._snapshots = snapshots.Snapshots( config )
+
+        self._edit_box = urwid.Edit(( 'body', _('Snapshot Name') + ': ' ), self._snapshots.get_snapshot_name( main_win.selected_snapshot ) )
+        pile_list = [
+            urwid.AttrWrap( self._edit_box, 'edit_box', 'edit_focus' ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('OK'), self.ok_pressed ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Cancel'), self.cancel_pressed ), 'button', 'button_focus' )
+                ], 10, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def ok_pressed( self, button ):
+        self._snapshots.set_snapshot_name( self._main_win.selected_snapshot, self._edit_box.get_edit_text().strip() )
+        self._main_win.update_content( restorewidget.RestoreWidget( self._main_win, self._config ), 5 )
+
+    def cancel_pressed( self, button ):
+        self._main_win.update_content( restorewidget.RestoreWidget( self._main_win, self._config ), 5 )
 
=== added file 'cli/snapshotswidget.py'
--- cli/snapshotswidget.py	1970-01-01 00:00:00 +0000
+++ cli/snapshotswidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,158 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+import os.path
+import subprocess
+import tempfile
+import urwid
+import gettext
+
+import logger
+import restorewidget
+
+_=gettext.gettext
+
+class SnapshotsWidget(urwid.WidgetWrap):
+
+    def __init__( self, main_win, config, snapshots, path ):
+        self._main_win = main_win
+        self._config = config
+        self._snapshots = snapshots
+        self._path = path
+        self._selected_left = ''
+        self._selected_right = None
+
+        left_side, right_side = self._build_snapshot_lists()
+        pile_list = [
+            urwid.Text( _('Diff versions of') + ': %s' % path ),
+            urwid.Divider(),
+            urwid.Columns( [
+                urwid.Pile( left_side ),
+                urwid.Pile( right_side )
+                ], 1 ),
+            urwid.Divider(),
+            urwid.GridFlow( [
+                urwid.AttrWrap( urwid.Button( _('Jump to'), self.jump ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Diff'), self.diff ), 'button', 'button_focus' ),
+                urwid.AttrWrap( urwid.Button( _('Cancel'), self.go_back ), 'button', 'button_focus' )
+                ], 11, 2, 1, 'right' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def _build_snapshot_lists( self ):
+        snapshots_list = self._snapshots.get_snapshots_list()
+        left_list = [
+            urwid.Text( _('Snapshots') + ':' ),
+            urwid.Divider()
+            ]
+        left_list_buttons = []
+        right_list = [
+            urwid.Text( _('Diff with') + ':' ),
+            urwid.Divider()
+            ]
+        right_list_buttons = []
+        
+        path = self._snapshots.get_snapshot_path_to( self._main_win.selected_snapshot, self._path )
+        isdir = os.path.isdir( path )
+
+        # add now
+        path = self._path
+        if os.path.lexists( path ):
+            if os.path.isdir( path ) == isdir:
+                left_list.append( urwid.RadioButton( left_list_buttons, _('Now'), True, self.left_changed, '' ) )
+                right_list.append( urwid.RadioButton( right_list_buttons, _('Now'), False, self.right_changed, '' ) )
+
+        # add snapshots
+        for snapshot in snapshots_list:
+            path = self._snapshots.get_snapshot_path_to( snapshot, self._path )
+            if os.path.lexists( path ):
+                if os.path.isdir( path ) == isdir:
+                    display_name = self._snapshots.get_snapshot_display_id( snapshot )
+                    user_name = self._snapshots.get_snapshot_name( snapshot )
+                    if len( user_name ) > 0:
+                        display_name += ' - ' + user_name
+                    if self._main_win.is_selected_snapshot( snapshot ):
+                        selected = True
+                        self._selected_right = snapshot
+                    else:
+                        selected = False
+                    left_list.append( urwid.RadioButton( left_list_buttons, display_name, False, self.left_changed, snapshot ) )
+                    right_list.append( urwid.RadioButton( right_list_buttons, display_name, selected, self.right_changed, snapshot ) )
+
+        return left_list, right_list
+
+    def left_changed( self, radio_button, new_state, user_data ):
+        if new_state:
+            self._selected_left = user_data
+
+    def right_changed( self, radio_button, new_state, user_data ):
+        if new_state:
+            self._selected_right = user_data
+                    
+    def jump( self, button ):
+        self._main_win.selected_snapshot = self._selected_left
+        self._main_win.update_content( restorewidget.RestoreWidget( self._main_win, self._config ), 5 )
+
+    def diff( self, button ):
+        if self._selected_right is not None:
+            self._main_win.update_content( DiffWidget( self._main_win, self._config, self._snapshots, self._path, self._selected_left, self._selected_right ), 5 )
+
+    def go_back( self, button ):
+        self._main_win.update_content( restorewidget.RestoreWidget( self._main_win, self._config ), 5 )
+
+class DiffWidget(SnapshotsWidget):
+    def __init__( self, main_win, config, snapshots, path, selected_left, selected_right ):
+        self._main_win = main_win
+        self._config = config
+
+        path_left = snapshots.get_snapshot_path_to( selected_left, path )
+        path_right = snapshots.get_snapshot_path_to( selected_right, path )
+
+        diff_cmd = 'diff "%s" "%s"' % ( path_left, path_right )
+        logger.info( 'diff cmd = "%s"' % diff_cmd )
+
+        wc_cmd = '%s | wc -l' % diff_cmd
+        callback = subprocess.Popen( wc_cmd, shell=True, stdout=subprocess.PIPE )
+        output = callback.communicate()
+        if main_win.main_loop.screen_size:
+            rows = main_win.main_loop.screen_size[1]
+        else:
+            rows = main_win.main_loop.screen.get_cols_rows()[1]
+        
+        if int( output[0] ) > rows:
+            temp_file, temp_file_name = tempfile.mkstemp( '_bitdiff', os.path.basename( path ), text=True )
+            output_text = _('This diff was too long for the window, it has been written to') + ': %s' % temp_file_name
+            callback = subprocess.Popen( diff_cmd, shell=True, stdout=temp_file )
+            callback.communicate()
+        else:
+            callback = subprocess.Popen( diff_cmd, shell=True, stdout=subprocess.PIPE )
+            output = callback.communicate()
+            output_text = output[0]
+            
+        pile_list = [
+            urwid.Text( diff_cmd ),
+            urwid.Divider(),
+            urwid.Text( output_text ),
+            urwid.Divider(),
+            urwid.AttrWrap( urwid.Button( _('OK'), self.go_back ), 'button', 'button_focus' )
+            ]
+
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
 
=== added file 'cli/viewerwidget.py'
--- cli/viewerwidget.py	1970-01-01 00:00:00 +0000
+++ cli/viewerwidget.py	2010-03-02 06:06:17 +0000
@@ -0,0 +1,132 @@
+#    Back In Time
+#    Copyright (C) 2010 Ryan Ahearn
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+import os	
+import os.path
+import urwid
+import gettext
+
+import logger
+import restorewidget
+import copywidget
+import snapshotswidget
+
+_=gettext.gettext
+
+class ViewerWidget(urwid.WidgetWrap):
+
+    def __init__( self, main_win, config, snapshots ):
+        self._main_win = main_win
+        self._config = config
+        self._snapshots = snapshots
+        self._selected = ''
+
+        if main_win.show_hidden:
+            hidden_label = _('Hide hidden files')
+        else:
+            hidden_label = _('Show hidden files')
+        self.build_fileview()
+        pile_list = [
+            urwid.Columns( [
+                ( 'fixed', 6, urwid.AttrWrap( urwid.Button( _('Up'), self.up_directory ), 'button', 'button_focus' ) ),
+                urwid.Text( main_win.current_directory, wrap='clip' )
+                ], 1),
+            urwid.Divider(),
+            urwid.Columns( [
+                ( 'fixed', 21, urwid.AttrWrap( urwid.Button( hidden_label, self.flip_hidden ), 'button', 'button_focus' ) ),
+                ( 'fixed', 11, urwid.AttrWrap( urwid.Button( _('Restore'), self.restore ), 'button', 'button_focus' ) ),
+                ( 'fixed', 8, urwid.AttrWrap( urwid.Button( _('Copy'), self.copy ), 'button', 'button_focus' ) ),
+                ( 'fixed', 13,urwid.AttrWrap(  urwid.Button( _('Snapshots'), self.snapshots ), 'button', 'button_focus' ) )
+                ], 1 ),
+            urwid.Divider(),
+            urwid.Columns( [ self.build_shortcuts(),
+                             ( 'weight', 3, urwid.Pile( self._file_list ) ) ], 1 )
+            ]
+        display_widget = urwid.Pile( pile_list )
+        urwid.WidgetWrap.__init__( self, display_widget )
+
+    def build_fileview( self ):
+        self._file_list = [
+            urwid.Text( _('Files and Folders') ),
+            urwid.Divider()
+            ]
+
+        sid = self._main_win.selected_snapshot
+        
+        full_path = self._snapshots.get_snapshot_path_to( sid, self._main_win.current_directory )
+
+        if not self._snapshots.can_open_path( sid, full_path ):
+            self._file_list.append( urwid.Text( _('This folder does not exist') ) )
+            self._file_list.append( urwid.Text( _('in current snapshot !' ) ) )
+            return
+
+        directory = os.listdir( full_path )
+        decorated = [ ( not os.path.isdir( os.path.join( full_path, file_name ) ), file_name ) for file_name in directory ]
+        decorated.sort()
+        restore_radios = []
+        for is_file, file_name in decorated:
+            if self._main_win.show_hidden or not file_name.startswith( '.' ):
+                if is_file:
+                    self._file_list.append( urwid.RadioButton( restore_radios, file_name, False, self.select_for_restore, file_name ) )
+                else:
+                    self._file_list.append( urwid.Columns( [
+                        ( 'fixed', 4, urwid.RadioButton( restore_radios, '', False, self.select_for_restore, file_name ) ),
+                        urwid.AttrWrap( urwid.Button( file_name, self.go_to_directory ), 'button', 'button_focus' )
+                        ], 0 ) )
+        
+
+    def select_for_restore( self, radio_button, new_state, user_data ):
+        if new_state:
+            self._selected = os.path.join( self._main_win.current_directory, user_data )
+        
+    def go_to_directory( self, button ):
+        new_directory = os.path.join( self._main_win.current_directory, button.get_label() )
+        self._main_win.update_current_directory( new_directory )
+
+    def build_shortcuts( self ):
+        pile_list = [ urwid.Text( _('Shortcuts') ) ]
+
+        included_folders = self._config.get_include_folders()
+        for label in included_folders:
+            pile_list.append( urwid.AttrWrap( urwid.Button( label, self.go_to_shortcut ), 'button', 'button_focus' ) )
+
+        return urwid.Pile( pile_list )
+
+    def go_to_shortcut( self, button ):
+        self._main_win.update_current_directory( button.get_label() )
+
+    def up_directory( self, button ):
+        self._main_win.update_current_directory( os.path.dirname( self._main_win.current_directory ) )
+
+    def flip_hidden( self, button ):
+        self._main_win.show_hidden = not self._main_win.show_hidden
+        self._main_win.update_content( restorewidget.RestoreWidget( self._main_win, self._config ), 5 )
+
+    def restore( self, button ):
+        if self._main_win.selected_snapshot != '' and self._selected != '':
+            self._snapshots.restore( self._main_win.selected_snapshot, self._selected )
+
+    def copy( self, button ):
+        if self._main_win.selected_snapshot != '' and self._selected != '':
+            source_path = self._snapshots.get_snapshot_path_to( self._main_win.selected_snapshot, self._selected )
+            self._main_win.update_content( copywidget.CopyWidget( self._main_win, self._config, source_path ), 5 )
+
+    def snapshots( self, button ):
+        if self._selected != '':
+            self._main_win.update_content( snapshotswidget.SnapshotsWidget( self._main_win, self._config, self._snapshots, self._selected ), 5 )
+            
 
=== modified file 'common/backintime.py'
--- common/backintime.py	2009-12-17 10:18:53 +0000
+++ common/backintime.py	2010-03-02 06:06:18 +0000
@@ -83,7 +83,6 @@
 
 def start_app( app_name = 'backintime', extra_args = [] ):
 	cfg = config.Config()
-	print_version( cfg, app_name )
 
 	skip = False
 	index = 0
@@ -111,6 +110,7 @@
 			sys.exit(0)
 
 		if arg == '--version' or arg == '-v':
+			print_version( cfg, app_name )
 			sys.exit(0)
 
 		if arg == '--license':
 
=== modified file 'common/logger.py'
--- common/logger.py	2009-11-02 13:52:00 +0000
+++ common/logger.py	2010-03-02 06:06:18 +0000
@@ -27,14 +27,11 @@
 	syslog.closelog()
 
 def error( msg ):
-	print 'ERROR: ' + msg
 	syslog.syslog( syslog.LOG_ERR, 'ERROR: ' + msg )
 
 def warning( msg ):
-	print 'WARNING: ' + msg
 	syslog.syslog( syslog.LOG_WARNING, 'WARNING: ' + msg )
 
 def info( msg ):
-	print 'INFO: ' + msg
 	syslog.syslog( syslog.LOG_INFO, 'INFO: ' + msg )
 
 
=== modified file 'makedeb.sh'
--- makedeb.sh	2009-05-12 10:13:25 +0000
+++ makedeb.sh	2010-03-02 06:06:17 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-for i in common gnome kde4; do
+for i in common gnome kde4 cli; do
 	PKGNAME=`cat $i/debian_specific/control | grep "Package:" | cut -d" " -f2`
 	PKGVER=`cat $i/debian_specific/control | grep "Version:" | cut -d" " -f2`
 	PKGARCH=`cat $i/debian_specific/control | grep "Architecture:" | cut -d" " -f2`
 
=== modified file 'updateversion.sh'
--- updateversion.sh	2009-04-27 13:43:00 +0000
+++ updateversion.sh	2010-03-02 06:06:17 +0000
@@ -12,6 +12,9 @@
 echo "Update 'kde4/debian_specific/control'"
 sed -i -e "s/^Version: .*$/Version: $VERSION/" -e "s/backintime-common (= [^)]*)/backintime-common (= $VERSION)/" kde4/debian_specific/control
 
+echo "Update 'cli/debian_specific/control'"
+sed -i -e "s/^Version: .*$/Version: $VERSION/" -e "s/backintime-common (= [^)]*)/backintime-common (= $VERSION)/" cli/debian_specific/control
+
 echo "Update 'common/config.py'"
 sed -i -e "s/^\tVERSION = '.*'$/\tVERSION = '$VERSION'/" common/config.py
 
@@ -33,6 +36,16 @@
 sed -i -e "s/\.TH\(.*\)\"version\([^\"]*\)\"\(.*\)$/.TH\1\"version $VERSION\"\3/" $FILE
 gzip --best $FILE
 
+echo "Update CLI man page"
+FILE=cli/man/C/backintime-config.1
+gzip -d $FILE.gz
+sed -i -e "s/\.TH\(.*\)\"version\([^\"]*\)\"\(.*\)$/.TH\1\"version $VERSION\"\3/" $FILE
+gzip --best $FILE
+FILE=cli/man/C/backintime-restore.1
+gzip -d $FILE.gz
+sed -i -e "s/\.TH\(.*\)\"version\([^\"]*\)\"\(.*\)$/.TH\1\"version $VERSION\"\3/" $FILE
+gzip --best $FILE
+
 echo "Update help .omf file"
 sed -i -e "s/^\([ \]*\)<version\([^0-9]*\)\([^\"]*\)\(.*\)$/\1<version\2$VERSION\4/" gnome/docbook/C/backintime-C.omf