From a03d6f8d80a93c752d128acd5c9ea47e749581df Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 22 May 2013 12:55:46 -0700 Subject: [PATCH] moved pair to own menu --- interface/src/Application.cpp | 4 +++- interface/src/Transmitter.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e6119a71e7..d56163e170 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1192,8 +1192,10 @@ void Application::initMenu() { _window->setMenuBar(menuBar); QMenu* fileMenu = menuBar->addMenu("File"); - fileMenu->addAction("Pair", this, SLOT(pair())); fileMenu->addAction("Quit", this, SLOT(quit()), Qt::Key_Q); + + QMenu* pairMenu = menuBar->addMenu("Pair"); + pairMenu->addAction("Pair", this, SLOT(pair())); QMenu* optionsMenu = menuBar->addMenu("Options"); (_lookingInMirror = optionsMenu->addAction("Mirror", this, SLOT(setHead(bool)), Qt::Key_H))->setCheckable(true); diff --git a/interface/src/Transmitter.cpp b/interface/src/Transmitter.cpp index da1f4b1432..d489e84d49 100644 --- a/interface/src/Transmitter.cpp +++ b/interface/src/Transmitter.cpp @@ -12,7 +12,7 @@ #include #include #include "Log.h" -#include +#include const float DELTA_TIME = 1.f / 60.f; const float DECAY_RATE = 0.15f;