[Lmuse-cvs-traffic] muse/synti/deicsonze deicsonzegui.cpp,1.13,1.14 deicsonzegui.h,1.12,1.13

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	deicsonzegui.cpp deicsonzegui.h 
Log Message:
deicsonze compiles again

Index: deicsonzegui.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** deicsonzegui.h	15 Dec 2005 16:01:22 -0000	1.12
--- deicsonzegui.h	16 Dec 2005 13:49:34 -0000	1.13
***************
*** 31,40 ****
  #define __DEICSONZEGUI_H

- #include <q3listview.h>
- #include <q3frame.h>
- //Added by qt3to4:
- #include <QMouseEvent>
- #include <QPaintEvent>
- 
  #include "deicsonze.h"
  #include "deicsonzepreset.h"
--- 31,34 ----
***************
*** 42,47 ****
  #include "libsynti/gui.h"

- 
- 
  //Envelope Gui constants
  #define XOFFSET 2
--- 36,39 ----
***************
*** 161,167 ****
      void savePresetDialog();
      //popupMenu
!     void categoryPopupMenu(QListWidgetItem*);
!     void subcategoryPopupMenu(QListWidgetItem*);
!     void presetPopupMenu(QListWidgetItem*);
      //Preset and bank
      void setPresetName(const QString&);
--- 153,159 ----
      void savePresetDialog();
      //popupMenu
!     void categoryPopupMenu(QTreeWidgetItem*);
!     void subcategoryPopupMenu(QTreeWidgetItem*);
!     void presetPopupMenu(QTreeWidgetItem*);
      //Preset and bank
      void setPresetName(const QString&);
***************
*** 285,292 ****
      void setSet(void); //display the set, that is the category list
      void setCategory(Category*);
!     void setCategory(QListWidgetItem*);
      void setSubcategory(Subcategory*);
!     void setSubcategory(QListWidgetItem*);
!     void setPreset(QListWidgetItem*);
   public:
      virtual void processEvent(const MidiEvent&);
--- 277,284 ----
      void setSet(void); //display the set, that is the category list
      void setCategory(Category*);
!     void setCategory(QTreeWidgetItem*);
      void setSubcategory(Subcategory*);
!     void setSubcategory(QTreeWidgetItem*);
!     void setPreset(QTreeWidgetItem*);
   public:
      virtual void processEvent(const MidiEvent&);

Index: deicsonzegui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** deicsonzegui.cpp	15 Dec 2005 16:01:22 -0000	1.13
--- deicsonzegui.cpp	16 Dec 2005 13:49:34 -0000	1.14
***************
*** 28,55 ****
  //===========================================================================

- #include <qvariant.h>
- #include <q3groupbox.h>
- #include <qslider.h>
- #include <qcombobox.h>
- #include <qcheckbox.h>
- #include <qlineedit.h>
- #include <qlcdnumber.h>
- #include <q3listview.h>
- #include <q3popupmenu.h>
- #include <qspinbox.h>
- #include <q3listbox.h>
- #include <qcolor.h>
- #include <qtabwidget.h>
- #include <q3frame.h>
- #include <qradiobutton.h>
- #include <qlayout.h>
- #include <qtooltip.h>
- #include <q3whatsthis.h>
- #include <qstring.h>
- //Added by qt3to4:
- #include <QPaintEvent>
- #include <QMouseEvent>
- 
- //#include "newpreset.h"
  #include "muse/midi.h"
  #include "muse/midictrl.h"
--- 28,31 ----
***************
*** 58,62 ****

  DeicsOnzeGui::DeicsOnzeGui(DeicsOnze* deicsOnze)
