From dd598c315ec5a40c7169d043fef36f91df53d759 Mon Sep 17 00:00:00 2001 From: Taka Date: Thu, 4 May 2017 08:06:57 +0000 Subject: [PATCH] Show the View menu in the correct place in the menu bar. --- main_window.py | 9 +++++---- ui/about_widget.ui | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main_window.py b/main_window.py index ff2a7a0..ec90a27 100644 --- a/main_window.py +++ b/main_window.py @@ -2,7 +2,7 @@ import sys import os from PyQt5.QtCore import Qt , QPoint , QSize -from PyQt5.QtWidgets import QApplication , QMainWindow , QVBoxLayout , QHBoxLayout , QWidget , QTabWidget , QLabel +from PyQt5.QtWidgets import QApplication , QMainWindow , QVBoxLayout , QHBoxLayout , QWidget , QTabWidget , QLabel , QMenu from PyQt5.QtWidgets import QMessageBox , QAction from PyQt5.QtGui import QPainter , QPixmap , QIcon , QBrush @@ -74,11 +74,11 @@ class MainWindow( QMainWindow ) : action.setStatusTip( "Close the program." ) action.triggered.connect( self.close ) file_menu.addAction( action ) - help_menu = menu_bar.addMenu( "&Help" ) + self.help_menu = menu_bar.addMenu( "&Help" ) about_action = QAction( "&About" , self ) about_action.setStatusTip( "About this program." ) about_action.triggered.connect( self.on_about ) - help_menu.addAction( about_action ) + self.help_menu.addAction( about_action ) # restore the window geometry buf = globals.app_settings.value( MAINWINDOW_GEOMETRY ) if buf : @@ -137,7 +137,8 @@ class MainWindow( QMainWindow ) : db.open_database( db_fname , False ) globals.cards = db.load_cards() # show the View menu - self.view_menu = self.menuBar().addMenu( "&View" ) + self.view_menu = QMenu( "&View" ) + self.menuBar().insertMenu( self.help_menu.menuAction() , self.view_menu ) self.view_menu.aboutToShow.connect( self.on_about_to_show_view_menu ) # ask the user to add the first card self.add_card_action.setEnabled( True ) diff --git a/ui/about_widget.ui b/ui/about_widget.ui index ad3764b..cc381e8 100644 --- a/ui/about_widget.ui +++ b/ui/about_widget.ui @@ -84,7 +84,7 @@ - 180 + 183 25 21 21