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

Remove the HiDPI setting as it is no longer really tuneable in Qt 6

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-19 14:39:50 +05:30
parent 920d1e27d6
commit 984a070e2b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 141 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,6 @@ def create_defs():
defs['tag_browser_show_counts'] = True defs['tag_browser_show_counts'] = True
defs['tag_browser_show_tooltips'] = True defs['tag_browser_show_tooltips'] = True
defs['row_numbers_in_book_list'] = True defs['row_numbers_in_book_list'] = True
defs['hidpi'] = 'auto'
defs['tag_browser_item_padding'] = 0.5 defs['tag_browser_item_padding'] = 0.5
defs['paste_isbn_prefixes'] = ['isbn', 'url', 'amazon', 'google'] defs['paste_isbn_prefixes'] = ['isbn', 'url', 'amazon', 'google']
defs['qv_respects_vls'] = True defs['qv_respects_vls'] = True
@ -889,29 +888,6 @@ def show_temp_dir_error(err):
'Could not create temporary folder, calibre cannot start.') + ' ' + extra, det_msg=traceback.format_exc(), show=True) 'Could not create temporary folder, 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 automatic hidpi scaling')
QApplication.setAttribute(Qt.ApplicationAttribute.AA_EnableHighDpiScaling, True)
elif hidpi == 'off':
if DEBUG:
prints('Turning off automatic hidpi scaling')
QApplication.setAttribute(Qt.ApplicationAttribute.AA_EnableHighDpiScaling, False)
for p in env_vars:
os.environ.pop(p, None)
elif DEBUG:
prints('Not controlling automatic hidpi scaling')
def setup_unix_signals(self): def setup_unix_signals(self):
if hasattr(os, 'pipe2'): if hasattr(os, 'pipe2'):
read_fd, write_fd = os.pipe2(os.O_CLOEXEC | os.O_NONBLOCK) read_fd, write_fd = os.pipe2(os.O_CLOEXEC | os.O_NONBLOCK)
@ -969,9 +945,6 @@ class Application(QApplication):
qargs = [i.encode('utf-8') if isinstance(i, str) else i for i in args] qargs = [i.encode('utf-8') if isinstance(i, str) else i for i in args]
from calibre_extensions import progress_indicator from calibre_extensions import progress_indicator
self.pi = progress_indicator self.pi = progress_indicator
if not ismacos and not headless:
# On OS X high dpi scaling is turned on automatically by the OS, so we dont need to set it explicitly
setup_hidpi()
QApplication.setOrganizationName('calibre-ebook.com') QApplication.setOrganizationName('calibre-ebook.com')
QApplication.setOrganizationDomain(QApplication.organizationName()) QApplication.setOrganizationDomain(QApplication.organizationName())
QApplication.setApplicationVersion(__version__) QApplication.setApplicationVersion(__version__)
@ -986,7 +959,6 @@ class Application(QApplication):
if ismacos: if ismacos:
from calibre_extensions.cocoa import disable_cocoa_ui_elements from calibre_extensions.cocoa import disable_cocoa_ui_elements
disable_cocoa_ui_elements() disable_cocoa_ui_elements()
self.setAttribute(Qt.ApplicationAttribute.AA_UseHighDpiPixmaps)
self.setAttribute(Qt.ApplicationAttribute.AA_SynthesizeTouchForUnhandledMouseEvents, False) self.setAttribute(Qt.ApplicationAttribute.AA_SynthesizeTouchForUnhandledMouseEvents, False)
try: try:
base_dir() base_dir()

3
src/calibre/gui2/preferences/look_feel.py
View File

