mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'patch-1' of https://github.com/0verk1ll/calibre
This commit is contained in:
commit
47fc91689c
@ -10,7 +10,6 @@ __docformat__ = 'restructuredtext en'
|
|||||||
'''The main GUI'''
|
'''The main GUI'''
|
||||||
|
|
||||||
import apsw
|
import apsw
|
||||||
import collections
|
|
||||||
import errno
|
import errno
|
||||||
import gc
|
import gc
|
||||||
import os
|
import os
|
||||||
@ -18,7 +17,7 @@ import re
|
|||||||
import sys
|
import sys
|
||||||
import textwrap
|
import textwrap
|
||||||
import time
|
import time
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict, deque
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
from qt.core import (
|
from qt.core import (
|
||||||
QAction, QApplication, QDialog, QFont, QIcon, QMenu, QSystemTrayIcon, Qt, QTimer,
|
QAction, QApplication, QDialog, QFont, QIcon, QMenu, QSystemTrayIcon, Qt, QTimer,
|
||||||
@ -241,7 +240,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
|
|||||||
self.metadata_dialogs = []
|
self.metadata_dialogs = []
|
||||||
self.default_thumbnail = None
|
self.default_thumbnail = None
|
||||||
self.tb_wrapper = textwrap.TextWrapper(width=40)
|
self.tb_wrapper = textwrap.TextWrapper(width=40)
|
||||||
self.viewers = collections.deque()
|
self.viewers = deque()
|
||||||
self.system_tray_icon = None
|
self.system_tray_icon = None
|
||||||
do_systray = config['systray_icon'] or opts.start_in_tray
|
do_systray = config['systray_icon'] or opts.start_in_tray
|
||||||
if do_systray:
|
if do_systray:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user