Merge lp:~johannes-reinhardt/zim/fixes into lp:~jaap.karssenberg/zim/pyzim

[Johannes Reinhardt]

Documentation (FAQ, Dropwindow plugin)
Bugfixes (https://launchpad.net/bugs/562103,https://launchpad.net/bugs/513712)
improved attachment dialog

[Jaap Karssenberg (jaap.karssenberg)]

Merged with minor changes. Thanks for committing these fixes !

[Jaap Karssenberg (jaap.karssenberg)]

Flagged as approved since merge already happened...

review: Approve

=== modified file 'data/manual/FAQ.txt'
--- data/manual/FAQ.txt	2010-01-19 18:41:47 +0000
+++ data/manual/FAQ.txt	2010-04-24 13:30:35 +0000
@@ -24,6 +24,9 @@
 === I would like zim to hide in the system tray. ===
 There is a [[Plugins:Tray Icon|Tray Icon plugin]] which can be enabled from the Preferences dialog.
 
+=== I would like to start zim hidden in the system tray. ===
+See http://www.zim-wiki.org/wiki/doku.php?id=how_to_start_zim_as_icon_in_the_system_tray
+
 === Can I make zim appear with a global keybinding? ===
 By default zim will  only run a single instance of each notebook. Trying to open the same notebook again will just pop the corresponding window to the foreground. So you can set a default notebook (see [[Help:Notebooks|Notebooks]]) and just make a global key binding run the command "''zim''". 
 
@@ -41,3 +44,16 @@
 
 === Does it run on OS X? ===
 Yes it does. You can install the dependencies usign [[http://www.macports.org/|Mac Ports]].
+
+=== I want to move/backup/syncronize a zim notebook. Which files do I need to take care of? ===
+The visible files in the notebook folder contain all data of notes and attachments.
+
+=== What is the hidden .zim folder in my notebook folder? ===
+The hidden .zim folder contains only caches and GUI state. It doesn't contain any information that can not be recreated on the fly.
+
+=== I switched from the perl version to the python version and miss my favorite feature. ===
+Some features of the perl version of zim are not yet implemented in the python version.
+
+=== I have a useful trick or tip. How can I share it with other users? ===
+You can have a look at the [[http://www.zim-wiki.org/wiki/doku.php|zim documentation wiki]]. It has a section dedicated to [[http://www.zim-wiki.org/wiki/doku.php?id=tips_and_tricks|tricks and tips]]. Or write a mail to the mailing list, see the [[https://launchpad.net/~zim-wiki|team page]] on launchpad
+

=== modified file 'data/manual/Plugins.txt'
--- data/manual/Plugins.txt	2010-03-05 22:39:48 +0000
+++ data/manual/Plugins.txt	2010-04-24 13:30:35 +0000
@@ -7,6 +7,7 @@
 
 * [[+Calendar|Calendar]]
 * [[+Diagram Editor|Diagram Editor]]
+* [[Plugins:Dropwindow|Dropwindow]]
 * [[+Equation Editor|Equation Editor]]
 * [[+Insert Screenshot|Insert Screenshot]]
 * [[+Link Map|Link Map]]

=== added file 'data/manual/Plugins/Dropwindow.txt'
--- data/manual/Plugins/Dropwindow.txt	1970-01-01 00:00:00 +0000
+++ data/manual/Plugins/Dropwindow.txt	2010-04-24 13:30:35 +0000
@@ -0,0 +1,20 @@
+Content-Type: text/x-zim-wiki
+Wiki-Format: zim 0.4
+Creation-Date: 2010-04-24T13:49:51.331910
+
+====== Dropwindow ======
+Created Samstag 24 April 2010
+
+The Dropwindow plugin offers a small dialog for inserting notes into a notebook. It is invoked from the commandline and can therefore easily be bound to keyboard short cuts or used in scripts.
+
+**Commandline: **''zim'' --plugin dropwindow [OPTIONS]
+
+**Options:**
+* notebook=URI    Select the notebook in the dialog
+* namespace=STRING    Fill in the namespace in the dialog
+* basename=STRING    Fill in the page name in the dialog
+* text=TEXT    Provide the text directly
+* input=stdin    Provide the text on stdin
+* input=clipboard    Take the text from the clipboard
+
+**Dependencies:** This plugin has no additional dependencies.

=== modified file 'data/manual/Plugins/Version_Control.txt'
--- data/manual/Plugins/Version_Control.txt	2010-03-16 21:04:23 +0000
+++ data/manual/Plugins/Version_Control.txt	2010-04-24 13:30:35 +0000
@@ -9,14 +9,14 @@
 **Dependencies:** This plugin requires one of the supported version control systems to be installed. Currently only Bazaar is supported, so this application is required. In specific the "bzr" command should be available in the system path.
 
 ===== Introduction =====
-If you want to keep track of your changes or if you want to collaborate on a Zim Wiki with as a team, Version Control is the best way to go. Zim integrates very well with existing Version Control Software because all relevant data is stored in plain text files.
+If you want to keep track of your changes or if you want to collaborate on a Zim Wiki as a team, Version Control is the best way to go. Zim integrates very well with existing Version Control Software because all relevant data is stored in plain text files.
 
 ===== Usage =====
 To save the current state of the Notebook, choose ''File -> Save Version...'' from the Main Menu and confirm that you want to enable Version Control. In the next window add a comment describing the changes (probably something like "yeah, first version" at this point) and confirm by clicking Save.
 You can browse the complete history of saved versions by selecting ''File -> Versions...'' from the Main Menu. You can view and restore previous versions of your Notebook and view all your changes between two versions in the window that open.
 
 ===== Sharing =====
-TODO here should be documented how to share the newly created repository with your colaborators...
+TODO here should be documented how to share the newly created repository with your collaborators...
 
 ===== Details =====
 Technically speaking a local repository is created when enabling Version Control -- a [[http://bazaar.canonical.com/en/|Bazaar]] repository to be precise. Every time you save a version, another revision is checked in. Zim just uses the Bazaar application, so you can always view and export your history using standard Bazaar tools.
@@ -36,3 +36,8 @@
 * anything you manually put into or below the root folder you do not want to be in your repository
 
 The files in the .zim folder are caches of the index and some client configuration (window sizes, scroll position etc.) and some of it is in binary format, so you do not need or want it in your repository.
+
+If you want for some reason stop using version control and throw away all history, you can do the following:
+* disable the version control plugin
+* quit zim
+* remove the .bzr folder and .bzrignore file from your notebook

=== modified file 'zim/gui/__init__.py'
--- zim/gui/__init__.py	2010-04-17 20:09:38 +0000
+++ zim/gui/__init__.py	2010-04-24 13:30:35 +0000
@@ -2252,7 +2252,9 @@
 class AttachFileDialog(FileDialog):
 
 	def __init__(self, ui, path=None):
-		FileDialog.__init__(self, ui, _('Attach File')) # T: Dialog title
+		FileDialog.__init__(self, ui, _('Attach File'),multiple=True) # T: Dialog title
+		self.uistate.setdefault('last_attachment_folder','~')
+		self.filechooser.set_current_folder(self.uistate['last_attachment_folder'])
 		if path is None:
 			self.path = self.ui.get_path_context()
 		else:
@@ -2272,24 +2274,26 @@
 		self.filechooser.set_extra_widget(checkbox)
 
 	def do_response_ok(self):
-		file = self.get_file()
-		if file is None:
+		files = self.get_file()
+		if len(files) == 0:
 			return False
 
 		checkbox = self.filechooser.get_extra_widget()
 		self.uistate['insert_attached_images'] = checkbox.get_active()
+		self.uistate['last_attachment_folder'] = self.filechooser.get_current_folder()
 			# Similar code in zim.gui.InsertImageDialog
 
-		file.copyto(self.dir)
-		file = self.dir.file(file.basename)
-		pageview = self.ui.mainwindow.pageview
-		if self.uistate['insert_attached_images'] and file.isimage():
-			try:
-				pageview.insert_image(file, interactive=False)
-			except:
-				logger.exception('Could not insert image')
-				pageview.insert_links([file]) # image type not supported?
-		else:
-			pageview.insert_links([file])
+		for file in files:
+			file.copyto(self.dir)
+			file = self.dir.file(file.basename)
+			pageview = self.ui.mainwindow.pageview
+			if self.uistate['insert_attached_images'] and file.isimage():
+				try:
+					pageview.insert_image(file, interactive=False)
+				except:
+					logger.exception('Could not insert image')
+					pageview.insert_links([file]) # image type not supported?
+			else:
+				pageview.insert_links([file])
+
 		return True
-

=== modified file 'zim/gui/widgets.py'
--- zim/gui/widgets.py	2010-04-17 20:09:38 +0000
+++ zim/gui/widgets.py	2010-04-24 13:30:35 +0000
@@ -1022,7 +1022,7 @@
 
 	def __init__(self, ui, title, action=gtk.FILE_CHOOSER_ACTION_OPEN,
 			buttons=gtk.BUTTONS_OK_CANCEL, button=None,
-			help_text=None, fields=None, help=None
+			help_text=None, fields=None, help=None, multiple=False
 		):
 		if button is None:
 			if action == gtk.FILE_CHOOSER_ACTION_OPEN:
@@ -1037,6 +1037,7 @@
 			self.set_default_size(500, 400)
 		self.filechooser = gtk.FileChooserWidget(action=action)
 		self.filechooser.set_do_overwrite_confirmation(True)
+		self.filechooser.set_select_multiple(multiple)
 		self.filechooser.connect('file-activated', lambda o: self.response_ok())
 		self.vbox.add(self.filechooser)
 		# FIXME hook to expander to resize window
@@ -1049,11 +1050,16 @@
 
 	def get_file(self):
 		'''Wrapper for filechooser.get_filename().
-		Returns a File object or None.
+		Returns a File object or None (if multiple=False)
+		 or a list of File objects (if multiple=True).
 		'''
-		path = self.filechooser.get_filename()
-		if path is None: return None
-		else: return File(path)
+		if self.filechooser.get_select_multiple():
+			path = self.filechooser.get_filenames()
+			return map(lambda x: File(x),path)
+		else:
+			path = self.filechooser.get_filename()
+			if path is None: return None
+			else: return File(path)
 
 	def get_dir(self):
 		'''Wrapper for filechooser.get_filename().
@@ -1352,11 +1358,11 @@
 				pixbuf = self._pixbuf
 			else:
 				pixbuf = self._pixbuf.scale_simple(
-							wimg, himg, gtk.gdk.INTERP_HYPER)
+							wimg, himg, gtk.gdk.INTERP_NEAREST)
 		else:
 			# Generate checkboard background while scaling
 			pixbuf = self._pixbuf.composite_color_simple(
-				wimg, himg, gtk.gdk.INTERP_HYPER,
+				wimg, himg, gtk.gdk.INTERP_NEAREST,
 				255, 16, self._lightgrey.pixel, self._darkgrey.pixel )
 
 		# And align the image in the layout