[Lmuse-cvs-traffic] muse/muse/arranger arranger.cpp,1.146,1.147 arranger.h,1.70,1.71 canvas.cpp,1.52,1.53 tlwidget.cpp,1.57,1.58 tlwidget.h,1.20,1.21

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

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

Modified Files:
	arranger.cpp arranger.h canvas.cpp tlwidget.cpp tlwidget.h 
Log Message:
misc updates


Index: tlwidget.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlwidget.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** tlwidget.cpp	26 Jan 2006 16:11:22 -0000	1.57
--- tlwidget.cpp	3 Feb 2006 16:46:38 -0000	1.58
***************
*** 575,587 ****
  
  //---------------------------------------------------------
- //   keyPressEvent
- //---------------------------------------------------------
- 
- void TLWidget::keyPressEvent(QKeyEvent* e)
-       {
-       e->ignore(); // let arranger take care of all events (didn't work well with eventFilter... ml)
-       }
- 
- //---------------------------------------------------------
  //   instrumentSelected
  //---------------------------------------------------------
--- 575,578 ----

Index: arranger.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** arranger.h	26 Jan 2006 16:11:22 -0000	1.70
--- arranger.h	3 Feb 2006 16:46:38 -0000	1.71
***************
*** 131,134 ****
--- 131,136 ----
        void editPart(Part*);
        void cursorPos(const AL::Pos&,bool);
+       void addMarker(const AL::Pos&);
+       void removeMarker(const AL::Pos&);
  
     public:

Index: arranger.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** arranger.cpp	1 Feb 2006 18:40:47 -0000	1.146
--- arranger.cpp	3 Feb 2006 16:46:38 -0000	1.147
***************
*** 243,246 ****
--- 243,247 ----
     : QWidget(parent)
        {
+       setFocusPolicy(Qt::StrongFocus);
        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
  
***************
*** 434,437 ****
--- 435,440 ----
        connect(canvas, SIGNAL(partChanged(Part*,unsigned,unsigned)),
           song, SLOT(changePart(Part*,unsigned,unsigned)));
+       connect(canvas, SIGNAL(addMarker(const AL::Pos&)), SIGNAL(addMarker(const AL::Pos&)));
+       connect(canvas, SIGNAL(removeMarker(const AL::Pos&)), SIGNAL(removeMarker(const AL::Pos&)));
  
        layout()->addWidget(split);
***************
*** 1245,1270 ****
                    }
              } // -- end movement
-       //
-       // Delete parts
-       //
-       if (key == shortcuts[SHRT_DELETE].key) {
-             keypress_handled = true;
-             song->startUndo();
-             PartList* midiParts = song->getSelectedMidiParts();
-             for (iPart i = midiParts->begin(); i != midiParts->end(); i++) {
-                   Part* p = i->second;
-                   Track* t = p->track();
-                   audio->msgRemovePart(p, false);
-                   t->partListChanged();
-                   }
-             PartList* audioParts = song->getSelectedWaveParts();
-             for (iPart i = audioParts->begin(); i != audioParts->end(); i++) {
-                   Part* p = i->second;
-                   Track* t = p->track();
-                   audio->msgRemovePart(p, false);
-                   t->partListChanged();
-                   }
-             song->endUndo(SC_PART_REMOVED);
-             }
  
        // If we haven't dealt with the keypress, pass it along
--- 1248,1251 ----
***************
*** 1272,1276 ****
              e->ignore();
              }
- 
        }
  
--- 1253,1256 ----
***************
*** 1284,1288 ****
  void Arranger::kbdMovementUpdate(Track* t, Part* p)
        {
- // printf("kbdMovementUpdate\n");
        if (t && p ) {
              // If other track selected:
--- 1264,1267 ----

Index: tlwidget.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlwidget.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tlwidget.h	12 Jan 2006 14:49:13 -0000	1.20
--- tlwidget.h	3 Feb 2006 16:46:38 -0000	1.21
***************
*** 14,18 ****
  class TLWidgetLayout;
  class SimpleButton;
- // class SelectFilter;
  
  //---------------------------------------------------------
--- 14,17 ----
***************
*** 54,60 ****
        virtual void dropEvent(QDropEvent*);
  
-    protected:
-       virtual void keyPressEvent(QKeyEvent* e);
- 
     signals:
        void startDrag(int idx);
--- 53,56 ----

Index: canvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/canvas.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** canvas.cpp	23 Jan 2006 17:41:21 -0000	1.52
--- canvas.cpp	3 Feb 2006 16:46:38 -0000	1.53
***************
*** 641,646 ****
                                found = true;
                          }
!                   if (found)
                          widget()->setCursor(Qt::SizeHorCursor);
                    else
                          setCursor();
--- 641,647 ----
                                found = true;
                          }
!                   if (found) {
                          widget()->setCursor(Qt::SizeHorCursor);
+                         }
                    else
                          setCursor();