From 147b944d89c06c9cfe28d39ff2ba820c0cc4b83f Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sun, 21 Nov 2010 22:41:17 +0000 Subject: port .ui widgets to Qt4 --- muse2/ChangeLog | 3 +- muse2/muse/cliplist/cliplist.cpp | 36 ++- muse2/muse/cliplist/cliplist.h | 28 +- muse2/muse/conf.cpp | 5 +- muse2/muse/conf.h | 8 +- muse2/muse/transpose.cpp | 6 +- muse2/muse/widgets/CMakeLists.txt | 4 +- muse2/muse/widgets/cliplisteditorbase.ui | 311 ++++++++++----------- muse2/muse/widgets/configmidifilebase.ui | 466 +++++++++++++++---------------- 9 files changed, 427 insertions(+), 440 deletions(-) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index dbb8a4f9..39197f03 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,7 +1,8 @@ 21.11.2010 - All menus now use QActions. Some shortcuts are left to be assigned correctly (Orcan) - Clean up: Remove submenu integer ids from the MusE class in favor of QActions (Orcan) - - Ported the following .ui widgets to Qt4: didyouknow, transposebase (Orcan) + - Ported the following .ui widgets to Qt4: didyouknow, transposebase, cliplist, + configmidifilebase (Orcan) 20.11.2010 - Remove most wrapper classes around .ui widgets. I was wrapping them too much. Some widgets (e.g. songinfo) still need wrappers though. (Orcan) diff --git a/muse2/muse/cliplist/cliplist.cpp b/muse2/muse/cliplist/cliplist.cpp index 30b269d3..256a3f9c 100644 --- a/muse2/muse/cliplist/cliplist.cpp +++ b/muse2/muse/cliplist/cliplist.cpp @@ -12,15 +12,11 @@ #include "wave.h" #include "xml.h" #include "posedit.h" -#include "cliplisteditorbase.h" - -#include -#include -#include -#include -#include -//Added by qt3to4: +#include "ui_cliplisteditorbase.h" + #include +#include +#include extern int mtcType; enum { COL_NAME=0, COL_REFS, COL_POS, COL_LEN }; @@ -29,18 +25,18 @@ enum { COL_NAME=0, COL_REFS, COL_POS, COL_LEN }; // ClipItem //--------------------------------------------------------- -class ClipItem : public Q3ListViewItem { +class ClipItem : public QTreeWidgetItem { SndFileR _wf; virtual QString text(int) const; public: - ClipItem(Q3ListView*, const SndFileR&); + ClipItem(QTreeWidget*, const SndFileR&); SndFileR* wf() { return &_wf; } }; -ClipItem::ClipItem(Q3ListView* parent, const SndFileR& w) - : Q3ListViewItem(parent), _wf(w) +ClipItem::ClipItem(QTreeWidget* parent, const SndFileR& w) + : QTreeWidgetItem(parent), _wf(w) { } @@ -108,21 +104,21 @@ ClipListEdit::ClipListEdit() //setAttribute(Qt::WA_DeleteOnClose); setCaption(tr("MusE: Clip List Editor")); - editor = new ClipListEditorBase(this, "edit"); + editor = new ClipListEditorBaseWidget; setCentralWidget(editor); - editor->view->setColumnAlignment(COL_REFS, Qt::AlignRight); - + //editor->view->setColumnAlignment(COL_REFS, Qt::AlignRight); + QFontMetrics fm(editor->view->font()); int fw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth,0, this); // ddskrjo 0 int w = 2 + fm.width('9') * 9 + fm.width(':') * 3 + fw * 4; - editor->view->setColumnAlignment(COL_POS, Qt::AlignRight); + //editor->view->setColumnAlignment(COL_POS, Qt::AlignRight); editor->view->setColumnWidth(COL_POS, w); - editor->view->setColumnAlignment(COL_LEN, Qt::AlignRight); + //editor->view->setColumnAlignment(COL_LEN, Qt::AlignRight); editor->view->setColumnWidth(COL_LEN, w); - connect(editor->view, SIGNAL(selectionChanged()), SLOT(clipSelectionChanged())); - connect(editor->view, SIGNAL(clicked(Q3ListViewItem*)), SLOT(clicked(Q3ListViewItem*))); + connect(editor->view, SIGNAL(itemSelectionChanged()), SLOT(clipSelectionChanged())); + connect(editor->view, SIGNAL(itemClicked(QTreeWidgetItem*, int)), SLOT(clicked(QTreeWidgetItem*, int))); connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int))); connect(editor->start, SIGNAL(valueChanged(const Pos&)), SLOT(startChanged(const Pos&))); @@ -254,7 +250,7 @@ void ClipListEdit::clipSelectionChanged() // clicked //--------------------------------------------------------- -void ClipListEdit::clicked(Q3ListViewItem*) +void ClipListEdit::clicked(QTreeWidgetItem*, int) { // printf("clicked\n"); } diff --git a/muse2/muse/cliplist/cliplist.h b/muse2/muse/cliplist/cliplist.h index 3f13d586..156bc230 100644 --- a/muse2/muse/cliplist/cliplist.h +++ b/muse2/muse/cliplist/cliplist.h @@ -11,14 +11,28 @@ #include "../cobject.h" #include "event.h" -//Added by qt3to4: -#include -class Q3ListView; -class Q3ListViewItem; +#include "ui_cliplisteditorbase.h" + +class QCloseEvent; +class QDialog; +class QTreeWidgetItem; + class Xml; class Pos; -class ClipListEditorBase; + +//--------------------------------------------------------- +// ClipListEditorBaseWidget +// Wrapper around Ui::ClipListEditorBase +//--------------------------------------------------------- + +class ClipListEditorBaseWidget : public QWidget, public Ui::ClipListEditorBase +{ + Q_OBJECT + + public: + ClipListEditorBaseWidget(QWidget *parent = 0) : QWidget(parent) { setupUi(this); } +}; //--------------------------------------------------------- // ClipListEdit @@ -26,7 +40,7 @@ class ClipListEditorBase; class ClipListEdit : public TopWin { Q_OBJECT - ClipListEditorBase* editor; + ClipListEditorBaseWidget* editor; virtual void closeEvent(QCloseEvent*); void updateList(); @@ -36,7 +50,7 @@ class ClipListEdit : public TopWin { void startChanged(const Pos&); void lenChanged(const Pos&); void clipSelectionChanged(); - void clicked(Q3ListViewItem*); + void clicked(QTreeWidgetItem*, int); signals: void deleted(unsigned long); diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp index 53fa3deb..33631211 100644 --- a/muse2/muse/conf.cpp +++ b/muse2/muse/conf.cpp @@ -1340,9 +1340,10 @@ void MusE::configMidiFile() // config properties of exported midi files //--------------------------------------------------------- -MidiFileConfig::MidiFileConfig() - : ConfigMidiFileBase() +MidiFileConfig::MidiFileConfig(QWidget* parent) + : QDialog(parent), ConfigMidiFileBase() { + setupUi(this); connect(buttonOk, SIGNAL(clicked()), SLOT(okClicked())); connect(buttonCancel, SIGNAL(clicked()), SLOT(cancelClicked())); } diff --git a/muse2/muse/conf.h b/muse2/muse/conf.h index 285f5e98..656be4a7 100644 --- a/muse2/muse/conf.h +++ b/muse2/muse/conf.h @@ -9,9 +9,9 @@ #ifndef __CONF_H__ #define __CONF_H__ -#include -#include "configmidifilebase.h" +#include "ui_configmidifilebase.h" +class QDialog; class QLineEdit; //--------------------------------------------------------- @@ -19,7 +19,7 @@ class QLineEdit; // config properties of exported midi files //--------------------------------------------------------- -class MidiFileConfig : public ConfigMidiFileBase { +class MidiFileConfig : public QDialog, public Ui::ConfigMidiFileBase { Q_OBJECT private slots: @@ -27,7 +27,7 @@ class MidiFileConfig : public ConfigMidiFileBase { void cancelClicked(); public: - MidiFileConfig(); + MidiFileConfig(QWidget* parent=0); void updateValues(); }; diff --git a/muse2/muse/transpose.cpp b/muse2/muse/transpose.cpp index 3462dfc4..c7ab912d 100644 --- a/muse2/muse/transpose.cpp +++ b/muse2/muse/transpose.cpp @@ -1,8 +1,8 @@ #include -#include -#include -#include + +#include + #include "transpose.h" #include "track.h" #include "song.h" diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt index d91e362d..d62339ca 100644 --- a/muse2/muse/widgets/CMakeLists.txt +++ b/muse2/muse/widgets/CMakeLists.txt @@ -135,7 +135,9 @@ QT4_WRAP_CPP (widget_mocs QT4_WRAP_UI (UIC aboutbox.ui appearancebase.ui + cliplisteditorbase.ui commentbase.ui + configmidifilebase.ui didyouknow.ui editnotedialogbase.ui editsysexdialogbase.ui @@ -163,8 +165,6 @@ QT4_WRAP_UI3 (widget_ui_headers editmetadialogbase.ui gatetimebase.ui wtrackinfobase.ui - cliplisteditorbase.ui - configmidifilebase.ui ) # add_custom_command(OUTPUT ui_midisync.h diff --git a/muse2/muse/widgets/cliplisteditorbase.ui b/muse2/muse/widgets/cliplisteditorbase.ui index 272c578c..5c4806c2 100644 --- a/muse2/muse/widgets/cliplisteditorbase.ui +++ b/muse2/muse/widgets/cliplisteditorbase.ui @@ -1,168 +1,163 @@ - -ClipListEditorBase - - - ClipListEditorBase - + + + + + + ClipListEditorBase + - - 0 - 0 - 600 - 480 - + + 0 + 0 + 600 + 480 + - - MusE: ClipList + + MusE: ClipList - - - unnamed - - - 11 - - - 6 - - - - - Name - - - true - - - true - - - - - Refs - - - true - - - true - - - - - Start - - - true - - - true - - - - - Len - - - true - - - true - - - - - Data - - - true - - - true - - - - view + + + 11 + + + 6 + + + + + true + + + true + + + + Name + + + true + + + true + + + + + Refs + + + true + + + true + + + + + Start + + + true + + + true - - true + + + + Len - - true + + true + + true + + + + + Data + + + true + + + true + + - - - GroupBox1 + + + + + Clip Properties + + + + 11 - - Clip Properties + + 6 - - - unnamed - - - 11 - - - 6 - - - - TextLabel1 - - - Pos: - - - - - start - - - true - - - - - TextLabel2 - - - Len: - - - - - len - - - true - - - - - Spacer1 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - - + + + + Pos: + + + false + + + + + + + true + + + + + + + Len: + + + false + + + + + + + true + + + + + + + + 20 + 20 + + + + QSizePolicy::Expanding + + + Qt::Horizontal + + + + - - - - posedit.h - - - + + + + + qPixmapFromMimeSource + + posedit.h + + diff --git a/muse2/muse/widgets/configmidifilebase.ui b/muse2/muse/widgets/configmidifilebase.ui index 4ba53d7e..9fd603dc 100644 --- a/muse2/muse/widgets/configmidifilebase.ui +++ b/muse2/muse/widgets/configmidifilebase.ui @@ -1,259 +1,239 @@ - -ConfigMidiFileBase - - - ConfigMidiFileBase - + + + + + + ConfigMidiFileBase + - - 0 - 0 - 548 - 353 - + + 0 + 0 + 548 + 353 + - - MusE: Config Midi File Import/Export + + MusE: Config Midi File Import/Export - true + true - - - unnamed - - - - midiImportGroupBox - - - - 5 - 1 - 0 - 0 - - - - Import: - - - - unnamed + + + + + + 5 + 1 + 0 + 0 + + + + Import: + + + + + + Split tracks into &parts - - - splitPartsCheckBox - - - Split tracks into &parts - - - Alt+P - - - Split tracks into parts, or one single part - - - - - - - midiExportGroupBox - - - - 5 - 7 - 0 - 0 - - - - Export: - - - - unnamed + + Alt+P + + + Split tracks into parts, or one single part - - - copyrightEdit - - - - - - 96 - - - - - 192 - - - - - 384 - - - - divisionCombo - - - - - extendedFormat - - - true - - - Enable extended smf format (currently not implemented) - - - - - twoByteTimeSigs - - - Use &2-byte time signatures instead of standard 4 - - - Alt+2 - - - - - textLabel2 - - - Copyright: - - - - - textLabel3 - - - Format: - - - - - textLabel1 - - - Division: - - - - - optNoteOffs - - - Save space by replacing note-offs with &zero velocity note-ons - - - Alt+Z - - - - - - 0 (single track) - - - - - 1 (multiple tracks) - - - - formatCombo - - - + + + - - - Layout1 - - - - unnamed + + + + + + 5 + 7 + 0 + 0 + + + + Export: + + + + + + + + + + 96 + + + + + 192 + + + + + 384 + + + + + + + + true + + + Enable extended smf format (currently not implemented) + + + + + + + Use &2-byte time signatures instead of standard 4 + + + Alt+2 + + + + + + + Copyright: + + + false + + + + + + + Format: + + + false + + + + + + + Division: + + + false - - 0 + + + + + + Save space by replacing note-offs with &zero velocity note-ons - - 6 + + Alt+Z - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - - - - buttonOk - - - &OK - - - - - - true - - - true - - - - - buttonCancel - - - &Cancel - - - - - - true - - - + + + + + + + 0 (single track) + + + + + 1 (multiple tracks) + + + + + - - - + + + + + 0 + + + 6 + + + + + + 20 + 20 + + + + QSizePolicy::Expanding + + + Qt::Horizontal + + + + + + + &OK + + + + + + true + + + true + + + + + + + &Cancel + + + + + + true + + + + + + + + + qPixmapFromMimeSource + - buttonOk - clicked() - ConfigMidiFileBase - accept() + buttonOk + clicked() + ConfigMidiFileBase + accept() - buttonCancel - clicked() - ConfigMidiFileBase - reject() + buttonCancel + clicked() + ConfigMidiFileBase + reject() - - - + + -- cgit v1.2.3