@ -423,9 +423,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.default_author_link = DefaultAuthorLink(self.default_author_link_container) self.default_author_link = DefaultAuthorLink(self.default_author_link_container)
self.default_author_link.changed_signal.connect(self.changed_signal) self.default_author_link.changed_signal.connect(self.changed_signal)
r('gui_layout', config, restart_required=True, choices=[(_('Wide'), 'wide'), (_('Narrow'), 'narrow')]) r('gui_layout', config, restart_required=True, choices=[(_('Wide'), 'wide'), (_('Narrow'), 'narrow')])
r('hidpi', gprefs, restart_required=True, choices=[(_('Automatic'), 'auto'), (_('On'), 'on'), (_('Off'), 'off')])
if ismacos:
self.opt_hidpi.setVisible(False), self.label_hidpi.setVisible(False)
r('ui_style', gprefs, restart_required=True, choices=[(_('System default'), 'system'), (_('calibre style'), 'calibre')]) r('ui_style', gprefs, restart_required=True, choices=[(_('System default'), 'system'), (_('calibre style'), 'calibre')])
r('book_list_tooltips', gprefs) r('book_list_tooltips', gprefs)
r('dnd_merge', gprefs) r('dnd_merge', gprefs)

307
src/calibre/gui2/preferences/look_feel.ui
View File

