Mercurial > hg > sonic-visualiser
comparison main/MainWindow.cpp @ 1390:4c5533df5d72 levelpanwidget
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Mon, 05 Dec 2016 17:03:09 +0000 |
parents | 05d35ce6ea72 7b058ba5fa67 |
children | 3e2dee09c10c |
comparison
equal
deleted
inserted
replaced
1386:05d35ce6ea72 | 1390:4c5533df5d72 |
---|---|
1070 connect(action, SIGNAL(triggered()), this, SLOT(showUnitConverter())); | 1070 connect(action, SIGNAL(triggered()), this, SLOT(showUnitConverter())); |
1071 menu->addAction(action); | 1071 menu->addAction(action); |
1072 | 1072 |
1073 menu->addSeparator(); | 1073 menu->addSeparator(); |
1074 | 1074 |
1075 #ifndef Q_OS_MAC | |
1076 // Only on non-Mac platforms -- on the Mac this interacts very | |
1077 // badly with the "native" full-screen mode | |
1075 action = new QAction(tr("Go Full-Screen"), this); | 1078 action = new QAction(tr("Go Full-Screen"), this); |
1076 action->setShortcut(tr("F11")); | 1079 action->setShortcut(tr("F11")); |
1077 action->setStatusTip(tr("Expand the pane area to the whole screen")); | 1080 action->setStatusTip(tr("Expand the pane area to the whole screen")); |
1078 connect(action, SIGNAL(triggered()), this, SLOT(goFullScreen())); | 1081 connect(action, SIGNAL(triggered()), this, SLOT(goFullScreen())); |
1079 m_keyReference->registerShortcut(action); | 1082 m_keyReference->registerShortcut(action); |
1080 menu->addAction(action); | 1083 menu->addAction(action); |
1084 #endif | |
1081 } | 1085 } |
1082 | 1086 |
1083 void | 1087 void |
1084 MainWindow::setupPaneAndLayerMenus() | 1088 MainWindow::setupPaneAndLayerMenus() |
1085 { | 1089 { |