Merge branch 'release/0.2'

i-score-old · Jan 26, 2015 · ca6ac3c · ca6ac3c
2 parents 524f00f + 16b61b7
commit ca6ac3c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -325,11 +325,11 @@ if(UNIX)
 		set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images/i-score.icns")
 
 		install(DIRECTORY installer_data/examples
-			DESTINATION Examples)
+			DESTINATION .)
 		install(DIRECTORY installer_data/documentation
-			DESTINATION Documentation)
+			DESTINATION .)
 		install(DIRECTORY installer_data/Licenses
-			DESTINATION Licenses)
+			DESTINATION .)
 
 		install(CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/deploy_osx.sh)")
 	else()

diff --git a/deploy_osx.sh b/deploy_osx.sh
@@ -30,7 +30,7 @@ cp -rf /usr/local/lib/libportmidi.dylib $ISCORE_BUNDLE/Contents/Frameworks/
 install_name_tool -change /usr/local/lib/libportmidi.dylib @executable_path/../Frameworks/libportmidi.dylib $ISCORE_BUNDLE/Contents/Frameworks/jamoma/extensions/MIDI.ttdylib
 
 # Gecode linking
-GECODE_DIR=$(dirname $(find /usr/ -name libgecodekernel*.dylib))
+GECODE_DIR=$(dirname $(find /usr -name libgecodekernel.dylib ! -path "*Cellar*"|head -1))
 declare -a gecodelibs=("kernel" "support" "int" "set" "driver" "flatzinc" "minimodel" "search" "float")
 for GECODE_LIB in "${gecodelibs[@]}"
 do

diff --git a/src/GUI/DeviceEdit.cpp b/src/GUI/DeviceEdit.cpp
@@ -345,7 +345,6 @@ void DeviceEdit::setCorrespondingProtocolLayout()
 {
     if(_protocolsComboBox->currentText() == "OSC")
     {
-      defaultName = "OSCdevice";
       defaultPort = 9997;
       defaultInputPort = 9996;
 
@@ -354,23 +353,19 @@ void DeviceEdit::setCorrespondingProtocolLayout()
     }
     else if (_protocolsComboBox->currentText() == "Minuit")
     {
-      defaultName = "MinuitDevice";
       defaultPort = 9998;
       defaultInputPort = 13579;
       setMinuitLayout();
 
     }
     else if (_protocolsComboBox->currentText() == "MIDI")
     {
-      defaultName = "MIDIDevice";
       setMidiLayout();
     }
 
     _localHostBox->setText(defaultLocalHost);
     _portOutputBox->setValue(defaultPort);
     _portInputBox->setValue(defaultInputPort);
-    checkName(defaultName);
-    _nameEdit->setText(defaultName);
     _nameEdit->setFocus();
 }
 

diff --git a/src/GUI/TriggerPointEdit.cpp b/src/GUI/TriggerPointEdit.cpp
@@ -7,7 +7,7 @@ TriggerPointEdit::TriggerPointEdit(AbstractTriggerPoint *abstract, QWidget *pare
     : QDialog(parent)
 {
     setModal(true);
-
+    setWindowFlags(Qt::WindowStaysOnTopHint);
     _abstract = abstract;
     _expressionChanged = false;
     _autoTriggerChanged = false;