[Lmuse-cvs-traffic] muse/muse/widgets Makefile.am,1.29,1.30 canvas.cpp,1.15,1.16 canvas.h,1.6,1.7 mtscale.cpp,1.13,1.14 mtscale.h,1.4,1.5 ctrlcombo.cw,1.1.1.1,NONE splitter.cpp,1.5,NONE splitter.h,1.4,NONE

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

Update of /cvsroot/lmuse/muse/muse/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15332/muse/widgets

Modified Files:
	Makefile.am canvas.cpp canvas.h mtscale.cpp mtscale.h 
Removed Files:
	ctrlcombo.cw splitter.cpp splitter.h 
Log Message:
reorganized pianoroll editor and drum editor; part1


Index: canvas.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/canvas.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** canvas.h	24 Sep 2005 19:14:06 -0000	1.6
--- canvas.h	28 Sep 2005 20:26:38 -0000	1.7
***************
*** 107,111 ****
     public slots:
        void setTool(int t);
!       void setPos(int, unsigned, bool adjustScrollbar);
  
     signals:
--- 107,111 ----
     public slots:
        void setTool(int t);
!       void setPos(int,const AL::Pos&, bool adjustScrollbar);
  
     signals:

Index: canvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/canvas.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** canvas.cpp	26 Sep 2005 20:14:03 -0000	1.15
--- canvas.cpp	28 Sep 2005 20:26:38 -0000	1.16
***************
*** 33,37 ****
        curPartId = -1;
        curItem = NULL;
!       connect(song, SIGNAL(posChanged(int, unsigned, bool)), this, SLOT(setPos(int, unsigned, bool)));
        }
  
--- 33,37 ----
        curPartId = -1;
        curItem = NULL;
!       connect(song, SIGNAL(posChanged(int,const AL::Pos&, bool)), this, SLOT(setPos(int,const AL::Pos&, bool)));
        }
  
***************
*** 43,48 ****
  //---------------------------------------------------------
  
