# HG changeset patch
# User Chris Cannam
# Date 1386800409 0
# Node ID 60d3575f8016db7080154978c6457d37ca43dbbb
# Parent  bfd68cc71a251eba0ecf8c3c630f72c746f223e6# Parent  242ebf1db0f16582b883d65ae80df99c613b99a7
Merge from default branch

diff -r bfd68cc71a25 -r 60d3575f8016 .hgsubstate
--- a/.hgsubstate	Thu Dec 05 10:57:51 2013 +0000
+++ b/.hgsubstate	Wed Dec 11 22:20:09 2013 +0000
@@ -1,5 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
 47964f188bd9cb2a75ad5c3783a86db76950a392 svapp
-c2a399f9384327b2e20c8660c35002b2a73c1e66 svcore
+786ee8d1f30e4920f361419a75eafa079ec0160d svcore
 97ea68f62c1f22c3732f939c512219426658efaf svgui
diff -r bfd68cc71a25 -r 60d3575f8016 CHANGELOG
--- a/CHANGELOG	Thu Dec 05 10:57:51 2013 +0000
+++ b/CHANGELOG	Wed Dec 11 22:20:09 2013 +0000
@@ -1,28 +1,66 @@
+
+
+Changes in Sonic Visualiser 2.3 since the previous release 2.2:
+
+ - Add a startup welcome dialog that also explains what SV makes
+   network connections for and allows user to forbid them
+
+ - Add "Export Audio Data" feature
+
+ - Show piano keyboard scale in note and time-value layers as well
+   as spectrogram, where vertical scale is log Hz; also show
+   numerical scale in note and region layers when not auto-aligned
+
+ - Speed up CSV file import and avoid showing crazily wide window
+   for CSV file format dialog when file has lots of columns
+
+ - Fix incorrectly saved window geometry when exiting from maximised
+   state
+
+ - Reduce number of timer wakeups when idle
+
+ - Add American English translation and make choice of translation
+   into a preference (defaulting to system locale)
+
+ - Permit installation to non-default location with Windows installer
+   build
+	
 
 Changes in Sonic Visualiser 2.2 since the previous release 2.1:
 
  - Build with support for hidpi ("retina") text on OS/X
+
  - Fix very slow analysis when using Ogg or FLAC files decoded
    via libsndfile
+
  - Fix inaccurate scale auto-align between time-value layers and
    others
+
  - Fix failure to open files specified on command line (or via
    Open With) on Windows
+
  - Reset cyclical counters and switch back to navigate mode when
    a new session is started
 
+
 Changes in Sonic Visualiser 2.1 since the previous release 2.0.1:
 
  - Fix incorrect handling of FixedSampleRate outputs (Vamp SDK fix)
+
  - Make it easier to see results from transforms that return a single point
+
  - Make labelling clearer on time-value layers
+
  - Add discrete-curve mode for time-value layers (for curves with gaps)
+
  - Update code to build against Qt5
 
+
 Changes in Sonic Visualiser 2.0.1 since the previous release 2.0:
 
  - Fix incorrect samplerate in reading m4a files on OS/X
 
