diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-11-18 09:11:56 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-11-18 09:11:56 +0000 |
commit | 87d3692e1ad5a79a3608ffd361c637e44d9291c7 (patch) | |
tree | 6750e2f5c759c18253c003323a39363d97a6d1a5 /muse2/muse/mplugins | |
parent | 670e396ad8eb962ea7e37720ef91d79106994bc5 (diff) |
ported .ui widgets to Qt4
Diffstat (limited to 'muse2/muse/mplugins')
-rw-r--r-- | muse2/muse/mplugins/midiitransform.cpp | 65 | ||||
-rw-r--r-- | muse2/muse/mplugins/midiitransform.h | 28 | ||||
-rw-r--r-- | muse2/muse/mplugins/mitplugin.cpp | 2 |
3 files changed, 58 insertions, 37 deletions
diff --git a/muse2/muse/mplugins/midiitransform.cpp b/muse2/muse/mplugins/midiitransform.cpp index f3eecece..e7d8763b 100644 --- a/muse2/muse/mplugins/midiitransform.cpp +++ b/muse2/muse/mplugins/midiitransform.cpp @@ -8,18 +8,12 @@ #include <stdio.h> #include <list> -#include <qpushbutton.h> -#include <q3buttongroup.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <q3listbox.h> -#include <qspinbox.h> -#include <q3multilineedit.h> -#include <qcheckbox.h> -#include <qtoolbutton.h> -//Added by qt3to4: #include <QCloseEvent> +#include <QButtonGroup> +#include <QDialog> +#include <QListWidgetItem> + #include "spinboxFP.h" #include "midi.h" #include "midictrl.h" @@ -597,14 +591,19 @@ bool MidiInputTransformation::typesMatch(MidiRecordEvent& e, int selType) const // procChannelOp procChannelVala procChannelValb //--------------------------------------------------------- -MidiInputTransformDialog::MidiInputTransformDialog(QWidget* parent, - const char* name, bool modal, Qt::WFlags fl) - : MidiInputTransformDialogBase(parent, name, modal, fl) +MidiInputTransformDialog::MidiInputTransformDialog(QDialog* parent, Qt::WFlags fl) + : MidiInputTransformDialogBaseWidget(parent, fl) { cindex = 0; cmodul = 0; cmt = 0; + modulGroup = new QButtonGroup; + modulGroup->addButton(modul1select,0); + modulGroup->addButton(modul2select,1); + modulGroup->addButton(modul3select,2); + modulGroup->addButton(modul4select,3); + for (unsigned i = 0; i < sizeof(oplist)/sizeof(*oplist); ++i) funcOp->insertItem(oplist[i].text, i); @@ -619,8 +618,8 @@ MidiInputTransformDialog::MidiInputTransformDialog(QWidget* parent, connect(procVal1Op, SIGNAL(activated(int)), SLOT(procVal1OpSel(int))); connect(procVal2Op, SIGNAL(activated(int)), SLOT(procVal2OpSel(int))); connect(funcOp, SIGNAL(activated(int)), SLOT(funcOpSel(int))); - connect(presetList, SIGNAL(highlighted(Q3ListBoxItem*)), - SLOT(presetChanged(Q3ListBoxItem*))); + connect(presetList, SIGNAL(itemActivated(QListWidgetItem*)), + SLOT(presetChanged(QListWidgetItem*))); connect(nameEntry, SIGNAL(textChanged(const QString&)), SLOT(nameChanged(const QString&))); connect(commentEntry, SIGNAL(textChanged()), SLOT(commentChanged())); @@ -638,7 +637,7 @@ MidiInputTransformDialog::MidiInputTransformDialog(QWidget* parent, connect(modul2enable, SIGNAL(toggled(bool)), SLOT(modul2enableChanged(bool))); connect(modul3enable, SIGNAL(toggled(bool)), SLOT(modul3enableChanged(bool))); connect(modul4enable, SIGNAL(toggled(bool)), SLOT(modul4enableChanged(bool))); - connect(modulGroup, SIGNAL(clicked(int)), SLOT(changeModul(int))); + connect(modulGroup, SIGNAL(buttonClicked(int)), SLOT(changeModul(int))); connect(selPortOp, SIGNAL(activated(int)), SLOT(selPortOpSel(int))); connect(selPortVala, SIGNAL(valueChanged(int)), SLOT(selPortValaChanged(int))); @@ -661,6 +660,8 @@ MidiInputTransformDialog::MidiInputTransformDialog(QWidget* parent, //--------------------------------------------------- updatePresetList(); + presetList->setCurrentItem(presetList->item(0)); + presetChanged(presetList->item(0)); connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int))); } @@ -687,7 +688,7 @@ void MidiInputTransformDialog::updatePresetList() modul1select->setOn(true); for (iMidiInputTransformation i = mtlist.begin(); i != mtlist.end(); ++i) { - presetList->insertItem((*i)->name); + presetList->addItem((*i)->name); if (cmt == 0) cmt = *i; } @@ -695,7 +696,7 @@ void MidiInputTransformDialog::updatePresetList() // create default "New" preset cmt = new MidiInputTransformation(tr("New")); mtlist.push_back(cmt); - presetList->insertItem(tr("New")); + presetList->addItem(tr("New")); presetList->setCurrentItem(0); } changeModul(0); @@ -1189,9 +1190,11 @@ void MidiInputTransformDialog::presetNew() break; } MidiInputTransformation* mt = new MidiInputTransformation(name); - Q3ListBoxText* lbi = new Q3ListBoxText(presetList, name); + QListWidgetItem* lbi = new QListWidgetItem(name); + presetList->addItem(lbi); mtlist.push_back(mt); presetList->setCurrentItem(lbi); + presetChanged(lbi); } //--------------------------------------------------------- @@ -1204,7 +1207,9 @@ void MidiInputTransformDialog::presetDelete() iMidiInputTransformation mt = mtlist.begin(); for (int i = 0; i < cindex; ++i, ++mt) { mtlist.erase(mt); - presetList->removeItem(cindex); + presetList->setCurrentItem(presetList->item(cindex - 1)); + presetList->takeItem(cindex); + presetChanged(presetList->item(cindex - 1)); break; } } @@ -1217,13 +1222,15 @@ void MidiInputTransformDialog::presetDelete() void MidiInputTransformDialog::nameChanged(const QString& s) { cmt->name = s; - Q3ListBoxItem* item = presetList->item(cindex); + QListWidgetItem* item = presetList->item(cindex); if (s != item->text()) { - disconnect(presetList, SIGNAL(highlighted(Q3ListBoxItem*)), - this, SLOT(presetChanged(Q3ListBoxItem*))); - presetList->changeItem(s, cindex); - connect(presetList, SIGNAL(highlighted(Q3ListBoxItem*)), - SLOT(presetChanged(Q3ListBoxItem*))); + disconnect(presetList, SIGNAL(itemActivated(QListWidgetItem*)), + this, SLOT(presetChanged(QListWidgetItem*))); + presetList->insertItem(cindex, s); + presetList->takeItem(cindex+1); + presetList->setCurrentItem(presetList->item(cindex)); + connect(presetList, SIGNAL(itemActivated(QListWidgetItem*)), + SLOT(presetChanged(QListWidgetItem*))); } } @@ -1565,7 +1572,7 @@ printf("change modul %d\n", k); iMidiInputTransformation i; for (i = mtlist.begin(); i != mtlist.end(); ++i, ++idx) { if (*i == modules[k].transform) { - presetList->setCurrentItem(idx); + presetList->setCurrentItem(presetList->item(idx)); break; } } @@ -1578,9 +1585,9 @@ printf("change modul %d\n", k); // presetChanged //--------------------------------------------------------- -void MidiInputTransformDialog::presetChanged(Q3ListBoxItem* item) +void MidiInputTransformDialog::presetChanged(QListWidgetItem* item) { - cindex = presetList->index(item); + cindex = presetList->row(item); //--------------------------------------------------- // search transformation in list and set diff --git a/muse2/muse/mplugins/midiitransform.h b/muse2/muse/mplugins/midiitransform.h index 860797c5..3180bf23 100644 --- a/muse2/muse/mplugins/midiitransform.h +++ b/muse2/muse/mplugins/midiitransform.h @@ -9,11 +9,11 @@ #ifndef __MIDIITRANSFORM_H__ #define __MIDIITRANSFORM_H__ -#include "itransformbase.h" -//Added by qt3to4: +#include "ui_itransformbase.h" + #include <QCloseEvent> -class Q3ListBoxItem; +class QButtonGroup; class MidiTransformation; class MidiInputTransformation; class MidiRecordEvent; @@ -23,11 +23,25 @@ class Xml; #include "miditransform.h" enum InputTransformProcEventOp { KeepType, FixType }; + +//--------------------------------------------------------- +// MidiInputTransformDialogBaseWidget +// Wrapper around Ui::MidiInputTransformDialogBase +//--------------------------------------------------------- + +class MidiInputTransformDialogBaseWidget : public QDialog, public Ui::MidiInputTransformDialogBase +{ + Q_OBJECT + + public: + MidiInputTransformDialogBaseWidget(QDialog *parent = 0, Qt::WFlags f = 0) : QDialog(parent, f) { setupUi(this); } +}; + //--------------------------------------------------------- // MidiInputTransform //--------------------------------------------------------- -class MidiInputTransformDialog : public MidiInputTransformDialogBase { +class MidiInputTransformDialog : public MidiInputTransformDialogBaseWidget { Q_OBJECT MidiInputTransformation* cmt; int cindex; // current index in preset list @@ -39,6 +53,7 @@ class MidiInputTransformDialog : public MidiInputTransformDialogBase { virtual void closeEvent(QCloseEvent*); void updatePresetList(); + QButtonGroup* modulGroup; signals: void hideWindow(); @@ -57,7 +72,7 @@ class MidiInputTransformDialog : public MidiInputTransformDialogBase { void procVal1OpSel(int); void procVal2OpSel(int); void funcOpSel(int); - void presetChanged(Q3ListBoxItem*); + void presetChanged(QListWidgetItem*); void nameChanged(const QString&); void commentChanged(); void selVal1aChanged(int); @@ -90,8 +105,7 @@ class MidiInputTransformDialog : public MidiInputTransformDialogBase { void songChanged(int); public: - MidiInputTransformDialog(QWidget* parent = 0, const char* name = 0, - bool modal = false, Qt::WFlags fl = 0); + MidiInputTransformDialog(QDialog* parent = 0, Qt::WFlags fl = 0); }; extern void writeMidiInputTransforms(int level, Xml& xml); diff --git a/muse2/muse/mplugins/mitplugin.cpp b/muse2/muse/mplugins/mitplugin.cpp index 1923f1d6..e06f4c24 100644 --- a/muse2/muse/mplugins/mitplugin.cpp +++ b/muse2/muse/mplugins/mitplugin.cpp @@ -116,7 +116,7 @@ void processMidiInputTransformPlugins(MEvent& event) void MusE::startMidiTransformer() { if (midiTransformerDialog == 0) - midiTransformerDialog = new MidiTransformerDialog(this); + midiTransformerDialog = new MidiTransformerDialog; midiTransformerDialog->show(); } |