Skip to content

Commit

Permalink
Added empty file menu to the launch image to reserve screen space
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Jul 27, 2015
1 parent 2a4a0f3 commit 5a657cb
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/mixxx.cpp
Expand Up @@ -116,6 +116,9 @@ MixxxMainWindow::MixxxMainWindow(QApplication* pApp, const CmdlineArgs& args)
logBuildDetails();
initializeWindow();

m_pFileMenu = new QMenu(tr("&File"), menuBar());
menuBar()->addMenu(m_pFileMenu);

// Check to see if this is the first time this version of Mixxx is run
// after an upgrade and make any needed changes.
m_pUpgrader = new Upgrade;
Expand Down Expand Up @@ -1597,15 +1600,17 @@ void MixxxMainWindow::slotUpdateWindowTitle(TrackPointer pTrack) {

void MixxxMainWindow::initMenuBar() {
// MENUBAR
m_pFileMenu = new QMenu(tr("&File"), menuBar());
m_pOptionsMenu = new QMenu(tr("&Options"), menuBar());
m_pLibraryMenu = new QMenu(tr("&Library"),menuBar());
m_pViewMenu = new QMenu(tr("&View"), menuBar());
m_pHelpMenu = new QMenu(tr("&Help"), menuBar());
m_pDeveloperMenu = new QMenu(tr("&Developer"), menuBar());
connect(m_pOptionsMenu, SIGNAL(aboutToShow()),
this, SLOT(slotOptionsMenuShow()));

// menuBar entry fileMenu
// m_pFileMenu is already shown in the launch Image to reserve
// space for the whole menu
m_pFileMenu->addAction(m_pFileLoadSongPlayer1);
m_pFileMenu->addAction(m_pFileLoadSongPlayer2);
m_pFileMenu->addSeparator();
Expand Down Expand Up @@ -1667,7 +1672,6 @@ void MixxxMainWindow::initMenuBar() {
m_pHelpMenu->addSeparator();
m_pHelpMenu->addAction(m_pHelpAboutApp);

menuBar()->addMenu(m_pFileMenu);
menuBar()->addMenu(m_pLibraryMenu);
menuBar()->addMenu(m_pViewMenu);
menuBar()->addMenu(m_pOptionsMenu);
Expand Down

2 comments on commit 5a657cb

@ywwg
Copy link
Member

@ywwg ywwg commented on 5a657cb Aug 23, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broken returning from full screen https://bugs.launchpad.net/mixxx/+bug/1487876

@daschuer
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for pointing that out. I will just have a look.

Please sign in to comment.