# HG changeset patch
# User mathieub <mathieu.barthet@eecs.qmul.ac.uk>
# Date 1311619130 -3600
# Node ID b3b9cc8f546682c355bdf0f26dc8ebb8fd6f36e7
# Parent  0ef4943f55ae539ff68cf1eaedc70820bd6f9c2b# Parent  d70890996156935f95ac358aacba2e7dca3be9ec
Merge with the Kiosk branch

diff -r 0ef4943f55ae -r b3b9cc8f5466 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Thu Jul 21 15:49:00 2011 +0100
+++ b/main/MainWindow.cpp	Mon Jul 25 19:38:50 2011 +0100
@@ -167,7 +167,7 @@
 {
     Profiler profiler("MainWindow::MainWindow");
 
-    setWindowTitle(tr("Sonic Visualiser"));
+    setWindowTitle(tr("Sonic Visualiser (Kiosk edition)"));
 
     UnitDatabase *udb = UnitDatabase::getInstance();
     udb->registerUnit("Hz");
@@ -470,6 +470,7 @@
     // the Import action we made earlier
     menu->addAction(iaction);
 
+    /* //removes the Export Audio File functionnality from the File menu
     action = new QAction(tr("&Export Audio File..."), this);
     action->setStatusTip(tr("Export selection as an audio file"));
     connect(action, SIGNAL(triggered()), this, SLOT(exportAudio()));
@@ -477,6 +478,7 @@
     menu->addAction(action);
 
     menu->addSeparator();
+    */
 
     action = new QAction(tr("Import Annotation &Layer..."), this);
     action->setShortcut(tr("Ctrl+L"));
@@ -2255,6 +2257,7 @@
     }
 }
 
+/*
 void
 MainWindow::exportAudio()
 {
@@ -2424,6 +2427,7 @@
 	QMessageBox::critical(this, tr("Failed to write file"), error);
     }
 }
+*/
 
 void
 MainWindow::importLayer()
@@ -2719,7 +2723,7 @@
     m_timeRulerLayer = 0; // document owned this
 
     m_sessionFile = "";
-    setWindowTitle(tr("Sonic Visualiser"));
+    setWindowTitle(tr("Sonic Visualiser (Kiosk edition)"));
 
     CommandHistory::getInstance()->clear();
     CommandHistory::getInstance()->documentSaved();
@@ -3153,7 +3157,7 @@
 	QMessageBox::critical(this, tr("Failed to save file"),
 			      tr("<b>Save failed</b><p>Session file \"%1\" could not be saved.").arg(path));
     } else {
-	setWindowTitle(tr("Sonic Visualiser: %1")
+	setWindowTitle(tr("Sonic Visualiser (Kiosk edition): %1")
 		       .arg(QFileInfo(path).fileName()));
 	m_sessionFile = path;
 	CommandHistory::getInstance()->documentSaved();
@@ -4144,8 +4148,8 @@
 
     QString aboutText;
 
-    aboutText += tr("<h3>About Sonic Visualiser</h3>");
-    aboutText += tr("<p>Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation.<br><a href=\"http://www.sonicvisualiser.org/\">http://www.sonicvisualiser.org/</a></p>");
+    aboutText += tr("<h3>About Sonic Visualiser (Kiosk edition)</h3>");
+    aboutText += tr("<p>Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation. The Kiosk edition provides all of the features of the full Sonic Visualiser, except that audio files cannot be saved from it. <br><a href=\"http://www.sonicvisualiser.org/\">http://www.sonicvisualiser.org/</a></p>");
     aboutText += tr("<p><small>%1 : %2 configuration</small></p>")
         .arg(version)
         .arg(debug ? tr("Debug") : tr("Release"));
diff -r 0ef4943f55ae -r b3b9cc8f5466 main/MainWindow.h
--- a/main/MainWindow.h	Thu Jul 21 15:49:00 2011 +0100
+++ b/main/MainWindow.h	Mon Jul 25 19:38:50 2011 +0100
@@ -85,7 +85,7 @@
     virtual void openLocation();
     virtual void openRecentFile();
     virtual void applyTemplate();
-    virtual void exportAudio();
+   
     virtual void importLayer();
     virtual void exportLayer();
     virtual void exportImage();
diff -r 0ef4943f55ae -r b3b9cc8f5466 main/main.cpp
--- a/main/main.cpp	Thu Jul 21 15:49:00 2011 +0100
+++ b/main/main.cpp	Mon Jul 25 19:38:50 2011 +0100
@@ -245,7 +245,7 @@
 
     if (args.contains("--help") || args.contains("-h") || args.contains("-?")) {
         std::cerr << QApplication::tr(
-            "\nSonic Visualiser is a program for viewing and exploring audio data\nfor semantic music analysis and annotation.\n\nUsage:\n\n  %1 [--no-audio] [--no-osc] [<file> ...]\n\n  --no-audio: Do not attempt to open an audio output device\n  --no-osc: Do not provide an Open Sound Control port for remote control\n  <file>: One or more Sonic Visualiser (.sv) and audio files may be provided.\n").arg(argv[0]) << std::endl;
+            "\nSonic Visualiser is a program for viewing and exploring audio data\nfor semantic music analysis and annotation. The Kiosk edition provides all of the features of the full Sonic Visualiser, except that audio files cannot be saved from it.\n\nUsage:\n\n  %1 [--no-audio] [--no-osc] [<file> ...]\n\n  --no-audio: Do not attempt to open an audio output device\n  --no-osc: Do not provide an Open Sound Control port for remote control\n  <file>: One or more Sonic Visualiser (.sv) and audio files may be provided.\n").arg(argv[0]).toStdString() << std::endl;
         exit(2);
     }
 
@@ -254,7 +254,7 @@
 
     QApplication::setOrganizationName("sonic-visualiser");
     QApplication::setOrganizationDomain("sonicvisualiser.org");
-    QApplication::setApplicationName(QApplication::tr("Sonic Visualiser"));
+    QApplication::setApplicationName(QApplication::tr("Sonic Visualiser (Kiosk edition)"));
 
     QSplashScreen *splash = 0;