[Lmuse-cvs-traffic] muse/muse/midiedit drumedit.cpp,1.34,1.35 drumedit.h,1.18,1.19 pianoroll.cpp,1.37,1.38 pianoroll.h,1.14,1.15

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

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

Modified Files:
	drumedit.cpp drumedit.h pianoroll.cpp pianoroll.h 
Log Message:
add icons to selection operations in pianoroll editor


Index: drumedit.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/drumedit.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** drumedit.cpp	2 Jan 2005 16:48:53 -0000	1.34
--- drumedit.cpp	7 Jan 2005 22:07:25 -0000	1.35
***************
*** 108,114 ****
        {
        refreshSettings();
! 
!       emit deleted((int)this);
!       e->accept();
        }
  
--- 108,112 ----
        {
        refreshSettings();
!       ExtMidiEditor::closeEvent(e);
        }
  
***************
*** 116,119 ****
--- 114,118 ----
  //   refreshSettings
  //---------------------------------------------------------
+ 
  void DrumEdit::refreshSettings()
        {

Index: pianoroll.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/pianoroll.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pianoroll.h	2 Jan 2005 14:40:00 -0000	1.14
--- pianoroll.h	7 Jan 2005 22:07:25 -0000	1.15
***************
*** 60,64 ****
        Q_OBJECT
        QWidget* genToolbar(QWidget* parent);
-       virtual void closeEvent(QCloseEvent*);
        virtual void keyPressEvent(QKeyEvent*);
  
--- 60,63 ----
***************
*** 87,93 ****
        void setFollowSong(bool val) { _followSong = val; }
  
-    signals:
-       void deleted(int);
- 
     public:
        PianoRoll(PartList*, QWidget* parent = 0, const char* name = 0);
--- 86,89 ----

Index: drumedit.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/drumedit.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** drumedit.h	2 Jan 2005 16:48:53 -0000	1.18
--- drumedit.h	7 Jan 2005 22:07:25 -0000	1.19
***************
*** 99,105 ****
        void soloChanged(bool);       // called by Solo button
  
-    signals:
-       void deleted(int);
- 
     public:
        DrumEdit(PartList*, QWidget* parent = 0, const char* name = 0);
--- 99,102 ----

Index: pianoroll.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/pianoroll.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** pianoroll.cpp	2 Jan 2005 14:40:00 -0000	1.37
--- pianoroll.cpp	7 Jan 2005 22:07:25 -0000	1.38
***************
*** 3,7 ****
  //  Linux Music Editor
  //    $Id$
! //  (C) Copyright 1999 Werner Schweer (ws...@se...)
  //=========================================================
  
--- 3,7 ----
  //  Linux Music Editor
  //    $Id$
! //  (C) Copyright 1999-2005 Werner Schweer (ws...@se...)
  //=========================================================
  
***************
*** 72,85 ****
  
        menuSelect = new QPopupMenu(this);
!       menuSelect->insertItem(tr("Select All"),   PianoCanvas::CMD_SELECT_ALL);
!       menuSelect->insertItem(tr("Select None"),  PianoCanvas::CMD_SELECT_NONE);
!       menuSelect->insertItem(tr("Invert"),       PianoCanvas::CMD_SELECT_INVERT);
! 
!       menuSelect->insertSeparator();
!       menuSelect->insertItem(tr("Inside Loop"),  PianoCanvas::CMD_SELECT_ILOOP);
! 
!       menuSelect->insertItem(tr("Outside Loop"), PianoCanvas::CMD_SELECT_OLOOP);
  
!       menuEdit->insertItem(tr("&Select"), menuSelect);
  
        eventColor = new QPopupMenu(this);
--- 72,88 ----
  
        menuSelect = new QPopupMenu(this);
!       menuSelect->insertItem(QIconSet(*select_allIcon),
!          tr("Select &All"),  PianoCanvas::CMD_SELECT_ALL);
!       menuSelect->insertItem(QIconSet(*select_deselect_allIcon),
!          tr("&Deselect All"), PianoCanvas::CMD_SELECT_NONE);
!       menuSelect->insertItem(QIconSet(*select_invert_selectionIcon),
!          tr("Invert &Selection"), PianoCanvas::CMD_SELECT_INVERT);
!       menuSelect->insertItem(QIconSet(*select_inside_loopIcon),
!          tr("&Inside Loop"), PianoCanvas::CMD_SELECT_ILOOP);
!       menuSelect->insertItem(QIconSet(*select_outside_loopIcon),
!          tr("&Outside Loop"), PianoCanvas::CMD_SELECT_OLOOP);
  
!       menuEdit->insertItem(QIconSet(*selectIcon),
!          tr("&Select"), menuSelect);
  
        eventColor = new QPopupMenu(this);
***************
*** 449,462 ****
  
  //---------------------------------------------------------
- //   closeEvent
- //---------------------------------------------------------
- 
- void PianoRoll::closeEvent(QCloseEvent* e)
-       {
-       emit deleted((int)this);
-       e->accept();
-       }
- 
- //---------------------------------------------------------
  //   readConfiguration
  //---------------------------------------------------------
--- 452,455 ----