diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-10-27 03:52:33 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-10-27 03:52:33 +0000 |
| commit | f31badef8108f50fe2f8d7ae208aa06734151563 (patch) | |
| tree | 9d87038440fe1ab263daf23c537c662a513bba42 /muse2/muse/waveedit | |
| parent | b5a9f51073ba4e3c166f9229cd596f22878acafc (diff) | |
See ChangeLog
Diffstat (limited to 'muse2/muse/waveedit')
| -rw-r--r-- | muse2/muse/waveedit/waveedit.cpp | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp index f6c5484f..8ef2607d 100644 --- a/muse2/muse/waveedit/waveedit.cpp +++ b/muse2/muse/waveedit/waveedit.cpp @@ -106,37 +106,43 @@ WaveEdit::WaveEdit(PartList* pl) connect(menuEdit, SIGNAL(activated(int)), SLOT(cmd(int))); //---------ToolBar---------------------------------- - tools = new QToolBar(this, "waveedit-tools"); - undoRedo->addTo(tools); + tools = addToolBar(tr("waveedit-tools")); + tools->addActions(undoRedo->actions()); Q3Accel* qa = new Q3Accel(this); qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Z), song, SLOT(undo())); qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Y), song, SLOT(redo())); connect(muse, SIGNAL(configChanged()), SLOT(configChanged())); - //-------------------------------------------------- // Transport Bar - QToolBar* transport = new QToolBar(this); - transportAction->addTo(transport); + QToolBar* transport = addToolBar(tr("transport")); + transport->addActions(transportAction->actions()); //-------------------------------------------------- // ToolBar: Solo Cursor1 Cursor2 - tb1 = new QToolBar(this, "pianoroll-tools"); + addToolBarBreak(); + tb1 = addToolBar(tr("pianoroll-tools")); - tb1->setLabel(tr("weTools")); - solo = new QToolButton(tb1); + //tb1->setLabel(tr("weTools")); + solo = new QToolButton(); solo->setText(tr("Solo")); - solo->setToggleButton(true); + solo->setCheckable(true); + tb1->addWidget(solo); connect(solo, SIGNAL(toggled(bool)), SLOT(soloChanged(bool))); - - QLabel* label = new QLabel(tr("Cursor"), tb1, "Cursor"); + + QLabel* label = new QLabel(tr("Cursor")); + tb1->addWidget(label); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setIndent(3); - pos1 = new PosLabel(tb1); - pos2 = new PosLabel(tb1); + pos1 = new PosLabel(0); + pos1->setFixedHeight(22); + tb1->addWidget(pos1); + pos2 = new PosLabel(0); + pos2->setFixedHeight(22); pos2->setSmpte(true); + tb1->addWidget(pos2); //--------------------------------------------------- // Rest |