E-book viewer: When in full screen mode, using the close window keyboard shortcut drops out of full screen instead of closing the window

This commit is contained in:
Kovid Goyal 2012-03-20 09:57:59 +05:30
parent e66f422d9f
commit c1bb1ab5c6

View File

@ -5,11 +5,11 @@ import traceback, os, sys, functools, collections, re
from functools import partial from functools import partial
from threading import Thread from threading import Thread
from PyQt4.Qt import QApplication, Qt, QIcon, QTimer, SIGNAL, QByteArray, \ from PyQt4.Qt import (QApplication, Qt, QIcon, QTimer, SIGNAL, QByteArray,
QDoubleSpinBox, QLabel, QTextBrowser, \ QDoubleSpinBox, QLabel, QTextBrowser,
QPainter, QBrush, QColor, QStandardItemModel, QPalette, \ QPainter, QBrush, QColor, QStandardItemModel, QPalette,
QStandardItem, QUrl, QRegExpValidator, QRegExp, QLineEdit, \ QStandardItem, QUrl, QRegExpValidator, QRegExp, QLineEdit,
QToolButton, QMenu, QInputDialog, QAction, QKeySequence QToolButton, QMenu, QInputDialog, QAction, QKeySequence)
from calibre.gui2.viewer.main_ui import Ui_EbookViewer from calibre.gui2.viewer.main_ui import Ui_EbookViewer
from calibre.gui2.viewer.printing import Printing from calibre.gui2.viewer.printing import Printing
@ -338,6 +338,10 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
count += 1 count += 1
def closeEvent(self, e): def closeEvent(self, e):
if self.isFullScreen():
self.showNormal()
e.ignore()
return
self.save_state() self.save_state()
return MainWindow.closeEvent(self, e) return MainWindow.closeEvent(self, e)