diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index d42bfcc9adc843353abb31a485db8cf55f711241..0636532ddd46c4a6935261ddd6b0815e0038704d 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -186,15 +186,8 @@ void MainWindow::init() // Setup user interface ui.setupUi(this); - hide(); menuActionHelper->setMenu(ui.menuTools); - // Qt 4 on Ubuntu does place the native menubar correctly so on Linux we revert back to in-window menu bar. - // TODO: Check that this is still necessary on Qt5 on Ubuntu -#ifdef Q_OS_LINUX - menuBar()->setNativeMenuBar(false); -#endif - // Set dock options setDockOptions(AnimatedDocks | AllowTabbedDocks | AllowNestedDocks); @@ -203,6 +196,12 @@ void MainWindow::init() // Setup corners setCorner(Qt::BottomRightCorner, Qt::BottomDockWidgetArea); + // Qt 4 on Ubuntu does place the native menubar correctly so on Linux we revert back to in-window menu bar. + // TODO: Check that this is still necessary on Qt5 on Ubuntu +#ifdef Q_OS_LINUX + menuBar()->setNativeMenuBar(false); +#endif + // Setup UI state machines centerStackActionGroup->setExclusive(true); diff --git a/src/ui/main/QGCWelcomeMainWindow.cc b/src/ui/main/QGCWelcomeMainWindow.cc index 721f4995ce430e1e656c8d7fc66baf710dfb2f2a..862ce88af6eb429b0786932a6bd04329a79a3327 100644 --- a/src/ui/main/QGCWelcomeMainWindow.cc +++ b/src/ui/main/QGCWelcomeMainWindow.cc @@ -9,7 +9,6 @@ QGCWelcomeMainWindow::QGCWelcomeMainWindow(QWidget *parent) : storeSettings(false) { ui->setupUi(this); - statusBar()->hide(); QString windowname = qApp->applicationName() + " " + qApp->applicationVersion(); setWindowTitle(windowname); diff --git a/src/ui/main/QGCWelcomeMainWindow.ui b/src/ui/main/QGCWelcomeMainWindow.ui index 5ef45995f3fddcbf643a67f60845d7435bf5a98b..e4b0441e843077c33b8fbde0cc308d9f96917453 100644 --- a/src/ui/main/QGCWelcomeMainWindow.ui +++ b/src/ui/main/QGCWelcomeMainWindow.ui @@ -1,7 +1,5 @@ + - - - QGCWelcomeMainWindow @@ -15,10 +13,8 @@ MainWindow - - - +