From 7a6952bbdbcf8bd6573543d1c28e6fa75d50d4e4 Mon Sep 17 00:00:00 2001
From: terminator356 <termtech@rogers.com>
Date: Tue, 7 Jan 2014 02:00:22 -0500
Subject: Instrument can now be changed from trackinfo panel. Tweaks, cleanups.

Midi instrument can now be changed from midi track info panel.
Some minor code tweaks, code cleanup in mtrackinfo.cpp, confmport.cpp.
---
 muse2/muse/widgets/mtrackinfobase.ui | 452 ++++++++++++++++++-----------------
 1 file changed, 234 insertions(+), 218 deletions(-)

(limited to 'muse2/muse/widgets/mtrackinfobase.ui')

diff --git a/muse2/muse/widgets/mtrackinfobase.ui b/muse2/muse/widgets/mtrackinfobase.ui
index f566d207..94bff6e2 100644
--- a/muse2/muse/widgets/mtrackinfobase.ui
+++ b/muse2/muse/widgets/mtrackinfobase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>94</width>
-    <height>417</height>
+    <width>93</width>
+    <height>437</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -59,16 +59,103 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="trackNameLabel">
+   <item row="7" column="0">
+    <widget class="MusEGui::SpinBox" name="iTransp">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Ignored" vsizetype="Minimum">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="specialValueText">
+      <string>off</string>
+     </property>
+     <property name="minimum">
+      <number>-127</number>
+     </property>
+     <property name="maximum">
+      <number>127</number>
+     </property>
+     <property name="value">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="MusEGui::SpinBox" name="iLen">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="suffix">
+      <string>%</string>
+     </property>
+     <property name="minimum">
+      <number>25</number>
+     </property>
+     <property name="maximum">
+      <number>200</number>
+     </property>
+     <property name="value">
+      <number>100</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLabel" name="TextLabel2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Out ch</string>
+     </property>
      <property name="wordWrap">
-      <bool>true</bool>
+      <bool>false</bool>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <property name="indent">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0">
+    <widget class="MusEGui::SpinBox" name="iAnschl">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="baseSize">
+      <size>
+       <width>8</width>
+       <height>5</height>
+      </size>
+     </property>
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="minimum">
+      <number>-127</number>
+     </property>
+     <property name="maximum">
+      <number>127</number>
+     </property>
+     <property name="value">
+      <number>0</number>
      </property>
     </widget>
    </item>
@@ -85,54 +172,42 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="MusEGui::SpinBox" name="iOutputChannel">
+   <item row="8" column="0" rowspan="2">
+    <widget class="MusEGui::SpinBox" name="iVerz">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip">
-      <string>output channel</string>
-     </property>
-     <property name="whatsThis">
-      <string>all midi events are sent to this output channel</string>
-     </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
+     <property name="specialValueText">
+      <string>off</string>
+     </property>
      <property name="minimum">
-      <number>1</number>
+      <number>-1000</number>
      </property>
      <property name="maximum">
-      <number>16</number>
+      <number>1000</number>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QLabel" name="TextLabel2">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="trackNameLabel">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+      <sizepolicy hsizetype="Ignored" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text">
-      <string>Out ch</string>
-     </property>
      <property name="wordWrap">
-      <bool>false</bool>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <property name="indent">
-      <number>1</number>
+      <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="6" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">
       <number>0</number>
@@ -251,33 +326,8 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
-    <widget class="MusEGui::SpinBox" name="iTransp">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="autoFillBackground">
-      <bool>false</bool>
-     </property>
-     <property name="specialValueText">
-      <string>off</string>
-     </property>
-     <property name="minimum">
-      <number>-127</number>
-     </property>
-     <property name="maximum">
-      <number>127</number>
-     </property>
-     <property name="value">
-      <number>1</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1" rowspan="2">
-    <widget class="QLabel" name="TextLabel9">
+   <item row="10" column="1">
+    <widget class="QLabel" name="TextLabel11">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -285,10 +335,10 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>Transpose notes up or down</string>
+      <string>Change note length in percent of actual length</string>
      </property>
      <property name="text">
-      <string>Transp.</string>
+      <string>Length</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
@@ -298,30 +348,30 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" rowspan="2">
-    <widget class="MusEGui::SpinBox" name="iVerz">
+   <item row="9" column="1">
+    <widget class="QLabel" name="TextLabel10">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="autoFillBackground">
-      <bool>false</bool>
+     <property name="toolTip">
+      <string>Offset playback of notes before or after actual note</string>
      </property>
-     <property name="specialValueText">
-      <string>off</string>
+     <property name="text">
+      <string>Delay</string>
      </property>
-     <property name="minimum">
-      <number>-1000</number>
+     <property name="wordWrap">
+      <bool>false</bool>
      </property>
