Started some conversions of midieditor, pianoroll, drumedit, etc. incl. their QGridLayouts.

2 files changed, 15 insertions, 11 deletions

diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index b8422e03..f23ae012 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -290,17 +290,18 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       mainGrid->setRowStretch(0, 100);
       mainGrid->setColStretch(1, 100);
 
-      mainGrid->addMultiCellWidget(split1, 0, 0, 0, 2);
+      mainGrid->addWidget(split1, 0, 0,  1, 3);
       mainGrid->addWidget(ctrl,    1, 0);
       mainGrid->addWidget(hscroll, 1, 1);
       mainGrid->addWidget(corner,  1, 2, Qt::AlignBottom|Qt::AlignRight);
 //      mainGrid->addRowSpacing(1, hscroll->sizeHint().height());
+//      mainGrid->addItem(new QSpacerItem(0, hscroll->sizeHint().height()), 1, 0); 
 
       split2              = new Splitter(Qt::Horizontal, split1, "split2");
       split1w1            = new QWidget(split2, "split1w1");
       QWidget* split1w2   = new QWidget(split2, "split1w2");
-      Q3GridLayout* gridS1 = new Q3GridLayout(split1w1);
-      Q3GridLayout* gridS2 = new Q3GridLayout(split1w2);
+      QGridLayout* gridS1 = new QGridLayout(split1w1);
+      QGridLayout* gridS2 = new QGridLayout(split1w2);
       time                = new MTScale(&_raster, split1w2, xscale);
       canvas              = new DrumCanvas(this, split1w2, xscale, yscale);
       vscroll             = new ScrollScale(-4, 1, yscale, DRUM_MAPSIZE*TH, Qt::Vertical, split1w2);
@@ -322,8 +323,8 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       gridS2->setRowStretch(1, 100);
       gridS2->setColStretch(0, 100);
       
-      gridS2->addMultiCellWidget(time,  0, 0, 0, 1);
-      gridS2->addMultiCellWidget(hLine(split1w2), 1, 1, 0, 1);
+      gridS2->addWidget(time,  0, 0, 1, 2);
+      gridS2->addWidget(hLine(split1w2), 1, 0, 1, 2);
       gridS2->addWidget(canvas,  2, 0);
       
       gridS2->addWidget(vscroll, 2, 1);
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 85057bba..7d93c582 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -243,14 +243,17 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
 
       mainGrid->setRowStretch(0, 100);
       mainGrid->setColStretch(1, 100);
-      mainGrid->addMultiCellWidget(splitter, 0, 0, 0, 2);
+      mainGrid->addWidget(splitter, 0, 0, 1, 3);
       mainGrid->addWidget(ctrl,    1, 0);
       mainGrid->addWidget(hscroll, 1, 1);
       mainGrid->addWidget(corner,  1, 2, Qt::AlignBottom|Qt::AlignRight);
-      mainGrid->addRowSpacing(1, hscroll->sizeHint().height());
-
+      
+      //mainGrid->addRowSpacing(1, hscroll->sizeHint().height());
+      mainGrid->addItem(new QSpacerItem(0, hscroll->sizeHint().height()), 1, 0); 
+      
       QWidget* split1     = new QWidget(splitter, "split1");
       QGridLayout* gridS1 = new QGridLayout(split1);
+      gridS1->setContentsMargins(0, 0, 0, 0);
       time                = new MTScale(&_raster, split1, xscale);
       Piano* piano        = new Piano(split1, yscale);
       canvas              = new PianoCanvas(this, split1, xscale, yscale);
@@ -266,8 +269,8 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       gridS1->setRowStretch(2, 100);
       gridS1->setColStretch(1, 100);
 
-      gridS1->addMultiCellWidget(time,          0, 0, 1, 2);
-      gridS1->addMultiCellWidget(hLine(split1), 1, 1, 0, 2);
+      gridS1->addWidget(time,                   0, 1, 1, 2);
+      gridS1->addWidget(hLine(split1),          1, 0, 1, 3);
       gridS1->addWidget(piano,                  2,    0);
       gridS1->addWidget(canvas,                 2,    1);
       
@@ -318,7 +321,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
 
       connect(song, SIGNAL(songChanged(int)), SLOT(songChanged1(int)));
 
-      setCaption(canvas->getCaption());
+      setWindowTitle(canvas->getCaption());
       
       updateHScrollRange();
       // connect to toolbar