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

...

Browse Source
This commit is contained in:
Kovid Goyal 2010-06-12 10:52:40 -06:00
parent bb81c3e2dd
commit 421f2ebc90
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/actions.py
View File

@ -251,6 +251,9 @@ class AnnotationsAction(object): # {{{
class AddAction(object): # {{{ class AddAction(object): # {{{
def __init__(self):
self._add_filesystem_book = Dispatcher(self.__add_filesystem_book)
def add_recursive(self, single): def add_recursive(self, single):
root = choose_dir(self, 'recursive book import root dir dialog', root = choose_dir(self, 'recursive book import root dir dialog',
'Select root folder') 'Select root folder')

13
src/calibre/gui2/ui.py
View File

@ -13,7 +13,7 @@ import collections, os, sys, textwrap, time
from Queue import Queue, Empty from Queue import Queue, Empty
from threading import Thread from threading import Thread
from PyQt4.Qt import Qt, SIGNAL, QObject, QUrl, QTimer, \ from PyQt4.Qt import Qt, SIGNAL, QObject, QUrl, QTimer, \
QPixmap, QMenu, QIcon, \ QPixmap, QMenu, QIcon, pyqtSignal, \
QDialog, QDesktopServices, \ QDialog, QDesktopServices, \
QSystemTrayIcon, QApplication, QKeySequence, QAction, \ QSystemTrayIcon, QApplication, QKeySequence, QAction, \
QMessageBox, QHelpEvent QMessageBox, QHelpEvent
@ -24,7 +24,7 @@ from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.config import prefs, dynamic from calibre.utils.config import prefs, dynamic
from calibre.utils.ipc.server import Server from calibre.utils.ipc.server import Server
from calibre.gui2 import error_dialog, GetMetadata, \ from calibre.gui2 import error_dialog, GetMetadata, \
Dispatcher, gprefs, max_available_height, config, info_dialog gprefs, max_available_height, config, info_dialog
from calibre.gui2.cover_flow import CoverFlowMixin from calibre.gui2.cover_flow import CoverFlowMixin
from calibre.gui2.widgets import ProgressIndicator from calibre.gui2.widgets import ProgressIndicator
from calibre.gui2.wizard import move_library from calibre.gui2.wizard import move_library
@ -77,13 +77,15 @@ class Listener(Thread): # {{{
class SystemTrayIcon(QSystemTrayIcon): # {{{ class SystemTrayIcon(QSystemTrayIcon): # {{{
tooltip_requested = pyqtSignal(object)
def __init__(self, icon, parent): def __init__(self, icon, parent):
QSystemTrayIcon.__init__(self, icon, parent) QSystemTrayIcon.__init__(self, icon, parent)
def event(self, ev): def event(self, ev):
if ev.type() == ev.ToolTip: if ev.type() == ev.ToolTip:
evh = QHelpEvent(ev) evh = QHelpEvent(ev)
self.emit(SIGNAL('tooltip_requested(PyQt_PyObject)'), self.tooltip_requested.emit(
(self, evh.globalPos())) (self, evh.globalPos()))
return True return True
return QSystemTrayIcon.event(self, ev) return QSystemTrayIcon.event(self, ev)
@ -149,8 +151,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceMixin, ToolbarMixin, # {{{
self.content_server = None self.content_server = None
self.system_tray_icon = SystemTrayIcon(QIcon(I('library.png')), self) self.system_tray_icon = SystemTrayIcon(QIcon(I('library.png')), self)
self.system_tray_icon.setToolTip('calibre') self.system_tray_icon.setToolTip('calibre')
self.connect(self.system_tray_icon, self.system_tray_icon.tooltip_requested.connect(
SIGNAL('tooltip_requested(PyQt_PyObject)'),
self.job_manager.show_tooltip) self.job_manager.show_tooltip)
if not config['systray_icon']: if not config['systray_icon']:
self.system_tray_icon.hide() self.system_tray_icon.hide()
@ -292,8 +293,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceMixin, ToolbarMixin, # {{{
self.location_view.setCurrentIndex(self.location_view.model().index(0)) self.location_view.setCurrentIndex(self.location_view.model().index(0))
self._add_filesystem_book = Dispatcher(self.__add_filesystem_book)
self.keyboard_interrupt.connect(self.quit, type=Qt.QueuedConnection) self.keyboard_interrupt.connect(self.quit, type=Qt.QueuedConnection)
AddAction.__init__(self)
self.read_settings() self.read_settings()
self.finalize_layout() self.finalize_layout()