From 1e2c10156202d4b50df409a1930adc3f151e44dc Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Tue, 7 Dec 2010 11:47:15 +0000 Subject: converted Qt3 methods to Qt4. Cleaned up app.* includes a bit. --- muse2/ChangeLog | 1 + muse2/muse/app.cpp | 8 ------- muse2/muse/app.h | 24 +++++++++------------ muse2/muse/arranger/arranger.cpp | 2 +- muse2/muse/liste/editevent.cpp | 2 +- muse2/muse/liste/listedit.cpp | 2 +- muse2/muse/midiedit/drumedit.cpp | 6 +++--- muse2/muse/midiedit/pianoroll.cpp | 4 ++-- muse2/muse/midiedit/pianoroll.h | 1 - muse2/muse/mixer/astrip.cpp | 4 ++-- muse2/muse/plugin.cpp | 2 +- muse2/muse/plugin.h | 4 ++-- muse2/muse/waveedit/waveedit.cpp | 4 ++-- muse2/muse/widgets/bigtime.cpp | 41 ++++++++++++++++++------------------ muse2/muse/widgets/filedialog.cpp | 4 ++-- muse2/muse/widgets/genset.cpp | 24 ++++++++++----------- muse2/muse/widgets/midisyncimpl.cpp | 10 ++++----- muse2/muse/widgets/mixdowndialog.cpp | 8 +++---- muse2/muse/widgets/nentry.cpp | 8 ++++--- muse2/muse/widgets/poslabel.cpp | 3 ++- 20 files changed, 76 insertions(+), 86 deletions(-) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index c911e1d4..c19ce208 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,6 +1,7 @@ 07.12.2010: - Ported rack. TODO: Drag and drop needs a hand. It's not working. (Orcan) - Converted various Qt3 support methods to Qt4 in many files. (Orcan) + - Includes cleanup in app.*. (Orcan) 06.12.2010 - Built Awl::posedit and Awl::sigedit, and replaced /widget versions and all usages. (Tim) TODO: Awl::sigedit has no returnPressed signal, for lmaster. diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 1870642a..aff7815c 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -22,28 +22,20 @@ #include #include -#include #include #include #include -#include #include -#include -#include #include #include -#include #include -#include #include #include #include -#include #include #include #include #include -#include #include #include #include diff --git a/muse2/muse/app.h b/muse2/muse/app.h index 6d2519b9..3a6189c5 100644 --- a/muse2/muse/app.h +++ b/muse2/muse/app.h @@ -10,29 +10,25 @@ #define __APP_H__ #include "config.h" - -#include -#include -//Added by qt3to4: -#include - -#include -#include -#include #include "cobject.h" #include "tools.h" -#include + +class QCloseEvent; +class QFileInfo; +class QFocusEvent; +class QMainWindow; +class QMenu; +class QPoint; +class QRect; +class QToolBar; +class QToolButton; class Part; class PartList; -class QToolBar; -class QMenu; class Transport; class BigTime; class Arranger; class Instrument; -class QPoint; -class QToolButton; class PopupMenu; class PopupView; class Track; diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp index 94acca5a..d03eaf92 100644 --- a/muse2/muse/arranger/arranger.cpp +++ b/muse2/muse/arranger/arranger.cpp @@ -326,7 +326,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name) split->setSizes(vallist); QGridLayout* egrid = new QGridLayout(editor); - egrid->setColStretch(0, 50); + egrid->setColumnStretch(0, 50); egrid->setRowStretch(2, 50); egrid->setContentsMargins(0, 0, 0, 0); egrid->setSpacing(0); diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp index 99c1ed1d..73c8f790 100644 --- a/muse2/muse/liste/editevent.cpp +++ b/muse2/muse/liste/editevent.cpp @@ -286,7 +286,7 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev, : EditEventDialog(parent) { meta = 0; - setCaption(tr("MusE: Enter Meta Event")); + setWindowTitle(tr("MusE: Enter Meta Event")); QLabel* l1 = new QLabel(tr("Time Position")); ///epos = new PosEdit; diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp index 44cab35a..90169fbf 100644 --- a/muse2/muse/liste/listedit.cpp +++ b/muse2/muse/liste/listedit.cpp @@ -521,7 +521,7 @@ ListEdit::ListEdit(PartList* pl) //--------------------------------------------------- mainGrid->setRowStretch(1, 100); - mainGrid->setColStretch(0, 100); + mainGrid->setColumnStretch(0, 100); mainGrid->addWidget(liste, 1, 0, 2, 1); connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int))); songChanged(-1); diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index d8845db7..43227810 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -311,7 +311,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini corner->setFixedHeight(hscroll->sizeHint().height()); mainGrid->setRowStretch(0, 100); - mainGrid->setColStretch(1, 100); + mainGrid->setColumnStretch(1, 100); mainGrid->addWidget(split1, 0, 0, 1, 3); mainGrid->addWidget(ctrl, 1, 0); @@ -348,7 +348,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini //split2->setResizeMode(split1w1, QSplitter::KeepSize); gridS2->setRowStretch(1, 100); - gridS2->setColStretch(0, 100); + gridS2->setColumnStretch(0, 100); gridS2->addWidget(time, 0, 0, 1, 2); gridS2->addWidget(hLine(split1w2), 1, 0, 1, 2); @@ -386,7 +386,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini connect(dlist, SIGNAL(mapChanged(int, int)), canvas, SLOT(mapChanged(int, int))); gridS1->setRowStretch(1, 100); - gridS1->setColStretch(0, 100); + gridS1->setColumnStretch(0, 100); gridS1->addWidget(header, 0, 0); gridS1->addWidget(dlist, 1, 0); diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp index 191d0db4..3d387b95 100644 --- a/muse2/muse/midiedit/pianoroll.cpp +++ b/muse2/muse/midiedit/pianoroll.cpp @@ -333,7 +333,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i QSizeGrip* corner = new QSizeGrip(mainw); mainGrid->setRowStretch(0, 100); - mainGrid->setColStretch(1, 100); + mainGrid->setColumnStretch(1, 100); mainGrid->addWidget(splitter, 0, 0, 1, 3); mainGrid->addWidget(ctrl, 1, 0); mainGrid->addWidget(hscroll, 1, 1); @@ -359,7 +359,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i time->setOrigin(offset, 0); gridS1->setRowStretch(2, 100); - gridS1->setColStretch(1, 100); + gridS1->setColumnStretch(1, 100); gridS1->addWidget(time, 0, 1, 1, 2); gridS1->addWidget(hLine(split1), 1, 0, 1, 3); diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h index a08853bd..8f225dc1 100644 --- a/muse2/muse/midiedit/pianoroll.h +++ b/muse2/muse/midiedit/pianoroll.h @@ -25,7 +25,6 @@ class TimeLabel; class PitchLabel; class QLabel; class PianoCanvas; -class IntLabel; class MTScale; class Track; class QToolButton; diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp index 9c2e14f5..58cf870f 100644 --- a/muse2/muse/mixer/astrip.cpp +++ b/muse2/muse/mixer/astrip.cpp @@ -568,7 +568,7 @@ void AudioStrip::updateChannels() meter[cc]->setFixedWidth(15); connect(meter[cc], SIGNAL(mousePress()), this, SLOT(resetPeaks())); sliderGrid->addWidget(meter[cc], 0, cc+1, Qt::AlignHCenter); - sliderGrid->setColStretch(cc, 50); + sliderGrid->setColumnStretch(cc, 50); meter[cc]->show(); } } @@ -787,7 +787,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at) meter[i]->setFixedWidth(15); connect(meter[i], SIGNAL(mousePress()), this, SLOT(resetPeaks())); sliderGrid->addWidget(meter[i], 0, i+1, Qt::AlignHCenter); - sliderGrid->setColStretch(i, 50); + sliderGrid->setColumnStretch(i, 50); } grid->addLayout(sliderGrid, _curGridRow++, 0, 1, 2); diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp index 8d2d3752..7a71f0a1 100644 --- a/muse2/muse/plugin.cpp +++ b/muse2/muse/plugin.cpp @@ -3070,7 +3070,7 @@ PluginGui::PluginGui(PluginIBase* p) // p3.3.43 resize(280, height()); - grid->setColStretch(2, 10); + grid->setColumnStretch(2, 10); mw->setLayout(grid); view->setWidget(mw); } diff --git a/muse2/muse/plugin.h b/muse2/muse/plugin.h index f5ac9031..fbe6169e 100644 --- a/muse2/muse/plugin.h +++ b/muse2/muse/plugin.h @@ -98,8 +98,8 @@ class Plugin { unsigned long id() const { return _uniqueID; } QString maker() const { return _maker; } QString copyright() const { return _copyright; } - QString lib(bool complete = true) /*const*/ { return fi.baseName(complete); } // ddskrjo const - QString dirPath(bool complete = true) const { return fi.dirPath(complete); } + QString lib(bool complete = true) /*const*/ { return complete ? fi.completeBaseName() : fi.baseName(); } // ddskrjo const + QString dirPath(bool complete = true) const { return complete ? fi.absolutePath() : fi.path(); } QString filePath() const { return fi.filePath(); } int references() const { return _references; } int incReferences(int); diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp index 62e7d6f1..cbe4e7a8 100644 --- a/muse2/muse/waveedit/waveedit.cpp +++ b/muse2/muse/waveedit/waveedit.cpp @@ -203,7 +203,7 @@ WaveEdit::WaveEdit(PartList* pl) time->setOrigin(0, 0); mainGrid->setRowStretch(0, 100); - mainGrid->setColStretch(0, 100); + mainGrid->setColumnStretch(0, 100); mainGrid->addWidget(time, 0, 0, 1, 2); mainGrid->addWidget(hLine(mainw), 1, 0, 1, 2); @@ -214,7 +214,7 @@ WaveEdit::WaveEdit(PartList* pl) connect(hscroll, SIGNAL(scrollChanged(int)), view, SLOT(setXPos(int))); connect(hscroll, SIGNAL(scaleChanged(int)), view, SLOT(setXMag(int))); - setCaption(view->getCaption()); + setWindowTitle(view->getCaption()); connect(view, SIGNAL(followEvent(int)), hscroll, SLOT(setOffset(int))); connect(hscroll, SIGNAL(scrollChanged(int)), time, SLOT(setXPos(int))); diff --git a/muse2/muse/widgets/bigtime.cpp b/muse2/muse/widgets/bigtime.cpp index 73c113d2..78da4248 100644 --- a/muse2/muse/widgets/bigtime.cpp +++ b/muse2/muse/widgets/bigtime.cpp @@ -27,16 +27,17 @@ extern int mtcType; //--------------------------------------------------------- BigTime::BigTime(QWidget* parent) - : QWidget(parent, 0, Qt::Window | Qt::WindowStaysOnTopHint) // Possibly also Qt::X11BypassWindowManagerHint + : QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint) // Possibly also Qt::X11BypassWindowManagerHint { tickmode = true; - dwin = new QWidget(this, "bigtime-dwin", Qt::WindowStaysOnTopHint); // Possibly also Qt::X11BypassWindowManagerHint + dwin = new QWidget(this, Qt::WindowStaysOnTopHint); // Possibly also Qt::X11BypassWindowManagerHint + dwin->setObjectName("bigtime-dwin"); dwin->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); fmtButton = new QCheckBox(QString(""), this); fmtButton->resize(18,18); fmtButton->setChecked(true); - QToolTip::add(fmtButton, tr("format display")); + fmtButton->setToolTip(tr("format display")); barLabel = new QLabel(dwin); beatLabel = new QLabel(dwin); tickLabel = new QLabel(dwin); @@ -52,16 +53,16 @@ BigTime::BigTime(QWidget* parent) sep5 = new QLabel(QString(":"), dwin); absTickLabel = new QLabel(dwin); absFrameLabel = new QLabel(dwin); - QToolTip::add(barLabel, tr("bar")); - QToolTip::add(beatLabel, tr("beat")); - QToolTip::add(tickLabel, tr("tick")); - //QToolTip::add(hourLabel, tr("hour")); - QToolTip::add(minLabel, tr("minute")); - QToolTip::add(secLabel, tr("second")); - QToolTip::add(frameLabel, tr("frame")); - QToolTip::add(subFrameLabel, tr("subframe")); - QToolTip::add(absTickLabel, tr("tick")); - QToolTip::add(absFrameLabel, tr("frame")); + barLabel->setToolTip(tr("bar")); + beatLabel->setToolTip(tr("beat")); + tickLabel->setToolTip(tr("tick")); + //hourLabel->setToolTip(tr("hour")); + minLabel->setToolTip(tr("minute")); + secLabel->setToolTip(tr("second")); + frameLabel->setToolTip(tr("frame")); + subFrameLabel->setToolTip(tr("subframe")); + absTickLabel->setToolTip(tr("tick")); + absFrameLabel->setToolTip(tr("frame")); fmtButtonToggled(true); connect(fmtButton, SIGNAL(toggled(bool)), SLOT(fmtButtonToggled(bool))); //oldbar = oldbeat = oldtick = oldhour = oldmin = oldsec = oldframe = -1; @@ -75,7 +76,7 @@ BigTime::BigTime(QWidget* parent) f.setPixelSize(10); dwin->setFont(f); - setCaption(tr("MusE: Bigtime")); + setWindowTitle(tr("MusE: Bigtime")); } @@ -386,9 +387,8 @@ void BigTime::resizeEvent(QResizeEvent *ev) void BigTime::setFgColor(QColor c) { - QColorGroup cg = palette().active(); - cg.setColor(QColorGroup::Foreground, c); - QPalette newpalette(cg, cg, cg); + QPalette newpalette(palette()); + newpalette.setColor(QPalette::Foreground, c); setPalette(newpalette); barLabel->setPalette(newpalette); @@ -415,9 +415,8 @@ void BigTime::setFgColor(QColor c) void BigTime::setBgColor(QColor c) { - QColorGroup cg = palette().active(); - cg.setColor(QColorGroup::Background, c); - QPalette newpalette(cg, cg, cg); + QPalette newpalette(palette()); + newpalette.setColor(QPalette::Window, c); setPalette(newpalette); barLabel->setPalette(newpalette); @@ -437,6 +436,6 @@ void BigTime::setBgColor(QColor c) sep4->setPalette(newpalette); sep5->setPalette(newpalette); - setBackgroundColor(c); + setPalette(newpalette); } diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp index c6c1f9ae..21bbbb27 100644 --- a/muse2/muse/widgets/filedialog.cpp +++ b/muse2/muse/widgets/filedialog.cpp @@ -418,8 +418,8 @@ QString getImageFileName(const QString& startWith, *workingDirectory = startWith; } else if (fi.exists() && fi.isFile()) { - *workingDirectory = fi.dirPath(TRUE); - initialSelection = fi.absFilePath(); + *workingDirectory = fi.absolutePath(); + initialSelection = fi.absoluteFilePath(); } } MFileDialog *dlg = new MFileDialog(*workingDirectory, QString::null, diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp index b82cd6d7..a05020d6 100644 --- a/muse2/muse/widgets/genset.cpp +++ b/muse2/muse/widgets/genset.cpp @@ -42,25 +42,25 @@ GlobalSettingsConfig::GlobalSettingsConfig(QWidget* parent) startSongGroup->addButton(startSongButton, 2); for (unsigned i = 0; i < sizeof(rtcResolutions)/sizeof(*rtcResolutions); ++i) { if (rtcResolutions[i] == config.rtcTicks) { - rtcResolutionSelect->setCurrentItem(i); + rtcResolutionSelect->setCurrentIndex(i); break; } } for (unsigned i = 0; i < sizeof(divisions)/sizeof(*divisions); ++i) { if (divisions[i] == config.division) { - midiDivisionSelect->setCurrentItem(i); + midiDivisionSelect->setCurrentIndex(i); break; } } for (unsigned i = 0; i < sizeof(divisions)/sizeof(*divisions); ++i) { if (divisions[i] == config.guiDivision) { - guiDivisionSelect->setCurrentItem(i); + guiDivisionSelect->setCurrentIndex(i); break; } } for (unsigned i = 0; i < sizeof(dummyAudioBufSizes)/sizeof(*dummyAudioBufSizes); ++i) { if (dummyAudioBufSizes[i] == config.dummyAudioBufSize) { - dummyAudioSize->setCurrentItem(i); + dummyAudioSize->setCurrentIndex(i); break; } } @@ -147,25 +147,25 @@ void GlobalSettingsConfig::updateSettings() { for (unsigned i = 0; i < sizeof(rtcResolutions)/sizeof(*rtcResolutions); ++i) { if (rtcResolutions[i] == config.rtcTicks) { - rtcResolutionSelect->setCurrentItem(i); + rtcResolutionSelect->setCurrentIndex(i); break; } } for (unsigned i = 0; i < sizeof(divisions)/sizeof(*divisions); ++i) { if (divisions[i] == config.division) { - midiDivisionSelect->setCurrentItem(i); + midiDivisionSelect->setCurrentIndex(i); break; } } for (unsigned i = 0; i < sizeof(divisions)/sizeof(*divisions); ++i) { if (divisions[i] == config.guiDivision) { - guiDivisionSelect->setCurrentItem(i); + guiDivisionSelect->setCurrentIndex(i); break; } } for (unsigned i = 0; i < sizeof(dummyAudioBufSizes)/sizeof(*dummyAudioBufSizes); ++i) { if (dummyAudioBufSizes[i] == config.dummyAudioBufSize) { - dummyAudioSize->setCurrentItem(i); + dummyAudioSize->setCurrentIndex(i); break; } } @@ -249,7 +249,7 @@ void GlobalSettingsConfig::showEvent(QShowEvent* e) void GlobalSettingsConfig::apply() { - int rtcticks = rtcResolutionSelect->currentItem(); + int rtcticks = rtcResolutionSelect->currentIndex(); config.guiRefresh = guiRefreshSelect->value(); config.minSlider = minSliderSelect->value(); config.minMeter = minMeterSelect->value(); @@ -261,13 +261,13 @@ void GlobalSettingsConfig::apply() config.helpBrowser = helpBrowser->text(); config.startSong = startSongEntry->text(); config.startMode = startSongGroup->checkedId(); - int das = dummyAudioSize->currentItem(); + int das = dummyAudioSize->currentIndex(); config.dummyAudioBufSize = dummyAudioBufSizes[das]; config.dummyAudioSampleRate = dummyAudioRate->value(); - int div = midiDivisionSelect->currentItem(); + int div = midiDivisionSelect->currentIndex(); config.division = divisions[div]; - div = guiDivisionSelect->currentItem(); + div = guiDivisionSelect->currentIndex(); config.guiDivision = divisions[div]; config.transportVisible = showTransport->isChecked(); diff --git a/muse2/muse/widgets/midisyncimpl.cpp b/muse2/muse/widgets/midisyncimpl.cpp index c9e3801a..25508c27 100644 --- a/muse2/muse/widgets/midisyncimpl.cpp +++ b/muse2/muse/widgets/midisyncimpl.cpp @@ -337,7 +337,7 @@ void MidiSyncConfig::songChanged(int flags) useJackTransportCheckbox->blockSignals(false); extSyncCheckbox->blockSignals(false); - mtcSyncType->setCurrentItem(mtcType); + mtcSyncType->setCurrentIndex(mtcType); mtcOffH->blockSignals(true); mtcOffM->blockSignals(true); @@ -632,7 +632,7 @@ void MidiSyncConfig::cancel() if(applyButton->isEnabled()) applyButton->setEnabled(false); - close(false); + close(); } //--------------------------------------------------------- @@ -695,7 +695,7 @@ void MidiSyncConfig::apply() syncSendFirstClockDelay = syncDelaySpinBox->value(); - mtcType = mtcSyncType->currentItem(); + mtcType = mtcSyncType->currentIndex(); //extSyncFlag.setValue(syncMode->id(syncMode->selected())); //extSyncFlag.blockSignals(true); extSyncFlag.setValue(extSyncCheckbox->isChecked()); @@ -1176,7 +1176,7 @@ void MidiSyncConfig::dlvDoubleClicked(QTreeWidgetItem* item, int col) { //int val = lvi->syncInfo().idIn(); int val = lvi->_idIn; - int newval = QInputDialog::getInteger("Muse: Sync info" , "Enter new id number (127 = all):", val, 0, 127, 1, &ok, this); + int newval = QInputDialog::getInteger(this, "Muse: Sync info" , "Enter new id number (127 = all):", val, 0, 127, 1, &ok); if(ok) { //lvi->syncInfo().setIdIn(newval); @@ -1189,7 +1189,7 @@ void MidiSyncConfig::dlvDoubleClicked(QTreeWidgetItem* item, int col) { //int val = lvi->syncInfo().idOut(); int val = lvi->_idOut; - int newval = QInputDialog::getInteger("Muse: Sync info" , "Enter new id number (127 = global):", val, 0, 127, 1, &ok, this); + int newval = QInputDialog::getInteger(this, "Muse: Sync info" , "Enter new id number (127 = global):", val, 0, 127, 1, &ok); if(ok) { //lvi->syncInfo().setIdOut(newval); diff --git a/muse2/muse/widgets/mixdowndialog.cpp b/muse2/muse/widgets/mixdowndialog.cpp index 1e2ecc5b..8ab26859 100644 --- a/muse2/muse/widgets/mixdowndialog.cpp +++ b/muse2/muse/widgets/mixdowndialog.cpp @@ -45,8 +45,8 @@ MixdownFileDialog::MixdownFileDialog(const SndFile* _sf, case 6: channels = 2; break; } editPath->setText(_sf->path()); - comboChannel->setCurrentItem(channels); - comboFormat->setCurrentItem(format); + comboChannel->setCurrentIndex(channels); + comboFormat->setCurrentIndex(format); } } @@ -57,8 +57,8 @@ MixdownFileDialog::MixdownFileDialog(const SndFile* _sf, void MixdownFileDialog::accept() { QString oldpath; - unsigned channel = comboChannel->currentItem(); - unsigned format = comboFormat->currentItem(); + unsigned channel = comboChannel->currentIndex(); + unsigned format = comboFormat->currentIndex(); switch (channel) { case 0: channel = 2; break; case 1: channel = 1; break; diff --git a/muse2/muse/widgets/nentry.cpp b/muse2/muse/widgets/nentry.cpp index 708836e1..7df7b964 100644 --- a/muse2/muse/widgets/nentry.cpp +++ b/muse2/muse/widgets/nentry.cpp @@ -133,9 +133,11 @@ void Nentry::setFocusPolicy(Qt::FocusPolicy policy) void Nentry::setDark() { const QPalette& oldpalette = edit->palette(); - QColorGroup cg1 = oldpalette.active(); - cg1.setColor(QColorGroup::Base, cg1.background()); - QPalette newpalette(cg1, cg1, cg1); + + const QColor& newcolor = oldpalette.color(QPalette::Window); + QPalette newpalette(oldpalette); + newpalette.setColor(QPalette::Base, newcolor); + edit->setPalette(newpalette); } diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp index 4ab7724c..98b790ad 100644 --- a/muse2/muse/widgets/poslabel.cpp +++ b/muse2/muse/widgets/poslabel.cpp @@ -25,8 +25,9 @@ extern int mtcType; //--------------------------------------------------------- PosLabel::PosLabel(QWidget* parent, const char* name) - : QLabel(parent, name) + : QLabel(parent) { + setObjectName(name); _tickValue = 0; _sampleValue = 0; _smpte = false; -- cgit v1.2.3