+
 Changes in Sonic Visualiser 2.0 since the previous release 1.9:
 
  - Support 64-bit builds on OS/X (using CoreAudio instead of
@@ -34,6 +72,7 @@
 
  - Add a fullscreen mode on the F11 key
 
+
 Changes in Sonic Visualiser 1.9 since the previous release 1.8:
 
  - Add session templates; save session as template; apply template to
@@ -44,6 +83,7 @@
 
  - Various bug fixes.
 
+
 Changes in Sonic Visualiser 1.8 since the previous release 1.7.2:
 
  - Sonic Visualiser now registers as a file type handler on OS/X,
@@ -73,6 +113,7 @@
 
  - A Czech translation is now included (thanks to Pavel Fric).
 
+
 Changes in Sonic Visualiser 1.7.2 since the previous release 1.7.1:
 
  - The time-value layer now has an origin line and an option to
@@ -85,6 +126,7 @@
  - A crash when pressing Play straight after New Session has been
  fixed
 
+
 Changes in Sonic Visualiser 1.7.1 since the previous release 1.7:
 
  - The RDF importer does a better job of assigning labels to layers,
@@ -101,6 +143,7 @@
 
  - The Russian translation has been updated (thanks Alexandre)
 
+
 Changes in Sonic Visualiser 1.7 since the previous release 1.6:
 
  - A new "Insert Item At Selection" function on the Edit menu
@@ -123,6 +166,7 @@
 
  - Various other bug fixes.
 
+
 Changes in Sonic Visualiser 1.6 since the previous release 1.5:
 
  - The Colour 3D Plot layer now supports logarithmic vertical
@@ -136,6 +180,7 @@
 
  - Various other bug fixes.
 
+
 Changes in Sonic Visualiser 1.5 since the previous version 1.4:
 
  - You can now insert time instants, time values, and notes using
@@ -206,6 +251,7 @@
 
  - Several crashes and other bugs have been fixed.
 
+
 Changes in Sonic Visualiser 1.3 since the previous version 1.2:
 
  - There is a new spreadsheet-style data viewer and editor for
@@ -224,6 +270,7 @@
 
  - Several other bug fixes.
 
+
 New features in Sonic Visualiser 1.2, since the previous version 1.0:
 
  - SV now supports time-alignment of multiple performances of a work
diff -r bfd68cc71a25 -r 60d3575f8016 deploy/osx/sign.sh
--- a/deploy/osx/sign.sh	Thu Dec 05 10:57:51 2013 +0000
+++ b/deploy/osx/sign.sh	Wed Dec 11 22:20:09 2013 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 
 # Execute this from the top-level directory of the project (the one
 # that contains the .app bundle).  Supply the name of the .app bundle
@@ -11,8 +11,14 @@
 	exit 2
 fi
 for app in "$dir"/*.app; do
+    find "$app" -name Qt\* -print | while read fr; do
+	codesign -s "Developer ID Application: Chris Cannam" -fv "$fr"
+    done
+    find "$app" -name \*.dylib -print | while read fr; do
+	codesign -s "Developer ID Application: Chris Cannam" -fv "$fr"
+    done
     codesign -s "Developer ID Application: Chris Cannam" -fv \
-         --requirements '=designated =>  identifier "org.sonicvisualiser.SonicVisualiser" and ( (anchor apple generic and    certificate leaf[field.1.2.840.113635.100.6.1.9] ) or (anchor apple generic and    certificate 1[field.1.2.840.113635.100.6.2.6]  and    certificate leaf[field.1.2.840.113635.100.6.1.13] and    certificate leaf[subject.OU] = "43AQ936H96"))' \
+         --requirements '=designated =>  identifier "org.sonicvisualiser.SonicVisualiser" and ( (anchor apple generic and    certificate leaf[field.1.2.840.113635.100.6.1.9] ) or (anchor apple generic and    certificate 1[field.1.2.840.113635.100.6.2.6]  and    certificate leaf[field.1.2.840.113635.100.6.1.13] and    certificate leaf[subject.OU] = "M2H8666U82"))' \
          "$app"
 done
 
diff -r bfd68cc71a25 -r 60d3575f8016 main/NetworkPermissionTester.cpp
--- a/main/NetworkPermissionTester.cpp	Thu Dec 05 10:57:51 2013 +0000
+++ b/main/NetworkPermissionTester.cpp	Wed Dec 11 22:20:09 2013 +0000
@@ -74,7 +74,7 @@
 	
 	d.exec();
 
-	bool permish = cb->isChecked();
+        permish = cb->isChecked();
 	settings.setValue(tag, permish);
     }
 
diff -r bfd68cc71a25 -r 60d3575f8016 main/main.cpp
--- a/main/main.cpp	Thu Dec 05 10:57:51 2013 +0000
+++ b/main/main.cpp	Wed Dec 11 22:20:09 2013 +0000
@@ -250,6 +250,13 @@
 #endif
 #endif
 
+#ifdef Q_OS_MAC
+    if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_8) {
+        // Fix for OS/X 10.9 font problem
+        QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
+    }
+#endif
+
     SVApplication application(argc, argv);
 
     QStringList args = application.arguments();