# HG changeset patch
# User mathieub <mathieu.barthet@eecs.qmul.ac.uk>
# Date 1300804178 0
# Node ID d70890996156935f95ac358aacba2e7dca3be9ec
# Parent  5c4943eae1663212e3b08378980ffc46412043ae
Modifications for the Kiosk edition

diff -r 5c4943eae166 -r d70890996156 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Mon Oct 25 11:15:47 2010 +0200
+++ b/main/MainWindow.cpp	Tue Mar 22 14:29:38 2011 +0000
@@ -161,7 +161,7 @@
 {
     Profiler profiler("MainWindow::MainWindow");
 
-    setWindowTitle(tr("Sonic Visualiser"));
+    setWindowTitle(tr("Sonic Visualiser (Kiosk edition)"));
 
     UnitDatabase *udb = UnitDatabase::getInstance();
     udb->registerUnit("Hz");
@@ -442,6 +442,7 @@
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
 
+    /* //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()));
@@ -449,6 +450,7 @@
     menu->addAction(action);
 
     menu->addSeparator();
+    */
 
     action = new QAction(tr("Import Annotation &Layer..."), this);
     action->setShortcut(tr("Ctrl+L"));
@@ -2157,6 +2159,7 @@
     }
 }
 
+/*
 void
 MainWindow::exportAudio()
 {
@@ -2324,6 +2327,7 @@
 	QMessageBox::critical(this, tr("Failed to write file"), error);
     }
 }
+*/
 
 void
 MainWindow::importLayer()
@@ -2619,7 +2623,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();
@@ -2989,7 +2993,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();
@@ -3972,8 +3976,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 5c4943eae166 -r d70890996156 main/MainWindow.h
--- a/main/MainWindow.h	Mon Oct 25 11:15:47 2010 +0200
+++ b/main/MainWindow.h	Tue Mar 22 14:29:38 2011 +0000
@@ -83,7 +83,7 @@
     virtual void openSomething();
     virtual void openLocation();
     virtual void openRecentFile();
-    virtual void exportAudio();
+    //virtual void exportAudio(); //removes the Export Audio File functionnality from the File menu
     virtual void importLayer();
     virtual void exportLayer();
     virtual void exportImage();
diff -r 5c4943eae166 -r d70890996156 main/main.cpp
--- a/main/main.cpp	Mon Oct 25 11:15:47 2010 +0200
+++ b/main/main.cpp	Tue Mar 22 14:29:38 2011 +0000
@@ -234,7 +234,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]).toStdString() << 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);
     }
 
@@ -243,7 +243,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;