From 7370c2468b14db695398713206b0b2fc4a5cbb97 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Mon, 27 Dec 2010 22:22:57 +0000 Subject: Fixed midi track info size issues. --- muse2/ChangeLog | 1 + muse2/muse/arranger/arranger.cpp | 2 + muse2/muse/midiedit/pianoroll.cpp | 38 ++++++------- muse2/muse/widgets/mtrackinfobase.ui | 107 ++++++++++++++++++----------------- 4 files changed, 74 insertions(+), 74 deletions(-) (limited to 'muse2') 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 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 @@ 0 0 - 100 - 400 + 103 + 468 - + 0 0 @@ -38,11 +38,14 @@ + + QLayout::SetDefaultConstraint + 0 - 0 + -1 @@ -73,7 +76,7 @@ - + 0 0 @@ -95,7 +98,7 @@ - + 0 0 @@ -115,11 +118,11 @@ - + - + 0 0 @@ -128,14 +131,10 @@ input routing - Inputs + In - - - - @@ -163,10 +162,14 @@ + + + + - + 0 0 @@ -188,11 +191,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Expanding - 4 + 2 2 @@ -203,7 +206,7 @@ - + 0 0 @@ -225,7 +228,7 @@ - + 0 0 @@ -244,7 +247,7 @@ - + 0 0 @@ -263,7 +266,7 @@ - + 0 0 @@ -304,7 +307,7 @@ - + 0 0 @@ -323,7 +326,7 @@ - + 0 0 @@ -342,7 +345,7 @@ - + 0 0 @@ -386,7 +389,7 @@ - + 0 0 @@ -452,13 +455,13 @@ - + 0 0 - Record: + Rec: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -476,11 +479,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Minimum - 4 + 2 2 @@ -508,11 +511,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Expanding - 4 + 2 2 @@ -523,7 +526,7 @@ - + 0 0 @@ -548,7 +551,7 @@ - + 0 0 @@ -573,7 +576,7 @@ - + 0 0 @@ -598,7 +601,7 @@ - + 0 0 @@ -623,7 +626,7 @@ - + 0 0 @@ -659,11 +662,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Minimum - 4 + 2 2 @@ -681,7 +684,7 @@ Add bank + prog settings to song - Prog. + Prog @@ -691,11 +694,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Expanding - 4 + 2 2 @@ -706,7 +709,7 @@ - + 0 0 @@ -742,11 +745,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Minimum - 4 + 2 2 @@ -764,7 +767,7 @@ Add vol setting to song - Vol. + Vol @@ -774,11 +777,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Expanding - 4 + 2 2 @@ -789,7 +792,7 @@ - + 0 0 @@ -828,11 +831,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Minimum - 4 + 2 2 @@ -841,7 +844,7 @@ - + 0 0 @@ -860,11 +863,11 @@ Qt::Horizontal - QSizePolicy::Maximum + QSizePolicy::Expanding - 4 + 2 2 -- cgit v1.2.3