diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-07 11:47:15 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-07 11:47:15 +0000 |
commit | 1e2c10156202d4b50df409a1930adc3f151e44dc (patch) | |
tree | bb6c040e4c80d73ec50d6eb7dc3ce38ffe832a2a /muse2/muse/widgets | |
parent | c2adb2d1ec669182b127c1414ac0583a4e9c9386 (diff) |
converted Qt3 methods to Qt4. Cleaned up app.* includes a bit.
Diffstat (limited to 'muse2/muse/widgets')
-rw-r--r-- | muse2/muse/widgets/bigtime.cpp | 41 | ||||
-rw-r--r-- | muse2/muse/widgets/filedialog.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/widgets/genset.cpp | 24 | ||||
-rw-r--r-- | muse2/muse/widgets/midisyncimpl.cpp | 10 | ||||
-rw-r--r-- | muse2/muse/widgets/mixdowndialog.cpp | 8 | ||||
-rw-r--r-- | muse2/muse/widgets/nentry.cpp | 8 | ||||
-rw-r--r-- | muse2/muse/widgets/poslabel.cpp | 3 |
7 files changed, 50 insertions, 48 deletions
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; |