Mercurial > hg > easyhg
comparison src/mainwindow.cpp @ 666:98a7fbbe9d88 qt5
Merge from default branch, and build fixes
author | Chris Cannam |
---|---|
date | Fri, 27 May 2016 09:55:56 +0100 |
parents | cfe684675e81 |
children | ce29dc775650 |
comparison
equal
deleted
inserted
replaced
663:f9b805d8cab4 | 666:98a7fbbe9d88 |
---|---|
3046 this, SLOT(clearSelections())); | 3046 this, SLOT(clearSelections())); |
3047 } | 3047 } |
3048 | 3048 |
3049 void MainWindow::createMenus() | 3049 void MainWindow::createMenus() |
3050 { | 3050 { |
3051 #ifdef Q_OS_LINUX | |
3052 // In Ubuntu 14.04 the window's menu bar goes missing entirely if | |
3053 // the user is running any desktop environment other than Unity | |
3054 // (in which the faux single-menubar appears). The user has a | |
3055 // workaround, to remove the appmenu-qt5 package, but that is | |
3056 // awkward and the problem is so severe that it merits disabling | |
3057 // the system menubar integration altogether. Like this: | |
3058 menuBar()->setNativeMenuBar(false); | |
3059 #endif | |
3060 | |
3051 m_fileMenu = menuBar()->addMenu(tr("&File")); | 3061 m_fileMenu = menuBar()->addMenu(tr("&File")); |
3052 | 3062 |
3053 m_fileMenu->addAction(m_openAct); | 3063 m_fileMenu->addAction(m_openAct); |
3054 m_recentMenu = m_fileMenu->addMenu(tr("Open Re¢")); | 3064 m_recentMenu = m_fileMenu->addMenu(tr("Open Re¢")); |
3055 m_fileMenu->addAction(m_hgRefreshAct); | 3065 m_fileMenu->addAction(m_hgRefreshAct); |