From: Shie E. <er...@us...> - 2005-06-13 22:56:45
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26394/krusader/Panel Modified Files: krdetailedview.cpp krdetailedview.h krview.h listpanel.cpp listpanel.h Log Message: refactoring Index: krdetailedview.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** krdetailedview.h 13 Jun 2005 22:13:33 -0000 1.54 --- krdetailedview.h 13 Jun 2005 22:56:34 -0000 1.55 *************** *** 100,105 **** signals: - void executed( QString &name ); - void needFocus(); void middleButtonClicked( QListViewItem *item ); --- 100,103 ---- *************** *** 138,142 **** void setNameToMakeCurrent( QListViewItem *it ); void sortOrderChanged(int); ! /** * used internally to produce the signal middleButtonClicked() --- 136,141 ---- void setNameToMakeCurrent( QListViewItem *it ); void sortOrderChanged(int); ! void slotRightButtonPressed(QListViewItem*, const QPoint& point, int); ! /** * used internally to produce the signal middleButtonClicked() *************** *** 145,149 **** inline void slotExecuted( QListViewItem* i ) { QString tmp = dynamic_cast<KrViewItem*>( i ) ->name(); ! emit executed( tmp ); } --- 144,148 ---- inline void slotExecuted( QListViewItem* i ) { QString tmp = dynamic_cast<KrViewItem*>( i ) ->name(); ! op()->emitExecuted( tmp ); } Index: listpanel.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** listpanel.h 9 Jun 2005 20:56:48 -0000 1.46 --- listpanel.h 13 Jun 2005 22:56:34 -0000 1.47 *************** *** 97,101 **** void gotStats( const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); // displays filesystem status void popRightClickMenu( const QPoint& ); ! void popEmptyRightClickMenu( QListViewItem *, const QPoint &, int ); void select( KRQuery query, bool select); void select( bool, bool ); // see doc in ListPanel --- 97,101 ---- void gotStats( const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); // displays filesystem status void popRightClickMenu( const QPoint& ); ! void popEmptyRightClickMenu( const QPoint & ); void select( KRQuery query, bool select); void select( bool, bool ); // see doc in ListPanel Index: krview.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** krview.h 13 Jun 2005 22:13:33 -0000 1.32 --- krview.h 13 Jun 2005 22:56:34 -0000 1.33 *************** *** 87,92 **** void emitItemDescription(QString &desc) { emit itemDescription(desc); } void emitContextMenu(const QPoint &point) { emit contextMenu(point); } void emitRenameItem(const QString &oldName, const QString &newName) { emit renameItem(oldName, newName); } ! signals: --- 87,94 ---- void emitItemDescription(QString &desc) { emit itemDescription(desc); } void emitContextMenu(const QPoint &point) { emit contextMenu(point); } + void emitEmptyContextMenu(const QPoint &point) { emit emptyContextMenu(point); } void emitRenameItem(const QString &oldName, const QString &newName) { emit renameItem(oldName, newName); } ! void emitExecuted( QString &name ) { emit executed(name); } ! void emitNeedFocus() { emit needFocus(); } signals: *************** *** 96,100 **** --- 98,106 ---- void itemDescription( QString &desc ); void contextMenu( const QPoint &point ); + void emptyContextMenu( const QPoint& point ); void renameItem( const QString &oldName, const QString &newName ); + void executed( QString &name ); + void needFocus(); + protected: Index: listpanel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v retrieving revision 1.150 retrieving revision 1.151 diff -C2 -d -r1.150 -r1.151 *** listpanel.cpp 13 Jun 2005 22:13:33 -0000 1.150 --- listpanel.cpp 13 Jun 2005 22:56:34 -0000 1.151 *************** *** 250,260 **** view = new KrDetailedView( splt, _left, krConfig ); view->init(); ! connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( executed( QString& ) ), func, SLOT( execute( QString& ) ) ); ! connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( needFocus() ), this, SLOT( slotFocusOnMe() ) ); 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 ) ) ); connect( view->op(), SIGNAL( letsDrag( QStringList, QPixmap ) ), this, SLOT( startDragging( QStringList, QPixmap ) ) ); connect( view->op(), SIGNAL( gotDrop( QDropEvent * ) ), this, SLOT( handleDropOnView( QDropEvent * ) ) ); --- 250,260 ---- view = new KrDetailedView( splt, _left, krConfig ); view->init(); ! connect( view->op(), SIGNAL( executed( QString& ) ), func, SLOT( execute( QString& ) ) ); ! connect( view->op(), SIGNAL( needFocus() ), this, SLOT( slotFocusOnMe() ) ); 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( view->op(), SIGNAL( emptyContextMenu( const QPoint &) ), ! this, SLOT( popEmptyRightClickMenu( const QPoint & ) ) ); connect( view->op(), SIGNAL( letsDrag( QStringList, QPixmap ) ), this, SLOT( startDragging( QStringList, QPixmap ) ) ); connect( view->op(), SIGNAL( gotDrop( QDropEvent * ) ), this, SLOT( handleDropOnView( QDropEvent * ) ) ); *************** *** 770,774 **** } ! void ListPanel::popEmptyRightClickMenu( QListViewItem */*item*/, const QPoint &loc, int ) { KrPopupMenu::run(loc, this); } --- 770,774 ---- } ! void ListPanel::popEmptyRightClickMenu( const QPoint &loc ) { KrPopupMenu::run(loc, this); } Index: krdetailedview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** krdetailedview.cpp 13 Jun 2005 22:13:32 -0000 1.138 --- krdetailedview.cpp 13 Jun 2005 22:56:27 -0000 1.139 *************** *** 122,125 **** --- 122,127 ---- connect( this, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ), this, SLOT( handleContextMenu( QListViewItem*, const QPoint&, int ) ) ); + connect( this, SIGNAL( rightButtonPressed(QListViewItem*, const QPoint&, int)), + this, SLOT(slotRightButtonPressed(QListViewItem*, const QPoint&, int))); connect( this, SIGNAL( currentChanged( QListViewItem* ) ), this, SLOT( setNameToMakeCurrent( QListViewItem* ) ) ); connect( this, SIGNAL( mouseButtonClicked ( int, QListViewItem *, const QPoint &, int ) ), *************** *** 416,420 **** return ; QString tmp = dynamic_cast<KrViewItem*>( item ) ->name(); ! emit executed( tmp ); } --- 418,422 ---- return ; QString tmp = dynamic_cast<KrViewItem*>( item ) ->name(); ! op()->emitExecuted(tmp); } *************** *** 561,565 **** if ( !_focused ) ! emit needFocus(); if (processEvent && ( (e->state() & ShiftButton) || (e->state() & ControlButton) || (e->state() & AltButton) ) && !KrSelectionMode::getSelectionHandler()->useQTSelection()){ if ( oldCurrent && newCurrent && oldCurrent != newCurrent && e->state() & ShiftButton ) { --- 563,567 ---- if ( !_focused ) ! op()->emitNeedFocus(); if (processEvent && ( (e->state() & ShiftButton) || (e->state() & ControlButton) || (e->state() & AltButton) ) && !KrSelectionMode::getSelectionHandler()->useQTSelection()){ if ( oldCurrent && newCurrent && oldCurrent != newCurrent && e->state() & ShiftButton ) { *************** *** 668,672 **** void KrDetailedView::contentsWheelEvent( QWheelEvent * e ) { if ( !_focused ) ! emit needFocus(); KListView::contentsWheelEvent( e ); } --- 670,674 ---- void KrDetailedView::contentsWheelEvent( QWheelEvent * e ) { if ( !_focused ) ! op()->emitNeedFocus(); KListView::contentsWheelEvent( e ); } *************** *** 674,678 **** void KrDetailedView::handleContextMenu( QListViewItem * it, const QPoint & pos, int ) { if ( !_focused ) ! emit needFocus(); if ( !it ) return ; --- 676,680 ---- void KrDetailedView::handleContextMenu( QListViewItem * it, const QPoint & pos, int ) { if ( !_focused ) ! op()->emitNeedFocus(); if ( !it ) return ; *************** *** 824,828 **** KrViewItem * i = getCurrentKrViewItem(); QString tmp = i->name(); ! emit executed( tmp ); } break; --- 826,830 ---- KrViewItem * i = getCurrentKrViewItem(); QString tmp = i->name(); ! op()->emitExecuted(tmp); } break; *************** *** 849,853 **** if ( i->VF->vfile_isDir() ) { // we create a return-pressed event, QString tmp = i->name(); ! emit executed( tmp ); // thereby emulating a chdir } return ; // safety --- 851,855 ---- if ( i->VF->vfile_isDir() ) { // we create a return-pressed event, QString tmp = i->name(); ! op()->emitExecuted(tmp); // thereby emulating a chdir } return ; // safety *************** *** 1290,1292 **** --- 1292,1298 ---- } + void KrDetailedView::slotRightButtonPressed(QListViewItem*, const QPoint& point, int) { + op()->emitEmptyContextMenu(point); + } + #include "krdetailedview.moc" |