Merge lp:~tkluck/backintime/mountmonitor into lp:backintime/1.0

[Timo Kluck]

[Timo Kluck (tkluck)]

I added some functionality that I want to propose for the main trunk.

It is a small python script that monitors mounting of filesystems. It checks whether a new mount contains a backintime directory, and if it does, shows a dialog box to the user asking whether to make a snapshot. Behaviour (no action / show dialog box / silently make backup) is configurable.

Works both in Gnome and KDE4. However, Gnome mounts connected volumes automatically, and KDE does not. So in Gnome, the dialog box is shown after connecting the drive, and in KDE, only after manually mounting.

Pros: this feature has been requested a couple of times, and I myself am a happy user.

Cons: it seems a waste of resources to have a daemon running just for showing a single dialog box. This is not yet configurable from BiT (but is it with system preferences).

[Christophe CHAUVET (christophe-chauvet)]

Hi

I see lot of conflict in your merge proposal, can you resolve it before ask to merge ?

Regards,

review: Needs Fixing

[lp:~tkluck/backintime/mountmonitor]

592. By Timo Kluck <tkluck@netbook-tjk> on 2010-01-08

fix some merge conflicts.

593. By Timo Kluck <tkluck@netbook-tjk> on 2010-01-08

fixed merge conflict config.py

594. By Timo Kluck <tkluck@netbook-tjk> on 2010-01-08

fixed merge conflicts

[Timo Kluck (tkluck)]

> Hi
>
> I see lot of conflict in your merge proposal, can you resolve it before ask to
> merge ?
>
> Regards,

Hi,

I think I have fixed the merge conflicts in the code. I kept different version numbers for 'my' branch though (appending -tjk) to distinguish the branches. Should I change those too?

Also, I added the dependency python-gobject (part of PythonGTK) to the backintime-common package. The mount monitor daemon depends on it. I am unsure of whether this is a problem for KDE users?

Unmerged revisions

594. By Timo Kluck <tkluck@netbook-tjk> on 2010-01-08

fixed merge conflicts

593. By Timo Kluck <tkluck@netbook-tjk> on 2010-01-08

fixed merge conflict config.py

592. By Timo Kluck <tkluck@netbook-tjk> on 2010-01-08

fix some merge conflicts.

591. By Timo Kluck <tkluck@netbook-tjk> on 2009-11-28

KDE4Plugin now working.
Added logging in mount monitor

590. By Timo Kluck <tkluck@netbook-tjk> on 2009-11-26

Correct dialog box for KDE

589. By Timo Kluck <tkluck@netbook-tjk> on 2009-11-26

removed merge tags

588. By Timo Kluck <tkluck@netbook-tjk> on 2009-11-26

* added kde support
 * removed accidentally added ¨feature¨ of a per-folder on-mount action (added by copy pasting code)
 * merge with current version in trunk

587. By Timo Kluck <tkluck@netbook-tjk> on 2009-11-25

added new files

586. By Timo Kluck <tkluck@netbook-tjk> on 2009-11-22

adding mount monitor

=== modified file 'AUTHORS'
--- AUTHORS	2009-11-06 13:00:42 +0000
+++ AUTHORS	2010-01-08 19:59:12 +0000
@@ -1,3 +1,4 @@
 Oprea Dan (<[e-mail]>)
 Bart de Koning (<[e-mail]>)
 Richard Bailey (<[e-mail]>)
+Timo Kluck (<[e-mail]>) (additional code)
 
=== modified file 'CHANGES'
--- CHANGES	2010-01-07 08:57:36 +0000
+++ CHANGES	2010-01-08 19:59:12 +0000
@@ -1,5 +1,6 @@
 Back In Time
 
