[Lmuse-cvs-traffic] muse/synti/deicsonze Makefile.am,1.12,1.13 deicsonzegui.cpp,1.16,1.17 deicsonzegui.h,1.15,1.16

[Nil G. <a-...@us...>]

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

Modified Files:
	Makefile.am deicsonzegui.cpp deicsonzegui.h 
Log Message:
DeicsOnze Qt4 port completed

Index: deicsonzegui.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** deicsonzegui.h	29 Dec 2005 02:25:44 -0000	1.15
--- deicsonzegui.h	30 Dec 2005 11:08:57 -0000	1.16
***************
*** 72,79 ****
  class QFrameEnvelope;
  
! class QListViewCategory:public QTreeWidgetItem {
   public:
      Category* _category;
!     QListViewCategory(QTreeWidget* p, QString shbank, QString l, Category* c)
  	:QTreeWidgetItem(p) {
        	setText(0, shbank);
--- 72,79 ----
  class QFrameEnvelope;
  
! class QTreeCategory:public QTreeWidgetItem {
   public:
      Category* _category;
!     QTreeCategory(QTreeWidget* p, QString shbank, QString l, Category* c)
  	:QTreeWidgetItem(p) {
        	setText(0, shbank);
***************
*** 83,90 ****
  };
  
! class QListViewSubcategory:public QTreeWidgetItem {
   public:
      Subcategory* _subcategory;
!     QListViewSubcategory(QTreeWidget* p, QString slbank,
  			     QString l, Subcategory* s)
  	:QTreeWidgetItem(p) {
--- 83,90 ----
  };
  
! class QTreeSubcategory:public QTreeWidgetItem {
   public:
      Subcategory* _subcategory;
!     QTreeSubcategory(QTreeWidget* p, QString slbank,
  			     QString l, Subcategory* s)
  	:QTreeWidgetItem(p) {
***************
*** 95,102 ****
  };
  
! class QListViewPreset:public QTreeWidgetItem {
   public:
      Preset* _preset;
!     QListViewPreset(QTreeWidget* pa, QString sprog, QString l, Preset* p)
  	:QTreeWidgetItem(pa) {
              setText(0, sprog);
--- 95,102 ----
  };
  
! class QTreePreset:public QTreeWidgetItem {
   public:
      Preset* _preset;
!     QTreePreset(QTreeWidget* pa, QString sprog, QString l, Preset* p)
  	:QTreeWidgetItem(pa) {
              setText(0, sprog);
***************
*** 110,117 ****
  //---------------------------------------------------------
  class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui {
-     QListViewCategory* _currentQLVCategory;
-     QListViewSubcategory* _currentQLVSubcategory;
-     QListViewPreset* _currentQLVPreset;
- 
      bool _enabledPreset;
  
--- 110,113 ----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile.am	28 Dec 2005 13:13:27 -0000	1.12
--- Makefile.am	30 Dec 2005 11:08:57 -0000	1.13
***************
*** 16,20 ****
  nodist_deicsonze_la_SOURCES = obj/moc_deicsonzegui.cpp
  
! deicsonze_la_LIBADD    = ../libsynti/libsynti.la
  deicsonze_la_LDFLAGS   = -module -avoid-version
  
--- 16,20 ----
  nodist_deicsonze_la_SOURCES = obj/moc_deicsonzegui.cpp
  
! deicsonze_la_LIBADD    = ../libsynti/libsynti.la -L$(top_srcdir)/al -lal
  deicsonze_la_LDFLAGS   = -module -avoid-version
  

Index: deicsonzegui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** deicsonzegui.cpp	29 Dec 2005 02:25:44 -0000	1.16
--- deicsonzegui.cpp	30 Dec 2005 11:08:57 -0000	1.17
***************
*** 293,301 ****
    updatePreset();
    setEnabledPreset(false);
- 
-   _currentQLVCategory = NULL;
-   _currentQLVSubcategory = NULL;
-   _currentQLVPreset = NULL;
- 
  };
  
--- 293,296 ----
[...1306 lines suppressed...]
!       presetListView->scrollToItem(qpre);
!       updatePresetName(qpre->text(1), true);
!       updateProg(prog, true);
!       pre=(QTreePreset*) qpre;
!       setEnabledPreset(true);
      }
      else {
!       updatePresetName(QString("INITVOICE"), false);
!       updateProg(prog, false);
!       presetListView->clearSelection();
!       setEnabledPreset(false);
      }
+   }
+   else {
+     updatePresetName(QString("INITVOICE"), false);
+     updateProg(prog, false);
+     presetListView->clearSelection();
+     setEnabledPreset(false);
+   }
  }