summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/arranger/arranger.cpp2
-rw-r--r--muse2/muse/midiedit/pianoroll.cpp38
-rw-r--r--muse2/muse/widgets/mtrackinfobase.ui107
4 files changed, 74 insertions, 74 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 1e4a5e78..9c621d00 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -17,6 +17,7 @@
- midiedit links to ctrl. (Orcan)
- Merged changes from ccherrett into pianroll (h-splittter). (Tim)
- changed open dialog to view stored project directory for PROJECT_VIEW (rj)
+ - Fixed midi track info size issues. (Tim)
26.12.2010:
- Initial addition of midi track info to pianoroll. WORK IN PROGRESS. (Tim)
TODO: Just to get off the hard drive. A few things still need to be linked up!
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index 62578d48..76d2dab7 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -414,6 +414,8 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
//connect(time, SIGNAL(addMarker(int)), SIGNAL(addMarker(int)));
configChanged(); // set configuration values
+ if(canvas->part())
+ midiTrackInfo->setTrack(canvas->part()->track()); // Tim.
showTrackInfo(showTrackinfoFlag);
}
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 70e0d65a..d2bc27b6 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -326,9 +326,8 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
//---------------------------------------------------
splitter = new Splitter(Qt::Vertical, mainw, "splitter");
- splitter->setHandleWidth(2); // Disabled by Tim.
+ splitter->setHandleWidth(2);
- // ccherrett
hsplitter = new Splitter(Qt::Horizontal, mainw, "hsplitter");
hsplitter->setChildrenCollapsible(true);
hsplitter->setHandleWidth(2);
@@ -353,32 +352,25 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
QSizeGrip* corner = new QSizeGrip(mainw);
- // ccherrett
midiTrackInfo = new MidiTrackInfo(mainw);
- //midiTrackInfo = new MidiTrackInfo(this, canvas->part() ? canvas->part()->track() : 0); // Tim.
- midiTrackInfo->setMinimumWidth(105);
- midiTrackInfo->setMaximumWidth(150);
+ int mtiw = midiTrackInfo->width(); // Save this.
+ //midiTrackInfo->setMinimumWidth(105);
+ //midiTrackInfo->setMaximumWidth(150);
- // Tim.
- //midiTrackInfo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
midiTrackInfo->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Expanding));
infoScroll = new QScrollArea;
infoScroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- //infoScroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); /// No choice right now. Got 'Issues' with AsNeeded.
infoScroll->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
infoScroll->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding));
- //infoScroll->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
infoScroll->setWidget(midiTrackInfo);
infoScroll->setWidgetResizable(true);
- ///infoScroll->setVisible(false);
- ///infoScroll->setEnabled(false);
+ //infoScroll->setVisible(false);
+ //infoScroll->setEnabled(false);
- // ccherrett
//hsplitter->addWidget(midiTrackInfo);
hsplitter->addWidget(infoScroll); // Tim.
hsplitter->addWidget(splitter);
- // ccherrett
mainGrid->setRowStretch(0, 100);
mainGrid->setColumnStretch(1, 100);
mainGrid->addWidget(hsplitter, 0, 1, 1, 3);
@@ -404,7 +396,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
*/
//mainGrid->addRowSpacing(1, hscroll->sizeHint().height());
-/// mainGrid->addItem(new QSpacerItem(0, hscroll->sizeHint().height()), 1, 0); // Orig + Tim.
+ //mainGrid->addItem(new QSpacerItem(0, hscroll->sizeHint().height()), 1, 0); // Orig + Tim.
QWidget* split1 = new QWidget(splitter);
split1->setObjectName("split1");
@@ -418,9 +410,6 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
canvas = new PianoCanvas(this, split1, xscale, yscale);
vscroll = new ScrollScale(-3, 7, yscale, KH * 75, Qt::Vertical, split1);
- //if(canvas->part())
- // midiTrackInfo->setTrack(canvas->part()->track()); // Tim.
-
int offset = -(config.division/4);
canvas->setOrigin(offset, 0);
canvas->setCanvasTools(pianorollTools);
@@ -429,10 +418,9 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
time->setOrigin(offset, 0);
gridS1->setRowStretch(2, 100);
- gridS1->setColumnStretch(1, 100); // Orig + ccharrett.
- ///gridS1->setColumnStretch(2, 100); // Tim.
+ gridS1->setColumnStretch(1, 100);
+ //gridS1->setColumnStretch(2, 100); // Tim.
- // Orig + ccharrett.
gridS1->addWidget(time, 0, 1, 1, 2);
gridS1->addWidget(hLine(split1), 1, 0, 1, 3);
gridS1->addWidget(piano, 2, 0);
@@ -466,11 +454,17 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
piano->setFixedWidth(pianoWidth);
+ // Tim.
+ QList<int> mops;
+ mops.append(mtiw + 30); // 30 for possible scrollbar
+ mops.append(width() - mtiw - 30);
+ hsplitter->setSizes(mops);
+
connect(tools2, SIGNAL(toolChanged(int)), canvas, SLOT(setTool(int)));
//connect(midiTrackInfo, SIGNAL(outputPortChanged(int)), list, SLOT(redraw()));
connect(ctrl, SIGNAL(clicked()), SLOT(addCtrl()));
- ///connect(trackInfoButton, SIGNAL(clicked()), SLOT(toggleTrackInfo())); Tim.
+ //connect(trackInfoButton, SIGNAL(clicked()), SLOT(toggleTrackInfo())); Tim.
connect(info, SIGNAL(valueChanged(NoteInfo::ValType, int)), SLOT(noteinfoChanged(NoteInfo::ValType, int)));
connect(vscroll, SIGNAL(scrollChanged(int)), piano, SLOT(setYPos(int)));
connect(vscroll, SIGNAL(scrollChanged(int)), canvas, SLOT(setYPos(int)));
diff --git a/muse2/muse/widgets/mtrackinfobase.ui b/muse2/muse/widgets/mtrackinfobase.ui
index 88da348d..1649b1d5 100644
--- a/muse2/muse/widgets/mtrackinfobase.ui
+++ b/muse2/muse/widgets/mtrackinfobase.ui
@@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
- <width>100</width>
- <height>400</height>
+ <width>103</width>
+ <height>468</height>
</rect>
</property>
<property name="sizePolicy">
- <sizepolicy hsizetype="Ignored" vsizetype="MinimumExpanding">
+ <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -38,11 +38,14 @@
<string/>
</property>
<layout class="QGridLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
- <number>0</number>
+ <number>-1</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="trackNameLabel">
@@ -73,7 +76,7 @@
<item row="2" column="0">
<widget class="SpinBox" name="iOutputChannel" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -95,7 +98,7 @@
<item row="2" column="1">
<widget class="QLabel" name="TextLabel2">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -115,11 +118,11 @@
</widget>
</item>
<item row="3" column="0">
- <layout class="QHBoxLayout">
+ <layout class="QHBoxLayout" stretch="0,0">
<item>
<widget class="QToolButton" name="iRButton">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -128,14 +131,10 @@
<string>input routing</string>
</property>
<property name="text">
- <string>Inputs</string>
+ <string>In</string>
</property>
</widget>
</item>
- </layout>
- </item>
- <item row="3" column="1">
- <layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="iChanDetectLabel">
<property name="sizePolicy">
@@ -163,10 +162,14 @@
</property>
</widget>
</item>
+ </layout>
+ </item>
+ <item row="3" column="1">
+ <layout class="QHBoxLayout">
<item>
<widget class="QToolButton" name="recEchoButton">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -188,11 +191,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
@@ -203,7 +206,7 @@
<item row="5" column="0">
<widget class="SpinBox" name="iTransp" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -225,7 +228,7 @@
<item row="5" column="1">
<widget class="QLabel" name="TextLabel9">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -244,7 +247,7 @@
<item row="6" column="0">
<widget class="SpinBox" name="iVerz" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -263,7 +266,7 @@
<item row="6" column="1">
<widget class="QLabel" name="TextLabel10">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -304,7 +307,7 @@
<item row="7" column="1">
<widget class="QLabel" name="TextLabel11">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -323,7 +326,7 @@
<item row="8" column="0">
<widget class="SpinBox" name="iAnschl" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -342,7 +345,7 @@
<item row="8" column="1">
<widget class="QLabel" name="TextLabel12">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -386,7 +389,7 @@
<item row="9" column="1">
<widget class="QLabel" name="TextLabel13">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -452,13 +455,13 @@
<item row="12" column="0">
<widget class="QLabel" name="textLabel1">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
- <string>Record:</string>
+ <string>Rec:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -476,11 +479,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
@@ -508,11 +511,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
@@ -523,7 +526,7 @@
<item row="13" column="0">
<widget class="SpinBox" name="iHBank" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -548,7 +551,7 @@
<item row="13" column="1">
<widget class="QLabel" name="TextLabel4">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -573,7 +576,7 @@
<item row="14" column="0">
<widget class="SpinBox" name="iLBank" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -598,7 +601,7 @@
<item row="14" column="1">
<widget class="QLabel" name="TextLabel5">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -623,7 +626,7 @@
<item row="15" column="0">
<widget class="SpinBox" name="iProgram" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -659,11 +662,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
@@ -681,7 +684,7 @@
<string>Add bank + prog settings to song</string>
</property>
<property name="text">
- <string>Prog.</string>
+ <string>Prog</string>
</property>
</widget>
</item>
@@ -691,11 +694,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
@@ -706,7 +709,7 @@
<item row="16" column="0">
<widget class="SpinBox" name="iLautst" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -742,11 +745,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
@@ -764,7 +767,7 @@
<string>Add vol setting to song</string>
</property>
<property name="text">
- <string>Vol.</string>
+ <string>Vol</string>
</property>
</widget>
</item>
@@ -774,11 +777,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
@@ -789,7 +792,7 @@
<item row="17" column="0">
<widget class="SpinBox" name="iPan" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -828,11 +831,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
@@ -841,7 +844,7 @@
<item>
<widget class="QToolButton" name="panRecButton">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -860,11 +863,11 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>4</width>
+ <width>2</width>
<height>2</height>
</size>
</property>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 03:54:51 +0000