[Lmuse-cvs-traffic] muse/synti/simpledrums simpledrumsgui.cpp,1.12,1.13 simpledrumsgui.h,1.7,1.8 ssplugin.cpp,1.4,1.5 ssplugingui.cpp,1.5,1.6 ssplugingui.h,1.6,1.7

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/synti/simpledrums
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20689/synti/simpledrums

Modified Files:
	simpledrumsgui.cpp simpledrumsgui.h ssplugin.cpp 
	ssplugingui.cpp ssplugingui.h 
Log Message:
qt4 port, chunk 1


Index: ssplugingui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/simpledrums/ssplugingui.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ssplugingui.cpp	11 Dec 2004 23:24:05 -0000	1.5
--- ssplugingui.cpp	22 Sep 2005 20:14:50 -0000	1.6
***************
*** 13,16 ****
--- 13,21 ----
  #include "ssplugin.h"
  #include "simpledrumsgui.h"
+ //Added by qt3to4:
+ #include <Q3Frame>
+ #include <QHBoxLayout>
+ #include <QLabel>
+ #include <QVBoxLayout>
  
  #define SS_PLUGINGUI_XOFF       300
***************
*** 45,49 ****
              //Support for only 2 or 1 inport/outports
              if ( ((*i)->outports() == 2 || (*i)->outports() == 1) && ((*i)->inports() == 2 || (*i)->inports() == 1) ) {
!                   QListViewItem* tmpItem = new QListViewItem(effectsListView);
                    tmpItem->setText(SS_PLUGINCHOOSER_NAMECOL, (*i)->name());
                    tmpItem->setText(SS_PLUGINCHOOSER_LABELCOL, (*i)->label());
--- 50,54 ----
              //Support for only 2 or 1 inport/outports
              if ( ((*i)->outports() == 2 || (*i)->outports() == 1) && ((*i)->inports() == 2 || (*i)->inports() == 1) ) {
!                   Q3ListViewItem* tmpItem = new Q3ListViewItem(effectsListView);
                    tmpItem->setText(SS_PLUGINCHOOSER_NAMECOL, (*i)->name());
                    tmpItem->setText(SS_PLUGINCHOOSER_LABELCOL, (*i)->label());
***************
*** 56,61 ****
        connect(okButton, SIGNAL(pressed()), SLOT(okPressed()));
        connect(cancelButton, SIGNAL(pressed()), SLOT(cancelPressed()));
!       connect(effectsListView, SIGNAL(selectionChanged(QListViewItem*)), SLOT(selectionChanged(QListViewItem*)));
!       connect(effectsListView, SIGNAL(doubleClicked(QListViewItem*)), SLOT(doubleClicked(QListViewItem*)));
        SS_TRACE_OUT
        }
--- 61,66 ----
        connect(okButton, SIGNAL(pressed()), SLOT(okPressed()));
        connect(cancelButton, SIGNAL(pressed()), SLOT(cancelPressed()));
!       connect(effectsListView, SIGNAL(selectionChanged(Q3ListViewItem*)), SLOT(selectionChanged(Q3ListViewItem*)));
!       connect(effectsListView, SIGNAL(doubleClicked(Q3ListViewItem*)), SLOT(doubleClicked(Q3ListViewItem*)));
        SS_TRACE_OUT
        }
***************
*** 64,68 ****
      \fn SS_PluginChooser::selectionChanged(QListViewItem* item)
   */