-     <property name="maximum">
-      <number>1000</number>
+     <property name="indent">
+      <number>2</number>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
-    <widget class="QLabel" name="TextLabel10">
+   <item row="7" column="1" rowspan="2">
+    <widget class="QLabel" name="TextLabel9">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -329,10 +379,10 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>Offset playback of notes before or after actual note</string>
+      <string>Transpose notes up or down</string>
      </property>
      <property name="text">
-      <string>Delay</string>
+      <string>Transp.</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
@@ -342,8 +392,8 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
-    <widget class="MusEGui::SpinBox" name="iLen">
+   <item row="12" column="0">
+    <widget class="MusEGui::SpinBox" name="iKompr">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -356,6 +406,9 @@
      <property name="suffix">
       <string>%</string>
      </property>
+     <property name="prefix">
+      <string/>
+     </property>
      <property name="minimum">
       <number>25</number>
      </property>
@@ -367,8 +420,8 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
-    <widget class="QLabel" name="TextLabel11">
+   <item row="16" column="0">
+    <widget class="MusEGui::SpinBox" name="iHBank">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -376,99 +429,80 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>Change note length in percent of actual length</string>
-     </property>
-     <property name="text">
-      <string>Length</string>
-     </property>
-     <property name="wordWrap">
-      <bool>false</bool>
-     </property>
-     <property name="indent">
-      <number>2</number>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0">
-    <widget class="MusEGui::SpinBox" name="iAnschl">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="baseSize">
-      <size>
-       <width>8</width>
-       <height>5</height>
-      </size>
+      <string>Bank Select MSB. Ctrl-double-click on/off.</string>
      </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
+     <property name="specialValueText">
+      <string>off</string>
+     </property>
      <property name="minimum">
-      <number>-127</number>
+      <number>0</number>
      </property>
      <property name="maximum">
-      <number>127</number>
+      <number>128</number>
      </property>
      <property name="value">
       <number>0</number>
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
-    <widget class="QLabel" name="TextLabel12">
+   <item row="16" column="1">
+    <widget class="QLabel" name="TextLabel4">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add or substract velocity to notes on track.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Since the midi note range is 0-127 this &lt;br/&gt;might mean that the notes do not reach &lt;br/&gt;the combined velocity, note + Velocity.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     <property name="lineWidth">
+      <number>1</number>
      </property>
      <property name="text">
-      <string>Velocity</string>
+      <string>H-Bank</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
-     <property name="indent">
+     <property name="margin">
       <number>0</number>
      </property>
+     <property name="indent">
+      <number>2</number>
+     </property>
     </widget>
    </item>
-   <item row="9" column="0">
-    <widget class="MusEGui::SpinBox" name="iKompr">
+   <item row="17" column="0">
+    <widget class="MusEGui::SpinBox" name="iLBank">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="toolTip">
+      <string>Bank Select LSB. Ctrl-double-click on/off.</string>
+     </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
-     <property name="suffix">
-      <string>%</string>
-     </property>
-     <property name="prefix">
-      <string/>
+     <property name="specialValueText">
+      <string>off</string>
      </property>
      <property name="minimum">
-      <number>25</number>
+      <number>0</number>
      </property>
      <property name="maximum">
-      <number>200</number>
+      <number>128</number>
      </property>
      <property name="value">
-      <number>100</number>
+      <number>0</number>
      </property>
     </widget>
    </item>
-   <item row="9" column="1">
-    <widget class="QLabel" name="TextLabel13">
+   <item row="3" column="0">
+    <widget class="MusEGui::SpinBox" name="iOutputChannel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -476,67 +510,45 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>Compress the notes velocity range, in percent of actual velocity</string>
+      <string>output channel</string>
      </property>
-     <property name="text">
-      <string>Compr.</string>
+     <property name="whatsThis">
+      <string>all midi events are sent to this output channel</string>
      </property>
-     <property name="wordWrap">
+     <property name="autoFillBackground">
       <bool>false</bool>
      </property>
-     <property name="indent">
-      <number>2</number>
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>16</number>
      </property>
     </widget>
    </item>
-   <item row="10" column="0" colspan="2">
-    <widget class="QLabel" name="TextLabel1_2">
+   <item row="11" column="1">
+    <widget class="QLabel" name="TextLabel12">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::WinPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <property name="lineWidth">
-      <number>1</number>
-     </property>
-     <property name="midLineWidth">
-      <number>1</number>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add or substract velocity to notes on track.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Since the midi note range is 0-127 this &lt;br/&gt;might mean that the notes do not reach &lt;br/&gt;the combined velocity, note + Velocity.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
-      <string>Channel Info</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <string>Velocity</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
-    </widget>
-   </item>
-   <item row="11" column="0" colspan="2">
-    <widget class="QPushButton" name="iPatch">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip">
-      <string>Select instrument patch</string>
-     </property>
-     <property name="text">
-      <string>&lt;unknown&gt;</string>
+     <property name="indent">
+      <number>0</number>
      </property>
     </widget>
    </item>
