From d0196814541920684787c1e0b8d99379eff8860f Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Tue, 23 Nov 2010 03:39:27 +0000 Subject: Fixed some remaining layout issues using setSpacing(0). --- muse2/ChangeLog | 1 + muse2/muse/app.cpp | 7 ++++--- muse2/muse/arranger/arranger.cpp | 1 + muse2/muse/arranger/tlist.cpp | 2 +- muse2/muse/midiedit/drumedit.cpp | 12 +++++++++--- muse2/muse/midiedit/pianoroll.cpp | 1 + muse2/muse/midieditor.cpp | 1 + muse2/muse/mixer/amixer.cpp | 1 + muse2/muse/mixer/astrip.cpp | 1 + 9 files changed, 20 insertions(+), 7 deletions(-) (limited to 'muse2') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 91a0525f..c6201cdf 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -9,6 +9,7 @@ - Eliminated double-buffer pixmap in View class (not required in Qt4). TODO: install event handler. (Tim) - Ported the following .ui widgets to Qt4: editgainbase, gensetbase (Orcan) - Removed unused .ui widgets: wtrackinfo.ui, editctrl7dialogbase.ui, editmetadialogbase.ui (Orcan) + - Fixed remaining alignment issues in editors, using setSpacing(0). TODO Controller panels. (Tim) 21.11.2010 - All menus now use QActions. Some shortcuts are left to be assigned correctly (Orcan) - Clean up: Remove submenu integer ids from the MusE class in favor of QActions (Orcan) diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 758c05a6..ede1cf50 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -614,8 +614,9 @@ struct addSynth_cmp_str } }; */ - // ORCAN - CHECK -QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0) + +// ORCAN - CHECK +QMenu* populateAddSynth(QWidget* parent) { QMenu* synp = new QMenu(parent); @@ -827,7 +828,7 @@ QActionGroup* populateAddTrack(QMenu* addTrack) grp->addAction(aaux); // Create a sub-menu and fill it with found synth types. Make addTrack the owner. - QMenu* synp = populateAddSynth(addTrack, song, SLOT(addNewTrack(QAction *))); + QMenu* synp = populateAddSynth(addTrack); synp->setIcon(*synthIcon); synp->setTitle(QT_TR_NOOP("Add Synth")); diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp index c0f7c1cd..89bde276 100644 --- a/muse2/muse/arranger/arranger.cpp +++ b/muse2/muse/arranger/arranger.cpp @@ -209,6 +209,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name) QVBoxLayout* box = new QVBoxLayout(this); box->setContentsMargins(0, 0, 0, 0); + box->setSpacing(0); box->addWidget(hLine(this), Qt::AlignTop); //QFrame* hline = hLine(this); //hline->setLineWidth(0); diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 8d8d430c..28e50750 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -50,7 +50,7 @@ #include "dssihost.h" #endif -extern QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0); +extern QMenu* populateAddSynth(QWidget* parent); static const int MIN_TRACKHEIGHT = 20; static const int WHEEL_DELTA = 120; diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index f23ae012..8344635c 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -24,11 +24,13 @@ #include #include #include +#include +#include //Added by qt3to4: #include -#include -#include +//#include +//#include #include #include @@ -302,6 +304,10 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini QWidget* split1w2 = new QWidget(split2, "split1w2"); QGridLayout* gridS1 = new QGridLayout(split1w1); QGridLayout* gridS2 = new QGridLayout(split1w2); + gridS1->setContentsMargins(0, 0, 0, 0); + gridS1->setSpacing(0); + gridS2->setContentsMargins(0, 0, 0, 0); + gridS2->setSpacing(0); 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); @@ -312,7 +318,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini connect(canvas, SIGNAL(toolChanged(int)), tools2, SLOT(set(int))); time->setOrigin(offset, 0); - Q3ValueList mops; + QList mops; mops.append(_dlistWidthInit); mops.append(_dcanvasWidthInit); split2->setSizes(mops); diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp index 7d93c582..54416b8f 100644 --- a/muse2/muse/midiedit/pianoroll.cpp +++ b/muse2/muse/midiedit/pianoroll.cpp @@ -254,6 +254,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i QWidget* split1 = new QWidget(splitter, "split1"); QGridLayout* gridS1 = new QGridLayout(split1); gridS1->setContentsMargins(0, 0, 0, 0); + gridS1->setSpacing(0); time = new MTScale(&_raster, split1, xscale); Piano* piano = new Piano(split1, yscale); canvas = new PianoCanvas(this, split1, xscale, yscale); diff --git a/muse2/muse/midieditor.cpp b/muse2/muse/midieditor.cpp index 8816465c..58013986 100644 --- a/muse2/muse/midieditor.cpp +++ b/muse2/muse/midieditor.cpp @@ -43,6 +43,7 @@ MidiEditor::MidiEditor(int q, int r, PartList* pl, mainw->setLayout(mainGrid); mainGrid->setContentsMargins(0, 0, 0, 0); + mainGrid->setSpacing(0); setCentralWidget(mainw); } diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp index 60230aa1..fe72136d 100644 --- a/muse2/muse/mixer/amixer.cpp +++ b/muse2/muse/mixer/amixer.cpp @@ -209,6 +209,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c) central->setLayout(layout); layout->setSpacing(0); layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); view->setWidget(central); view->setWidgetResizable(true); diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp index 98707d18..88d8f945 100644 --- a/muse2/muse/mixer/astrip.cpp +++ b/muse2/muse/mixer/astrip.cpp @@ -769,6 +769,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at) sliderGrid = new QGridLayout(); sliderGrid->setRowStretch(0, 100); sliderGrid->setContentsMargins(0, 0, 0, 0); + sliderGrid->setSpacing(0); slider = new Slider(this, "vol", Qt::Vertical, Slider::None, Slider::BgTrough | Slider::BgSlot); -- cgit v1.2.3