+=======
 Version 1.0.0
 * smart remove was slightly changed (https://bugs.launchpad.net/backintime/+bug/502435)
 * fix bug: https://bugs.launchpad.net/backintime/+bug/503859
@@ -17,6 +18,7 @@
 * fix bug: https://bugs.launchpad.net/backintime/+bug/412695
 * update Slovak translation (Tomáš Vadina <[e-mail]>)
 * multiple profiles support
+* Added a backintime daemon that (optionally) makes a snapshot upon mounting an external drive.
 * GNOME: fix notification
 * backintime snapshot folder is restructured to ../backintime/machine/user/profile_id/
 * added the possibility to include other snapshot folders within a profile, it can only read those, there is not a GUI implementation yet
 
=== modified file 'VERSION'
--- VERSION	2010-01-07 08:57:36 +0000
+++ VERSION	2010-01-08 19:59:12 +0000
@@ -1,1 +1,2 @@
-0.9.99beta10
+0.9.99tjk
+
 
=== modified file 'common/Makefile.template'
--- common/Makefile.template	2009-04-28 14:02:13 +0000
+++ common/Makefile.template	2010-01-08 19:59:12 +0000
@@ -37,4 +37,8 @@
 	#install application
 	install -d $(DEST)/bin
 	install backintime $(DEST)/bin
+	
+	# install daemon
+	install -d $(DESTDIR)/etc/xdg/autostart
+	install --mode=644 backintime-mountmonitor.desktop $(DESTDIR)/etc/xdg/autostart
 
 
=== added file 'common/backintime-mountmonitor.desktop'
--- common/backintime-mountmonitor.desktop	1970-01-01 00:00:00 +0000
+++ common/backintime-mountmonitor.desktop	2010-01-08 19:59:12 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Back In Time (Mount Monitor)
+Exec=backintime --mountmonitor
+NoDisplay=true
+Icon=gtk-save
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+StartupNotify=false
+Categories=GNOME;GTK;System;
+Comment=Simple backup system
+Name[nl_NL]=backintime-mountmonitor.desktop
 
=== modified file 'common/backintime.py'
--- common/backintime.py	2009-12-17 10:18:53 +0000
+++ common/backintime.py	2010-01-08 19:59:12 +0000
@@ -72,6 +72,10 @@
 	print '\tShow the ID of the last snapshot (and exit)'
 	print '--last-snapshot-path'
 	print '\tShow the path to the last snapshot (and exit)'
+	print '--mountmonitor'
+	print '\tStart the mount monitor daemon'
+	print '--mountmonitor-stop'
+	print '\tStop the mount monitor daemon'
 	print '-v | --version'
 	print '\tShow version (and exit)'
 	print '--license'
@@ -80,7 +84,17 @@
 	print '\tShow this help (and exit)'
 	print ''
 
+def start_mountmonitor():	
+	import subprocess
+	source = os.path.join(os.path.dirname(__file__),"mountmonitor.py")
+	cmd = "python"
+	p=subprocess.Popen((cmd,source))
+	print "Mount Monitor Started, Process ID is %s." % p.pid
+	
 
+def stop_mountmonitor():
+	print "Cannot stop Mount Monitor, not implemented."
+	
 def start_app( app_name = 'backintime', extra_args = [] ):
 	cfg = config.Config()
 	print_version( cfg, app_name )
@@ -182,6 +196,15 @@
 		if arg == '--gnome' or arg == '--kde4' or arg == '--kde3':
 			continue
 
+		if arg == '--mountmonitor':
+			start_mountmonitor()
+			sys.exit(0)
+			
+		if arg == '--mountmonitor-stop':
+			stop_mountmonitor()
+			sys.exit(0)
+
+		
 		if arg[0] == '-':
 			if not arg[0] in extra_args:
 				print "Ignore option: %s" % arg
 
=== modified file 'common/config.py'
--- common/config.py	2010-01-07 08:57:36 +0000
+++ common/config.py	2010-01-08 19:59:12 +0000
@@ -35,7 +35,7 @@
 
 class Config( configfile.ConfigFileWithProfiles ):
 	APP_NAME = 'Back In Time'
-	VERSION = '0.9.99beta10'
+	VERSION = '0.9.99tjk'
 	COPYRIGHT = 'Copyright (c) 2008-2009 Oprea Dan, Bart de Koning, Richard Bailey'
 	CONFIG_VERSION = 4
 
@@ -50,6 +50,10 @@
 
 	DISK_UNIT_MB = 10
 	DISK_UNIT_GB = 20
+	
+	NO_ACTION = 0
+	ASK = 10
+	SILENT_SNAPSHOT = 20
 
 	AUTOMATIC_BACKUP_MODES = { 
 				NONE : _('Disabled'), 
@@ -68,6 +72,12 @@
 				}
 
 	MIN_FREE_SPACE_UNITS = { DISK_UNIT_MB : 'Mb', DISK_UNIT_GB : 'Gb' }
+	
+	ON_MOUNT_ACTIONS = {
+				NO_ACTION: _('No action'),
+				ASK: _('Ask user'),
+				SILENT_SNAPSHOT: _('Silently take snapshot')
+				}
 
 
 	def __init__( self ):
@@ -238,7 +248,7 @@
 			profile_id = self.get_current_profile()
 
 		if not os.path.isdir( value ):
-			self.notify_error( _( '%s is not a folder !' ) )
+			self.notify_error( _( '%s is not a folder !' % value) )
 			return False
 
 		#Initialize the snapshots folder
@@ -335,6 +345,12 @@
 	def set_automatic_backup_mode( self, value, profile_id = None ):
 		self.set_profile_int_value( 'snapshots.automatic_backup_mode', value, profile_id )
 
+	def get_on_mount_action( self, profile_id = None ):
+		return self.get_profile_int_value( 'snapshots.on_mount_action', self.NO_ACTION, profile_id )
+
+	def set_on_mount_action( self, value, profile_id = None ):
+		self.set_profile_int_value( 'snapshots.on_mount_action', value, profile_id )
+	
 	#def get_per_directory_schedule( self, profile_id = None ):
 	#	return self.get_profile_bool_value( 'snapshots.expert.per_directory_schedule', False, profile_id )
 
 
=== modified file 'common/debian_specific/control'
--- common/debian_specific/control	2010-01-07 08:57:36 +0000
+++ common/debian_specific/control	2010-01-08 19:59:12 +0000
@@ -1,11 +1,11 @@
 Package: backintime-common
-Version: 0.9.99beta10
+Version: 0.9.99tjk
 Priority: optional
 Section: utils
 Maintainer: BIT Team <[e-mail]>
 Architecture: all
 Homepage: http://backintime.le-web.org
-Depends: python, rsync, cron
+Depends: python, rsync, cron, python-gobject
 Recommends: powermgmt-base
 Conflicts: backintime
 Replaces: backintime
 
=== removed file 'common/man/C/backintime.1.gz'
 Binary files common/man/C/backintime.1.gz	2010-01-07 08:57:36 +0000 and common/man/C/backintime.1.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'common/mountmonitor.py'
--- common/mountmonitor.py	1970-01-01 00:00:00 +0000
+++ common/mountmonitor.py	2010-01-08 19:59:12 +0000
@@ -0,0 +1,117 @@
+#    Back In Time
+#    Copyright (C) 2008-2009 Oprea Dan
+#    Additional code for monitoring volume mounts: Copyright (C) 2009 Timo Kluck
+#
+#    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 sys
+
+import os
+
+import gtk
+
+import config
+import pluginmanager
+import logger
+
+
+# this function can be called if we find another way of monitoring mounts than running a daemon
+def on_mount_action(mount_path):
+	mount_monitor=backintime_mount_monitor()
+	mount_monitor.on_mount_added(mount_path)
+
+# set up a monitor
+class backintime_mount_monitor():
+	
+	# connect specifies whether to listen for mount events
+	def __init__(self, connect=False):
+
+		if connect:
+			import gio
+			self.volume_monitor=gio.VolumeMonitor()
+			#self.volume_monitor.connect("drive-connected",self._on_drive_connected)
+			self.volume_monitor.connect("mount-added",self._on_mount_added)
+		
+		
+		self.pluginmanager = pluginmanager.PluginManager()
+		
+		self.config=config.Config()
+		# FIXME: no Snapshots object available, but plugins use only snapshots.config. So we pass self as argument.
+		# this is probably going to be buggy in the future
+		self.pluginmanager.load_plugins(self)
+
+	# ask user whether he/she wants to take a snapshot
+	def ask_user(self, mount_path):
+		if self.pluginmanager.has_gui_plugins():
+			make_backup=self.pluginmanager.ask_user_on_mount(mount_path)
+
+			if make_backup:
+				self.make_snapshot()
+				
+	# make a snapshot
+	def make_snapshot(self):
+		app = 'backintime'
+		if os.path.isfile( './backintime' ):
+			app = './backintime'
+		cmd = "%s --backup &" % app
+		os.system( cmd )
+
+	
+	# callback for gio 	
+	def _on_mount_added(self,volume_monitor,mount):
+
+		mount_path=mount.get_root().get_path()
+		logger.info("Mount detected: %s" % mount_path)
+		self.on_mount_added(mount_path)
+	
+	# callback for gio 	
+	def _on_drive_connected(self,volume_monitor,drive):
+		# reload configuration
+		self.config=config.Config()
+		
+		snapshots_path=self.config.get_snapshots_path()
+		
+		volumes=drive.get_volumes()
+		for volume in volumes:
+			if snapshots_path.find(volume.get_name())>=0:
+				volume.mount(None,self._empty_callback)
+		
+	def _empty_callback(a,b,c):
+		return
+
+	# actual code to run when mount added
+	def on_mount_added(self,mount_path):		
+
+		# reload configuration
+		self.config=config.Config()
+
+		snapshots_path=self.config.get_snapshots_path()
+		
+		if os.path.commonprefix([snapshots_path,mount_path])==mount_path:
+			if os.path.isdir(snapshots_path):
+				logger.info("Mounted disk contains snapshots. Performing configured action.")				
+				on_mount_action=self.config.get_on_mount_action()
+				if on_mount_action==self.config.ASK:
+					self.ask_user(mount_path)
+				elif on_mount_action==self.config.SILENT_SNAPSHOT:
+					self.make_snapshot()
+				
+		
+if __name__=="__main__":
+	mount_monitor=backintime_mount_monitor(True)
+
+	
+	gtk.main()
+
 
=== modified file 'common/pluginmanager.py'
--- common/pluginmanager.py	2009-11-02 13:52:00 +0000
+++ common/pluginmanager.py	2010-01-08 19:59:12 +0000
@@ -46,6 +46,9 @@
 
 	def on_new_snapshot( self, snapshot_id, snapshot_path ):
 		return
+		
+	def ask_user_on_mount( self, path ):
+		return False
 
 
 class PluginManager():
@@ -103,4 +106,10 @@
 	def on_new_snapshot( self, snapshot_id, snapshot_path ):
 		for plugin in self.plugins:
 			plugin.on_new_snapshot( snapshot_id, snapshot_path )
+			
+	def ask_user_on_mount( self,path ):
+		if self.has_gui_plugins_:
+			return self.plugins[0].ask_user_on_mount( path )
+		else:
+			return False
 
 
=== modified file 'gnome/debian_specific/control'
--- gnome/debian_specific/control	2010-01-07 08:57:36 +0000
+++ gnome/debian_specific/control	2010-01-08 19:59:12 +0000
@@ -1,10 +1,10 @@
 Package: backintime-gnome
-Version: 0.9.99beta10
+Version: 0.9.99tjk
 Priority: optional
 Section: gnome
 Maintainer: BIT Team <[e-mail]>
 Architecture: all
 Homepage: http://backintime.le-web.org
-Depends: x11-utils, python-glade2, python-gnome2, python-notify, meld, gksu, backintime-common (= 0.9.99beta10)
+Depends: x11-utils, python-glade2, python-gnome2, python-notify, meld, gksu, backintime-common (= 0.9.99tjk)
 Description: Simple backup system for GNOME Desktop
  This is a GNOME GUI frontend for backintime-common.
 
=== modified file 'gnome/docbook/C/backintime-C.omf'
--- gnome/docbook/C/backintime-C.omf	2010-01-07 08:57:36 +0000
+++ gnome/docbook/C/backintime-C.omf	2010-01-08 19:59:12 +0000
@@ -5,7 +5,15 @@
     <maintainer>(BIT Team)</maintainer>
     <title>Back In Time Manual</title>
     <date>November 2008</date>
+<<<<<<< TREE
+<<<<<<< TREE
+    <version identifier="Back In Time Manual 0.9.26" date="November 2008"/>
+=======
+    <version identifier="Back In Time Manual 0.9.99beta2" date="November 2008"/>
+>>>>>>> MERGE-SOURCE
+=======
     <version identifier="Back In Time Manual 0.9.99beta10" date="November 2008"/>
+>>>>>>> MERGE-SOURCE
     <subject category="GNOME|Applications|System Tools"/>
     <description>
 		Back In Time is a simple backup system for GNOME desktop.
 
=== modified file 'gnome/docbook/C/backintime.xml'
--- gnome/docbook/C/backintime.xml	2010-01-07 08:57:36 +0000
+++ gnome/docbook/C/backintime.xml	2010-01-08 19:59:12 +0000
@@ -3,8 +3,18 @@
 <!ENTITY legal SYSTEM "legal.xml">
 <!ENTITY appname "Back In Time">
 <!ENTITY app "<application>&appname;</application>">
+<<<<<<< TREE
+<<<<<<< TREE
+<!ENTITY appversion "0.9.26">
+<!ENTITY manrevision "0.9.26">
+=======
+<!ENTITY appversion "0.9.99beta2">
+<!ENTITY manrevision "0.9.99beta2">
+>>>>>>> MERGE-SOURCE
+=======
 <!ENTITY appversion "0.9.99beta10">
 <!ENTITY manrevision "0.9.99beta10">
+>>>>>>> MERGE-SOURCE
 <!ENTITY date "Mars 2009">
 ]>
 <!--
 
