← Back to branch summary

~ubuntu-branches/debian/jessie/calibre/jessie

« back to all changes in this revision

Viewing changes to src/calibre/gui2/dialogs/comments_dialog.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-11-04 11:02:15 UTC
  • mfrom: (1.3.39) (29.4.25 sid)
  • Revision ID: package-import@ubuntu.com-20131104110215-ctify0v2gpccj240
Tags: 1.9.0+dfsg-1
* New upstream release.
* debian/calibre.install: Install new module.
* Bump Standards-Version to 3.9.5, no changes necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/calibre/gui2/dialogs/comments_dialog.py
4
4
__license__   = 'GPL v3'
5
5
 
6
6
from PyQt4.Qt import Qt, QDialog, QDialogButtonBox
 
7
 
 
8
from calibre.gui2 import gprefs
7
9
from calibre.gui2.dialogs.comments_dialog_ui import Ui_CommentsDialog
8
10
from calibre.library.comments import comments_to_html
9
11
 
18
20
        self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint))
19
21
        self.setWindowIcon(icon)
20
22
 
21
 
        if text is not None:
22
 
            self.textbox.html = comments_to_html(text)
 
23
        self.textbox.html = comments_to_html(text) if text else ''
 
24
        self.textbox.wyswyg_dirtied()
23
25
        # self.textbox.setTabChangesFocus(True)
24
26
        self.buttonBox.button(QDialogButtonBox.Ok).setText(_('&OK'))
25
27
        self.buttonBox.button(QDialogButtonBox.Cancel).setText(_('&Cancel'))
27
29
        if column_name:
28
30
            self.setWindowTitle(_('Edit "{0}"').format(column_name))
29
31
 
 
32
        geom = gprefs.get('comments_dialog_geom', None)
 
33
        if geom is not None:
 
34
            self.restoreGeometry(geom)
 
35
 
 
36
    def save_geometry(self):
 
37
        gprefs.set('comments_dialog_geom', bytearray(self.saveGeometry()))
 
38
 
 
39
    def accept(self):
 
40
        self.save_geometry()
 
41
        QDialog.accept(self)
 
42
 
 
43
    def reject(self):
 
44
        self.save_geometry()
 
45
        QDialog.reject(self)
 
46
 
 
47
    def closeEvent(self, ev):
 
48
        self.save_geometry()
 
49
        return QDialog.closeEvent(self, ev)
 
50