-   <item row="12" column="0">
+   <item row="15" column="0">
     <widget class="QLabel" name="textLabel1">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -555,7 +567,7 @@
      </property>
     </widget>
    </item>
-   <item row="12" column="1">
+   <item row="15" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <property name="spacing">
       <number>0</number>
@@ -594,61 +606,55 @@
      </item>
     </layout>
    </item>
-   <item row="13" column="0">
-    <widget class="MusEGui::SpinBox" name="iHBank">
+   <item row="13" column="0" colspan="2">
+    <widget class="QLabel" name="TextLabel1_2">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+      <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip">
-      <string>Bank Select MSB. Ctrl-double-click on/off.</string>
+     <property name="frameShape">
+      <enum>QFrame::WinPanel</enum>
      </property>
-     <property name="autoFillBackground">
-      <bool>false</bool>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
      </property>
-     <property name="specialValueText">
-      <string>off</string>
+     <property name="lineWidth">
+      <number>1</number>
      </property>
-     <property name="minimum">
-      <number>0</number>
+     <property name="midLineWidth">
+      <number>1</number>
      </property>
-     <property name="maximum">
-      <number>128</number>
+     <property name="text">
+      <string>Channel Info</string>
      </property>
-     <property name="value">
-      <number>0</number>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="13" column="1">
-    <widget class="QLabel" name="TextLabel4">
+   <item row="14" column="0" colspan="2">
+    <widget class="QPushButton" name="iPatch">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+      <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="lineWidth">
-      <number>1</number>
+     <property name="toolTip">
+      <string>Select instrument patch</string>
      </property>
      <property name="text">
-      <string>H-Bank</string>
-     </property>
-     <property name="wordWrap">
-      <bool>false</bool>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <property name="indent">
-      <number>2</number>
+      <string>&lt;unknown&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="14" column="0">
-    <widget class="MusEGui::SpinBox" name="iLBank">
+   <item row="12" column="1">
+    <widget class="QLabel" name="TextLabel13">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -656,26 +662,20 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>Bank Select LSB. Ctrl-double-click on/off.</string>
-     </property>
-     <property name="autoFillBackground">
-      <bool>false</bool>
-     </property>
-     <property name="specialValueText">
-      <string>off</string>
+      <string>Compress the notes velocity range, in percent of actual velocity</string>
      </property>
-     <property name="minimum">
-      <number>0</number>
+     <property name="text">
+      <string>Compr.</string>
      </property>
-     <property name="maximum">
-      <number>128</number>
+     <property name="wordWrap">
+      <bool>false</bool>
      </property>
-     <property name="value">
-      <number>0</number>
+     <property name="indent">
+      <number>2</number>
      </property>
     </widget>
    </item>
-   <item row="14" column="1">
+   <item row="17" column="1">
     <widget class="QLabel" name="TextLabel5">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -700,7 +700,7 @@
      </property>
     </widget>
    </item>
-   <item row="15" column="0">
+   <item row="18" column="0">
     <widget class="MusEGui::SpinBox" name="iProgram">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -728,7 +728,7 @@
      </property>
     </widget>
    </item>
-   <item row="15" column="1">
+   <item row="18" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <property name="spacing">
       <number>0</number>
@@ -767,7 +767,7 @@
      </item>
     </layout>
    </item>
-   <item row="16" column="0">
+   <item row="19" column="0">
     <widget class="MusEGui::SpinBox" name="iLautst">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -795,7 +795,7 @@
      </property>
     </widget>
    </item>
-   <item row="16" column="1">
+   <item row="19" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_5">
      <property name="spacing">
       <number>0</number>
@@ -834,7 +834,7 @@
      </item>
     </layout>
    </item>
-   <item row="17" column="0">
+   <item row="20" column="0">
     <widget class="MusEGui::SpinBox" name="iPan">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -865,7 +865,7 @@
      </property>
     </widget>
    </item>
-   <item row="17" column="1">
+   <item row="20" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_6">
      <property name="spacing">
       <number>0</number>
@@ -904,7 +904,7 @@
      </item>
     </layout>
    </item>
-   <item row="18" column="0">
+   <item row="21" column="0">
     <spacer name="spacer5">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -920,6 +920,22 @@
      </property>
     </spacer>
    </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QPushButton" name="instrPushButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip">
+      <string>Select instrument</string>
+     </property>
+     <property name="text">
+      <string>&lt;unknown&gt;</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
-- 
cgit v1.2.3