! void Canvas::setPos(int idx, unsigned val, bool adjustScrollbar)
        {
        if (pos[idx] == val)
              return;
--- 43,49 ----
  //---------------------------------------------------------
  
! void Canvas::setPos(int idx, const AL::Pos& ppos, bool adjustScrollbar)
        {
+       unsigned val = ppos.tick();
        if (pos[idx] == val)
              return;

Index: mtscale.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/mtscale.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mtscale.h	22 Sep 2005 20:13:39 -0000	1.4
--- mtscale.h	28 Sep 2005 20:26:38 -0000	1.5
***************
*** 10,16 ****
  
  #include "view.h"
! //Added by qt3to4:
! #include <QMouseEvent>
! #include <QEvent>
  
  class QPainter;
--- 10,18 ----
  
  #include "view.h"
! 
! namespace AL {
!       class Pos;
!       };
! class AL::Pos;
  
  class QPainter;
***************
*** 44,48 ****
  
     public slots:
!       void setPos(int, unsigned, bool);
  
     public:
--- 46,50 ----
  
     public slots:
!       void setPos(int,const AL::Pos&, bool);
  
     public:

--- ctrlcombo.cw DELETED ---

--- splitter.cpp DELETED ---

Index: mtscale.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/mtscale.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mtscale.cpp	26 Sep 2005 20:14:03 -0000	1.13
--- mtscale.cpp	28 Sep 2005 20:26:38 -0000	1.14
***************
*** 11,15 ****
  #include "song.h"
  #include "al/marker.h"
- // #include "../marker/markerview.h"
  #include "icons.h"
  #include "gconfig.h"
--- 11,14 ----
***************
*** 41,45 ****
        button = Qt::NoButton;
        setMouseTracking(true);
!       connect(song, SIGNAL(posChanged(int, unsigned, bool)), SLOT(setPos(int, unsigned, bool)));
        connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
        connect(song, SIGNAL(markerChanged(int)), SLOT(update()));
--- 40,44 ----
        button = Qt::NoButton;
        setMouseTracking(true);
!       connect(song, SIGNAL(posChanged(int,const AL::Pos&, bool)), SLOT(setPos(int,const AL::Pos&, bool)));
        connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
        connect(song, SIGNAL(markerChanged(int)), SLOT(update()));
***************
*** 69,74 ****
  //---------------------------------------------------------
  
! void MTScale::setPos(int idx, unsigned val, bool)
        {
        if (val == MAXINT) {
              if (idx == 3) {
--- 68,74 ----
  //---------------------------------------------------------
  
! void MTScale::setPos(int idx,const AL::Pos& ppos, bool)
        {
+       unsigned int val = ppos.tick();
        if (val == MAXINT) {
              if (idx == 3) {

Index: Makefile.am
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile.am	26 Sep 2005 18:26:21 -0000	1.29
--- Makefile.am	28 Sep 2005 20:26:38 -0000	1.30
***************
*** 7,10 ****
--- 7,27 ----
  noinst_LIBRARIES = libwidgets.a
  
+ MOCBASES = \
+ 	scrollscale view nentry mtscale sigscale intlabel \
+ 	doublelabel canvas noteinfo dentry siglabel simplebutton \
+ 	tb1 swidget tools fontsel ctrlcombo midisyncimpl genset \
+ 	mixdowndialog comboQuant bigtime comment gatetime velocity \
+ 	filedialog shortcutconfig shortcutcapturedialog combobox \
+       outportcombo
+ 
+ UIC3BASES = \
+       midisync gensetbase mixdowndialogbase transposebase transformbase \
+ 	appearancebase commentbase gatetimebase velocitybase mtrackinfobase \
+ 	wtrackinfobase fdialogbuttons shortcutconfigbase  \
+       shortcutcapturedialogbase aboutbox configmidifilebase
+ 
+ UICBASES = \
+ 	editmetadialogbase editnotedialogbase
+ 
  dist_libwidgets_a_SOURCES = \
  	utils.cpp utils.h \
***************
*** 33,37 ****
  	bigtime.cpp bigtime.h \
  	comment.cpp comment.h \
- 	splitter.cpp splitter.h \
  	gatetime.cpp gatetime.h \
  	velocity.cpp velocity.h \
--- 50,53 ----
***************
*** 40,63 ****
  	shortcutcapturedialog.cpp shortcutcapturedialog.h \
        combobox.cpp combobox.h \
!       outportcombo.cpp outportcombo.h\
! 	\
! 	midisync.ui3 \
! 	gensetbase.ui3 \
! 	mixdowndialogbase.ui3 \
! 	transposebase.ui3 \
! 	transformbase.ui3 \
! 	appearancebase.ui3 \
! 	commentbase.ui3 \
! 	gatetimebase.ui3 \
! 	velocitybase.ui3 \
! 	mtrackinfobase.ui3 \
! 	wtrackinfobase.ui3 \
! 	fdialogbuttons.ui3 \
! 	shortcutconfigbase.ui3 \
! 	shortcutcapturedialogbase.ui3 \
!       aboutbox.ui3 \
!       configmidifilebase.ui3 \
! 	editmetadialogbase.ui  \
! 	editnotedialogbase.ui
  
  #	mittransposebase.ui3
--- 56,76 ----
  	shortcutcapturedialog.cpp shortcutcapturedialog.h \
        combobox.cpp combobox.h \
!       outportcombo.cpp outportcombo.h \
!       midisync.cpp \
!       gensetbase.cpp \
!       mixdowndialogbase.cpp \
!       transposebase.cpp \
!       transformbase.cpp \
! 	appearancebase.cpp \
!       commentbase.cpp \
!       gatetimebase.cpp \
!       velocitybase.cpp \
!       mtrackinfobase \
! 	wtrackinfobase.cpp \
!       fdialogbuttons.cpp \
!       shortcutconfigbase.cpp  \
!       shortcutcapturedialogbase.cpp \
!       aboutbox.cpp \
!       configmidifilebase.cpp
  
  #	mittransposebase.ui3
***************
*** 68,104 ****
  
  nodist_libwidgets_a_SOURCES = \
! 	moc_scrollscale.cpp \
! 	moc_view.cpp \
! 	moc_nentry.cpp \
! 	moc_mtscale.cpp \
! 	moc_sigscale.cpp \
! 	moc_intlabel.cpp \
! 	moc_doublelabel.cpp \
! 	moc_canvas.cpp \
! 	moc_noteinfo.cpp \
! 	moc_dentry.cpp \
! 	moc_siglabel.cpp \
! 	moc_simplebutton.cpp \
! 	moc_tb1.cpp \
! 	moc_swidget.cpp \
! 	moc_tools.cpp \
! 	moc_fontsel.cpp \
! 	moc_ctrlcombo.cpp \
! 	moc_midisyncimpl.cpp \
! 	moc_genset.cpp \
! 	moc_mixdowndialog.cpp \
! 	moc_comboQuant.cpp \
! 	moc_bigtime.cpp \
! 	moc_comment.cpp \
! 	moc_splitter.cpp \
! 	moc_gatetime.cpp \
! 	moc_velocity.cpp \
! 	moc_filedialog.cpp \
! 	moc_shortcutconfig.cpp \
! 	moc_shortcutcapturedialog.cpp \
!       moc_combobox.cpp \
!       moc_aboutbox.cpp \
!       moc_transformbase.cpp \
!       moc_outportcombo.cpp
  
  
--- 81,116 ----
  
  nodist_libwidgets_a_SOURCES = \
! 	obj/moc_scrollscale.cpp \
! 	obj/moc_view.cpp \
! 	obj/moc_nentry.cpp \
! 	obj/moc_mtscale.cpp \
! 	obj/moc_sigscale.cpp \
! 	obj/moc_intlabel.cpp \
! 	obj/moc_doublelabel.cpp \
! 	obj/moc_canvas.cpp \
! 	obj/moc_noteinfo.cpp \
! 	obj/moc_dentry.cpp \
! 	obj/moc_siglabel.cpp \
! 	obj/moc_simplebutton.cpp \
! 	obj/moc_tb1.cpp \
! 	obj/moc_swidget.cpp \
! 	obj/moc_tools.cpp \
! 	obj/moc_fontsel.cpp \
! 	obj/moc_ctrlcombo.cpp \
! 	obj/moc_midisyncimpl.cpp \
! 	obj/moc_genset.cpp \
! 	obj/moc_mixdowndialog.cpp \
! 	obj/moc_comboQuant.cpp \
! 	obj/moc_bigtime.cpp \
! 	obj/moc_comment.cpp \
! 	obj/moc_gatetime.cpp \
! 	obj/moc_velocity.cpp \
! 	obj/moc_filedialog.cpp \
! 	obj/moc_shortcutconfig.cpp \
! 	obj/moc_shortcutcapturedialog.cpp \
!       obj/moc_combobox.cpp \
!       obj/moc_aboutbox.cpp \
!       obj/moc_transformbase.cpp \
!       obj/moc_outportcombo.cpp
  
  

--- splitter.h DELETED ---