See ChangeLog

5 files changed, 97 insertions, 43 deletions

diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 82d0186d..acfd3a03 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -23,6 +23,8 @@
 #include <qclipboard.h>
 #include <qmessagebox.h>
 #include <qaction.h>
+#include <QWhatsThis>
+
 //Added by qt3to4:
 #include <QKeyEvent>
 #include <Q3ValueList>
@@ -221,41 +223,72 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       //    Toolbars
       //---------------------------------------------------
 
-      tools = new Q3ToolBar(this, "drum-tools");
-      new QToolButton(*openIcon, tr("Load Drummap"),
-                  QString::null, this, SLOT(load()),
-                  tools, "load drummap from file");
-
-      new QToolButton(*saveIcon, tr("Store Drummap"),
-                  QString::null,
-                  this, SLOT(save()),
-                  tools, "store drummap to file");
-
-      Q3WhatsThis::whatsThisButton(tools);
+      //tools = new QToolBar(this, "drum-tools");
+      tools = addToolBar(tr("drum-tools"));
+      
+      //new QToolButton(*openIcon, tr("Load Drummap"),
+      //            QString::null, this, SLOT(load()),
+      //            tools, "load drummap from file");
+
+      //new QToolButton(*saveIcon, tr("Store Drummap"),
+      //            QString::null,
+      //            this, SLOT(save()),
+      //            tools, "store drummap to file");
+                  
+      QToolButton *ldm = new QToolButton();
+      QToolTip::add(ldm, tr("Load Drummap"));
+      ldm->setIcon(*openIcon);
+      connect(ldm, SIGNAL(clicked()), SLOT(load()));
+      tools->addWidget(ldm);
+      
+      QToolButton *sdm = new QToolButton();
+      QToolTip::add(sdm, tr("Store Drummap"));
+      sdm->setIcon(*saveIcon);
+      connect(sdm, SIGNAL(clicked()), SLOT(save()));
+      tools->addWidget(sdm);
+      
+      //Q3WhatsThis::whatsThisButton(tools);
+      tools->addAction(QWhatsThis::createAction(this));
 
       tools->addSeparator();
-      undoRedo->addTo(tools);
+      //undoRedo->addTo(tools);
+      tools->addActions(undoRedo->actions());
       tools->addSeparator();
 
-      srec  = new QToolButton(tools, "srec");
+      //srec  = new QToolButton(tools, "srec");
+      srec  = new QToolButton();
       QToolTip::add(srec, tr("Step Record"));
-      srec->setPixmap(*steprecIcon);
+      srec->setIcon(*steprecIcon);
       srec->setToggleButton(true);
+      tools->addWidget(srec);
 
-      midiin  = new QToolButton(tools, "midiin");
+      //midiin  = new QToolButton(tools, "midiin");
+      midiin  = new QToolButton();
       QToolTip::add(midiin, tr("Midi Input"));
-      midiin->setPixmap(*midiinIcon);
+      midiin->setIcon(*midiinIcon);
       midiin->setToggleButton(true);
-
+      tools->addWidget(midiin);
+      
       tools2 = new EditToolBar(this, drumeditTools);
+      addToolBar(tools2);
 
-      Q3ToolBar* transport = new Q3ToolBar(this);
-      transportAction->addTo(transport);
-
-      // dontt show pitch value in toolbar
-      //toolbar = new Toolbar1(this, _rasterInit, _quantInit, false);
-      toolbar = new Toolbar1(this, _rasterInit, _quantInit);
+      QToolBar* panicToolbar = addToolBar(tr("panic"));         
+      //panicAction->addTo(panicToolbar);
+      panicToolbar->addAction(panicAction);
+      
+      //QToolBar* transport = new QToolBar(this);
+      QToolBar* transport = addToolBar(tr("transport"));
+      //transportAction->addTo(transport);
+      transport->addActions(transportAction->actions());
+      
+      addToolBarBreak();
+      // don't show pitch value in toolbar
+      toolbar = new Toolbar1(this, _rasterInit, _quantInit, false);
+      addToolBar(toolbar);
+      
+      addToolBarBreak();
       info    = new NoteInfo(this);
+      addToolBar(info);
 
       //---------------------------------------------------
       //    split
diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index 5043412f..a1c8583b 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -94,7 +94,7 @@ class DrumEdit : public MidiEditor {
       QWidget* split1w1;
       DList* dlist;
       Header* header;
-      Q3ToolBar* tools;
+      QToolBar* tools;
 
       static int _quantInit, _rasterInit;
       static int _widthInit, _heightInit;
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 22d9c55e..dbeda748 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -22,7 +22,7 @@
 #include <qaction.h>
 //Added by qt3to4:
 #include <QKeyEvent>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QResizeEvent>
 #include <QCloseEvent>
 
@@ -178,38 +178,59 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       connect(menuFunctions, SIGNAL(activated(int)), SLOT(cmd(int)));
 
       //---------ToolBar----------------------------------
-      tools = new Q3ToolBar(this, "pianoroll-tools");
-      tools->setLabel(tr("Pianoroll Tools"));
-      undoRedo->addTo(tools);
+      //tools = new QToolBar(this, "pianoroll-tools");
+      tools = addToolBar(tr("pianoroll-tools"));          
+      //undoRedo->addTo(tools);
+      tools->addActions(undoRedo->actions());
       tools->addSeparator();
 
-      srec  = new QToolButton(tools, "srec");
+      //srec  = new QToolButton(tools, "srec");
+      // Does not like this, draws on top of other buttons! Must use QToolBar::addWidget()
+      //srec  = new QToolButton(tools);          
+      srec  = new QToolButton();
       QToolTip::add(srec, tr("Step Record"));
-      srec->setPixmap(*steprecIcon);
+      srec->setIcon(*steprecIcon);
       srec->setToggleButton(true);
+      tools->addWidget(srec);
 
-      midiin  = new QToolButton(tools, "midiin");
+      //midiin  = new QToolButton(tools, "midiin");
+      midiin  = new QToolButton();
       QToolTip::add(midiin, tr("Midi Input"));
-      midiin->setPixmap(*midiinIcon);
+      midiin->setIcon(*midiinIcon);
       midiin->setToggleButton(true);
+      tools->addWidget(midiin);
 
-      speaker  = new QToolButton(tools, "speaker");
+      //speaker  = new QToolButton(tools, "speaker");
+      speaker  = new QToolButton();
       QToolTip::add(speaker, tr("Play Events"));
-      speaker->setPixmap(*speakerIcon);
+      speaker->setIcon(*speakerIcon);
       speaker->setToggleButton(true);
+      tools->addWidget(speaker);
 
       tools2 = new EditToolBar(this, pianorollTools);
+      addToolBar(tools2);
 
-      Q3ToolBar* panicToolbar = new Q3ToolBar(this);
-      panicAction->addTo(panicToolbar);
+      //QToolBar* panicToolbar = new QToolBar(this);
+      QToolBar* panicToolbar = addToolBar(tr("panic"));         
+      //panicAction->addTo(panicToolbar);
+      panicToolbar->addAction(panicAction);
+      //this->addToolBar(panicToolbar);
 
       //-------------------------------------------------------------
       //    Transport Bar
-      Q3ToolBar* transport = new Q3ToolBar(this);
-      transportAction->addTo(transport);
+      //QToolBar* transport = new QToolBar(this);
+      QToolBar* transport = addToolBar(tr("transport"));
+      //transportAction->addTo(transport);
+      transport->addActions(transportAction->actions());
+      //this->addToolBar(transport);
 
+      addToolBarBreak();
       toolbar = new Toolbar1(this, _rasterInit, _quantInit);
+      addToolBar(toolbar);
+
+      addToolBarBreak();
       info    = new NoteInfo(this);
+      addToolBar(info);
 
       //---------------------------------------------------
       //    split
@@ -233,7 +254,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       mainGrid->addRowSpacing(1, hscroll->sizeHint().height());
 
       QWidget* split1     = new QWidget(splitter, "split1");
-      Q3GridLayout* gridS1 = new Q3GridLayout(split1);
+      QGridLayout* gridS1 = new QGridLayout(split1);
       time                = new MTScale(&_raster, split1, xscale);
       Piano* piano        = new Piano(split1, yscale);
       canvas              = new PianoCanvas(this, split1, xscale, yscale);
diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h
index 8987915a..10818b94 100644
--- a/muse2/muse/midiedit/pianoroll.h
+++ b/muse2/muse/midiedit/pianoroll.h
@@ -72,7 +72,7 @@ class PianoRoll : public MidiEditor {
       Splitter* splitter;
 
       QToolButton* speaker;
-      Q3ToolBar* tools;
+      QToolBar* tools;
       EditToolBar* tools2;
 
       Q3PopupMenu* eventColor;
diff --git a/muse2/muse/midiedit/quantconfig.cpp b/muse2/muse/midiedit/quantconfig.cpp
index f00b713f..867dedea 100644
--- a/muse2/muse/midiedit/quantconfig.cpp
+++ b/muse2/muse/midiedit/quantconfig.cpp
@@ -7,7 +7,7 @@
 //=========================================================
 
 #include <qspinbox.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <q3groupbox.h>
@@ -15,7 +15,7 @@
 
 #include "quantconfig.h"
 //Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 const char* wtStrengthTxt = QT_TR_NOOP("sets amount of quantization:\n"
                             "0   - no quantization\n"
@@ -31,7 +31,7 @@ QuantConfig::QuantConfig(int s, int l, bool lenFlag)
    : QDialog()
       {
       setCaption(tr("MusE: Config Quantize"));
-      Q3VBoxLayout* layout = new Q3VBoxLayout(this);
+      QVBoxLayout* layout = new QVBoxLayout(this);
       Q3GroupBox* gb = new Q3GroupBox(2, Qt::Horizontal, tr("Config Quantize"), this);
       layout->addWidget(gb);