Merge commit '30477f49f846c77193418f31653cb692bcdf58b2' into feature/launcherconfigs

* commit '30477f49f846c77193418f31653cb692bcdf58b2':
  * Launcher checkbox colors are green (not so bright) or grey (not red) * Changed "Cancel" button to "Exit"
This commit is contained in:
Matthew Territo
2017-02-20 08:39:36 -07:00
2 changed files with 3 additions and 4 deletions

View File

@@ -136,7 +136,7 @@ MainWindow::MainWindow()
{
QBoxLayout* innerLayout = new QHBoxLayout;
QPushButton* cancelButton = new QPushButton("Cancel");
QPushButton* cancelButton = new QPushButton("Exit");
QObject::connect(
cancelButton, SIGNAL(clicked(bool)),
QApplication::instance(), SLOT(quit())