summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/muse/app.cpp88
-rw-r--r--muse2/muse/arranger/alayout.h2
-rw-r--r--muse2/muse/arranger/arranger.cpp2
-rw-r--r--muse2/muse/arranger/tlist.cpp50
-rw-r--r--muse2/muse/mixer/amixer.cpp2
-rw-r--r--muse2/muse/mixer/astrip.cpp2
-rw-r--r--muse2/muse/mixer/strip.cpp2
-rw-r--r--muse2/muse/plugin.cpp2
-rw-r--r--muse2/muse/song.cpp3
-rw-r--r--muse2/muse/song.h2
-rw-r--r--muse2/muse/transport.cpp30
-rw-r--r--muse2/synti/simpledrums2/ssplugingui.cpp8
12 files changed, 109 insertions, 84 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 7f292feb..b1130fba 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -694,7 +694,8 @@ QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0)
// No MESS sub-menu yet? Create it now.
if(!synpMESS)
synpMESS = new QMenu(parent);
- synpMESS->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
+ QAction* sM = synpMESS->addAction(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">");
+ sM->setData(MENU_ADD_SYNTH_ID_BASE + idx);
}
}
@@ -710,7 +711,9 @@ QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0)
// No DSSI sub-menu yet? Create it now.
if(!synpDSSI)
synpDSSI = new QMenu(parent);
- synpDSSI->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
+ //synpDSSI->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
+ QAction* sD = synpDSSI->addAction(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">");
+ sD->setData(MENU_ADD_SYNTH_ID_BASE + idx);
}
}
#endif
@@ -727,7 +730,8 @@ QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0)
// No VST sub-menu yet? Create it now.
if(!synpVST)
synpVST = new QMenu(parent);
- synpVST->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
+ QAction* sV = synpVST->addAction(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">");
+ sV->setData(MENU_ADD_SYNTH_ID_BASE + idx);
}
}
#endif
@@ -741,39 +745,41 @@ QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0)
// No Other sub-menu yet? Create it now.
if(!synpOther)
synpOther = new QMenu(parent);
- synpOther->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
+ //synpOther->insertItem(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
+ QAction* sO = synpOther->addAction(QT_TR_NOOP(s->description()) + " <" + QT_TR_NOOP(s->name()) + ">");
+ sO->setData(MENU_ADD_SYNTH_ID_BASE + idx);
}
if(synpMESS)
{
- synp->insertItem(*synthIcon, QT_TR_NOOP("MESS"), synpMESS, Track::AUDIO_SOFTSYNTH);
- if(obj && slot)
- QObject::connect(synpMESS, SIGNAL(activated(int)), obj, slot);
+ synpMESS->setIcon(*synthIcon);
+ synpMESS->setTitle(QT_TR_NOOP("MESS"));
+ synp->addMenu(synpMESS);
}
#ifdef DSSI_SUPPORT
if(synpDSSI)
{
- synp->insertItem(*synthIcon, QT_TR_NOOP("DSSI"), synpDSSI, Track::AUDIO_SOFTSYNTH);
- if(obj && slot)
- QObject::connect(synpDSSI, SIGNAL(activated(int)), obj, slot);
+ synpDSSI->setIcon(*synthIcon);
+ synpDSSI->setTitle(QT_TR_NOOP("DSSI"));
+ synp->addMenu(synpDSSI);
}
#endif
#ifdef VST_SUPPORT
if(synpVST)
{
- synp->insertItem(*synthIcon, QT_TR_NOOP("FST"), synpVST, Track::AUDIO_SOFTSYNTH);
- if(obj && slot)
- QObject::connect(synpVST, SIGNAL(activated(int)), obj, slot);
+ synpVST->setIcon(*synthIcon);
+ synpVST->setTitle(QT_TR_NOOP("FST"));
+ synp->addMenu(synpVST);
}
#endif
if(synpOther)
{
- synp->insertItem(*synthIcon, QObject::tr("Other"), synpOther, Track::AUDIO_SOFTSYNTH);
- if(obj && slot)
- QObject::connect(synpOther, SIGNAL(activated(int)), obj, slot);
+ synpOther->setIcon(*synthIcon);
+ synpOther->setTitle(QObject::tr("Other"));
+ synp->addMenu(synpOther);
}
return synp;
@@ -786,29 +792,37 @@ QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0)
void populateAddTrack(QMenu* addTrack)
{
- addTrack->insertItem(QIcon(*addtrack_addmiditrackIcon),
- QT_TR_NOOP("Add Midi Track"), Track::MIDI);
- addTrack->insertItem(QIcon(*addtrack_drumtrackIcon),
- QT_TR_NOOP("Add Drum Track"), Track::DRUM);
- addTrack->insertItem(QIcon(*addtrack_wavetrackIcon),
- QT_TR_NOOP("Add Wave Track"), Track::WAVE);
- addTrack->insertItem(QIcon(*addtrack_audiooutputIcon),
- QT_TR_NOOP("Add Audio Output"), Track::AUDIO_OUTPUT);
- addTrack->insertItem(QIcon(*addtrack_audiogroupIcon),
- QT_TR_NOOP("Add Audio Group"), Track::AUDIO_GROUP);
- addTrack->insertItem(QIcon(*addtrack_audioinputIcon),
- QT_TR_NOOP("Add Audio Input"), Track::AUDIO_INPUT);
- addTrack->insertItem(QIcon(*addtrack_auxsendIcon),
- QT_TR_NOOP("Add Aux Send"), Track::AUDIO_AUX);
-
+ QAction* midi = addTrack->addAction(QIcon(*addtrack_addmiditrackIcon),
+ QT_TR_NOOP("Add Midi Track"));
+ midi->setData(Track::MIDI);
+ QAction* drum = addTrack->addAction(QIcon(*addtrack_drumtrackIcon),
+ QT_TR_NOOP("Add Drum Track"));
+ drum->setData(Track::DRUM);
+ QAction* wave = addTrack->addAction(QIcon(*addtrack_wavetrackIcon),
+ QT_TR_NOOP("Add Wave Track"));
+ wave->setData(Track::WAVE);
+ QAction* aoutput = addTrack->addAction(QIcon(*addtrack_audiooutputIcon),
+ QT_TR_NOOP("Add Audio Output"));
+ aoutput->setData(Track::AUDIO_OUTPUT);
+ QAction* agroup = addTrack->addAction(QIcon(*addtrack_audiogroupIcon),
+ QT_TR_NOOP("Add Audio Group"));
+ agroup->setData(Track::AUDIO_GROUP);
+ QAction* ainput = addTrack->addAction(QIcon(*addtrack_audioinputIcon),
+ QT_TR_NOOP("Add Audio Input"));
+ ainput->setData(Track::AUDIO_INPUT);
+ QAction* aaux = addTrack->addAction(QIcon(*addtrack_auxsendIcon),
+ QT_TR_NOOP("Add Aux Send"));
+ aaux->setData(Track::AUDIO_AUX);
+
// Create a sub-menu and fill it with found synth types. Make addTrack the owner.
- QMenu* synp = populateAddSynth(addTrack, song, SLOT(addNewTrack(int)));
+ QMenu* synp = populateAddSynth(addTrack, song, SLOT(addNewTrack(QAction *)));
+ synp->setIcon(*synthIcon);
+ synp->setTitle(QT_TR_NOOP("Add Synth"));
+
// Add the sub-menu to the given menu.
- addTrack->insertItem(*synthIcon, QT_TR_NOOP("Add Synth"), synp, Track::AUDIO_SOFTSYNTH);
-
- //addTrack->connect(addTrack, SIGNAL(activated(int)), song, SLOT(addTrack(int)));
- addTrack->connect(addTrack, SIGNAL(activated(int)), song, SLOT(addNewTrack(int)));
- //synp->connect(synp, SIGNAL(activated(int)), song, SLOT(addNewTrack(int)));
+ addTrack->addMenu(synp);
+
+ QObject::connect(addTrack, SIGNAL(triggered(QAction *)), song, SLOT(addNewTrack(QAction *)));
}
//---------------------------------------------------------
diff --git a/muse2/muse/arranger/alayout.h b/muse2/muse/arranger/alayout.h
index 08eb1727..05d418b5 100644
--- a/muse2/muse/arranger/alayout.h
+++ b/muse2/muse/arranger/alayout.h
@@ -33,7 +33,7 @@ class TLLayout : public QLayout
public:
//TLLayout(QWidget *parent) : QLayout(parent, 0, -1) {}
- TLLayout(QWidget *parent) : QLayout(parent) { setMargin(0); setSpacing(-1); }
+ TLLayout(QWidget *parent) : QLayout(parent) { setContentsMargins(0, 0, 0, 0); setSpacing(-1); }
~TLLayout() { clear(); }
void addItem(QLayoutItem *item) { ilist.append(item); }
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index a3c23a0a..422980f1 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -332,7 +332,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
egrid->setColStretch(0, 50);
egrid->setRowStretch(2, 50);
//egrid->setContentsMargins(0, 0, 0, 0);
- egrid->setMargin(0);
+ egrid->setContentsMargins(0, 0, 0, 0);
egrid->setSpacing(0);
time = new MTScale(&_raster, editor, xscale);
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index 618dc2e6..d2da81b1 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -50,7 +50,7 @@
#include "dssihost.h"
#endif
-extern Q3PopupMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0);
+extern QMenu* populateAddSynth(QWidget* parent, QObject* obj = 0, const char* slot = 0);
static const int MIN_TRACKHEIGHT = 20;
static const int WHEEL_DELTA = 120;
@@ -795,30 +795,40 @@ void TList::mousePressEvent(QMouseEvent* ev)
TrackColumn col = TrackColumn(header->sectionAt(x));
if (t == 0) {
if (button == Qt::RightButton) {
- Q3PopupMenu* p = new Q3PopupMenu(this);
+ QMenu* p = new QMenu(this);
p->clear();
- p->insertItem(*addtrack_addmiditrackIcon,
- tr("Add Midi Track"), Track::MIDI, 0);
- p->insertItem(*addtrack_drumtrackIcon,
- tr("Add Drum Track"),Track::DRUM, 1);
- p->insertItem(*addtrack_wavetrackIcon,
- tr("Add Wave Track"), Track::WAVE, 2);
- p->insertItem(*addtrack_audiooutputIcon,
- tr("Add Output"), Track::AUDIO_OUTPUT, 3);
- p->insertItem(*addtrack_audiogroupIcon,
- tr("Add Group"), Track::AUDIO_GROUP, 4);
- p->insertItem(*addtrack_audioinputIcon,
- tr("Add Input"), Track::AUDIO_INPUT, 5);
- p->insertItem(*addtrack_auxsendIcon,
- tr("Add Aux Send"), Track::AUDIO_AUX, 6);
+ QAction* midi = p->addAction(*addtrack_addmiditrackIcon,
+ tr("Add Midi Track"));
+ midi->setData(Track::MIDI);
+ QAction* drum = p->addAction(*addtrack_drumtrackIcon,
+ tr("Add Drum Track"));
+ drum->setData(Track::DRUM);
+ QAction* wave = p->addAction(*addtrack_wavetrackIcon,
+ tr("Add Wave Track"));
+ wave->setData(Track::WAVE);
+ QAction* aoutput = p->addAction(*addtrack_audiooutputIcon,
+ tr("Add Output"));
+ aoutput->setData(Track::AUDIO_OUTPUT);
+ QAction* agroup = p->addAction(*addtrack_audiogroupIcon,
+ tr("Add Group"));
+ agroup->setData(Track::AUDIO_GROUP);
+ QAction* ainput = p->addAction(*addtrack_audioinputIcon,
+ tr("Add Input"));
+ ainput->setData(Track::AUDIO_INPUT);
+ QAction* aaux = p->addAction(*addtrack_auxsendIcon,
+ tr("Add Aux Send"));
+ aaux->setData(Track::AUDIO_AUX);
// Create a sub-menu and fill it with found synth types. Make p the owner.
- Q3PopupMenu* synp = populateAddSynth(p);
+ QMenu* synp = populateAddSynth(p);
+ synp->setIcon(*synthIcon);
+ synp->setTitle(QT_TR_NOOP("Add Synth"));
+
// Add the 'Add Synth' sub-menu to the menu.
- p->insertItem(*synthIcon, tr("Add Synth"), synp, Track::AUDIO_SOFTSYNTH);
-
+ p->addMenu(synp);
+
// Show the menu
- int n = p->exec(ev->globalPos(), 0);
+ int n = p->exec(ev->globalPos(), 0)->data().toInt();
// Valid click?
if((n >= 0) && ((Track::TrackType)n != Track::AUDIO_SOFTSYNTH))
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index ca805f35..dccdb53b 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -106,7 +106,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
layout = new QHBoxLayout();
central->setLayout(layout);
layout->setSpacing(0);
- layout->setMargin(0);
+ layout->setContentsMargins(0, 0, 0, 0);
view->setWidget(central);
view->setWidgetResizable(true);
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 2b1b53cf..9c42f18c 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -755,7 +755,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
sliderGrid = new QGridLayout();
sliderGrid->setRowStretch(0, 100);
- sliderGrid->setMargin(0);
+ sliderGrid->setContentsMargins(0, 0, 0, 0);
slider = new Slider(this, "vol", Qt::Vertical, Slider::None,
Slider::BgTrough | Slider::BgSlot);
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index cef793d0..2f32270b 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -184,7 +184,7 @@ Strip::Strip(QWidget* parent, Track* t)
setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding)); // TESTING Tim.
grid = new QGridLayout();
- grid->setMargin(0);
+ grid->setContentsMargins(0, 0, 0, 0);
grid->setSpacing(0);
setLayout(grid);
diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp
index 68486bf0..4b215277 100644
--- a/muse2/muse/plugin.cpp
+++ b/muse2/muse/plugin.cpp
@@ -3028,7 +3028,7 @@ PluginGui::PluginGui(PluginIBase* p)
params[i].label->setPrecision(2);
params[i].label->setId(i);
- //params[i].label->setMargin(2);
+ //params[i].label->setContentsMargins(2, 2, 2, 2);
//params[i].label->setFixedHeight(h);
Slider* s = new Slider(mw, "param", Qt::Horizontal,
diff --git a/muse2/muse/song.cpp b/muse2/muse/song.cpp
index 9e206fad..98d9875c 100644
--- a/muse2/muse/song.cpp
+++ b/muse2/muse/song.cpp
@@ -140,8 +140,9 @@ void Song::setSig(int z, int n)
// Besides normal track types, n includes synth menu ids from populateAddTrack()
//---------------------------------------------------------
-Track* Song::addNewTrack(int n)
+Track* Song::addNewTrack(QAction* action)
{
+ int n = action->data().toInt();
// Ignore negative numbers since this slot could be called by a menu or list etc. passing -1.
if(n < 0)
return 0;
diff --git a/muse2/muse/song.h b/muse2/muse/song.h
index 15119b93..3e53afbc 100644
--- a/muse2/muse/song.h
+++ b/muse2/muse/song.h
@@ -389,7 +389,7 @@ class Song : public QObject {
void panic();
void seqSignal(int fd);
Track* addTrack(int);
- Track* addNewTrack(int);
+ Track* addNewTrack(QAction* action);
QString getScriptPath(int id, bool delivered);
void populateScriptMenu(QMenu* menuPlugins, QObject* receiver);
diff --git a/muse2/muse/transport.cpp b/muse2/muse/transport.cpp
index e080fd67..48e5175d 100644
--- a/muse2/muse/transport.cpp
+++ b/muse2/muse/transport.cpp
@@ -45,7 +45,7 @@ static const char* fforwardTransportText = QT_TR_NOOP("Click this button to forw
//---------------------------------------------------------
static QToolButton* newButton(const QString& s, const QString& tt,
- bool toggle=false, int height=25, QWidget* parent=0)
+ bool toggle=false, int height=25, QWidget* parent=0)
{
QToolButton* button = new QToolButton(parent);
button->setFixedHeight(height);
@@ -57,7 +57,7 @@ static QToolButton* newButton(const QString& s, const QString& tt,
}
static QToolButton* newButton(const QPixmap* pm, const QString& tt,
- bool toggle=false, QWidget* parent=0)
+ bool toggle=false, QWidget* parent=0)
{
QToolButton* button = new QToolButton(parent);
button->setFixedHeight(25);
@@ -114,11 +114,11 @@ TempoSig::TempoSig(QWidget* parent)
: QWidget(parent)
{
QBoxLayout* vb1 = new QVBoxLayout;
- vb1->setMargin(0);
+ vb1->setContentsMargins(0, 0, 0, 0);
vb1->setSpacing(0);
QBoxLayout* vb2 = new QVBoxLayout;
- vb2->setMargin(0);
+ vb2->setContentsMargins(0, 0, 0, 0);
vb2->setSpacing(0);
@@ -227,7 +227,7 @@ Transport::Transport(QWidget*, const char* name)
setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
QHBoxLayout* hbox = new QHBoxLayout;
- hbox->setMargin(2);
+ hbox->setContentsMargins(2, 2, 2, 2);
lefthandle = new Handle(this);
hbox->addWidget(lefthandle);
@@ -312,7 +312,7 @@ Transport::Transport(QWidget*, const char* name)
// ORCAN: should we change PosEdit constructor so we can call it without a parent argument?
QVBoxLayout *marken = new QVBoxLayout;
marken->setSpacing(0);
- marken->setMargin(0);
+ marken->setContentsMargins(0, 0, 0, 0);
tl1 = new PosEdit(0);
tl1->setMinimumSize(105,0);
@@ -342,10 +342,10 @@ Transport::Transport(QWidget*, const char* name)
QVBoxLayout *box4 = new QVBoxLayout;
box4->setSpacing(0);
- box4->setMargin(0);
+ box4->setContentsMargins(0, 0, 0, 0);
QHBoxLayout *hbox1 = new QHBoxLayout;
- hbox1->setMargin(0);
+ hbox1->setContentsMargins(0, 0, 0, 0);
time1 = new PosEdit(0);
time2 = new PosEdit(0);
@@ -387,10 +387,10 @@ Transport::Transport(QWidget*, const char* name)
buttons[5]->setWhatsThis(tr(recordTransportText));
for (int i = 0; i < 6; ++i)
- {
+ {
buttons[i]->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed));
- tb->addWidget(buttons[i]);
- }
+ tb->addWidget(buttons[i]);
+ }
connect(buttons[3], SIGNAL(toggled(bool)), SLOT(stopToggled(bool)));
connect(buttons[4], SIGNAL(toggled(bool)), SLOT(playToggled(bool)));
@@ -408,7 +408,7 @@ Transport::Transport(QWidget*, const char* name)
//-----------------------------------------------------
QVBoxLayout *button1 = new QVBoxLayout;
- button1->setMargin(0);
+ button1->setContentsMargins(0, 0, 0, 0);
button1->setSpacing(0);
quantizeButton = newButton(tr("AC"), tr("quantize during record"), true,19);
@@ -449,7 +449,7 @@ Transport::Transport(QWidget*, const char* name)
QVBoxLayout *box5 = new QVBoxLayout;
box5->setSpacing(0);
- box5->setMargin(0);
+ box5->setContentsMargins(0, 0, 0, 0);
tempo = new TempoSig;
@@ -518,8 +518,8 @@ void Transport::setTempo(int t)
void Transport::setHandleColor(QColor c)
{
- lefthandle->setBackgroundColor(c);
- righthandle->setBackgroundColor(c);
+ lefthandle->setBackgroundColor(c);
+ righthandle->setBackgroundColor(c);
}
//---------------------------------------------------------
diff --git a/muse2/synti/simpledrums2/ssplugingui.cpp b/muse2/synti/simpledrums2/ssplugingui.cpp
index 0428988b..da74bd56 100644
--- a/muse2/synti/simpledrums2/ssplugingui.cpp
+++ b/muse2/synti/simpledrums2/ssplugingui.cpp
@@ -140,7 +140,7 @@ SS_PluginFront::SS_PluginFront(QWidget* parent, int in_fxid)
setMaximumSize(SS_PLUGINGUI_MAX_WIDTH, SS_PLUGINFRONT_MINHEIGHT);
QVBoxLayout* bigLayout = new QVBoxLayout(this);
- bigLayout->setMargin(SS_PLUGINFRONT_MARGIN);
+ bigLayout->setContentsMargins(SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN);
bigLayout->setAlignment(Qt::AlignTop);
//TODO bigLayout->setResizeMode(QLayout::SetNoConstraint);
@@ -152,7 +152,7 @@ SS_PluginFront::SS_PluginFront(QWidget* parent, int in_fxid)
QVBoxLayout* onOffLayout = new QVBoxLayout;
layout->addLayout(onOffLayout);
- onOffLayout->setMargin(SS_PLUGINFRONT_MARGIN);
+ onOffLayout->setContentsMargins(SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN);
onOff = new QCheckBox(this);
onOffLayout->addWidget(new QLabel("On/Off", this));
onOffLayout->addWidget(onOff);
@@ -196,7 +196,7 @@ SS_PluginFront::SS_PluginFront(QWidget* parent, int in_fxid)
QVBoxLayout* gainSliderLayout = new QVBoxLayout;
layout->addLayout(gainSliderLayout);
gainSliderLayout->addWidget(new QLabel("Return level", this));
- gainSliderLayout->setMargin(SS_PLUGINFRONT_MARGIN);
+ gainSliderLayout->setContentsMargins(SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN);
outGainSlider = new QSlider(Qt::Horizontal, this);
outGainSlider->setMinimumSize(100, pluginName->geometry().height());
outGainSlider->setMaximumSize(500, pluginName->geometry().height());
@@ -419,7 +419,7 @@ void SS_PluginFront::createPluginParameters()
QVBoxLayout* expGroupLayout = new QVBoxLayout(expGroup); // , 1);
expGroupLayout->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
//TD expGroupLayout->setResizeMode(QLayout::FreeResize);
- expGroupLayout->setMargin(SS_PLUGINFRONT_MARGIN);
+ expGroupLayout->setContentsMargins(SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN);
for (int i=0; i < plugin->parameter(); i++) {
QHBoxLayout* paramStrip = new QHBoxLayout; // (expGroupLayout, 3);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 22:14:28 +0000