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

Pull from trunk

Browse Source
This commit is contained in:
Kovid Goyal 2010-05-14 21:45:16 -06:00
commit 6d1122ad1d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,6 +396,9 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
self.action_sync.setShortcut(Qt.Key_D) self.action_sync.setShortcut(Qt.Key_D)
self.action_sync.setEnabled(True) self.action_sync.setEnabled(True)
self.create_device_menu() self.create_device_menu()
self.connect(self.action_sync, SIGNAL('triggered(bool)'),
self._sync_action_triggered)
self.action_edit.setMenu(md) self.action_edit.setMenu(md)
self.action_save.setMenu(self.save_menu) self.action_save.setMenu(self.save_menu)
@ -666,6 +669,10 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
MainWindow.resizeEvent(self, ev) MainWindow.resizeEvent(self, ev)
self.search.setMaximumWidth(self.width()-150) self.search.setMaximumWidth(self.width()-150)
def _sync_action_triggered(self, *args):
m = getattr(self, '_sync_menu', None)
if m is not None:
m.trigger_default()
def create_device_menu(self): def create_device_menu(self):
self._sync_menu = DeviceMenu(self) self._sync_menu = DeviceMenu(self)
@ -673,8 +680,6 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
self.connect(self._sync_menu, self.connect(self._sync_menu,
SIGNAL('sync(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'), SIGNAL('sync(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'),
self.dispatch_sync_event) self.dispatch_sync_event)
self.connect(self.action_sync, SIGNAL('triggered(bool)'),
self._sync_menu.trigger_default)
self._sync_menu.fetch_annotations.connect(self.fetch_annotations) self._sync_menu.fetch_annotations.connect(self.fetch_annotations)
def add_spare_server(self, *args): def add_spare_server(self, *args):