=== removed file 'gnome/man/C/backintime-gnome.1.gz'
 Binary files gnome/man/C/backintime-gnome.1.gz	2010-01-07 08:57:36 +0000 and gnome/man/C/backintime-gnome.1.gz	1970-01-01 00:00:00 +0000 differ
=== modified file 'gnome/settingsdialog.glade'
--- gnome/settingsdialog.glade	2010-01-07 08:57:36 +0000
+++ gnome/settingsdialog.glade	2010-01-08 19:59:12 +0000
@@ -205,6 +205,35 @@
                   </packing>
                 </child>
                 <child>
+                  <object class="GtkFrame" id="frame3">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment3">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkComboBox" id="cb_on_mount_action">
+                            <property name="visible">True</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="lbl_onmount1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;On connecting disk&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
                     <child>
@@ -223,7 +252,7 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>
 
=== modified file 'gnome/settingsdialog.py'
--- gnome/settingsdialog.py	2010-01-06 08:42:40 +0000
+++ gnome/settingsdialog.py	2010-01-08 19:59:12 +0000
@@ -111,6 +111,17 @@
 			self.rev_automatic_backup_modes[ map[key] ] = key
 			self.store_backup_mode.append( [ map[key], key ] )
 		
+		#on mount action store
+		self.store_on_mount_action = gtk.ListStore( str, int )
+		default_on_mount_action_index = 0
+		map = self.config.ON_MOUNT_ACTIONS
+		self.rev_on_mount_actions = {}
+		keys = map.keys()
+		keys.sort()
+		for key in keys:
+			self.rev_on_mount_actions[ map[key] ] = key
+			self.store_on_mount_action.append( [ map[key], key ] )
+
 		#per directory schedule
 		#self.cb_per_directory_schedule = get( 'cb_per_directory_schedule' )
 		#self.lbl_schedule = get( 'lbl_schedule' )
