diff --git a/resources/images/add_book.png b/resources/images/add_book.png index 2d69937ef1..a5381cea17 100644 Binary files a/resources/images/add_book.png and b/resources/images/add_book.png differ diff --git a/resources/images/config.png b/resources/images/config.png index 7763ad4ec4..4a2f44c57b 100644 Binary files a/resources/images/config.png and b/resources/images/config.png differ diff --git a/resources/images/connect_share_on.png b/resources/images/connect_share_on.png index 6fdd573ad8..c2d1627ce0 100644 Binary files a/resources/images/connect_share_on.png and b/resources/images/connect_share_on.png differ diff --git a/resources/images/convert.png b/resources/images/convert.png index 3a17c66172..c985c08d16 100644 Binary files a/resources/images/convert.png and b/resources/images/convert.png differ diff --git a/resources/images/default_cover.png b/resources/images/default_cover.png index cbd0ae30e4..8302eb9104 100644 Binary files a/resources/images/default_cover.png and b/resources/images/default_cover.png differ diff --git a/resources/images/devices/bambook.png b/resources/images/devices/bambook.png index ff80f4a023..8381074946 100644 Binary files a/resources/images/devices/bambook.png and b/resources/images/devices/bambook.png differ diff --git a/resources/images/devices/boox.jpg b/resources/images/devices/boox.jpg deleted file mode 100644 index 93e5c70fa1..0000000000 Binary files a/resources/images/devices/boox.jpg and /dev/null differ diff --git a/resources/images/devices/boox.png b/resources/images/devices/boox.png new file mode 100644 index 0000000000..e804ada839 Binary files /dev/null and b/resources/images/devices/boox.png differ diff --git a/resources/images/devices/ipad.png b/resources/images/devices/ipad.png index 91d1240cd5..0b51b31824 100644 Binary files a/resources/images/devices/ipad.png and b/resources/images/devices/ipad.png differ diff --git a/resources/images/devices/kindle.jpg b/resources/images/devices/kindle.jpg deleted file mode 100644 index 2f7a2e4467..0000000000 Binary files a/resources/images/devices/kindle.jpg and /dev/null differ diff --git a/resources/images/devices/kindle.png b/resources/images/devices/kindle.png new file mode 100644 index 0000000000..d9acbecc43 Binary files /dev/null and b/resources/images/devices/kindle.png differ diff --git a/resources/images/devices/nook.jpg b/resources/images/devices/nook.jpg deleted file mode 100644 index 4164042194..0000000000 Binary files a/resources/images/devices/nook.jpg and /dev/null differ diff --git a/resources/images/devices/nook.png b/resources/images/devices/nook.png new file mode 100644 index 0000000000..f7e19e7dc6 Binary files /dev/null and b/resources/images/devices/nook.png differ diff --git a/resources/images/edit_input.png b/resources/images/edit_input.png index 2e5bcee679..6aba5dba49 100644 Binary files a/resources/images/edit_input.png and b/resources/images/edit_input.png differ diff --git a/resources/images/gmail_logo.png b/resources/images/gmail_logo.png index 7d17a6af08..be553d76d6 100644 Binary files a/resources/images/gmail_logo.png and b/resources/images/gmail_logo.png differ diff --git a/resources/images/merge_books.png b/resources/images/merge_books.png index 88b14214e1..001c9d7761 100644 Binary files a/resources/images/merge_books.png and b/resources/images/merge_books.png differ diff --git a/resources/images/mimetypes/opml.png b/resources/images/mimetypes/opml.png index 3fab59ea1e..3195527769 100644 Binary files a/resources/images/mimetypes/opml.png and b/resources/images/mimetypes/opml.png differ diff --git a/resources/images/notify.png b/resources/images/notify.png index 94d7ece3ea..d63d7e9255 100644 Binary files a/resources/images/notify.png and b/resources/images/notify.png differ diff --git a/resources/images/save.png b/resources/images/save.png index 2d8b5cbdd1..0c5a3b906b 100644 Binary files a/resources/images/save.png and b/resources/images/save.png differ diff --git a/resources/images/scroll.png b/resources/images/scroll.png index a89c79615d..03d19b6498 100644 Binary files a/resources/images/scroll.png and b/resources/images/scroll.png differ diff --git a/resources/images/smarten-punctuation.png b/resources/images/smarten-punctuation.png index dbfef989cc..f921ffe5c0 100644 Binary files a/resources/images/smarten-punctuation.png and b/resources/images/smarten-punctuation.png differ diff --git a/resources/images/sync.png b/resources/images/sync.png index 9373f7555c..c1266388ee 100644 Binary files a/resources/images/sync.png and b/resources/images/sync.png differ diff --git a/resources/images/trash.png b/resources/images/trash.png index e2ee120723..18b3a4eeaf 100644 Binary files a/resources/images/trash.png and b/resources/images/trash.png differ diff --git a/resources/images/view.png b/resources/images/view.png index 1438be879d..0036e535ee 100644 Binary files a/resources/images/view.png and b/resources/images/view.png differ diff --git a/resources/images/welcome_wizard.png b/resources/images/welcome_wizard.png index d57b3073c7..81581aa2d0 100644 Binary files a/resources/images/welcome_wizard.png and b/resources/images/welcome_wizard.png differ diff --git a/src/calibre/devices/hanlin/driver.py b/src/calibre/devices/hanlin/driver.py index f4b57c4511..18b2682deb 100644 --- a/src/calibre/devices/hanlin/driver.py +++ b/src/calibre/devices/hanlin/driver.py @@ -117,7 +117,7 @@ class BOOX(HANLINV3): supported_platforms = ['windows', 'osx', 'linux'] METADATA_CACHE = '.metadata.calibre' DRIVEINFO = '.driveinfo.calibre' - icon = I('devices/boox.jpg') + icon = I('devices/boox.png') # Ordered list of supported formats FORMATS = ['epub', 'fb2', 'djvu', 'pdf', 'html', 'txt', 'rtf', 'mobi', diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py index 8d3afe435d..0811ddb8f4 100644 --- a/src/calibre/devices/kindle/driver.py +++ b/src/calibre/devices/kindle/driver.py @@ -44,7 +44,7 @@ class KINDLE(USBMS): name = 'Kindle Device Interface' gui_name = 'Amazon Kindle' - icon = I('devices/kindle.jpg') + icon = I('devices/kindle.png') description = _('Communicate with the Kindle eBook reader.') author = 'John Schember' supported_platforms = ['windows', 'osx', 'linux'] diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py index b66e896ae9..5825f8d534 100644 --- a/src/calibre/devices/nook/driver.py +++ b/src/calibre/devices/nook/driver.py @@ -22,7 +22,7 @@ class NOOK(USBMS): gui_name = _('The Nook') description = _('Communicate with the Nook eBook reader.') author = 'John Schember' - icon = I('devices/nook.jpg') + icon = I('devices/nook.png') supported_platforms = ['windows', 'linux', 'osx'] # Ordered list of supported formats diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 3cf26ddab5..d0180702a1 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -874,6 +874,7 @@ class Application(QApplication): qargs = [i.encode('utf-8') if isinstance(i, unicode) else i for i in args] self.pi = plugins['progress_indicator'][0] QApplication.__init__(self, qargs) + self.setAttribute(Qt.AA_UseHighDpiPixmaps) if not iswindows: self.setup_unix_signals() if islinux or isbsd: diff --git a/src/calibre/utils/img.py b/src/calibre/utils/img.py index 9246080894..a62db32b26 100644 --- a/src/calibre/utils/img.py +++ b/src/calibre/utils/img.py @@ -481,8 +481,9 @@ def test(): # {{{ from calibre.ptempfile import TemporaryDirectory from calibre import CurrentDir from glob import glob + img = image_from_data(I('lt.png', data=True, allow_user_override=False)) with TemporaryDirectory() as tdir, CurrentDir(tdir): - shutil.copyfile(I('devices/kindle.jpg', allow_user_override=False), 'test.jpg') + save_image(img, 'test.jpg') ret = optimize_jpeg('test.jpg') if ret is not None: raise SystemExit('optimize_jpeg failed: %s' % ret) @@ -495,7 +496,6 @@ def test(): # {{{ raise SystemExit('optimize_png failed: %s' % ret) if glob('*.bak'): raise SystemExit('Spurious .bak files left behind') - img = image_from_data(I('devices/kindle.jpg', data=True, allow_user_override=False)) quantize_image(img) oil_paint_image(img) gaussian_sharpen_image(img)