! void SS_PluginChooser::selectionChanged(QListViewItem* item)
        {
        SS_TRACE_IN
--- 69,73 ----
      \fn SS_PluginChooser::selectionChanged(QListViewItem* item)
   */
! void SS_PluginChooser::selectionChanged(Q3ListViewItem* item)
        {
        SS_TRACE_IN
***************
*** 95,99 ****
      \fn SS_PluginChooser::doubleClicked(QListViewItem* item)
   */
! void SS_PluginChooser::doubleClicked(QListViewItem* /*item*/)
        {
        SS_TRACE_IN
--- 100,104 ----
      \fn SS_PluginChooser::doubleClicked(QListViewItem* item)
   */
! void SS_PluginChooser::doubleClicked(Q3ListViewItem* /*item*/)
        {
        SS_TRACE_IN
***************
*** 122,126 ****
   */
  SS_PluginFront::SS_PluginFront(QWidget* parent, int in_fxid, const char* name)
!       : QGroupBox(parent, name), fxid (in_fxid)
        {
        SS_TRACE_IN
--- 127,131 ----
   */
  SS_PluginFront::SS_PluginFront(QWidget* parent, int in_fxid, const char* name)
!       : Q3GroupBox(parent, name), fxid (in_fxid)
        {
        SS_TRACE_IN
***************
*** 130,139 ****
        expGroup = 0;
  
!       setLineWidth(3);
        setFlat(false);
!       setFrameStyle( QFrame::Box | QFrame::Raised );
!       setFrameShape(GroupBoxPanel);
        setFrameShadow(Sunken);
!       setFocusPolicy(NoFocus);
        setMinimumSize(SS_PLUGINFRONT_MINWIDTH, SS_PLUGINFRONT_MINHEIGHT);
        setMaximumSize(SS_PLUGINGUI_MAX_WIDTH, SS_PLUGINFRONT_MINHEIGHT);
--- 135,144 ----
        expGroup = 0;
  
! //TD      setLineWidth(3);
        setFlat(false);
! //TD      setFrameStyle( Q3Frame::Box | Q3Frame::Raised );
! //TD      setFrameShape(QFrame::StyledPanel);
        setFrameShadow(Sunken);
!       setFocusPolicy(Qt::NoFocus);
        setMinimumSize(SS_PLUGINFRONT_MINWIDTH, SS_PLUGINFRONT_MINHEIGHT);
        setMaximumSize(SS_PLUGINGUI_MAX_WIDTH, SS_PLUGINFRONT_MINHEIGHT);
***************
*** 142,150 ****
        bigLayout->setMargin(SS_PLUGINFRONT_MARGIN);
        bigLayout->setAlignment(Qt::AlignTop);
!       bigLayout->setResizeMode(QLayout::FreeResize);
  
        layout = new QHBoxLayout(bigLayout);
        layout->setAlignment(Qt::AlignVCenter);
!       layout->setResizeMode(QLayout::FreeResize);
  
  
--- 147,155 ----
        bigLayout->setMargin(SS_PLUGINFRONT_MARGIN);
        bigLayout->setAlignment(Qt::AlignTop);
!       bigLayout->setResizeMode(QLayout::SetNoConstraint);
  
        layout = new QHBoxLayout(bigLayout);
        layout->setAlignment(Qt::AlignVCenter);
!       layout->setResizeMode(QLayout::SetNoConstraint);
  
  
***************
*** 194,198 ****
        gainSliderLayout->add(new QLabel("Return level", this));
        gainSliderLayout->setMargin(SS_PLUGINFRONT_MARGIN);
!       outGainSlider = new QSlider(Horizontal, this);
        outGainSlider->setMinimumSize(100, pluginName->geometry().height());
        outGainSlider->setMaximumSize(500, pluginName->geometry().height());
--- 199,203 ----
        gainSliderLayout->add(new QLabel("Return level", this));
        gainSliderLayout->setMargin(SS_PLUGINFRONT_MARGIN);
!       outGainSlider = new QSlider(Qt::Horizontal, this);
        outGainSlider->setMinimumSize(100, pluginName->geometry().height());
        outGainSlider->setMaximumSize(500, pluginName->geometry().height());
***************
*** 398,402 ****
        {
        SS_TRACE_IN
!       expGroup = new QButtonGroup(this);
  
        expGroup->setMinimumSize(QSize(50, 50));
--- 403,407 ----
        {
        SS_TRACE_IN
!       expGroup = new Q3ButtonGroup(this);
  
        expGroup->setMinimumSize(QSize(50, 50));

Index: ssplugingui.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/simpledrums/ssplugingui.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ssplugingui.h	12 Mar 2005 10:10:39 -0000	1.6
--- ssplugingui.h	22 Sep 2005 20:14:50 -0000	1.7
***************
*** 14,17 ****
--- 14,20 ----
  #define __SS_PLUGINGUI_H__
  #include <qdialog.h>
+ //Added by qt3to4:
+ #include <QVBoxLayout>
+ #include <QHBoxLayout>
  #include "sspluginchooserbase.h"
  #include "common.h"
***************
*** 104,112 ****
        void okPressed();
        void cancelPressed();
!       void selectionChanged(QListViewItem* item);
!       void doubleClicked(QListViewItem* item);
  
     private:
!       QListViewItem* selectedItem;
        LadspaPlugin* findSelectedPlugin();
  
--- 107,115 ----
        void okPressed();
        void cancelPressed();
!       void selectionChanged(Q3ListViewItem* item);
!       void doubleClicked(Q3ListViewItem* item);
  
     private:
!       Q3ListViewItem* selectedItem;
        LadspaPlugin* findSelectedPlugin();
  
***************
*** 116,120 ****
  // SS_PluginGuiFront
  //-------------------------------
! class SS_PluginFront : public QGroupBox
     {
     Q_OBJECT
--- 119,123 ----
  // SS_PluginGuiFront
  //-------------------------------
! class SS_PluginFront : public Q3GroupBox
     {
     Q_OBJECT
***************
*** 130,134 ****
        SS_PluginChooser* pluginChooser;
        LadspaPlugin*     plugin;
!       QButtonGroup*     expGroup;
  
        int               fxid;
--- 133,137 ----
        SS_PluginChooser* pluginChooser;
        LadspaPlugin*     plugin;
!       Q3ButtonGroup*     expGroup;
  
        int               fxid;

Index: simpledrumsgui.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/simpledrums/simpledrumsgui.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** simpledrumsgui.h	11 May 2005 14:18:49 -0000	1.7
--- simpledrumsgui.h	22 Sep 2005 20:14:50 -0000	1.8
***************
*** 17,20 ****
--- 17,22 ----
  #include <qpushbutton.h>
  #include <qdial.h>
+ //Added by qt3to4:
+ #include <QLabel>
  
  #include "libsynti/gui.h"
***************
*** 24,28 ****
  
  
! class QButtonGroup;
  class QLabel;
  class SS_PluginGui;
--- 26,30 ----
  
  
! class Q3ButtonGroup;
  class QLabel;
  class SS_PluginGui;
***************
*** 155,161 ****
        void setChannelVolume(int channel, int volume);
        void displayPluginGui();
!       QGroupBox* channelButtonGroups[SS_NR_OF_CHANNELS];
!       QButtonGroup*           masterButtonGroup;
!       QGroupBox*              mainGroupBox;
        QInvertedChannelSlider* volumeSliders[SS_NR_OF_CHANNELS];
        QChannelSlider*         panSliders[SS_NR_OF_CHANNELS];
--- 157,163 ----
        void setChannelVolume(int channel, int volume);
        void displayPluginGui();
!       Q3GroupBox* channelButtonGroups[SS_NR_OF_CHANNELS];
!       Q3ButtonGroup*           masterButtonGroup;
!       Q3GroupBox*              mainGroupBox;
        QInvertedChannelSlider* volumeSliders[SS_NR_OF_CHANNELS];
        QChannelSlider*         panSliders[SS_NR_OF_CHANNELS];

Index: ssplugin.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/simpledrums/ssplugin.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ssplugin.cpp	11 Dec 2004 00:54:05 -0000	1.4
--- ssplugin.cpp	22 Sep 2005 20:14:50 -0000	1.5
***************
*** 70,81 ****
        {
        SS_TRACE_IN
!       QDir pluginDir(s, QString("*.so"), QDir::Files);
        if (pluginDir.exists()) {
!             const QFileInfoList* list = pluginDir.entryInfoList();
!             QFileInfoListIterator it(*list);
!             QFileInfo* fi;
!             while((fi = it.current())) {
!                   loadPluginLib(fi);
!                   ++it;
                    }
              }
--- 70,80 ----
        {
        SS_TRACE_IN
!       QDir pluginDir(s, QString("*.so"), 0, QDir::Files);
        if (pluginDir.exists()) {
!             QFileInfoList list = pluginDir.entryInfoList();
!             int n = list.size();
!             for (int i = 0; i < n; ++i) {
!                   QFileInfo fi = list.at(i);
!                   loadPluginLib(&fi);
                    }
              }

Index: simpledrumsgui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/simpledrums/simpledrumsgui.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** simpledrumsgui.cpp	11 May 2005 14:18:49 -0000	1.12
--- simpledrumsgui.cpp	22 Sep 2005 20:14:50 -0000	1.13
***************
*** 11,17 ****
  //
  
! #include <qbuttongroup.h>
  #include <qlabel.h>
! #include <qfiledialog.h>
  
  #include "simpledrumsgui.h"
--- 11,21 ----
  //
  
! #include <q3buttongroup.h>
  #include <qlabel.h>
! #include <q3filedialog.h>
! //Added by qt3to4:
! #include <QGridLayout>
! #include <QHBoxLayout>
! #include <QVBoxLayout>
  
  #include "simpledrumsgui.h"
***************
*** 211,215 ****
        //this->setFixedHeight(SS_GUI_WINDOW_HEIGHT);
        for (int i=0; i<SS_NR_OF_CHANNELS; i++) {
!             channelButtonGroups[i] = new QButtonGroup(this);
              channelButtonGroups[i]->setMinimumSize(SS_BTNGRP_WIDTH, SS_BTNGRP_HEIGHT);
              channelButtonGroups[i]->setTitle(QString::number(i + 1));
--- 215,219 ----
        //this->setFixedHeight(SS_GUI_WINDOW_HEIGHT);
        for (int i=0; i<SS_NR_OF_CHANNELS; i++) {
!             channelButtonGroups[i] = new Q3ButtonGroup(this);
              channelButtonGroups[i]->setMinimumSize(SS_BTNGRP_WIDTH, SS_BTNGRP_HEIGHT);
              channelButtonGroups[i]->setTitle(QString::number(i + 1));
***************
*** 229,233 ****
              connect(onOff[i], SIGNAL(channelState(int, bool)), SLOT(channelOnOff(int, bool)));
  
!             volumeSliders[i] = new QInvertedChannelSlider(QSlider::Vertical, i, channelButtonGroups[i], name);
              volumeSliders[i]->setMinValue(SS_VOLUME_MIN_VALUE);
              volumeSliders[i]->setMaxValue(SS_VOLUME_MAX_VALUE);
--- 233,237 ----
              connect(onOff[i], SIGNAL(channelState(int, bool)), SLOT(channelOnOff(int, bool)));
  
!             volumeSliders[i] = new QInvertedChannelSlider(Qt::Vertical, i, channelButtonGroups[i], name);
              volumeSliders[i]->setMinValue(SS_VOLUME_MIN_VALUE);
              volumeSliders[i]->setMaxValue(SS_VOLUME_MAX_VALUE);
***************
*** 250,254 ****
              connect(nOffIgnore[i], SIGNAL(channelState(int, bool)),SLOT(channelNoteOffIgnore(int, bool)));
  
!             panSliders[i] = new QChannelSlider(QSlider::Horizontal, i, channelButtonGroups[i]);
              panSliders[i]->setRange(0, 127);
              panSliders[i]->setValue(SS_PANSLDR_DEFAULT_VALUE);
--- 254,258 ----
              connect(nOffIgnore[i], SIGNAL(channelState(int, bool)),SLOT(channelNoteOffIgnore(int, bool)));
  
!             panSliders[i] = new QChannelSlider(Qt::Horizontal, i, channelButtonGroups[i]);
              panSliders[i]->setRange(0, 127);
              panSliders[i]->setValue(SS_PANSLDR_DEFAULT_VALUE);
***************
*** 297,306 ****
  
        //Master buttongroup:
!       masterButtonGroup = new QButtonGroup(this, "masterButtonGroup");
        channelLayout->add(masterButtonGroup);
        QVBoxLayout* mbgLayout = new QVBoxLayout(masterButtonGroup, 0);
        mbgLayout->setAlignment(Qt::AlignCenter);
        masterButtonGroup->setMinimumSize(SS_BTNGRP_WIDTH, SS_BTNGRP_HEIGHT);
!       masterSlider = new QInvertedSlider(QSlider::Vertical, masterButtonGroup);
        QToolTip::add(masterSlider, "Master volume");
        mbgLayout->add(masterSlider);
--- 301,310 ----
  
        //Master buttongroup:
!       masterButtonGroup = new Q3ButtonGroup(this, "masterButtonGroup");
        channelLayout->add(masterButtonGroup);
        QVBoxLayout* mbgLayout = new QVBoxLayout(masterButtonGroup, 0);
        mbgLayout->setAlignment(Qt::AlignCenter);
        masterButtonGroup->setMinimumSize(SS_BTNGRP_WIDTH, SS_BTNGRP_HEIGHT);
!       masterSlider = new QInvertedSlider(Qt::Vertical, masterButtonGroup);
        QToolTip::add(masterSlider, "Master volume");
        mbgLayout->add(masterSlider);
***************
*** 311,315 ****
  
        //Main groupbox
!       mainGroupBox = new QGroupBox(this, "mainGroupBox");
        mainLayout->add(mainGroupBox);
  
--- 315,319 ----
  
        //Main groupbox
!       mainGroupBox = new Q3GroupBox(this, "mainGroupBox");
        mainLayout->add(mainGroupBox);
  
***************
*** 347,351 ****
  
        // Right bottom panel:
!       QButtonGroup* rbPanel= new QButtonGroup(mainGroupBox, "right_bottom_panel");
        mgbLayout->addMultiCellWidget(rbPanel, 1, 8, 3, 3, Qt::AlignCenter);
        QGridLayout* rbLayout = new QGridLayout(rbPanel, 6, 1, 8, 5);
--- 351,355 ----
  
        // Right bottom panel:
!       Q3ButtonGroup* rbPanel= new Q3ButtonGroup(mainGroupBox, "right_bottom_panel");
        mgbLayout->addMultiCellWidget(rbPanel, 1, 8, 3, 3, Qt::AlignCenter);
        QGridLayout* rbLayout = new QGridLayout(rbPanel, 6, 1, 8, 5);
***************
*** 629,633 ****
        {
        QString filename =
!             QFileDialog::getOpenFileName(lastDir,
                                         QString("*.wav;*.WAV"),
                                         this,
--- 633,637 ----
        {
        QString filename =
!             Q3FileDialog::getOpenFileName(lastDir,
                                         QString("*.wav;*.WAV"),
                                         this,
***************
*** 757,761 ****
        QString text = caption + "\n\n(C) Copyright 2000-2004 Mathias Lundgren (lun...@us...), Werner Schweer\nPublished under the GNU Public License";
        QMessageBox* msgBox = new QMessageBox(caption, text, QMessageBox::NoIcon,
!             QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton, this, "SimpleDrums About Dialog");
        msgBox->exec();
        }
--- 761,765 ----
        QString text = caption + "\n\n(C) Copyright 2000-2004 Mathias Lundgren (lun...@us...), Werner Schweer\nPublished under the GNU Public License";
        QMessageBox* msgBox = new QMessageBox(caption, text, QMessageBox::NoIcon,
!             QMessageBox::Ok, Qt::NoButton, Qt::NoButton, this);
        msgBox->exec();
        }