@@ -168,6 +179,15 @@
 		self.cb_backup_mode.pack_start( renderer, True )
 		self.cb_backup_mode.add_attribute( renderer, 'text', 0 )
 		
+		#setup on mount action
+		self.cb_on_mount_action = get( 'cb_on_mount_action' )
+		self.cb_on_mount_action.set_model( self.store_on_mount_action )
+
+		self.cb_on_mount_action.clear()
+		renderer = gtk.CellRendererText()
+		self.cb_on_mount_action.pack_end( renderer, True )
+		self.cb_on_mount_action.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' )
@@ -308,6 +328,9 @@
 		#per directory schedule
 		#self.cb_per_directory_schedule.set_active( self.config.get_per_directory_schedule() )
 		
+		#setup on mount action
+		self.cb_on_mount_action.set_active( self.config.get_on_mount_action() )
+		
 		#setup include folders
 		#self.update_per_directory_option()
 		
@@ -433,6 +456,9 @@
 		
 		#global schedule
 		self.config.set_automatic_backup_mode( self.store_backup_mode.get_value( self.cb_backup_mode.get_active_iter(), 1 ) )
+
+		#on mount action
+		self.config.set_on_mount_action( self.store_on_mount_action.get_value( self.cb_on_mount_action.get_active_iter(), 1 ) )
 		
 		#auto-remove snapshots
 		self.config.set_remove_old_snapshots( 
 
=== modified file 'kde4/backintime-kde4.desktop' (properties changed: -x to +x)
--- kde4/backintime-kde4.desktop	2009-04-27 13:43:00 +0000
+++ kde4/backintime-kde4.desktop	2010-01-08 19:59:12 +0000
@@ -1,3 +1,4 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=Back In Time
 Exec=backintime-kde4
 
=== modified file 'kde4/debian_specific/control'
--- kde4/debian_specific/control	2010-01-07 08:57:36 +0000
+++ kde4/debian_specific/control	2010-01-08 19:59:12 +0000
@@ -1,11 +1,11 @@
 Package: backintime-kde4
-Version: 0.9.99beta10
+Version: 0.9.99tjk
 Priority: optional
 Section: kde4
 Maintainer: BIT Team <[e-mail]>
 Architecture: all
 Homepage: http://backintime.le-web.org
-Depends: x11-utils, kdesudo, python-kde4 (>= 4.1), backintime-common (= 0.9.99beta10)
+Depends: x11-utils, kdesudo, python-kde4 (>= 4.1), backintime-common (= 0.9.99tjk)
 Suggests: kompare
 Description: Simple backup system for KDE4 Desktop
  This is a KDE4 (>= 4.1) GUI frontend for backintime-common.
 
=== modified file 'kde4/docbook/en/index.docbook'
--- kde4/docbook/en/index.docbook	2010-01-07 08:57:36 +0000
+++ kde4/docbook/en/index.docbook	2010-01-08 19:59:12 +0000
@@ -3,8 +3,18 @@
 <!ENTITY legal SYSTEM "legal.xml">
 <!ENTITY appname "Back In Time">
 <!ENTITY app "<application>&appname;</application>">
+<<<<<<< TREE
+<<<<<<< TREE
+<!ENTITY appversion "0.9.26">
+<!ENTITY manrevision "0.9.26">
+=======
+<!ENTITY appversion "0.9.99beta2">
+<!ENTITY manrevision "0.9.99beta2">
+>>>>>>> MERGE-SOURCE
+=======
 <!ENTITY appversion "0.9.99beta10">
 <!ENTITY manrevision "0.9.99beta10">
+>>>>>>> MERGE-SOURCE
 <!ENTITY date "November 2008">
 ]>
 <!--
 
