From 833ac77654ef97c5709b619e1f1fd34670a2ad54 Mon Sep 17 00:00:00 2001
From: Alex Montgomery <apmontgo@users.sourceforge.net>
Date: Sun, 8 May 2011 13:55:43 +0100
Subject: [PATCH] fixed "about" box, updated TODO

---
 TODO                  | 13 +++++++++----
 VERSION               |  4 +++-
 main.c                |  2 +-
 qt/src/mainWindow.cpp | 16 +++++++---------
 qt/src/mainWindow.h   |  1 -
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/TODO b/TODO
index 5568477..3839a2b 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,17 @@
-- pass CFLAGS to qt
+- fix XRun on quit
 - thread-proof / separate the listen loop
-- allow 'verbose' to be changed while listening
+- change verbose to dropdown with output levels: normal, verbose, silent
+- allow 'output level' to be changed while listening
 - use XML for settings
 - have listen on startup automatically save to defaults
-- make Help/About work
+- add "what's this?" as a button
+- change icon
 - update NEWS, VERSION
+- add README with advice on configure's parameters and how to call help
 - update screenshots
 - update documentation
 - upload tarball
 - announce
-- make portage file for overlay
+- pass CFLAGS to qt
+- make portage file for pro-audio overlay
+- base prefix on jackd's path?
diff --git a/VERSION b/VERSION
index eca01f2..06a2deb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,3 @@
-QJackMMC / JackCtlMMC version 4 written by Alex Montgomery and Nedko Arnaudov. This application lets you drive JACK transport by connecting devices or programs that send Midi Machine Code.
+// DON'T remove the quotes around this string, QJackMMC relies on them.
+
+"QJackMMC / JackCtlMMC version 4 written by Alex Montgomery and Nedko Arnaudov. This application lets you drive JACK transport by connecting devices or programs that send Midi Machine Code."
diff --git a/main.c b/main.c
index 116e40f..8eb5c1c 100644
--- a/main.c
+++ b/main.c
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
    // read the jitter tolerance, verbose setting, and device frame rate from command line
    process_command_line(argc, argv, &settings);
 
-   printMMCMessage("%s starting with a jitter tolerance of %d milliseconds and a device frame rate of %d per second listening for device %x.\n\n", 
+   printMMCMessage("%s starting with a jitter tolerance of %d milliseconds and a device frame rate of %d per second listening for device %x.\n", 
           argv[0], settings.jitterTolerance, settings.frameRate, settings.deviceID);
 
    // setup our signal handler signalled() above, so we can exit cleanly
diff --git a/qt/src/mainWindow.cpp b/qt/src/mainWindow.cpp
index 8465acd..d2658b7 100644
--- a/qt/src/mainWindow.cpp
+++ b/qt/src/mainWindow.cpp
@@ -82,16 +82,14 @@ void MainWindow::on_actionQuit_triggered()
 
 void MainWindow::on_actionAbout_triggered()
 {
-   QFile aboutFile(QJACKMMC_ABOUT);
-   if (aboutFile.exists() && aboutFile.open(QIODevice::ReadOnly | QIODevice::Text))
-   {
-      QTextStream in(&aboutFile);
-      QString message(in.readLine());
+   QString message;
+   message = QString(
+      #include "../../VERSION"
+            );
       
-      QMessageBox* aboutBox = new QMessageBox(this);
-      aboutBox->setText(message);
-      aboutBox->exec();
-   }
+   QMessageBox* aboutBox = new QMessageBox(this);
+   aboutBox->setText(message);
+   aboutBox->exec();
 }
 
 void MainWindow::on_actionWhat_triggered()
diff --git a/qt/src/mainWindow.h b/qt/src/mainWindow.h
index 34edbb9..77d8f75 100644
--- a/qt/src/mainWindow.h
+++ b/qt/src/mainWindow.h
@@ -30,7 +30,6 @@ class QValidator;
 class SequencerThread;
 
 #define QJACKMMC_CONFIG "/.qjackmmc"
-#define QJACKMMC_ABOUT "VERSION"
 
 class MainWindow : public QMainWindow, public Ui::QjackMMC
 {
-- 
2.11.4.GIT