# HG changeset patch
# User Chris Cannam
# Date 1425375239 0
# Node ID 3c88bf74959d372db4c0d377e525b4d7fee50c01
# Parent  6d3220e7ecef19cd5ccc35384243d1711458224e# Parent  fbe7565f4ce6b9d9df77ae3117d03660232d4ef0
Merge from default branch

diff -r 6d3220e7ecef -r 3c88bf74959d .hgsubstate
--- a/.hgsubstate	Mon Feb 09 10:31:07 2015 +0000
+++ b/.hgsubstate	Tue Mar 03 09:33:59 2015 +0000
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds
-7a671befc76df9b87b00c9eea4bb603c773966ec svapp
-ce1077bd663a337219375ed92b7f5564df7aa553 svcore
-2be9753651c8df0fd499a294811a30278a6e5ea2 svgui
+720f732e8082eec24508cc87df604de4d7950d95 svapp
+bf0e5944289bb56c34e7ee545483374b0b85d5c0 svcore
+1fc4f29feb2e530c4d76430050181f5aea4157ad svgui
diff -r 6d3220e7ecef -r 3c88bf74959d deploy/win32/build.cmd
--- a/deploy/win32/build.cmd	Mon Feb 09 10:31:07 2015 +0000
+++ b/deploy/win32/build.cmd	Tue Mar 03 09:33:59 2015 +0000
@@ -1,7 +1,7 @@
 @ECHO OFF
-SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.8\bin"
+SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.9\bin"
 IF NOT EXIST %WIXPATH% (
-    SET WIXPATH="C:\Program Files\WiX Toolset v3.8\bin"
+    SET WIXPATH="C:\Program Files\WiX Toolset v3.9\bin"
 )
 DEL sonic-visualiser.msi
 %WIXPATH%\candle.exe -v sonic-visualiser.wxs
diff -r 6d3220e7ecef -r 3c88bf74959d deploy/win32/sonic-visualiser.wxs
--- a/deploy/win32/sonic-visualiser.wxs	Mon Feb 09 10:31:07 2015 +0000
+++ b/deploy/win32/sonic-visualiser.wxs	Tue Mar 03 09:33:59 2015 +0000
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="2.4"
+      Version="2.5.0"
       UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
       Manufacturer="Queen Mary, University of London">
     
@@ -144,20 +144,20 @@
                   DiskId="1"
                   Source="release\Qt5Xml.dll"/>
               <File
-                  Id="icudt52"
-                  Name="icudt52.dll"
+                  Id="icudt53"
+                  Name="icudt53.dll"
                   DiskId="1"
-                  Source="release\icudt52.dll"/>
+                  Source="release\icudt53.dll"/>
               <File
-                  Id="icuin52"
-                  Name="icuin52.dll"
+                  Id="icuin53"
+                  Name="icuin53.dll"
                   DiskId="1"
-                  Source="release\icuin52.dll"/>
+                  Source="release\icuin53.dll"/>
               <File
-                  Id="icuuc52"
-                  Name="icuuc52.dll"
+                  Id="icuuc53"
+                  Name="icuuc53.dll"
                   DiskId="1"
-                  Source="release\icuuc52.dll"/>
+                  Source="release\icuuc53.dll"/>
               <File
                   Id="libgcc"
                   Name="libgcc_s_dw2-1.dll"
@@ -228,8 +228,9 @@
       <UIRef Id="WixUI_InstallDir" />
       <UIRef Id="WixUI_ErrorProgressText" />
     </UI>
-		
+
     <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
+    <Property Id="WIXUI_DONTVALIDATEPATH" Value="1" />
     <Property Id="ApplicationFolderName" Value="Sonic Visualiser" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
     <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
diff -r 6d3220e7ecef -r 3c88bf74959d main/MainWindow.cpp
--- a/main/MainWindow.cpp	Mon Feb 09 10:31:07 2015 +0000
+++ b/main/MainWindow.cpp	Tue Mar 03 09:33:59 2015 +0000
@@ -108,6 +108,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QTextStream>
+#include <QTextCodec>
 #include <QProcess>
 #include <QShortcut>
 #include <QSettings>