=== removed file 'kde4/man/C/backintime-kde4.1.gz'
 Binary files kde4/man/C/backintime-kde4.1.gz	2010-01-07 08:57:36 +0000 and kde4/man/C/backintime-kde4.1.gz	1970-01-01 00:00:00 +0000 differ
=== modified file 'kde4/settingsdialog.py'
--- kde4/settingsdialog.py	2010-01-07 09:15:31 +0000
+++ kde4/settingsdialog.py	2010-01-08 19:59:12 +0000
@@ -130,6 +130,17 @@
 		hlayout.addWidget( self.combo_automatic_snapshots )
 		self.fill_combo( self.combo_automatic_snapshots, self.config.AUTOMATIC_BACKUP_MODES )
 
+		#On mount action
+		group_box = QGroupBox( self )
+		self.global_on_mount_group_box = group_box
+		group_box.setTitle( QString.fromUtf8( _( 'On connecting disk:' ) ) )
+		layout.addWidget( group_box )
+
+		hlayout = QHBoxLayout( group_box )
+
+		self.combo_on_mount_action = KComboBox( self )
+		hlayout.addWidget( self.combo_on_mount_action )
+		self.fill_combo( self.combo_on_mount_action, self.config.ON_MOUNT_ACTIONS )
 		#
 		layout.addStretch()
 		
