comparison main/MainWindow.cpp @ 779:8b51bfe70625

Fix #1039 (Menu bar missing, under Ubuntu with Gnome 3)
author Chris Cannam
date Mon, 01 Sep 2014 15:55:28 +0100
parents 902756b8d8b1
children 624a8864391e
comparison
equal deleted inserted replaced
777:e546e2261470 779:8b51bfe70625
335 335
336 void 336 void
337 MainWindow::setupMenus() 337 MainWindow::setupMenus()
338 { 338 {
339 if (!m_mainMenusCreated) { 339 if (!m_mainMenusCreated) {
340
341 #ifdef Q_OS_LINUX
342 // In Ubuntu 14.04 the window's menu bar goes missing entirely
343 // if the user is running any desktop environment other than Unity
344 // (in which the faux single-menubar appears). The user has a
345 // workaround, to remove the appmenu-qt5 package, but that is
346 // awkward and the problem is so severe that it merits disabling
347 // the system menubar integration altogether. Like this:
348 menuBar()->setNativeMenuBar(false); // fix #1039
349 #endif
350
340 m_rightButtonMenu = new QMenu(); 351 m_rightButtonMenu = new QMenu();
341 352
342 // No -- we don't want tear-off enabled on the right-button 353 // No -- we don't want tear-off enabled on the right-button
343 // menu. If it is enabled, then simply right-clicking and 354 // menu. If it is enabled, then simply right-clicking and
344 // releasing will pop up the menu, activate the tear-off, and 355 // releasing will pop up the menu, activate the tear-off, and