!     : QDialog(0, "deicsOnzeGui"),
        MessGui()
  {
--- 34,38 ----

  DeicsOnzeGui::DeicsOnzeGui(DeicsOnze* deicsOnze)
!     : QDialog(0),
        MessGui()
  {
***************
*** 97,112 ****
      connect(blueSlider, SIGNAL(valueChanged(int)),
  	    this, SLOT(setBlueColor(int)));
!     connect(colorListBox, SIGNAL(selectionChanged(Q3ListBoxItem*)),
! 	    this, SLOT(setRGBSliders(Q3ListBoxItem*)));
      //PopupMenu Category Subcategory Preset
!     connect(categoryListView, SIGNAL(rightButtonClicked(Q3ListViewItem*,
! 							const QPoint &, int)),
! 	    this, SLOT(categoryPopupMenu(Q3ListViewItem*)));
!     connect(subcategoryListView, SIGNAL(rightButtonClicked(Q3ListViewItem*,
! 							const QPoint &, int)),
! 	    this, SLOT(subcategoryPopupMenu(Q3ListViewItem*)));
!     connect(presetListView, SIGNAL(rightButtonClicked(Q3ListViewItem*,
! 							const QPoint &, int)),
! 	    this, SLOT(presetPopupMenu(Q3ListViewItem*)));
      //Preset and bank
      connect(presetLineEdit, SIGNAL(textChanged(const QString&)),
--- 73,91 ----
      connect(blueSlider, SIGNAL(valueChanged(int)),
  	    this, SLOT(setBlueColor(int)));
!     connect(colorListBox, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
! 	    this, SLOT(setRGBSliders(QListWidgetItem*)));
      //PopupMenu Category Subcategory Preset
! //
! // implement with signal "customContextMenuRequested(const QPoint& pos)
! //
! //TODO    connect(categoryListView, SIGNAL(rightButtonClicked(QTreeWidgetItem*,
! //							const QPoint &, int)),
! //	    this, SLOT(categoryPopupMenu(QTreeWidgetItem*)));
! //TODO    connect(subcategoryListView, SIGNAL(rightButtonClicked(QTreeWidgetItem*,
! //							const QPoint &, int)),
! //	    this, SLOT(subcategoryPopupMenu(QTreeWidgetItem*)));
! //TODO    connect(presetListView, SIGNAL(rightButtonClicked(QTreeWidgetItem*,
! //							const QPoint &, int)),
! //	    this, SLOT(presetPopupMenu(QTreeWidgetItem*)));
      //Preset and bank
      connect(presetLineEdit, SIGNAL(textChanged(const QString&)),
***************
*** 276,291 ****
  	    this, SLOT(setWaveForm4(int)));
      //category subcategory preset
!     connect(categoryListView, SIGNAL(selectionChanged(Q3ListViewItem*)),
! 	    this, SLOT(setCategory(Q3ListViewItem*)));
!     connect(categoryListView, SIGNAL(clicked(Q3ListViewItem*)),
! 	    this, SLOT(setCategory(Q3ListViewItem*)));
!     connect(subcategoryListView, SIGNAL(selectionChanged(Q3ListViewItem*)),
! 	    this, SLOT(setSubcategory(Q3ListViewItem*)));
!     connect(subcategoryListView, SIGNAL(clicked(Q3ListViewItem*)),
! 	    this, SLOT(setSubcategory(Q3ListViewItem*)));
!     connect(presetListView, SIGNAL(selectionChanged(Q3ListViewItem*)),
! 	    this, SLOT(setPreset(Q3ListViewItem*)));
!     connect(presetListView, SIGNAL(clicked(Q3ListViewItem*)),
! 	    this, SLOT(setPreset(Q3ListViewItem*)));
      //Connect socketnotifier to fifo
      QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
--- 255,270 ----
  	    this, SLOT(setWaveForm4(int)));
      //category subcategory preset
!     connect(categoryListView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
! 	    this, SLOT(setCategory(QTreeWidgetItem*)));
!     connect(categoryListView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
! 	    this, SLOT(setCategory(QTreeWidgetItem*)));
!     connect(subcategoryListView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
! 	    this, SLOT(setSubcategory(QTreeWidgetItem*)));
!     connect(subcategoryListView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
! 	    this, SLOT(setSubcategory(QTreeWidgetItem*)));
!     connect(presetListView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
! 	    this, SLOT(setPreset(QTreeWidgetItem*)));
!     connect(presetListView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
! 	    this, SLOT(setPreset(QTreeWidgetItem*)));
      //Connect socketnotifier to fifo
      QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
***************
*** 297,301 ****
      setEditBackgroundColor(reinterpret_cast<const QColor &>(*ebColor));

!     colorListBox->setSelected(0, true);//selects the first item

      setSet();
--- 276,281 ----
      setEditBackgroundColor(reinterpret_cast<const QColor &>(*ebColor));

! // there are no items in the colorListBox:
! //    colorListBox->setItemSelected(colorListBox->item(0), true);//selects the first item

      setSet();
***************
*** 336,340 ****
  //-----------------------------------------------------------
  void DeicsOnzeGui::setRedColor(int r) {
!     Q3ListBoxItem* i=colorListBox->selectedItem();
      if(i){
  	curColor->setRgb(r, curColor->green(), curColor->blue());
--- 316,320 ----
  //-----------------------------------------------------------
  void DeicsOnzeGui::setRedColor(int r) {
!     QListWidgetItem* i=colorListBox->selectedItems().at(0);
      if(i){
  	curColor->setRgb(r, curColor->green(), curColor->blue());
***************
*** 360,364 ****
  }
  void DeicsOnzeGui::setGreenColor(int g) {
!     Q3ListBoxItem* i=colorListBox->selectedItem();
      if(i) {
  	curColor->setRgb(curColor->red(), g, curColor->blue());
--- 340,344 ----
  }
  void DeicsOnzeGui::setGreenColor(int g) {
!     QListWidgetItem* i=colorListBox->selectedItems().at(0);
      if(i) {
  	curColor->setRgb(curColor->red(), g, curColor->blue());
***************
*** 384,388 ****
  }
  void DeicsOnzeGui::setBlueColor(int b) {
!     Q3ListBoxItem* i=colorListBox->selectedItem();
      if(i) {
  	curColor->setRgb(curColor->red(), curColor->green(), b);
--- 364,368 ----
  }
  void DeicsOnzeGui::setBlueColor(int b) {
!     QListWidgetItem* i=colorListBox->selectedItems().at(0);
      if(i) {
  	curColor->setRgb(curColor->red(), curColor->green(), b);
***************
*** 407,411 ****
      }
  }
! void DeicsOnzeGui::setRGBSliders(Q3ListBoxItem* i) {
      if(i->text()==QString("Text"))
  	curColor->setRgb(tColor->red(), tColor->green(), tColor->blue());
--- 387,391 ----
      }
  }
! void DeicsOnzeGui::setRGBSliders(QListWidgetItem* i) {
      if(i->text()==QString("Text"))
  	curColor->setRgb(tColor->red(), tColor->green(), tColor->blue());
***************
*** 1182,1190 ****
  void DeicsOnzeGui::loadSetDialog() {
      QString fileName =
! 	Q3FileDialog::getOpenFileName(lastDir,
! 				     QString("*.dei"),
! 				     this,
  				     tr("Load set dialog"),
! 				     tr("Choose set"));

      // read the XML file and create DOM tree
--- 1162,1171 ----
  void DeicsOnzeGui::loadSetDialog() {
      QString fileName =
! 	QFileDialog::getOpenFileName(
!       			     this,
  				     tr("Load set dialog"),
!       			     lastDir,
! 				     QString("*.dei")
!       			     );

      // read the XML file and create DOM tree
***************
*** 1236,1244 ****
  void DeicsOnzeGui::saveSetDialog() {
      QString filename =
! 	Q3FileDialog::getSaveFileName(lastDir,
! 				     QString("*.dei"),
! 				     this,
  				     tr("Save set dialog"),
! 				     tr("Choose file"));

      if(!filename.isEmpty()) {
--- 1217,1225 ----
  void DeicsOnzeGui::saveSetDialog() {
      QString filename =
! 	QFileDialog::getSaveFileName(
!       			     this,
  				     tr("Save set dialog"),
!       			     lastDir,
! 				     QString("*.dei"));

      if(!filename.isEmpty()) {
***************
*** 1258,1326 ****
  // popupMenuCategory
  //-----------------------------------------------------------
! void DeicsOnzeGui::categoryPopupMenu(Q3ListViewItem* cat) {
!     Q3PopupMenu *categoryMenu = new Q3PopupMenu;
!     categoryMenu->insertItem(tr("New category"),
  			     this, SLOT(newCategoryDialog()));
!     int deleteItem = categoryMenu->insertItem(tr("Delete category"), this,
  					      SLOT(deleteCategoryDialog()));
!     categoryMenu->insertItem(tr("Load category"),
  			     this, SLOT(loadCategoryDialog()));
!     int saveItem = categoryMenu->insertItem(tr("Save category"), this,
  					    SLOT(saveCategoryDialog()));
      if(!cat) {
! 	categoryMenu->setItemEnabled(deleteItem, false);
! 	categoryMenu->setItemEnabled(saveItem, false);	
      }
!     categoryMenu->insertSeparator();
!     categoryMenu->insertItem(tr("Load set"),
  			     this, SLOT(loadSetDialog()));;
!     categoryMenu->insertItem(tr("Save set"),
  			     this, SLOT(saveSetDialog()));;
!     categoryMenu->insertItem(tr("Delete set"),
  			     this, SLOT(deleteSetDialog()));;
      categoryMenu->exec(QCursor::pos());
  }
! void DeicsOnzeGui::subcategoryPopupMenu(Q3ListViewItem* sub) {
!     Q3PopupMenu *subcategoryMenu = new Q3PopupMenu;
!     int newItem = subcategoryMenu->insertItem(tr("New subcategory"), this,
  					      SLOT(newSubcategoryDialog()));
!     int deleteItem = subcategoryMenu->insertItem(tr("Delete subcategory"),
  				      this, SLOT(deleteSubcategoryDialog()));
!     int loadItem = subcategoryMenu->insertItem(tr("Load subcategory"), this,
  					       SLOT(loadSubcategoryDialog()));
!     int saveItem = subcategoryMenu->insertItem(tr("Save subcategory"), this,
  					       SLOT(saveSubcategoryDialog()));
      if(!sub) {
! 	subcategoryMenu->setItemEnabled(deleteItem, false);
! 	subcategoryMenu->setItemEnabled(saveItem, false);	
      }
      if(!_currentQLVCategory
!        || !categoryListView->isSelected(_currentQLVCategory)) {
! 	subcategoryMenu->setItemEnabled(newItem, false);
! 	subcategoryMenu->setItemEnabled(loadItem, false);	
      }	
      subcategoryMenu->exec(QCursor::pos());
  }

! void DeicsOnzeGui::presetPopupMenu(Q3ListViewItem* pre) {
      QListViewPreset* preQ=(QListViewPreset*)pre;
!     Q3PopupMenu *presetMenu = new Q3PopupMenu;
!     int newItem = presetMenu->insertItem(tr("New preset"), this,
  					 SLOT(newPresetDialog()));
!     int deleteItem = presetMenu->insertItem(tr("Delete preset"), this,
  					    SLOT(deletePresetDialog()));
!     int loadItem = presetMenu->insertItem(tr("Load preset"), this,
  					  SLOT(loadPresetDialog()));
!     int saveItem = presetMenu->insertItem(tr("Save preset"), this,
  					  SLOT(savePresetDialog()));

      if(!preQ) {
! 	presetMenu->setItemEnabled(deleteItem, false);
! 	presetMenu->setItemEnabled(saveItem, false);	
      }
      if(!_currentQLVSubcategory
!        || !subcategoryListView->isSelected(_currentQLVSubcategory)) {
! 	presetMenu->setItemEnabled(newItem, false);
! 	presetMenu->setItemEnabled(loadItem, false);	
      }	
      presetMenu->exec(QCursor::pos());
--- 1239,1307 ----
  // popupMenuCategory
  //-----------------------------------------------------------
! void DeicsOnzeGui::categoryPopupMenu(QTreeWidgetItem* cat) {
!     QMenu *categoryMenu = new QMenu;
!     categoryMenu->addAction(tr("New category"),
  			     this, SLOT(newCategoryDialog()));
!     QAction* deleteItem = categoryMenu->addAction(tr("Delete category"), this,
  					      SLOT(deleteCategoryDialog()));
!     categoryMenu->addAction(tr("Load category"),
  			     this, SLOT(loadCategoryDialog()));
!     QAction* saveItem = categoryMenu->addAction(tr("Save category"), this,
  					    SLOT(saveCategoryDialog()));
      if(!cat) {
! 	deleteItem->setEnabled(false);
! 	saveItem->setEnabled(false);	
      }
!     categoryMenu->addSeparator();
!     categoryMenu->addAction(tr("Load set"),
  			     this, SLOT(loadSetDialog()));;
!     categoryMenu->addAction(tr("Save set"),
  			     this, SLOT(saveSetDialog()));;
!     categoryMenu->addAction(tr("Delete set"),
  			     this, SLOT(deleteSetDialog()));;
      categoryMenu->exec(QCursor::pos());
  }
! void DeicsOnzeGui::subcategoryPopupMenu(QTreeWidgetItem* sub) {
!     QMenu *subcategoryMenu = new QMenu;
!     QAction* newItem = subcategoryMenu->addAction(tr("New subcategory"), this,
  					      SLOT(newSubcategoryDialog()));
!     QAction* deleteItem = subcategoryMenu->addAction(tr("Delete subcategory"),
  				      this, SLOT(deleteSubcategoryDialog()));
!     QAction* loadItem = subcategoryMenu->addAction(tr("Load subcategory"), this,
  					       SLOT(loadSubcategoryDialog()));
!     QAction* saveItem = subcategoryMenu->addAction(tr("Save subcategory"), this,
  					       SLOT(saveSubcategoryDialog()));
      if(!sub) {
! 	deleteItem->setEnabled(false);
! 	saveItem->setEnabled(false);	
      }
      if(!_currentQLVCategory
!        || !categoryListView->isItemSelected(_currentQLVCategory)) {
! 	newItem->setEnabled(false);
! 	loadItem->setEnabled(false);	
      }	
      subcategoryMenu->exec(QCursor::pos());
  }

! void DeicsOnzeGui::presetPopupMenu(QTreeWidgetItem* pre) {
      QListViewPreset* preQ=(QListViewPreset*)pre;
!     QMenu *presetMenu = new QMenu;
!     QAction* newItem = presetMenu->addAction(tr("New preset"), this,
  					 SLOT(newPresetDialog()));
!     QAction* deleteItem = presetMenu->addAction(tr("Delete preset"), this,
  					    SLOT(deletePresetDialog()));
!     QAction* loadItem = presetMenu->addAction(tr("Load preset"), this,
  					  SLOT(loadPresetDialog()));
!     QAction* saveItem = presetMenu->addAction(tr("Save preset"), this,
  					  SLOT(savePresetDialog()));

      if(!preQ) {
! 	deleteItem->setEnabled(false);
!       saveItem->setEnabled(false);
      }
      if(!_currentQLVSubcategory
!        || !subcategoryListView->isItemSelected(_currentQLVSubcategory)) {
! 	newItem->setEnabled(false);
! 	loadItem->setEnabled(false);	
      }	
      presetMenu->exec(QCursor::pos());
***************
*** 1340,1348 ****
  	new Category(_deicsOnze->_set, "NEWCAT", nhbank);
  	setSet();
! 	Q3ListViewItem* ci=
! 	    categoryListView->findItem(num3Digits(nhbank+1), 0);
! 	categoryListView->setSelected(ci, true);
  	setCategory(ci);
! 	categoryListView->ensureItemVisible(ci);
      }
  }
--- 1321,1329 ----
  	new Category(_deicsOnze->_set, "NEWCAT", nhbank);
  	setSet();
! 	QTreeWidgetItem* ci=
! 	    categoryListView->findItems(num3Digits(nhbank+1), Qt::MatchExactly).at(0);
! 	categoryListView->setItemSelected(ci, true);
  	setCategory(ci);
! 	categoryListView->scrollToItem(ci);
      }
  }
***************
*** 1353,1357 ****
  void DeicsOnzeGui::deleteCategoryDialog() {
      if(_currentQLVCategory &&
!        categoryListView->isSelected(_currentQLVCategory)) {
  	if(!QMessageBox::question(
  	       this,
--- 1334,1338 ----
  void DeicsOnzeGui::deleteCategoryDialog() {
      if(_currentQLVCategory &&
!        categoryListView->isItemSelected(_currentQLVCategory)) {
  	if(!QMessageBox::question(
  	       this,
***************
*** 1385,1393 ****
      QString buffstr;
      QString fileName =
! 	Q3FileDialog::getOpenFileName(lastDir,
! 				     QString("*.dec"),
! 				     this,
  				     tr("Load category dialog"),
! 				     tr("Choose preset"));

      // read the XML file and create DOM tree
--- 1366,1374 ----
      QString buffstr;
      QString fileName =
! 	QFileDialog::getOpenFileName(
!       			     this,
  				     tr("Load category dialog"),
!       			     lastDir,
! 				     QString("*.dec"));

      // read the XML file and create DOM tree
***************
*** 1462,1470 ****
      if(_currentQLVCategory) {
  	QString filename =
! 	    Q3FileDialog::getSaveFileName(lastDir,
! 					 QString("*.dec"),
  					 this,
  					 tr("Save category dialog"),
! 					 tr("Choose category"));

  	if(!filename.isEmpty()) {
--- 1443,1451 ----
      if(_currentQLVCategory) {
  	QString filename =
! 	    QFileDialog::getSaveFileName(
  					 this,
  					 tr("Save category dialog"),
!             			 lastDir,
! 					 QString("*.dec"));

  	if(!filename.isEmpty()) {
***************
*** 1489,1493 ****
  void DeicsOnzeGui::newSubcategoryDialog() {
      if(_currentQLVCategory
!        && categoryListView->isSelected(_currentQLVCategory)) {
  	int nlbank=_currentQLVCategory->_category->firstFreeLBank();
  	if(nlbank==-1)
--- 1470,1474 ----
  void DeicsOnzeGui::newSubcategoryDialog() {
      if(_currentQLVCategory
!        && categoryListView->isItemSelected(_currentQLVCategory)) {
  	int nlbank=_currentQLVCategory->_category->firstFreeLBank();
  	if(nlbank==-1)
***************
*** 1500,1508 ****
  			    "NEWSUB", nlbank);
  	    setCategory(_currentQLVCategory);
! 	    Q3ListViewItem* si=
! 		subcategoryListView->findItem(num3Digits(nlbank+1), 0);
! 	    subcategoryListView->setSelected(si, true);
  	    setSubcategory(si);
! 	    subcategoryListView->ensureItemVisible(si);
  	}
      }
--- 1481,1489 ----
  			    "NEWSUB", nlbank);
  	    setCategory(_currentQLVCategory);
! 	    QTreeWidgetItem* si=
! 		subcategoryListView->findItems(num3Digits(nlbank+1), Qt::MatchExactly).at(0);
! 	    subcategoryListView->setItemSelected(si, true);
  	    setSubcategory(si);
! 	    subcategoryListView->scrollToItem(si);
  	}
      }
***************
*** 1514,1518 ****
  void DeicsOnzeGui::deleteSubcategoryDialog() {
      if(_currentQLVSubcategory &&
!        subcategoryListView->isSelected(_currentQLVSubcategory)) {
  	if(!QMessageBox::question(
  	       this,
--- 1495,1499 ----
  void DeicsOnzeGui::deleteSubcategoryDialog() {
      if(_currentQLVSubcategory &&
!        subcategoryListView->isItemSelected(_currentQLVSubcategory)) {
  	if(!QMessageBox::question(
  	       this,
***************
*** 1545,1553 ****
      QString buffstr;
      QString fileName =
! 	Q3FileDialog::getOpenFileName(lastDir,
! 				     QString("*.des"),
! 				     this,
  				     tr("Load subcategory dialog"),
! 				     tr("Choose subcategory"));

      // read the XML file and create DOM tree
--- 1526,1534 ----
      QString buffstr;
      QString fileName =
! 	QFileDialog::getOpenFileName(
!       			     this,
  				     tr("Load subcategory dialog"),
!       			     lastDir,
! 				     QString("*.des"));

      // read the XML file and create DOM tree
***************
*** 1627,1635 ****
      if(_currentQLVSubcategory) {
  	QString filename =
! 	    Q3FileDialog::getSaveFileName(lastDir,
! 					 QString("*.des"),
! 					 this,
  					 tr("Save subcategory dialog"),
! 					 tr("Choose file"));

  	if(!filename.isEmpty()) {
--- 1608,1616 ----
      if(_currentQLVSubcategory) {
  	QString filename =
! 	    QFileDialog::getSaveFileName(
!             			 this,
  					 tr("Save subcategory dialog"),
!             			 lastDir,
! 					 QString("*.des"));

  	if(!filename.isEmpty()) {
***************
*** 1656,1660 ****
  void DeicsOnzeGui::newPresetDialog() {
      if(_currentQLVSubcategory
!        && subcategoryListView->isSelected(_currentQLVSubcategory)) {
  	int nprog=_currentQLVSubcategory->_subcategory->firstFreeProg();
  	if(nprog==-1)
--- 1637,1641 ----
  void DeicsOnzeGui::newPresetDialog() {
      if(_currentQLVSubcategory
!        && subcategoryListView->isItemSelected(_currentQLVSubcategory)) {
  	int nprog=_currentQLVSubcategory->_subcategory->firstFreeProg();
  	if(nprog==-1)
***************
*** 1666,1674 ****
  	    new Preset(_currentQLVSubcategory->_subcategory, nprog);
  	    setSubcategory(_currentQLVSubcategory);
! 	    Q3ListViewItem* pi=
! 		presetListView->findItem(num3Digits(nprog+1), 0);
! 	    presetListView->setSelected(pi, true);
  	    setPreset(pi);
! 	    presetListView->ensureItemVisible(pi);
  	}
      }
--- 1647,1655 ----
  	    new Preset(_currentQLVSubcategory->_subcategory, nprog);
  	    setSubcategory(_currentQLVSubcategory);
! 	    QTreeWidgetItem* pi=
! 		presetListView->findItems(num3Digits(nprog+1), Qt::MatchExactly).at(0);
! 	    presetListView->setItemSelected(pi, true);
  	    setPreset(pi);
! 	    presetListView->scrollToItem(pi);
  	}
      }
***************
*** 1680,1684 ****
  void DeicsOnzeGui::deletePresetDialog() {
      if(_currentQLVPreset) {
! 	if(presetListView->isSelected(_currentQLVPreset)) {
  	    if(!QMessageBox::question(
  		   this,
--- 1661,1665 ----
  void DeicsOnzeGui::deletePresetDialog() {
      if(_currentQLVPreset) {
! 	if(presetListView->isItemSelected(_currentQLVPreset)) {
  	    if(!QMessageBox::question(
  		   this,
***************
*** 1710,1718 ****
      QString buffstr;
      QString fileName =
! 	Q3FileDialog::getOpenFileName(lastDir,
! 				     QString("*.dep"),
! 				     this,
  				     tr("Load preset dialog"),
! 				     tr("Choose preset"));

      // read the XML file and create DOM tree
--- 1691,1699 ----
      QString buffstr;
      QString fileName =
! 	QFileDialog::getOpenFileName(
!       			     this,
  				     tr("Load preset dialog"),
!       			     lastDir,
! 				     QString("*.dep"));

      // read the XML file and create DOM tree
***************
*** 1793,1801 ****
      if(_currentQLVPreset) {
  	QString filename =
! 	    Q3FileDialog::getSaveFileName(lastDir,
! 					 QString("*.dep"),
! 					 this,
  					 tr("Save preset dialog"),
! 					 tr("Choose file"));

  	if(!filename.isEmpty()) {
--- 1774,1782 ----
      if(_currentQLVPreset) {
  	QString filename =
! 	    QFileDialog::getSaveFileName(
!             			 this,
  					 tr("Save preset dialog"),
!             			 lastDir,
! 					 QString("*.dep"));

  	if(!filename.isEmpty()) {
***************
*** 1839,1844 ****
      if(_currentQLVCategory) {//must be changed with SysEx
  	if(!_deicsOnze->_set->isFreeHBank(hb-1)) {
! 	    Q3ListViewItem* qcat;
! 	    qcat=categoryListView->findItem(num3Digits(hb), 0);
  	    ((QListViewCategory*)qcat)->_category->_hbank=
  		_currentQLVCategory->_category->_hbank;
--- 1820,1825 ----
      if(_currentQLVCategory) {//must be changed with SysEx
  	if(!_deicsOnze->_set->isFreeHBank(hb-1)) {
! 	    QTreeWidgetItem* qcat;
! 	    qcat=categoryListView->findItems(num3Digits(hb), Qt::MatchExactly).at(0);
  	    ((QListViewCategory*)qcat)->_category->_hbank=
  		_currentQLVCategory->_category->_hbank;
***************
*** 1849,1854 ****
  	_currentQLVCategory->_category->_hbank=hb-1;
  	_currentQLVCategory->setText(0,num3Digits(hb));
! 	categoryListView->sort();
! 	categoryListView->ensureItemVisible(_currentQLVCategory);
      }
  }
--- 1830,1835 ----
  	_currentQLVCategory->_category->_hbank=hb-1;
  	_currentQLVCategory->setText(0,num3Digits(hb));
! 	categoryListView->sortItems(0, Qt::AscendingOrder);
! 	categoryListView->scrollToItem(_currentQLVCategory);
      }
  }
***************
*** 1857,1862 ****
  	Category* currentCat=_currentQLVSubcategory->_subcategory->_category;
  	if(!currentCat->isFreeLBank(lb-1)) {
! 	    Q3ListViewItem* qsub;
! 	    qsub=subcategoryListView->findItem(num3Digits(lb), 0);
  	    ((QListViewSubcategory*)qsub)->_subcategory->_lbank=
  		_currentQLVSubcategory->_subcategory->_lbank;
--- 1838,1843 ----
  	Category* currentCat=_currentQLVSubcategory->_subcategory->_category;
  	if(!currentCat->isFreeLBank(lb-1)) {
! 	    QTreeWidgetItem* qsub;
! 	    qsub=subcategoryListView->findItems(num3Digits(lb), Qt::MatchExactly).at(0);
  	    ((QListViewSubcategory*)qsub)->_subcategory->_lbank=
  		_currentQLVSubcategory->_subcategory->_lbank;
***************
*** 1867,1872 ****
  	_currentQLVSubcategory->_subcategory->_lbank=lb-1;
  	_currentQLVSubcategory->setText(0,num3Digits(lb));
! 	subcategoryListView->sort();
! 	subcategoryListView->ensureItemVisible(_currentQLVSubcategory);
      }

--- 1848,1853 ----
  	_currentQLVSubcategory->_subcategory->_lbank=lb-1;
  	_currentQLVSubcategory->setText(0,num3Digits(lb));
! 	subcategoryListView->sortItems(0, Qt::AscendingOrder);
! 	subcategoryListView->scrollToItem(_currentQLVSubcategory);
      }

***************
*** 1876,1881 ****
  	Subcategory* currentSub=_currentQLVPreset->_preset->_subcategory;
  	if(!currentSub->isFreeProg(pr-1)) {
! 	    Q3ListViewItem* qpre;
! 	    qpre=presetListView->findItem(num3Digits(pr), 0);
  	    ((QListViewPreset*)qpre)->_preset->prog=
  		_currentQLVPreset->_preset->prog;
--- 1857,1862 ----
  	Subcategory* currentSub=_currentQLVPreset->_preset->_subcategory;
  	if(!currentSub->isFreeProg(pr-1)) {
! 	    QTreeWidgetItem* qpre;
! 	    qpre=presetListView->findItems(num3Digits(pr), Qt::MatchExactly).at(0);
  	    ((QListViewPreset*)qpre)->_preset->prog=
  		_currentQLVPreset->_preset->prog;
***************
*** 1886,1891 ****
  	_currentQLVPreset->_preset->prog=pr-1;
  	_currentQLVPreset->setText(0,num3Digits(pr));
! 	presetListView->sort();
! 	presetListView->ensureItemVisible(_currentQLVPreset);
      }
  }
--- 1867,1872 ----
  	_currentQLVPreset->_preset->prog=pr-1;
  	_currentQLVPreset->setText(0,num3Digits(pr));
! 	presetListView->sortItems(0,Qt::AscendingOrder);
! 	presetListView->scrollToItem(_currentQLVPreset);
      }
  }
***************
*** 2288,2292 ****
  					    (*i)->_subcategoryName.c_str(),*i);
  }
! void DeicsOnzeGui::setCategory(Q3ListViewItem* cat) {
      if(cat) {
  	_currentQLVCategory=NULL;//to avoid setText and setValue effect
--- 2269,2273 ----
  					    (*i)->_subcategoryName.c_str(),*i);
  }
! void DeicsOnzeGui::setCategory(QTreeWidgetItem* cat) {
      if(cat) {
  	_currentQLVCategory=NULL;//to avoid setText and setValue effect
***************
*** 2316,2320 ****
  				       (*i)->name.c_str(),*i);
  }
! void DeicsOnzeGui::setSubcategory(Q3ListViewItem* sub) {
      if(sub) {
  	_currentQLVSubcategory=NULL;//to avoid setText and setValue effect
--- 2297,2301 ----
  				       (*i)->name.c_str(),*i);
  }
! void DeicsOnzeGui::setSubcategory(QTreeWidgetItem* sub) {
      if(sub) {
  	_currentQLVSubcategory=NULL;//to avoid setText and setValue effect
***************
*** 2334,2338 ****
  // setPreset
  //--------------------------------------------------------------
! void DeicsOnzeGui::setPreset(Q3ListViewItem* pre) {
      if(pre) {
  	_currentQLVPreset=NULL;//to avoid setText and setValue effect
--- 2315,2319 ----
  // setPreset
  //--------------------------------------------------------------
! void DeicsOnzeGui::setPreset(QTreeWidgetItem* pre) {
      if(pre) {
  	_currentQLVPreset=NULL;//to avoid setText and setValue effect
***************
*** 2398,2402 ****
  void DeicsOnzeGui::updateQuality(int val) {
      qualityComboBox->blockSignals(true);
!     qualityComboBox->setCurrentItem(val);		
      qualityComboBox->blockSignals(false);
  }
--- 2379,2383 ----
  void DeicsOnzeGui::updateQuality(int val) {
      qualityComboBox->blockSignals(true);
!     qualityComboBox->setCurrentIndex(val);		
      qualityComboBox->blockSignals(false);
  }
***************
*** 2973,2977 ****
  void DeicsOnzeGui::updateALG(int val) {
      algorithmComboBox->blockSignals(true);
!     algorithmComboBox->setCurrentItem(val);
      algorithmComboBox->blockSignals(false);
  }
--- 2954,2958 ----
  void DeicsOnzeGui::updateALG(int val) {
      algorithmComboBox->blockSignals(true);
!     algorithmComboBox->setCurrentIndex(val);
      algorithmComboBox->blockSignals(false);
  }
***************
*** 3023,3027 ****
  void DeicsOnzeGui::updateWAVE(int val) {
      LFOWaveComboBox->blockSignals(true);
!     LFOWaveComboBox->setCurrentItem(val);
      LFOWaveComboBox->blockSignals(false);
  }
--- 3004,3008 ----
  void DeicsOnzeGui::updateWAVE(int val) {
      LFOWaveComboBox->blockSignals(true);
!     LFOWaveComboBox->setCurrentIndex(val);
      LFOWaveComboBox->blockSignals(false);
  }
***************
*** 3052,3056 ****
  void DeicsOnzeGui::updatePOLYMODE(int val) {
      polyMonoComboBox->blockSignals(true);
!     polyMonoComboBox->setCurrentItem(val);
      polyMonoComboBox->blockSignals(false);
  }
--- 3033,3037 ----
  void DeicsOnzeGui::updatePOLYMODE(int val) {
      polyMonoComboBox->blockSignals(true);
!     polyMonoComboBox->setCurrentIndex(val);
      polyMonoComboBox->blockSignals(false);
  }
***************
*** 3065,3069 ****
  void DeicsOnzeGui::updatePORTAMODE(int val) {
      PortFingerFullComboBox->blockSignals(true);
!     PortFingerFullComboBox->setCurrentItem(val);
      PortFingerFullComboBox->blockSignals(false);
  }
--- 3046,3050 ----
  void DeicsOnzeGui::updatePORTAMODE(int val) {
      PortFingerFullComboBox->blockSignals(true);
!     PortFingerFullComboBox->setCurrentIndex(val);
      PortFingerFullComboBox->blockSignals(false);
  }
***************
*** 3155,3174 ****
  	case 0:
  	    WaveForm1ComboBox->blockSignals(true);
! 	    WaveForm1ComboBox->setCurrentItem(val);
  	    WaveForm1ComboBox->blockSignals(false);
  	    break;
  	case 1:
  	    WaveForm2ComboBox->blockSignals(true);
! 	    WaveForm2ComboBox->setCurrentItem(val);
  	    WaveForm2ComboBox->blockSignals(false);
  	    break;
  	case 2:
  	    WaveForm3ComboBox->blockSignals(true);
! 	    WaveForm3ComboBox->setCurrentItem(val);
  	    WaveForm3ComboBox->blockSignals(false);
  	    break;
  	case 3:
  	    WaveForm4ComboBox->blockSignals(true);
! 	    WaveForm4ComboBox->setCurrentItem(val);
  	    WaveForm4ComboBox->blockSignals(false);
  	    break;
--- 3136,3155 ----
  	case 0:
  	    WaveForm1ComboBox->blockSignals(true);
! 	    WaveForm1ComboBox->setCurrentIndex(val);
  	    WaveForm1ComboBox->blockSignals(false);
  	    break;
  	case 1:
  	    WaveForm2ComboBox->blockSignals(true);
! 	    WaveForm2ComboBox->setCurrentIndex(val);
  	    WaveForm2ComboBox->blockSignals(false);
  	    break;
  	case 2:
  	    WaveForm3ComboBox->blockSignals(true);
! 	    WaveForm3ComboBox->setCurrentIndex(val);
  	    WaveForm3ComboBox->blockSignals(false);
  	    break;
  	case 3:
  	    WaveForm4ComboBox->blockSignals(true);
! 	    WaveForm4ComboBox->setCurrentIndex(val);
  	    WaveForm4ComboBox->blockSignals(false);
  	    break;
***************
*** 3180,3199 ****
  	case 0:
  	    EGS1ComboBox->blockSignals(true);
! 	    EGS1ComboBox->setCurrentItem(val);
  	    EGS1ComboBox->blockSignals(false);
  	    break;
  	case 1:
  	    EGS2ComboBox->blockSignals(true);
! 	    EGS2ComboBox->setCurrentItem(val);
  	    EGS2ComboBox->blockSignals(false);
  	    break;
  	case 2:
  	    EGS3ComboBox->blockSignals(true);
! 	    EGS3ComboBox->setCurrentItem(val);
  	    EGS3ComboBox->blockSignals(false);
  	    break;
  	case 3:
  	    EGS4ComboBox->blockSignals(true);
! 	    EGS4ComboBox->setCurrentItem(val);
  	    EGS4ComboBox->blockSignals(false);
  	    break;
--- 3161,3180 ----
  	case 0:
  	    EGS1ComboBox->blockSignals(true);
! 	    EGS1ComboBox->setCurrentIndex(val);
  	    EGS1ComboBox->blockSignals(false);
  	    break;
  	case 1:
  	    EGS2ComboBox->blockSignals(true);
! 	    EGS2ComboBox->setCurrentIndex(val);
  	    EGS2ComboBox->blockSignals(false);
  	    break;
  	case 2:
  	    EGS3ComboBox->blockSignals(true);
! 	    EGS3ComboBox->setCurrentIndex(val);
  	    EGS3ComboBox->blockSignals(false);
  	    break;
  	case 3:
  	    EGS4ComboBox->blockSignals(true);
! 	    EGS4ComboBox->setCurrentIndex(val);
  	    EGS4ComboBox->blockSignals(false);
  	    break;
***************
*** 3349,3358 ****
      //select category, subcategory, preset
      //category
!     Q3ListViewItem* qcat=categoryListView->findItem(num3Digits(hbank+1), 0);
      //if the category is different than the last one then select the new one
      if(!_currentQLVCategory || qcat!= _currentQLVCategory) {
  	if(qcat) {
! 	    categoryListView->setSelected(qcat, true);
! 	    categoryListView->ensureItemVisible(qcat);
  	    setEnabledPreset(true);
  	}
--- 3330,3339 ----
      //select category, subcategory, preset
      //category
!     QTreeWidgetItem* qcat=categoryListView->findItems(num3Digits(hbank+1),Qt::MatchExactly).at(0);
      //if the category is different than the last one then select the new one
      if(!_currentQLVCategory || qcat!= _currentQLVCategory) {
  	if(qcat) {
! 	    categoryListView->setItemSelected(qcat, true);
! 	    categoryListView->scrollToItem(qcat);
  	    setEnabledPreset(true);
  	}
***************
*** 3368,3377 ****
      //subcategory
      if(_currentQLVCategory) {
! 	Q3ListViewItem* qsub;
! 	qsub=subcategoryListView->findItem(num3Digits(lbank+1), 0);
  	if(!_currentQLVSubcategory || qsub!=_currentQLVSubcategory) {
  	    if(qsub) {
! 		subcategoryListView->setSelected(qsub, true);
! 		subcategoryListView->ensureItemVisible(qsub);
  		setEnabledPreset(true);
  	    }
--- 3349,3358 ----
      //subcategory
      if(_currentQLVCategory) {
! 	QTreeWidgetItem* qsub;
! 	qsub=subcategoryListView->findItems(num3Digits(lbank+1), Qt::MatchExactly).at(0);
  	if(!_currentQLVSubcategory || qsub!=_currentQLVSubcategory) {
  	    if(qsub) {
! 		subcategoryListView->setItemSelected(qsub, true);
! 		subcategoryListView->scrollToItem(qsub);
  		setEnabledPreset(true);
  	    }
***************
*** 3396,3405 ****
      //preset
      if(_currentQLVSubcategory) {
! 	Q3ListViewItem* qpre=presetListView->findItem(num3Digits(prog+1), 0);
  	if(qpre) {
  	    presetListView->blockSignals(true);
! 	    presetListView->setSelected(qpre, true);
  	    presetListView->blockSignals(false);
! 	    presetListView->ensureItemVisible(qpre);
  	    updatePresetName(qpre->text(1), true);
  	    updateProg(prog, true);
--- 3377,3386 ----
      //preset
      if(_currentQLVSubcategory) {
! 	QTreeWidgetItem* qpre=presetListView->findItems(num3Digits(prog+1), Qt::MatchExactly).at(0);
  	if(qpre) {
  	    presetListView->blockSignals(true);
! 	    presetListView->setItemSelected(qpre, true);
  	    presetListView->blockSignals(false);
! 	    presetListView->scrollToItem(qpre);
  	    updatePresetName(qpre->text(1), true);
  	    updateProg(prog, true);