summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--muse/muse/arranger/arranger.cpp23
-rw-r--r--muse/muse/arranger/canvas.cpp2
-rw-r--r--muse/muse/arranger/tlswidget.cpp2
-rw-r--r--muse/muse/arranger/tlwidget.cpp28
-rw-r--r--muse/muse/arranger/tlwlayout.cpp1
-rw-r--r--muse/muse/midiedit/ctrledit.cpp3
-rw-r--r--muse/muse/mixer/astrip.cpp10
-rw-r--r--muse/muse/mixer/mstrip.cpp24
-rw-r--r--muse/muse/mixer/strip.cpp4
-rw-r--r--muse/muse/widgets/utils.cpp48
-rw-r--r--muse/muse/widgets/utils.h24
11 files changed, 89 insertions, 80 deletions
diff --git a/muse/muse/arranger/arranger.cpp b/muse/muse/arranger/arranger.cpp
index bf1cb44f..805efc62 100644
--- a/muse/muse/arranger/arranger.cpp
+++ b/muse/muse/arranger/arranger.cpp
@@ -157,7 +157,7 @@ void TLayout::addItem(QLayoutItem* item)
void TLayout::setGeometry(const QRect& r)
{
- int y = r.y() + 3;
+ int y = r.y();
int n = itemList.size();
int width = r.width(); // ((QWidget*)parent())->width();
for (int i = 0; i < n; ++i) {
@@ -346,47 +346,49 @@ Arranger::Arranger(QMainWindow* parent)
//
// Toolbox
//
- QWidget* ttools = new QWidget;
QHBoxLayout* ttoolsLayout = new QHBoxLayout;
ttoolsLayout->setMargin(1);
ttoolsLayout->setSpacing(1);
- ttools->setLayout(ttoolsLayout);
- ttools->setFixedHeight(rulerHeight - 2);
SimpleButton* configButton = new SimpleButton(configIcon, configIcon);
configButton->setAutoRaise(true);
configButton->setToolTip(tr("Config Tracklist"));
+ configButton->setFixedHeight(rulerHeight-4);
connect(configButton, SIGNAL(clicked()), SLOT(configTrackList()));
ttoolsLayout->addWidget(configButton);
ttoolsLayout->addStretch(100);
- gmute = newMuteButton(ttools);
+ gmute = newMuteButton();
gmute->setFixedWidth(rulerHeight);
gmute->setToolTip(tr("all mute off"));
+ gmute->setFixedHeight(rulerHeight-4);
ttoolsLayout->addWidget(gmute);
setGMute();
connect(song, SIGNAL(muteChanged(Track*,bool)), SLOT(setGMute()));
connect(gmute, SIGNAL(clicked(bool)), SLOT(offGMute()));
- gsolo = newSoloButton(ttools);
+ gsolo = newSoloButton();
gsolo->setFixedWidth(rulerHeight);
gsolo->setToolTip(tr("all solo off"));
+ gsolo->setFixedHeight(rulerHeight-4);
ttoolsLayout->addWidget(gsolo);
setGSolo();
connect(song, SIGNAL(soloChanged(Track*,bool)), SLOT(setGSolo()));
connect(gsolo, SIGNAL(clicked(bool)), SLOT(offGSolo()));
- gar = newAutoReadButton(ttools);
+ gar = newAutoReadButton();
gar->setFixedWidth(rulerHeight);
gar->setToolTip(tr("all autoRead off"));
+ gar->setFixedHeight(rulerHeight-4);
ttoolsLayout->addWidget(gar);
setGar();
connect(song, SIGNAL(autoReadChanged(Track*,bool)), SLOT(setGar()));
connect(gar, SIGNAL(clicked(bool)), SLOT(offGar()));
- gaw = newAutoWriteButton(ttools);
+ gaw = newAutoWriteButton();
gaw->setFixedWidth(rulerHeight);
gaw->setToolTip(tr("all autoWrite off"));
+ gaw->setFixedHeight(rulerHeight-4);
ttoolsLayout->addWidget(gaw);
setGaw();
connect(song, SIGNAL(autoWriteChanged(Track*,bool)), SLOT(setGaw()));
@@ -424,7 +426,10 @@ Arranger::Arranger(QMainWindow* parent)
trackListGrid->setSpacing(0);
tw->setLayout(trackListGrid);
- trackListGrid->addWidget(ttools);
+ trackListGrid->addLayout(ttoolsLayout);
+ QFrame* ruler = hLine(0);
+ ruler->setLineWidth(2);
+ trackListGrid->addWidget(ruler);
trackListGrid->addWidget(tlsv, 100);
trackListGrid->addLayout(infoboxLayout);
diff --git a/muse/muse/arranger/canvas.cpp b/muse/muse/arranger/canvas.cpp
index ee25d7e2..091250d4 100644
--- a/muse/muse/arranger/canvas.cpp
+++ b/muse/muse/arranger/canvas.cpp
@@ -166,7 +166,7 @@ void PartCanvas::paint(QPainter& p, QRect r)
if (at->tw == 0)
continue;
- int y = at->tw->y() - splitWidth/2;
+ int y = at->tw->y(); // - splitWidth/2;
int h = at->tw->height() - 1;
PartList* pl = t->parts();
diff --git a/muse/muse/arranger/tlswidget.cpp b/muse/muse/arranger/tlswidget.cpp
index 1bc72bd4..798b077d 100644
--- a/muse/muse/arranger/tlswidget.cpp
+++ b/muse/muse/arranger/tlswidget.cpp
@@ -130,7 +130,7 @@ TLSWidget::TLSWidget(Track* t, ArrangerTrack* atrack, TimeCanvas* timeC)
//
// track type
//
- SimpleButton* minus = newMinusButton(0);
+ SimpleButton* minus = newMinusButton();
minus->setToolTip(tr("Remove Subtrack"));
l->addWidget(minus);
diff --git a/muse/muse/arranger/tlwidget.cpp b/muse/muse/arranger/tlwidget.cpp
index f825790d..eff4d515 100644
--- a/muse/muse/arranger/tlwidget.cpp
+++ b/muse/muse/arranger/tlwidget.cpp
@@ -260,7 +260,7 @@ void TLWidget::configChanged()
label->setText(_track->cname());
label->setFixedHeight(11);
- plus = newPlusButton(this);
+ plus = newPlusButton();
l->addWidget(plus);
plus->setToolTip(tr("Add Subtrack"));
connect(plus, SIGNAL(clicked()), SLOT(labelPlusClicked()));
@@ -273,7 +273,7 @@ void TLWidget::configChanged()
switch(id) {
case TR_NAME:
nameEdit = new TLLineEdit(_track->name(), this);
- nameEdit->setBackgroundRole(QPalette::Window);
+// nameEdit->setBackgroundRole(QPalette::Window);
nameEdit->setFixedHeight(trackRowHeight);
connect(nameEdit, SIGNAL(contentChanged(QString)), SLOT(nameChanged(QString)));
connect(nameEdit, SIGNAL(mousePress()), SLOT(select()));
@@ -312,10 +312,10 @@ void TLWidget::configChanged()
case TR_OFF:
{
- off = newOffButton(this);
+ off = newOffButton();
off->setFixedSize(trackRowHeight, trackRowHeight);
off->setChecked(_track->off());
- off->setAutoFillBackground(true);
+// off->setAutoFillBackground(true);
connect(off, SIGNAL(clicked(bool)), SLOT(offToggled(bool)));
connect(_track, SIGNAL(offChanged(bool)), this, SLOT(updateOffState()));
l->addWidget(off);
@@ -325,7 +325,7 @@ void TLWidget::configChanged()
case TR_DRUMMAP:
{
- SimpleButton* dm = newDrumMapButton(this);
+ SimpleButton* dm = newDrumMapButton();
MidiChannel* mt = (MidiChannel*)_track;
dm->setFixedSize(trackRowHeight, trackRowHeight);
dm->setChecked(mt->useDrumMap());
@@ -338,7 +338,7 @@ void TLWidget::configChanged()
case TR_MUTE:
{
- SimpleButton* mute = newMuteButton(this);
+ SimpleButton* mute = newMuteButton();
mute->setFixedSize(trackRowHeight, trackRowHeight);
mute->setChecked(_track->isMute());
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
@@ -350,7 +350,7 @@ void TLWidget::configChanged()
case TR_SOLO:
{
- SimpleButton* solo = newSoloButton(this);
+ SimpleButton* solo = newSoloButton();
solo->setFixedSize(trackRowHeight, trackRowHeight);
solo->setChecked(_track->solo());
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
@@ -362,7 +362,7 @@ void TLWidget::configChanged()
case TR_MONITOR:
{
- SimpleButton* monitor = newMonitorButton(this);
+ SimpleButton* monitor = newMonitorButton();
monitor->setFixedSize(trackRowHeight+4, trackRowHeight);
monitor->setChecked(_track->monitor());
connect(monitor, SIGNAL(clicked(bool)), SLOT(monitorToggled(bool)));
@@ -374,10 +374,10 @@ void TLWidget::configChanged()
case TR_RECORD:
{
- record = newRecordButton(this);
+ record = newRecordButton();
record->setFixedSize(trackRowHeight, trackRowHeight);
record->setChecked(_track->recordFlag());
- record->setAutoFillBackground(true);
+// record->setAutoFillBackground(true);
connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool)));
connect(_track, SIGNAL(recordChanged(bool)), record, SLOT(setChecked(bool)));
l->addWidget(record);
@@ -387,7 +387,7 @@ void TLWidget::configChanged()
case TR_AREAD:
{
- SimpleButton* b = newAutoReadButton(this);
+ SimpleButton* b = newAutoReadButton();
b->setFixedSize(trackRowHeight, trackRowHeight);
b->setChecked(_track->autoRead());
connect(b, SIGNAL(clicked(bool)), SLOT(autoReadToggled(bool)));
@@ -399,7 +399,7 @@ void TLWidget::configChanged()
case TR_AWRITE:
{
- SimpleButton* b = newAutoWriteButton(this);
+ SimpleButton* b = newAutoWriteButton();
b->setFixedSize(trackRowHeight, trackRowHeight);
b->setChecked(_track->autoWrite());
connect(b, SIGNAL(clicked(bool)), SLOT(autoWriteToggled(bool)));
@@ -628,5 +628,9 @@ void TLWidget::paintEvent(QPaintEvent* ev)
QColor color(_track->selected() ? selectBgColor : bgColor);
p.fillRect(r, color);
paintHLine(p, r.x(), r.x() + r.width(), height() - splitWidth);
+ QPalette pl = nameEdit->palette();
+ pl.setColor(QPalette::Window, color);
+ pl.setColor(QPalette::Base, color);
+ nameEdit->setPalette(pl);
}
diff --git a/muse/muse/arranger/tlwlayout.cpp b/muse/muse/arranger/tlwlayout.cpp
index 126bcaea..f3ff445a 100644
--- a/muse/muse/arranger/tlwlayout.cpp
+++ b/muse/muse/arranger/tlwlayout.cpp
@@ -74,7 +74,6 @@ void TLWidgetLayout::setGeometry(const QRect &rect)
item->setGeometry(QRect(rect.x(), rect.y(), size.width(), size.height()));
item = itemList.at(1);
-// size = item->sizeHint();
item->setGeometry(QRect(x1 - 18, y2 - 19, 18, 18));
int x = x1;
diff --git a/muse/muse/midiedit/ctrledit.cpp b/muse/muse/midiedit/ctrledit.cpp
index 115a365b..7f8fce99 100644
--- a/muse/muse/midiedit/ctrledit.cpp
+++ b/muse/muse/midiedit/ctrledit.cpp
@@ -50,7 +50,8 @@ CtrlEdit::CtrlEdit(QWidget* parent, TimeCanvas* timeCanvas, Track* t)
sel->setToolTip(tr("select controller"));
sel->setAutoRaise(false);
- minus = newMinusButton(parent);
+ minus = newMinusButton();
+ minus->setParent(parent);
minus->setToolTip(tr("remove controller view"));
minus->setAutoRaise(false);
diff --git a/muse/muse/mixer/astrip.cpp b/muse/muse/mixer/astrip.cpp
index 3514cd09..f03f3320 100644
--- a/muse/muse/mixer/astrip.cpp
+++ b/muse/muse/mixer/astrip.cpp
@@ -382,7 +382,7 @@ AudioStrip::AudioStrip(Mixer* m, AudioTrack* t, bool align)
//---------------------------------------------------
QHBoxLayout* ppBox = new QHBoxLayout;
- stereo = newStereoButton(this);
+ stereo = newStereoButton();
stereo->setChecked(channel == 2);
stereo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
stereo->setFixedHeight(LABEL_HEIGHT);
@@ -469,21 +469,21 @@ AudioStrip::AudioStrip(Mixer* m, AudioTrack* t, bool align)
QHBoxLayout* smBox1 = new QHBoxLayout(0);
QHBoxLayout* smBox2 = new QHBoxLayout(0);
- mute = newMuteButton(this);
+ mute = newMuteButton();
mute->setChecked(t->mute());
mute->setFixedSize(buttonSize);
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
connect(t, SIGNAL(muteChanged(bool)), mute, SLOT(setChecked(bool)));
smBox2->addWidget(mute);
- solo = newSoloButton(this);
+ solo = newSoloButton();
solo->setDisabled(true);
solo->setFixedSize(buttonSize);
smBox2->addWidget(solo);
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
connect(t, SIGNAL(soloChanged(bool)), solo, SLOT(setChecked(bool)));
- off = newOffButton(this);
+ off = newOffButton();
off->setFixedSize(buttonSize);
off->setChecked(t->off());
connect(off, SIGNAL(clicked(bool)), SLOT(offToggled(bool)));
@@ -492,7 +492,7 @@ AudioStrip::AudioStrip(Mixer* m, AudioTrack* t, bool align)
smBox1->addWidget(off);
if (track->canRecord()) {
- record = newRecordButton(this);
+ record = newRecordButton();
record->setFixedSize(buttonSize);
if (type == Track::AUDIO_OUTPUT)
record->setToolTip(tr("record downmix"));
diff --git a/muse/muse/mixer/mstrip.cpp b/muse/muse/mixer/mstrip.cpp
index bebea036..0309a0b2 100644
--- a/muse/muse/mixer/mstrip.cpp
+++ b/muse/muse/mixer/mstrip.cpp
@@ -134,12 +134,12 @@ MidiChannelStrip::MidiChannelStrip(Mixer* m, MidiChannel* t, bool align)
if (_align)
layout->addSpacing(STRIP_WIDTH/3);
- mute = newMuteButton(this);
+ mute = newMuteButton();
mute->setChecked(track->isMute());
mute->setFixedSize(buttonSize);
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
- solo = newSoloButton(this);
+ solo = newSoloButton();
solo->setFixedSize(buttonSize);
solo->setChecked(track->solo());
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
@@ -428,18 +428,18 @@ MidiStrip::MidiStrip(Mixer* m, MidiTrack* t, bool align)
// record, mixdownfile
//---------------------------------------------------
- SimpleButton* record = newRecordButton(this);
+ SimpleButton* record = newRecordButton();
record->setFixedSize(buttonSize);
record->setChecked(track->recordFlag());
connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool)));
connect(t, SIGNAL(recordChanged(bool)), record, SLOT(setChecked(bool)));
- mute = newMuteButton(this);
+ mute = newMuteButton();
mute->setChecked(track->isMute());
mute->setFixedSize(buttonSize);
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
- solo = newSoloButton(this);
+ solo = newSoloButton();
solo->setFixedSize(buttonSize);
solo->setChecked(track->solo());
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
@@ -724,7 +724,7 @@ MidiOutPortStrip::MidiOutPortStrip(Mixer* m, MidiOutPort* t, bool align)
// mute, solo
//---------------------------------------------------
- sync = newSyncButton(this);
+ sync = newSyncButton();
sync->setFixedHeight(buttonSize.height());
sync->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
sync->setChecked(((MidiOutPort*)track)->sendSync());
@@ -732,12 +732,12 @@ MidiOutPortStrip::MidiOutPortStrip(Mixer* m, MidiOutPort* t, bool align)
connect(sync, SIGNAL(clicked(bool)), SLOT(syncToggled(bool)));
connect(track, SIGNAL(sendSyncChanged(bool)), sync, SLOT(setChecked(bool)));
- mute = newMuteButton(this);
+ mute = newMuteButton();
mute->setChecked(track->isMute());
mute->setFixedSize(buttonSize);
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
- solo = newSoloButton(this);
+ solo = newSoloButton();
solo->setFixedSize(buttonSize);
solo->setChecked(track->solo());
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
@@ -1062,12 +1062,12 @@ MidiInPortStrip::MidiInPortStrip(Mixer* m, MidiInPort* t, bool align)
// record, mixdownfile
//---------------------------------------------------
- mute = newMuteButton(this);
+ mute = newMuteButton();
mute->setChecked(track->isMute());
mute->setFixedSize(buttonSize);
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
- solo = newSoloButton(this);
+ solo = newSoloButton();
solo->setFixedSize(buttonSize);
solo->setChecked(track->solo());
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
@@ -1374,12 +1374,12 @@ MidiSyntiStrip::MidiSyntiStrip(Mixer* m, MidiSynti* t, bool align)
// mute, solo
//---------------------------------------------------
- mute = newMuteButton(this);
+ mute = newMuteButton();
mute->setChecked(track->isMute());
mute->setFixedSize(buttonSize);
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
- solo = newSoloButton(this);
+ solo = newSoloButton();
solo->setFixedSize(buttonSize);
solo->setChecked(track->solo());
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
diff --git a/muse/muse/mixer/strip.cpp b/muse/muse/mixer/strip.cpp
index a995f7e2..811fa253 100644
--- a/muse/muse/mixer/strip.cpp
+++ b/muse/muse/mixer/strip.cpp
@@ -101,11 +101,11 @@ void Strip::configChanged()
void Strip::addAutomationButtons()
{
QHBoxLayout* aBox = new QHBoxLayout;
- SimpleButton* ar = newAutoReadButton(this);
+ SimpleButton* ar = newAutoReadButton();
ar->setFixedSize(buttonSize);
ar->setChecked(track->autoRead());
aBox->addWidget(ar);
- SimpleButton* aw = newAutoWriteButton(this);
+ SimpleButton* aw = newAutoWriteButton();
aw->setFixedSize(buttonSize);
aw->setChecked(track->autoWrite());
aBox->addWidget(aw);
diff --git a/muse/muse/widgets/utils.cpp b/muse/muse/widgets/utils.cpp
index 71718c10..55998d27 100644
--- a/muse/muse/widgets/utils.cpp
+++ b/muse/muse/widgets/utils.cpp
@@ -218,10 +218,10 @@ int string2bitmap(const QString& str)
// muteButton
//---------------------------------------------------------
-SimpleButton* newMuteButton(QWidget* parent)
+SimpleButton* newMuteButton()
{
// SimpleButton* mute = new SimpleButton(parent, muteIconOff, muteIconOn);
- SimpleButton* mute = new SimpleButton(QT_TR_NOOP("m"), parent);
+ SimpleButton* mute = new SimpleButton(QT_TR_NOOP("m"));
mute->setFont(*config.fonts[BFONT]);
mute->setCheckable(true);
mute->setToolTip(QT_TR_NOOP("mute"));
@@ -232,10 +232,10 @@ SimpleButton* newMuteButton(QWidget* parent)
// soloButton
//---------------------------------------------------------
-SimpleButton* newSoloButton(QWidget* parent)
+SimpleButton* newSoloButton()
{
// SimpleButton* solo = new SimpleButton(parent, soloIconOn, soloIconOff);
- SimpleButton* solo = new SimpleButton(QT_TR_NOOP("s"), parent);
+ SimpleButton* solo = new SimpleButton(QT_TR_NOOP("s"));
solo->setFont(*config.fonts[BFONT]);
solo->setCheckable(true);
solo->setToolTip(QT_TR_NOOP("solo"));
@@ -246,9 +246,9 @@ SimpleButton* newSoloButton(QWidget* parent)
// monitorButton
//---------------------------------------------------------
-SimpleButton* newMonitorButton(QWidget* parent)
+SimpleButton* newMonitorButton()
{
- SimpleButton* monitor = new SimpleButton(QT_TR_NOOP("Mo"), parent);
+ SimpleButton* monitor = new SimpleButton(QT_TR_NOOP("Mo"));
monitor->setFont(*config.fonts[BFONT]);
monitor->setCheckable(true);
monitor->setToolTip(QT_TR_NOOP("monitor"));
@@ -259,9 +259,9 @@ SimpleButton* newMonitorButton(QWidget* parent)
// drumMapButton
//---------------------------------------------------------
-SimpleButton* newDrumMapButton(QWidget* parent)
+SimpleButton* newDrumMapButton()
{
- SimpleButton* dm = new SimpleButton(QT_TR_NOOP("Dr"), parent);
+ SimpleButton* dm = new SimpleButton(QT_TR_NOOP("Dr"));
dm->setFont(*config.fonts[BFONT]);
dm->setCheckable(true);
dm->setToolTip(QT_TR_NOOP("use drum map"));
@@ -272,9 +272,9 @@ SimpleButton* newDrumMapButton(QWidget* parent)
// newOffButton
//---------------------------------------------------------
-SimpleButton* newOffButton(QWidget* parent)
+SimpleButton* newOffButton()
{
- SimpleButton* off = new SimpleButton(exit1Icon, exitIcon, parent);
+ SimpleButton* off = new SimpleButton(exit1Icon, exitIcon);
off->setCheckable(true);
off->setToolTip(QT_TR_NOOP("off"));
return off;
@@ -284,18 +284,18 @@ SimpleButton* newOffButton(QWidget* parent)
// newRecordButton
//---------------------------------------------------------
-SimpleButton* newRecordButton(QWidget* parent)
+SimpleButton* newRecordButton()
{
- return new RecordButton(parent);
+ return new RecordButton();
}
//---------------------------------------------------------
// newAutoReadButton
//---------------------------------------------------------
-SimpleButton* newAutoReadButton(QWidget* parent)
+SimpleButton* newAutoReadButton()
{
- SimpleButton* ar = new SimpleButton(QT_TR_NOOP("aR"), parent);
+ SimpleButton* ar = new SimpleButton(QT_TR_NOOP("aR"));
ar->setFont(*config.fonts[BFONT]);
ar->setCheckable(true);
ar->setToolTip(QT_TR_NOOP("automation read"));
@@ -306,9 +306,9 @@ SimpleButton* newAutoReadButton(QWidget* parent)
// newAutoWriteButton
//---------------------------------------------------------
-SimpleButton* newAutoWriteButton(QWidget* parent)
+SimpleButton* newAutoWriteButton()
{
- SimpleButton* aw = new SimpleButton(QT_TR_NOOP("aW"), parent);
+ SimpleButton* aw = new SimpleButton(QT_TR_NOOP("aW"));
aw->setFont(*config.fonts[BFONT]);
aw->setCheckable(true);
aw->setToolTip(QT_TR_NOOP("automation write"));
@@ -319,9 +319,9 @@ SimpleButton* newAutoWriteButton(QWidget* parent)
// syncButton
//---------------------------------------------------------
-SimpleButton* newSyncButton(QWidget* parent)
+SimpleButton* newSyncButton()
{
- SimpleButton* sync = new SimpleButton(QT_TR_NOOP("sync"), parent);
+ SimpleButton* sync = new SimpleButton(QT_TR_NOOP("sync"));
sync->setFont(*config.fonts[BFONT]);
sync->setCheckable(true);
sync->setToolTip(QT_TR_NOOP("send sync events"));
@@ -332,18 +332,18 @@ SimpleButton* newSyncButton(QWidget* parent)
// newMinusButton
//---------------------------------------------------------
-SimpleButton* newMinusButton(QWidget* parent)
+SimpleButton* newMinusButton()
{
- return new SimpleButton(minusIcon, minusIcon, parent);
+ return new SimpleButton(minusIcon, minusIcon);
}
//---------------------------------------------------------
// newPlusButton
//---------------------------------------------------------
-SimpleButton* newPlusButton(QWidget* parent)
+SimpleButton* newPlusButton()
{
- SimpleButton* sync = new SimpleButton(plusIcon, plusIcon, parent);
+ SimpleButton* sync = new SimpleButton(plusIcon, plusIcon);
return sync;
}
@@ -351,9 +351,9 @@ SimpleButton* newPlusButton(QWidget* parent)
// newStereoButton
//---------------------------------------------------------
-SimpleButton* newStereoButton(QWidget* parent)
+SimpleButton* newStereoButton()
{
- SimpleButton* stereo = new SimpleButton(stereoIcon, monoIcon, parent);
+ SimpleButton* stereo = new SimpleButton(stereoIcon, monoIcon);
stereo->setCheckable(true);
stereo->setToolTip(QT_TR_NOOP("1/2 channel"));
return stereo;
diff --git a/muse/muse/widgets/utils.h b/muse/muse/widgets/utils.h
index d3741583..e395ff3a 100644
--- a/muse/muse/widgets/utils.h
+++ b/muse/muse/widgets/utils.h
@@ -33,18 +33,18 @@ extern QFrame* hLine(QWidget* parent);
extern QFrame* vLine(QWidget* parent);
extern void dump(const unsigned char* p, int n);
extern double curTime();
-extern SimpleButton* newMuteButton(QWidget* parent);
-extern SimpleButton* newSoloButton(QWidget* parent);
-extern SimpleButton* newMonitorButton(QWidget* parent);
-extern SimpleButton* newDrumMapButton(QWidget* parent);
-extern SimpleButton* newOffButton(QWidget* parent);
-extern SimpleButton* newRecordButton(QWidget* parent);
-extern SimpleButton* newAutoWriteButton(QWidget* parent);
-extern SimpleButton* newAutoReadButton(QWidget* parent);
-extern SimpleButton* newSyncButton(QWidget* parent);
-extern SimpleButton* newPlusButton(QWidget* parent);
-extern SimpleButton* newMinusButton(QWidget* parent);
-extern SimpleButton* newStereoButton(QWidget* parent);
+extern SimpleButton* newMuteButton();
+extern SimpleButton* newSoloButton();
+extern SimpleButton* newMonitorButton();
+extern SimpleButton* newDrumMapButton();
+extern SimpleButton* newOffButton();
+extern SimpleButton* newRecordButton();
+extern SimpleButton* newAutoWriteButton();
+extern SimpleButton* newAutoReadButton();
+extern SimpleButton* newSyncButton();
+extern SimpleButton* newPlusButton();
+extern SimpleButton* newMinusButton();
+extern SimpleButton* newStereoButton();
extern void fatalError(const char*);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 19:37:20 +0000