@@ -2726,6 +2727,7 @@
             error = tr("Failed to open file %1 for writing").arg(path);
         } else {
             QTextStream out(&file);
+            out.setCodec(QTextCodec::codecForName("UTF-8"));
             out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 << "<!DOCTYPE sonic-visualiser>\n"
                 << "<sv>\n"
diff -r 6d3220e7ecef -r 3c88bf74959d main/PreferencesDialog.cpp
--- a/main/PreferencesDialog.cpp	Mon Feb 09 10:31:07 2015 +0000
+++ b/main/PreferencesDialog.cpp	Tue Mar 03 09:33:59 2015 +0000
@@ -292,6 +292,14 @@
     connect(ttMode, SIGNAL(currentIndexChanged(int)),
             this, SLOT(timeToTextModeChanged(int)));
 
+    QCheckBox *hms = new QCheckBox;
+    int showHMS = prefs->getPropertyRangeAndValue
+        ("Show Hours And Minutes", &min, &max, &deflt);
+    m_showHMS = (showHMS != 0);
+    hms->setCheckState(m_showHMS ? Qt::Checked : Qt::Unchecked);
+    connect(hms, SIGNAL(stateChanged(int)),
+            this, SLOT(showHMSChanged(int)));
+    
     // General tab
 
     QFrame *frame = new QFrame;
@@ -342,6 +350,11 @@
     row = 0;
 
     subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
+                                                ("Show Splash Screen"))),
+                       row, 0);
+    subgrid->addWidget(showSplash, row++, 1, 1, 1);
+
+    subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
                                                 ("Property Box Layout"))),
                        row, 0);
     subgrid->addWidget(propertyLayout, row++, 1, 1, 2);
@@ -364,9 +377,9 @@
     subgrid->addWidget(ttMode, row++, 1, 1, 2);
 
     subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
-                                                ("Show Splash Screen"))),
+                                                ("Show Hours And Minutes"))),
                        row, 0);
-    subgrid->addWidget(showSplash, row++, 1, 1, 1);
+    subgrid->addWidget(hms, row++, 1, 1, 1);
 
     subgrid->setRowStretch(row, 10);
     
@@ -609,6 +622,13 @@
 }
 
 void
+PreferencesDialog::showHMSChanged(int state)
+{
+    m_showHMS = (state == Qt::Checked);
+    m_applyButton->setEnabled(true);
+}
+
+void
 PreferencesDialog::octaveSystemChanged(int system)
 {
     m_octaveSystem = system;
@@ -647,6 +667,7 @@
     prefs->setTemporaryDirectoryRoot(m_tempDirRoot);
     prefs->setBackgroundMode(Preferences::BackgroundMode(m_backgroundMode));
     prefs->setTimeToTextMode(Preferences::TimeToTextMode(m_timeToTextMode));
+    prefs->setShowHMS(m_showHMS);
     prefs->setViewFontSize(m_viewFontSize);
     
     prefs->setProperty("Octave Numbering System", m_octaveSystem);
diff -r 6d3220e7ecef -r 3c88bf74959d main/PreferencesDialog.h
--- a/main/PreferencesDialog.h	Mon Feb 09 10:31:07 2015 +0000
+++ b/main/PreferencesDialog.h	Tue Mar 03 09:33:59 2015 +0000
@@ -57,6 +57,7 @@
     void tempDirRootChanged(QString root);
     void backgroundModeChanged(int mode);
     void timeToTextModeChanged(int mode);
+    void showHMSChanged(int state);
     void octaveSystemChanged(int system);
     void viewFontSizeChanged(int sz);
     void showSplashChanged(int state);
@@ -97,6 +98,7 @@
     QString m_tempDirRoot;
     int m_backgroundMode;
     int m_timeToTextMode;
+    bool m_showHMS;
     int m_octaveSystem;
     int m_viewFontSize;
     bool m_showSplash;
diff -r 6d3220e7ecef -r 3c88bf74959d main/main.cpp
--- a/main/main.cpp	Mon Feb 09 10:31:07 2015 +0000
+++ b/main/main.cpp	Tue Mar 03 09:33:59 2015 +0000
@@ -20,6 +20,7 @@
 #include "base/TempDirectory.h"
 #include "base/PropertyContainer.h"
 #include "base/Preferences.h"
+#include "data/fileio/FileSource.h"
 #include "widgets/TipDialog.h"
 #include "widgets/InteractiveFileFinder.h"
 #include "svapp/framework/TransformUserConfigurator.h"
@@ -457,6 +458,8 @@
     settings.endGroup();
 #endif
 
+    FileSource::debugReport();
+    
     delete gui;
 
     cleanupMutex.unlock();
diff -r 6d3220e7ecef -r 3c88bf74959d version.h
--- a/version.h	Mon Feb 09 10:31:07 2015 +0000
+++ b/version.h	Tue Mar 03 09:33:59 2015 +0000
@@ -1,1 +1,1 @@
-#define SV_VERSION "2.4.1"
+#define SV_VERSION "2.4"