[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.cpp,1.136,1.137 krdetailedview.h,1.52,1.53 krview.cpp,1.19,1.20 krview.h,1.30,1.31 listpanel.cpp,1.148,1.149

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2287/krusader/Panel

Modified Files:
	krdetailedview.cpp krdetailedview.h krview.cpp krview.h 
	listpanel.cpp 
Log Message:
refactoring ...


Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** krdetailedview.h	13 Jun 2005 17:19:37 -0000	1.52
--- krdetailedview.h	13 Jun 2005 18:07:37 -0000	1.53
***************
*** 102,106 ****
     void executed( QString &name );
     void needFocus();
-    void contextMenu( const QPoint &point );
     void renameItem( const QString &oldName, const QString &newName );
     void middleButtonClicked( QListViewItem *item );
--- 102,105 ----
***************
*** 124,128 ****
     virtual void contentsDragMoveEvent( QDragMoveEvent *e );
     virtual QRect drawItemHighlighter(QPainter *painter, QListViewItem *item);
!    virtual void startDrag();
     virtual bool event( QEvent *e );
     virtual bool eventFilter( QObject * watched, QEvent * e );
--- 123,127 ----
     virtual void contentsDragMoveEvent( QDragMoveEvent *e );
     virtual QRect drawItemHighlighter(QPainter *painter, QListViewItem *item);
!    virtual void startDrag() { op()->startDrag(); }
     virtual bool event( QEvent *e );
     virtual bool eventFilter( QObject * watched, QEvent * e );

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** krdetailedview.cpp	13 Jun 2005 17:19:37 -0000	1.136
--- krdetailedview.cpp	13 Jun 2005 18:07:34 -0000	1.137
***************
*** 692,709 ****
  	if (lastSwushPosition)
  		lastSwushPosition->setSelected(true);
!    emit contextMenu( contextMenuPoint );
! }
! 
! void KrDetailedView::startDrag() {
!    QStringList items;
!    getSelectedItems( &items );
!    if ( items.empty() )
!       return ; // don't drag an empty thing
!    QPixmap px;
!    if ( items.count() > 1 )
!       px = FL_LOADICON( "queue" ); // how much are we dragging
!    else
!       px = getCurrentKrViewItem() ->icon();
!    op()->emitLetsDrag( items, px );
  }
  
--- 692,696 ----
  	if (lastSwushPosition)
  		lastSwushPosition->setSelected(true);
! 	op()->emitContextMenu( contextMenuPoint );
  }
  
***************
*** 744,747 ****
--- 731,735 ----
  }
  
+ // TODO: for brief mode, move as much of this as possible to the viewOperator
  void KrDetailedView::keyPressEvent( QKeyEvent * e ) {
     if ( !e || !firstChild() )
***************
*** 1000,1003 ****
--- 988,992 ----
  }
  
+ // TODO: move to operator
  void KrDetailedView::renameCurrentItem() {
     int c;

Index: krview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** krview.h	13 Jun 2005 17:19:38 -0000	1.30
--- krview.h	13 Jun 2005 18:07:37 -0000	1.31
***************
*** 80,83 ****
--- 80,84 ----
  	KrView *view() const { return _view; }
  	QWidget *widget() const { return _widget; }
+ 	void startDrag();
  	
  	void emitSelectionChanged() { emit selectionChanged(); }
***************
*** 85,88 ****
--- 86,90 ----
  	void emitLetsDrag(QStringList items, QPixmap icon ) { emit letsDrag(items, icon); }
  	void emitItemDescription(QString &desc) { emit itemDescription(desc); }
+ 	void emitContextMenu( const QPoint &point ) { emit contextMenu(point); }
  	
  signals:
***************
*** 91,94 ****
--- 93,98 ----
  	void letsDrag( QStringList items, QPixmap icon );
  	void itemDescription( QString &desc );
+    void contextMenu( const QPoint &point );
+ 
  	
  public slots:

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** listpanel.cpp	13 Jun 2005 17:19:38 -0000	1.148
--- listpanel.cpp	13 Jun 2005 18:07:37 -0000	1.149
***************
*** 254,258 ****
     connect( view->op(), SIGNAL( selectionChanged() ), this, SLOT( slotUpdateTotals() ) );
     connect( view->op(), SIGNAL( itemDescription( QString& ) ), krApp, SLOT( statusBarUpdate( QString& ) ) );
!    connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( contextMenu( const QPoint & ) ), this, SLOT( popRightClickMenu( const QPoint & ) ) );
     connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ), 
     	this, SLOT( popEmptyRightClickMenu( QListViewItem *, const QPoint &, int ) ) );
--- 254,258 ----
     connect( view->op(), SIGNAL( selectionChanged() ), this, SLOT( slotUpdateTotals() ) );
     connect( view->op(), SIGNAL( itemDescription( QString& ) ), krApp, SLOT( statusBarUpdate( QString& ) ) );
!    connect( view->op(), SIGNAL( contextMenu( const QPoint & ) ), this, SLOT( popRightClickMenu( const QPoint & ) ) );
     connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ), 
     	this, SLOT( popEmptyRightClickMenu( QListViewItem *, const QPoint &, int ) ) );

Index: krview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** krview.cpp	13 Jun 2005 17:19:37 -0000	1.19
--- krview.cpp	13 Jun 2005 18:07:37 -0000	1.20
***************
*** 49,52 ****
--- 49,65 ----
  }
  
+ void KrViewOperator::startDrag() {
+    QStringList items;
+    _view->getSelectedItems( &items );
+    if ( items.empty() )
+       return ; // don't drag an empty thing
+    QPixmap px;
+    if ( items.count() > 1 )
+       px = FL_LOADICON( "queue" ); // how much are we dragging
+    else
+       px = _view->getCurrentKrViewItem() ->icon();
+    emit letsDrag( items, px );
+ }
+ 
  // ----------------------------- krview