@@ -361,7 +372,8 @@
 		#TAB: General
 		self.edit_snapshots_path.setText( QString.fromUtf8( self.config.get_snapshots_path() ) )
 		self.set_combo_value( self.combo_automatic_snapshots, self.config.get_automatic_backup_mode() )
-
+		self.set_combo_value( self.combo_on_mount_action, self.config.get_on_mount_action() )
+		
 		#TAB: Include
 		self.list_include.clear()
 
@@ -433,6 +445,9 @@
 		#schedule
 		self.config.set_automatic_backup_mode( self.combo_automatic_snapshots.itemData( self.combo_automatic_snapshots.currentIndex() ).toInt()[0] )
 
+		# onmount action
+		self.config.set_on_mount_action( self.combo_on_mount_action.itemData( self.combo_on_mount_action.currentIndex() ).toInt()[0] )
+		
 		#auto-remove
 		self.config.set_remove_old_snapshots( 
 						self.cb_remove_older_then.isChecked(), 
 
=== modified file 'plugins/gnomeplugin.py'
--- plugins/gnomeplugin.py	2009-12-01 08:48:44 +0000
+++ plugins/gnomeplugin.py	2010-01-08 19:59:12 +0000
@@ -163,6 +163,9 @@
 			return False
 
 		self.systray = None
+		
+		self.config=snapshots.config
+		
 		try:
 			self.systray = GnomePlugin.Systray( snapshots )
 		except:
@@ -186,4 +189,17 @@
 
 	def on_new_snapshot( self, snapshot_id, snapshot_path ):
 		return
+		
+		
+	def ask_user_on_mount(self, path):
+
+		tools.register_backintime_path('gnome')
+		import messagebox
+		
+		make_backup=messagebox.show_question(None,self.config,"\
+The location %s contains snapshots (backups) of \
+some files in the system. Do you want to make \
+a snapshot now?" % path)
+		from gtk import RESPONSE_YES
+		return make_backup==RESPONSE_YES
 
 
=== modified file 'plugins/kde4plugin.py'
--- plugins/kde4plugin.py	2009-12-28 12:17:16 +0000
+++ plugins/kde4plugin.py	2010-01-08 19:59:12 +0000
@@ -70,3 +70,26 @@
 			except:
 				pass
 
+	def ask_user_on_mount( self, path ):
+		from PyKDE4.kdecore import KAboutData, KCmdLineArgs, ki18n
+		from PyKDE4.kdeui import KApplication, KSystemTrayIcon, KIcon, KMessageBox
+
+		kaboutdata = KAboutData( 'backintime', '', ki18n( self.config.APP_NAME ), self.config.VERSION, ki18n( '' ), KAboutData.License_GPL_V2, ki18n( self.config.COPYRIGHT ), ki18n( '' ), 'http://backintime.le-web.org', '[e-mail]' )
+
+		kaboutdata.setProgramIconName( 'document-save' )
+
+		KCmdLineArgs.init( [sys.argv[0]], kaboutdata )
+		kapp = KApplication()
+		messagebox = KMessageBox()
+		
+		make_backup=messagebox.questionYesNo(None,"\
+The location %s contains snapshots (backups) of \
+some files in the system. Do you want to make \
+a snapshot now?" % path, "")
+		
+		kapp = None
+
+		return make_backup==messagebox.Yes
+
+
+