Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

A spot of refatoring

Browse Source
This commit is contained in:
Kovid Goyal 2017-04-22 17:30:05 +05:30
parent 46b9d7762e
commit 3c9f17bd2b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/calibre/gui2/__init__.py
View File

@ -924,6 +924,29 @@ def show_temp_dir_error(err):
'Could not create temporary directory, calibre cannot start.') + ' ' + extra, det_msg=traceback.format_exc(), show=True) 'Could not create temporary directory, calibre cannot start.') + ' ' + extra, det_msg=traceback.format_exc(), show=True)
def setup_hidpi():
# This requires Qt >= 5.6
has_env_setting = False
env_vars = ('QT_AUTO_SCREEN_SCALE_FACTOR', 'QT_SCALE_FACTOR', 'QT_SCREEN_SCALE_FACTORS', 'QT_DEVICE_PIXEL_RATIO')
for v in env_vars:
if os.environ.get(v):
has_env_setting = True
break
hidpi = gprefs['hidpi']
if hidpi == 'on' or (hidpi == 'auto' and not has_env_setting):
if DEBUG:
prints('Turning on hidpi scaling')
QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)
elif hidpi == 'off':
if DEBUG:
prints('Turning off hidpi scaling')
QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, False)
for p in env_vars:
os.environ.pop(p, None)
elif DEBUG:
prints('Not controlling hidpi scaling')
class Application(QApplication): class Application(QApplication):
shutdown_signal_received = pyqtSignal() shutdown_signal_received = pyqtSignal()
@ -941,26 +964,7 @@ class Application(QApplication):
self.pi = plugins['progress_indicator'][0] self.pi = plugins['progress_indicator'][0]
if not isosx and not headless: if not isosx and not headless:
# On OS X high dpi scaling is turned on automatically by the OS, so we dont need to set it explicitly # On OS X high dpi scaling is turned on automatically by the OS, so we dont need to set it explicitly
# This requires Qt >= 5.6 setup_hidpi()
has_env_setting = False
env_vars = ('QT_AUTO_SCREEN_SCALE_FACTOR', 'QT_SCALE_FACTOR', 'QT_SCREEN_SCALE_FACTORS', 'QT_DEVICE_PIXEL_RATIO')
for v in env_vars:
if os.environ.get(v):
has_env_setting = True
break
hidpi = gprefs['hidpi']
if hidpi == 'on' or (hidpi == 'auto' and not has_env_setting):
if DEBUG:
prints('Turning on hidpi scaling')
QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)
elif hidpi == 'off':
if DEBUG:
prints('Turning off hidpi scaling')
QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, False)
for p in env_vars:
os.environ.pop(p, None)
elif DEBUG:
prints('Not controlling hidpi scaling')
QApplication.setOrganizationName('calibre-ebook.com') QApplication.setOrganizationName('calibre-ebook.com')
QApplication.setOrganizationDomain(QApplication.organizationName()) QApplication.setOrganizationDomain(QApplication.organizationName())
QApplication.setApplicationVersion(__version__) QApplication.setApplicationVersion(__version__)