@ -50,7 +50,61 @@
<string>&amp;Main interface</string> <string>&amp;Main interface</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_9"> <layout class="QGridLayout" name="gridLayout_9">
<item row="5" column="1"> <item row="5" column="0">
<widget class="QCheckBox" name="opt_disable_tray_notification">
<property name="toolTip">
<string>Disable popup notifications when calibre completes jobs such a conversion, sending to device etc. The notifications are sent via the operating system notification facility, if available. Note that on Windows, you have to enable the system tray icon for notifications to work.</string>
</property>
<property name="text">
<string>Disable n&amp;otifications on job completion</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="icon_theme">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="7" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>&amp;Interface font:</string>
</property>
<property name="buddy">
<cstring>font_display</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="font_display">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="opt_gui_layout">
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
<property name="minimumContentsLength">
<number>20</number>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="opt_disable_animations"> <widget class="QCheckBox" name="opt_disable_animations">
<property name="toolTip"> <property name="toolTip">
<string>Disable all animations. Useful if you have a slow/old computer.</string> <string>Disable all animations. Useful if you have a slow/old computer.</string>
@ -60,6 +114,29 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1">
<widget class="QComboBox" name="opt_language">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
<property name="minimumContentsLength">
<number>20</number>
</property>
</widget>
</item>
<item row="13" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_widget_style"> <widget class="QLabel" name="label_widget_style">
<property name="text"> <property name="text">
@ -70,6 +147,41 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QPushButton" name="icon_theme_button">
<property name="text">
<string>Change &amp;icon theme (needs restart)</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QCheckBox" name="opt_dnd_merge">
<property name="text">
<string>Allow using &amp;drag and drop to merge books</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="opt_show_splash_screen">
<property name="text">
<string>Show the &amp;splash screen at startup</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QCheckBox" name="opt_row_numbers_in_book_list">
<property name="text">
<string>Show &amp;row numbers in the book list</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="2">
<widget class="QCheckBox" name="opt_booklist_grid">
<property name="text">
<string>Draw a &amp;grid in the book list</string>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_17"> <widget class="QLabel" name="label_17">
<property name="text"> <property name="text">
@ -80,17 +192,24 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>E&amp;xtra spacing to add between rows in the book list (can be negative):</string> <string>Choose &amp;language (needs restart):</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>opt_book_list_extra_row_spacing</cstring> <cstring>opt_language</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1"> <item row="4" column="0">
<widget class="QCheckBox" name="opt_systray_icon">
<property name="text">
<string>Enable s&amp;ystem tray icon (needs restart)</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QSpinBox" name="opt_book_list_extra_row_spacing"> <widget class="QSpinBox" name="opt_book_list_extra_row_spacing">
<property name="suffix"> <property name="suffix">
<string> px</string> <string> px</string>
@ -100,7 +219,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0" colspan="2"> <item row="8" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Toolbar</string> <string>Toolbar</string>
@ -142,181 +261,37 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="9" column="0">
<widget class="QComboBox" name="opt_ui_style"/> <widget class="QLabel" name="label_4">
<property name="text">
<string>E&amp;xtra spacing to add between rows in the book list (can be negative):</string>
</property>
<property name="buddy">
<cstring>opt_book_list_extra_row_spacing</cstring>
</property>
</widget>
</item> </item>
<item row="8" column="1"> <item row="7" column="1">
<widget class="QPushButton" name="change_font_button"> <widget class="QPushButton" name="change_font_button">
<property name="text"> <property name="text">
<string>Change &amp;font (needs restart)</string> <string>Change &amp;font (needs restart)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="opt_gui_layout"> <widget class="QComboBox" name="opt_ui_style"/>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
<property name="minimumContentsLength">
<number>20</number>
</property>
</widget>
</item> </item>
<item row="7" column="0"> <item row="6" column="1">
<widget class="QCheckBox" name="opt_book_list_tooltips">
<property name="text">
<string>Show &amp;tooltips in the book list</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="opt_show_layout_buttons"> <widget class="QCheckBox" name="opt_show_layout_buttons">
<property name="text"> <property name="text">
<string>Show &amp;layout buttons in the status bar (needs restart)</string> <string>Show &amp;layout buttons in the status bar (needs restart)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="opt_systray_icon">
<property name="text">
<string>Enable s&amp;ystem tray icon (needs restart)</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Choose &amp;language (needs restart):</string>
</property>
<property name="buddy">
<cstring>opt_language</cstring>
</property>
</widget>
</item>
<item row="8" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>&amp;Interface font:</string>
</property>
<property name="buddy">
<cstring>font_display</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="font_display">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="icon_theme">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QCheckBox" name="opt_disable_tray_notification"> <widget class="QCheckBox" name="opt_book_list_tooltips">
<property name="toolTip">
<string>Disable popup notifications when calibre completes jobs such as conversion of books, sending to device, etc. The notifications are sent via the operating system notification facility, if available.</string>
</property>
<property name="text"> <property name="text">
<string>Disable n&amp;otifications on job completion</string> <string>Show &amp;tooltips in the book list</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="opt_language">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
<property name="minimumContentsLength">
<number>20</number>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QCheckBox" name="opt_show_splash_screen">
<property name="text">
<string>Show the &amp;splash screen at startup</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="icon_theme_button">
<property name="text">
<string>Change &amp;icon theme (needs restart)</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QCheckBox" name="opt_row_numbers_in_book_list">
<property name="text">
<string>Show &amp;row numbers in the book list</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_hidpi">
<property name="text">
<string>Ad&amp;just for high resolution screens (needs restart):</string>
</property>
<property name="buddy">
<cstring>opt_hidpi</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="opt_hidpi">
<property name="toolTip">
<string>&lt;p&gt;Whether to automatically adjust the calibre user interface for high resolution (high DPI) monitors. There are three possible values:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;b&gt;Automatic&lt;/b&gt;: Adjust the user interface if a high resolution monitor is detected. Will respect Qt environment variables controlling high DPI behavior. So if you use the environment variable QT_AUTO_SCREEN_SCALE_FACTOR then it will be used instead of this setting.&lt;/li&gt;
&lt;li&gt;&lt;b&gt;On&lt;/b&gt;: Same as &quot;Automatic&quot;, but ignores Qt environment variables controlling high DPI behavior.&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Off&lt;/b&gt;: Do not adjust the user interface, regardless of Qt environment variables.&lt;/li&gt;
&lt;/ul&gt;</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QCheckBox" name="opt_dnd_merge">
<property name="text">
<string>Allow using &amp;drag and drop to merge books</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<widget class="QCheckBox" name="opt_booklist_grid">
<property name="text">
<string>Draw a &amp;grid in the book list</string>
</property> </property>
</widget> </widget>
</item> </item>