← Back to branch summary

~ubuntu-branches/debian/sid/calibre/sid

« back to all changes in this revision

Viewing changes to src/calibre/gui2/comments_editor.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-12-06 08:28:47 UTC
  • mfrom: (1.5.6)
  • Revision ID: package-import@ubuntu.com-20131206082847-9pvvs5autptg9f9h
Tags: 1.14.0+dfsg-1
http://bugs.debian.org/731502
http://bugs.debian.org/731501
* New upstream release. (Closes: #731502)
* Depend on python-pil | python-imaging now, upstream source is compatible
  with both. (Closes: #731501)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/calibre/gui2/comments_editor.py
640
640
        self.highlighter = Highlighter(self.code_edit.document())
641
641
        self.layout().setContentsMargins(0, 0, 0, 0)
642
642
 
643
 
    def set_minimum_height_for_editor(self, val):
644
 
        self.editor.setMinimumHeight(val)
645
 
 
646
643
        # toolbar1 {{{
647
644
        self.toolbar1.addAction(self.editor.action_undo)
648
645
        self.toolbar1.addAction(self.editor.action_redo)
691
688
        self.code_edit.textChanged.connect(self.code_dirtied)
692
689
        self.editor.page().contentsChanged.connect(self.wyswyg_dirtied)
693
690
 
 
691
    def set_minimum_height_for_editor(self, val):
 
692
        self.editor.setMinimumHeight(val)
 
693
 
694
694
    @dynamic_property
695
695
    def html(self):
696
696
        def fset(self, v):
740
740
    app.exec_()
741
741
    # print w.html
742
742
 
 
743