Fix #1321 (Right-click on button bar gives empty option that removed button bar)

src/calibre/gui2/dialogs/scheduler.py

@@ -334,9 +334,9 @@ class Scheduler(QObject):
     def customize_feeds(self, *args):
         main = self.main
         d = UserProfiles(main, main.library_view.model().db.get_feeds())
-        if d.exec_() == QDialog.Accepted:
+        d.exec_()
-            feeds = tuple(d.profiles())
+        feeds = tuple(d.profiles())
-            main.library_view.model().db.set_feeds(feeds)
+        main.library_view.model().db.set_feeds(feeds)
             
     
     def debug(self, *args):

src/calibre/gui2/dialogs/user_profiles.ui

@@ -23,7 +23,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close</set>
      </property>
     </widget>
    </item>

src/calibre/gui2/main.py

@@ -110,6 +110,9 @@ class Main(MainWindow, Ui_MainWindow):
             if r == QSystemTrayIcon.Trigger:
                 self.hide() if self.isVisible() else self.show()
         self.connect(self.system_tray_icon, SIGNAL('activated(QSystemTrayIcon::ActivationReason)'), sta)
+        def tcme(self, *args):
+            print args
+        self.tool_bar.contextMenuEvent = tcme
         ####################### Location View ########################
         QObject.connect(self.location_view, SIGNAL('location_selected(PyQt_PyObject)'),
                         self.location_selected)

src/calibre/gui2/main.ui

@@ -16,6 +16,9 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="contextMenuPolicy" >
+   <enum>Qt::NoContextMenu</enum>
+  </property>
   <property name="windowTitle" >
    <string>__appname__</string>
   </property>
@@ -412,6 +415,9 @@
      <height>0</height>
     </size>
    </property>
+   <property name="contextMenuPolicy" >
+    <enum>Qt::PreventContextMenu</enum>
+   </property>
    <property name="movable" >
     <bool>false</bool>
    </property>