← Back to branch summary

~bkidwell/zim/pyzim-win-installer

« back to all changes in this revision

Viewing changes to zim/__init__.py

  • Committer: Jaap Karssenberg
  • Date: 2011-05-13 17:24:45 UTC
  • mfrom: (400.1.4 typos)
  • Revision ID: jaap.karssenberg@gmail.com-20110513172445-vfe41zoohsegv07z
Merging typo fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
zim/__init__.py
297
297
                                import zim.gui.notebookdialog
298
298
                                notebook = zim.gui.notebookdialog.prompt_notebook()
299
299
                                if not notebook:
300
 
                                        return # User cancelled notebook dialog
 
300
                                        return # User canceled notebook dialog
301
301
                        handler = zim.gui.GtkInterface(notebook, page, **optsdict)
302
302
                        handler.main()
303
303
                else:
311
311
                                notebook = zim.gui.notebookdialog.prompt_notebook()
312
312
                                if not notebook:
313
313
                                        proxy.quit_if_nochild()
314
 
                                        return # User cancelled notebook dialog
 
314
                                        return # User canceled notebook dialog
315
315
                        gui = proxy.get_notebook(notebook)
316
316
 
317
317
                        gui.present(page, **optsdict)
480
480
                        page = self.notebook.get_page(path)
481
481
 
482
482
                if page and output is None:
483
 
                        import sys
484
483
                        exporter.export_page_to_fh(sys.stdout, page)
485
484
                elif not output:
486
485
                        logger.error('Need output directory to export notebook')