Merge lp:~hsoft/zim/dev into lp:~jaap.karssenberg/zim/pyzim

[Virgil Dupras]

=== modified file 'tests/formats.py'
--- tests/formats.py	2012-07-21 10:14:36 +0000
+++ tests/formats.py	2012-11-12 14:30:51 +0000
@@ -203,6 +203,12 @@
 		text = tree.tostring()
 		self.assertEqual(text, wanted)
 
+	def testGetHeading(self):
+		'''Test that ParseTree.get_heading() returns the first header's text.
+		'''
+		tree = ParseTree().fromstring(self.xml)
+		self.assertEqual(tree.get_heading(), "Head 1")
+
 	def testSetHeading(self):
 		'''Test ParseTree.set_heading()'''
 		tree = ParseTree().fromstring(self.xml)

=== modified file 'tests/gui.py'
--- tests/gui.py	2012-08-25 16:05:50 +0000
+++ tests/gui.py	2012-11-12 14:30:51 +0000
@@ -10,7 +10,8 @@
 import gtk
 
 from zim.errors import Error
-from zim.notebook import get_notebook_list, Path, NotebookInfo
+from zim.notebook import get_notebook_list, Path, Page, NotebookInfo
+from zim.formats import ParseTree
 from zim.fs import File, Dir
 from zim.config import config_file
 from zim.gui.clipboard import Clipboard
@@ -163,12 +164,12 @@
 		dialog = zim.gui.RenamePageDialog(self.ui, path=Path('Test:foo:bar'))
 		self.assertTrue(dialog.form['update'])
 		self.assertTrue(dialog.form.widgets['update'].get_property('sensitive'))
-		self.assertTrue(dialog.form['head'])
+		self.assertFalse(dialog.form['head']) # There is no heading
 		self.assertTrue(dialog.form.widgets['head'].get_property('sensitive'))
 		dialog.form['name'] = 'New'
 		dialog.assert_response_ok()
 		self.assertEqual(self.ui.mock_calls[-1],
-			('do_rename_page', Path('Test:foo:bar'), 'New', True, True))
+			('do_rename_page', Path('Test:foo:bar'), 'New', False, True))
 
 		dialog = zim.gui.RenamePageDialog(self.ui, path=Path('New:bar'))
 		self.assertFalse(dialog.form['update'])
@@ -180,6 +181,20 @@
 		self.assertEqual(self.ui.mock_calls[-1],
 			('do_rename_page', Path('New:bar'), 'New', False, False))
 
+	def testRenamePageDialogWithHeadingChanges(self):
+		'''Test RenamePageDialog's heading auto-change option depending on
+		whether we have a changed heading or not.
+		'''
+		tree = ParseTree().fromstring('<zim-tree></zim-tree>')
+		tree.set_heading("bar")
+		self.ui.page = Page(Path("Test:foo:bar"), parsetree=tree)
+		self.ui.notebook.get_page = lambda path: self.ui.page
+		dialog = zim.gui.RenamePageDialog(self.ui, path=Path("Test:foo:bar"))
+		self.assertTrue(dialog.form['head'])
+		tree.set_heading("different")
+		dialog = zim.gui.RenamePageDialog(self.ui, path=Path("Test:foo:bar"))
+		self.assertFalse(dialog.form['head'])
+	
 	def testDeletePageDialog(self):
 		'''Test DeletePageDialog'''
 		# just check inputs are OK - skip output

=== modified file 'tests/notebook.py'
--- tests/notebook.py	2012-10-06 12:26:18 +0000
+++ tests/notebook.py	2012-11-12 14:30:51 +0000
@@ -639,7 +639,7 @@
 	def generator(self, name):
 		return self.notebook.get_page(Path(name))
 
-	def runTest(self):
+	def testMain(self):
 		'''Test Page object'''
 		TestPath.runTest(self)
 
@@ -674,6 +674,17 @@
 		self.assertFalse(tree.hascontent)
 		page.set_parsetree(tree)
 		self.assertFalse(page.hascontent)
+	
+	def testShouldAutochangeHeading(self):
+		page = Page(Path("Foo"))
+		page.readonly = False
+		tree = ParseTree().fromstring('<zim-tree></zim-tree>')
+		tree.set_heading("Foo")
+		page.set_parsetree(tree)
+		self.assertTrue(page.should_autochange_heading())
+		tree.set_heading("Bar")
+		page.set_parsetree(tree)
+		self.assertFalse(page.should_autochange_heading())
 
 
 class TestIndexPage(tests.TestCase):

=== modified file 'zim/formats/__init__.py'
--- zim/formats/__init__.py	2012-09-22 18:22:22 +0000
+++ zim/formats/__init__.py	2012-11-12 14:30:51 +0000
@@ -281,19 +281,32 @@
 		'''Parsing from file is not implemented, use fromstring() instead'''
 		raise NotImplementedError
 
+	def _get_heading_element(self, level=1):
+		children = self.getroot().getchildren()
+		if children:
+			first = children[0]
+			if first.tag == 'h' and first.attrib['level'] >= level:
+				return first
+		return None
+	
+	def get_heading(self, level=1):
+		heading_elem = self._get_heading_element(level)
+		if heading_elem is not None:
+			return heading_elem.text
+		else:
+			return ""
+	
 	def set_heading(self, text, level=1):
 		'''Set the first heading of the parse tree to 'text'. If the tree
 		already has a heading of the specified level or higher it will be
 		replaced. Otherwise the new heading will be prepended.
 		'''
 		root = self.getroot()
-		children = root.getchildren()
 		tail = "\n"
-		if children:
-			first = children[0]
-			if first.tag == 'h' and first.attrib['level'] >= level:
-				tail = first.tail # Keep trailing text
-				root.remove(first)
+		heading_elem = self._get_heading_element(level)
+		if heading_elem is not None:
+			tail = heading_elem.tail
+			root.remove(heading_elem)
 		heading = Element('h', {'level': level})
 		heading.text = text
 		heading.tail = tail

=== modified file 'zim/gui/__init__.py'
--- zim/gui/__init__.py	2012-09-29 21:21:38 +0000
+++ zim/gui/__init__.py	2012-11-12 14:30:51 +0000
@@ -3229,6 +3229,7 @@
 
 		page = self.ui.notebook.get_page(self.path)
 		existing = (page.hascontent or page.haschildren)
+		should_autochange_heading = page.should_autochange_heading()
 
 		self.vbox.add(gtk.Label(_('Rename page "%s"') % self.path.name))
 			# T: label in 'rename page' dialog - %s is the page name
@@ -3255,7 +3256,7 @@
 				# T: Option in the 'rename page' dialog
 		], {
 			'name': self.path.basename,
-			'head': existing,
+			'head': should_autochange_heading,
 			'update': True,
 		})
 

=== modified file 'zim/notebook.py'
--- zim/notebook.py	2012-10-06 12:26:18 +0000
+++ zim/notebook.py	2012-11-12 14:30:51 +0000
@@ -2505,6 +2505,18 @@
 			for tag, attrib in tags.iteritems():
 				yield tag, attrib
 
+	def should_autochange_heading(self):
+		'''Returns whether the page should have its heading auto-chaged on
+		rename/move.
+		
+		@returns: C{True} when the heading can be auto-changed.
+		'''
+		tree = self.get_parsetree()
+		if tree:
+			return tree.get_heading() == self.basename
+		else:
+			return False
+
 
 class IndexPage(Page):
 	'''Class implementing a special page for displaying a namespace index'''