From 4ce35e4fd76e7558b7708bbb014c1726a1ab6f2d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Jan 2009 21:23:16 -0800
Subject: [PATCH] Activate the Preferences menu item on OSX

---
 src/calibre/gui2/main.py        |  8 +++++---
 src/calibre/gui2/main_window.py | 26 ++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index d3538d79b3..1118d04dab 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -63,7 +63,8 @@ class Main(MainWindow, Ui_MainWindow):
         p.end()
         self.default_thumbnail = (pixmap.width(), pixmap.height(), pixmap_to_data(pixmap))
 
-    def __init__(self, single_instance, opts, parent=None):
+    def __init__(self, single_instance, opts, actions, parent=None):
+        self.preferences_action, self.quit_action = actions
         MainWindow.__init__(self, opts, parent)
         # Initialize fontconfig in a separate thread as this can be a lengthy
         # process if run for the first time on this machine
@@ -100,7 +101,6 @@ class Main(MainWindow, Ui_MainWindow):
         self.system_tray_menu = QMenu()
         self.restore_action = self.system_tray_menu.addAction(QIcon(':/images/page.svg'), _('&Restore'))
         self.donate_action  = self.system_tray_menu.addAction(QIcon(':/images/donate.svg'), _('&Donate'))
-        self.quit_action    = QAction(QIcon(':/images/window-close.svg'), _('&Quit'), self)
         self.addAction(self.quit_action)
         self.action_restart = QAction(_('&Restart'), self)
         self.addAction(self.action_restart)
@@ -242,6 +242,7 @@ class Main(MainWindow, Ui_MainWindow):
         self.tool_bar.setContextMenuPolicy(Qt.PreventContextMenu)
 
         QObject.connect(self.config_button, SIGNAL('clicked(bool)'), self.do_config)
+        self.connect(self.preferences_action, SIGNAL('triggered(bool)'), self.do_config)
         QObject.connect(self.advanced_search_button, SIGNAL('clicked(bool)'), self.do_advanced_search)
         
         ####################### Library view ########################
@@ -1547,6 +1548,7 @@ def main(args=sys.argv):
             prefs.set('library_path', opts.with_library)
             print 'Using library at', prefs['library_path']
         app = Application(args)
+        actions = tuple(Main.create_application_menubar())
         app.setWindowIcon(QIcon(':/library'))
         QCoreApplication.setOrganizationName(ORG_NAME)
         QCoreApplication.setApplicationName(APP_UID)
@@ -1561,7 +1563,7 @@ def main(args=sys.argv):
                                  '<p>%s is already running. %s</p>'%(__appname__, extra))
             return 1
         initialize_file_icon_provider()
-        main = Main(single_instance, opts)
+        main = Main(single_instance, opts, actions)
         sys.excepthook = main.unhandled_exception
         if len(args) > 1:
             main.add_filesystem_book(args[1])
diff --git a/src/calibre/gui2/main_window.py b/src/calibre/gui2/main_window.py
index db9cdd389d..95d77fc05c 100644
--- a/src/calibre/gui2/main_window.py
+++ b/src/calibre/gui2/main_window.py
@@ -3,7 +3,8 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import StringIO, traceback, sys
 
-from PyQt4.Qt import QMainWindow, QString, Qt, QFont, QCoreApplication, SIGNAL
+from PyQt4.Qt import QMainWindow, QString, Qt, QFont, QCoreApplication, SIGNAL,\
+                     QAction, QMenu, QMenuBar, QIcon
 from calibre.gui2.dialogs.conversion_error import ConversionErrorDialog
 from calibre.utils.config import OptionParser
 
@@ -33,6 +34,27 @@ class DebugWindow(ConversionErrorDialog):
         pass    
 
 class MainWindow(QMainWindow):
+
+    _menu_bar = None
+    
+    @classmethod
+    def create_application_menubar(cls):
+        mb = QMenuBar(None)
+        menu = QMenu()
+        for action in cls.get_menubar_actions():
+            menu.addAction(action)
+            yield action
+        mb.addMenu(menu)
+        cls._menu_bar = mb
+        
+    
+    @classmethod
+    def get_menubar_actions(cls):
+        preferences_action = QAction(QIcon(':/images/config.svg'), _('&Preferences'), None)
+        quit_action        = QAction(QIcon(':/images/window-close.svg'), _('&Quit'), None)
+        preferences_action.setMenuRole(QAction.PreferencesRole)
+        quit_action.setMenuRole(QAction.QuitRole)
+        return preferences_action, quit_action
     
     def __init__(self, opts, parent=None):
         QMainWindow.__init__(self, parent)
@@ -58,4 +80,4 @@ class MainWindow(QMainWindow):
             d = ConversionErrorDialog(self, _('ERROR: Unhandled exception'), msg)
             d.exec_()
         except:
-            pass
\ No newline at end of file
+            pass