krusader-commits Mailing List for Krusader (Page 4)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6235
          http://krusader.svn.sourceforge.net/krusader/?rev=6235&view=rev
Author:   ckarai
Date:     2009-03-02 19:34:12 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
InterView: final

Modified Paths:
--------------
    trunk/krusader_kde4/krusader/Panel/krinterbriefview.cpp
    trunk/krusader_kde4/krusader/Panel/krinterbriefview.h
    trunk/krusader_kde4/krusader/Panel/krinterdetailedview.cpp
    trunk/krusader_kde4/krusader/Panel/krmousehandler.cpp
    trunk/krusader_kde4/krusader/Panel/krmousehandler.h
    trunk/krusader_kde4/krusader/Panel/krvfsmodel.cpp
    trunk/krusader_kde4/krusader/Panel/krvfsmodel.h

Modified: trunk/krusader_kde4/krusader/Panel/krinterbriefview.cpp
===================================================================

--- trunk/krusader_kde4/krusader/Panel/krinterbriefview.cpp	2009-02-27 21:58:10 UTC (rev 6234)
+++ trunk/krusader_kde4/krusader/Panel/krinterbriefview.cpp	2009-03-02 19:34:12 UTC (rev 6235)
@@ -34,6 +34,11 @@
 #include <KMenu>
 #include <QPainter>
 #include <QScrollBar>
+#include <QHeaderView>
+#include <QRegion>
+#include <QItemSelection>
+#include <QItemSelectionRange>
+#include <KMenu>
 
 // dummy. remove this class when no longer needed
 class KrInterBriefViewItem: public KrViewItem
@@ -80,6 +85,8 @@
 		KrView(cfg),
 		QAbstractItemView(parent)
 {
+	_header = 0;
+	
 	// fix the context menu problem
 	int j = QFontMetrics( font() ).height() * 2;
 	_mouseHandler = new KrMouseHandler( this, j );
@@ -96,6 +103,7 @@
 	this->setModel(_model);
 	_model->sort( KrVfsModel::Name, Qt::AscendingOrder );
 	_model->setExtensionEnabled( false );
+	_model->setAlternatingTable( true );
 	connect( _model, SIGNAL( layoutChanged() ), this, SLOT( slotMakeCurrentVisible() ) );
 	//header()->installEventFilter( this );
 	
@@ -107,7 +115,6 @@
 	setAcceptDrops( true );
 	setDropIndicatorShown( true );
 	
-	restoreSettings();
 	connect( &KrColorCache::getColorCache(), SIGNAL( colorsRefreshed() ), this, SLOT( refreshColors() ) );
 }
 
@@ -252,13 +259,24 @@
 
 void KrInterBriefView::restoreSettings()
 {
-	/* TODO */
-	_numOfColumns = 3;
+	_numOfColumns = _properties->numberOfColumns;
+	
+	KConfigGroup group( krConfig, nameInKConfig() );
+	
+	int column = group.readEntry( "Sort Indicator Column", (int)KrVfsModel::Name );
+	bool isAscending = group.readEntry( "Ascending Sort Order", true );
+	Qt::SortOrder sortDir = isAscending ? Qt::AscendingOrder : Qt::DescendingOrder;
+	
+	_header->setSortIndicator(column, sortDir);
+	_model->sort( column, sortDir );
 }
 
 void KrInterBriefView::saveSettings()
 {
-	/* TODO */
+	KConfigGroup group( krConfig, nameInKConfig() );
+	
+	group.writeEntry( "Sort Indicator Column", (int)_model->getLastSortOrder() );
+	group.writeEntry( "Ascending Sort Order", (_model->getLastSortDir() == Qt::AscendingOrder ) );
 }
 
 void KrInterBriefView::setCurrentItem(const QString& name)
@@ -334,7 +352,25 @@
 
 void KrInterBriefView::setup()
 {
-
+	_header = new QHeaderView(Qt::Horizontal, this);
+	_header->setDefaultAlignment(Qt::AlignLeft|Qt::AlignVCenter);
+	_header->setParent( this );
+	_header->setModel( _model );
+	_header->hideSection( KrVfsModel::Mime );
+	_header->hideSection( KrVfsModel::Permissions );
+	_header->hideSection( KrVfsModel::KrPermissions );
+	_header->hideSection( KrVfsModel::Owner );
+	_header->hideSection( KrVfsModel::Group );
+	_header->setStretchLastSection( true );
+	_header->setResizeMode( QHeaderView::Fixed );
+	_header->setClickable( true );
+	_header->setSortIndicatorShown( true );
+	_header->setSortIndicator(KrVfsModel::Name, Qt::AscendingOrder);
+	connect(_header, SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)),
+		_model, SLOT(sort(int,Qt::SortOrder)));
+	_header->installEventFilter( this );
+	
+	restoreSettings();
 }
 
 void KrInterBriefView::initOperator()
@@ -539,17 +575,68 @@
 
 bool KrInterBriefView::eventFilter(QObject *object, QEvent *event)
 {
-	/* TODO */
+	if( object == _header )
+	{
+		if( event->type() == QEvent::ContextMenu )
+		{
+			QContextMenuEvent *me = (QContextMenuEvent *)event;
+			showContextMenu( me->globalPos() );
+			return true;
+		}
+	}
 	return false;
 }
 
 void KrInterBriefView::showContextMenu( const QPoint & p )
 {
-	/* TODO */
+	KMenu popup( this );
+	popup.setTitle( i18n("Columns"));
+	
+	int COL_ID = 14700;
+	
+	for( int i=1; i <= MAX_BRIEF_COLS; i++ )
+	{
+		QAction *act = popup.addAction( QString( "%1" ).arg( i ) );
+		act->setData( QVariant( COL_ID + i ) );
+		act->setCheckable( true );
+		act->setChecked( properties()->numberOfColumns == i );
+	}
+	
+	QAction * res = popup.exec( p );
+	int result= -1;
+	if( res && res->data().canConvert<int>() )
+		result = res->data().toInt();
+	
+	KConfigGroup group( krConfig, nameInKConfig() );
+	
+	if( result > COL_ID && result <= COL_ID + MAX_BRIEF_COLS )
+	{
+		group.writeEntry( "Number Of Brief Columns", result - COL_ID );
+		_properties->numberOfColumns = result - COL_ID;
+		_numOfColumns = result - COL_ID;
+		updateGeometries();
+	}
 }
 
 bool KrInterBriefView::viewportEvent ( QEvent * event )
 {
+	if( event->type() == QEvent::ToolTip )
+	{
+		QHelpEvent *he = static_cast<QHelpEvent*>(event);
+		const QModelIndex index = indexAt(he->pos());
+		
+		if( index.isValid() )
+		{
+			int width = visualRect( index ).width();
+			int textWidth = elementWidth( index );
+			
+			if( textWidth <= width )
+			{
+				event->accept();
+				return true;
+			}
+		}
+	}
 	return QAbstractItemView::viewportEvent( event );
 }
 
@@ -609,10 +696,55 @@
 	return _model->index( xs + ys, 0 );
 }
 
-QModelIndex KrInterBriefView::moveCursor(QAbstractItemView::CursorAction, Qt::KeyboardModifiers)
+QModelIndex KrInterBriefView::moveCursor(QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers)
 {
-	/* TODO */
-	return QModelIndex();
+	if( _model->rowCount() == 0 )
+		return QModelIndex();
+	
+	QModelIndex current = currentIndex();
+	if (!current.isValid())
+		return _model->index( 0, 0 );
+	
+	switch (cursorAction) {
+	case MoveLeft:
+	case MovePageDown:
+	{
+		int newRow = current.row() - itemsPerPage();
+		if( newRow < 0 )
+			newRow = 0;
+		return _model->index( newRow, 0 );
+	}
+	case MoveRight:
+	case MovePageUp:
+	{
+		int newRow = current.row() + itemsPerPage();
+		if( newRow >= _model->rowCount() )
+			newRow = _model->rowCount() - 1;
+		return _model->index( newRow, 0 );
+	}
+	case MovePrevious:
+	case MoveUp:
+	{
+		int newRow = current.row() - 1;
+		if( newRow < 0 )
+			newRow = 0;
+		return _model->index( newRow, 0 );
+	}
+	case MoveNext:
+	case MoveDown:
+	{
+		int newRow = current.row() + 1;
+		if( newRow >= _model->rowCount() )
+			newRow = _model->rowCount() - 1;
+		return _model->index( newRow, 0 );
+	}
+	case MoveHome:
+		return _model->index(0, 0);
+	case MoveEnd:
+		return _model->index(_model->rowCount() - 1, 0);
+	}
+	
+	return current;
 }
 
 int KrInterBriefView::horizontalOffset() const
@@ -632,18 +764,41 @@
 
 void KrInterBriefView::setSelection(const QRect&, QFlags<QItemSelectionModel::SelectionFlag>)
 {
-	/* TODO */
+	/* Don't do anything, selections are handled by the mouse handler and not by QAbstractItemView */
 }
 
-QRegion KrInterBriefView::visualRegionForSelection(const QItemSelection&) const
+QRegion KrInterBriefView::visualRegionForSelection(const QItemSelection &selection) const
 {
-	/* TODO */
-	return QRegion();
+	if (selection.isEmpty())
+		return QRegion();
+	
+	QRegion selectionRegion;
+	for (int i = 0; i < selection.count(); ++i) {
+		QItemSelectionRange range = selection.at(i);
+		if (!range.isValid())
+			continue;
+		QModelIndex leftIndex = range.topLeft();
+		if (!leftIndex.isValid())
+			continue;
+		const QRect leftRect = visualRect(leftIndex);
+		int top = leftRect.top();
+		QModelIndex rightIndex = range.bottomRight();
+		if (!rightIndex.isValid())
+			continue;
+		const QRect rightRect = visualRect(rightIndex);
+		int bottom = rightRect.bottom();
+		if (top > bottom)
+			qSwap<int>(top, bottom);
+		int height = bottom - top + 1;
+		QRect combined = leftRect|rightRect;
+		combined.setX(range.left());
+		selectionRegion += combined;
+	}
+	return selectionRegion;
 }
 
 void KrInterBriefView::paintEvent(QPaintEvent *e)
 {
-	/* TODO */
 	QStyleOptionViewItemV4 option = viewOptions();
 	option.widget = this;
 	option.decorationSize = QSize( _fileIconSize, _fileIconSize );
@@ -652,16 +807,20 @@
 	
 	QModelIndex curr = currentIndex();
 
+	QVector<QModelIndex> intersectVector;
+	QRect area = e->rect();
+	area.adjust( horizontalOffset(), verticalOffset(), horizontalOffset(), verticalOffset() );
+	intersectionSet( area, intersectVector );
 	
-	for( int i=0; i != _model->rowCount(); i++ )
+	foreach( QModelIndex mndx, intersectVector )
 	{
 		option.state = QStyle::State_None;
-		option.rect = visualRect( _model->index( i, 0 ) );
+		option.rect = visualRect( mndx );
 		painter.save();
 		
-		bool focus = curr.isValid() && curr.row() == i && hasFocus();
+		bool focus = curr.isValid() && curr.row() == mndx.row() && hasFocus();
 		
-		itemDelegate()->paint(&painter, option, _model->index( i, 0 ) );
+		itemDelegate()->paint(&painter, option, mndx );
 		
 		if( focus ) {
 			QStyleOptionFocusRect o;
@@ -683,11 +842,38 @@
 		iconSize = _fileIconSize;
 	if( iconSize > textHeight )
 		height = iconSize;
+	if( height == 0 )
+		height++;
 	return height;
 }
 
 void KrInterBriefView::updateGeometries()
 {
+	if( _header )
+	{
+		QSize hint = _header->sizeHint();
+		setViewportMargins(0, hint.height(), 0, 0);
+		QRect vg = viewport()->geometry();
+		QRect geometryRect(vg.left(), vg.top() - hint.height(), vg.width(), hint.height());
+		_header->setGeometry(geometryRect);
+		
+		int items = 0;
+		for( int i=0;  i!= _header->count(); i++ )
+			if( !_header->isSectionHidden( i ) )
+				items++;
+		if( items == 0 )
+			items++;
+		
+		int sectWidth = viewport()->width() / items; 
+		for( int i=0;  i!= _header->count(); i++ )
+			if( !_header->isSectionHidden( i ) )
+				_header->resizeSection( i, sectWidth );
+		
+		QMetaObject::invokeMethod(_header, "updateGeometries");
+	}
+	
+	
+	
 	if (_model->rowCount() <= 0 )
 		horizontalScrollBar()->setRange(0, 0);
 	else
@@ -735,6 +921,8 @@
 	int column = _model->convertSortOrderFromKrViewProperties( mode, sortDir );
 	if( column == _model->getLastSortOrder() && sortDir == _model->getLastSortDir() )
 		sortDir = (sortDir == Qt::AscendingOrder) ? Qt::DescendingOrder : Qt::AscendingOrder;
+	
+	_header->setSortIndicator(column, sortDir);
 	_model->sort( column, sortDir );
 }
 
@@ -755,4 +943,39 @@
 	}
 	
 	return textWidth;
-}
\ No newline at end of file
+}
+
+void KrInterBriefView::intersectionSet( const QRect &rect, QVector<QModelIndex> &ndxList )
+{
+	int maxNdx = _model->rowCount();
+	int width = (viewport()->width())/_numOfColumns;
+	if( (viewport()->width())%_numOfColumns )
+		width++;
+	
+	int height = getItemHeight();
+	int items = viewport()->height() / height;
+	if( items == 0 )
+		items++;
+	
+	int xmin = -1;
+	int ymin = -1;
+	int xmax = -1;
+	int ymax = -1;
+	
+	xmin = rect.x() / width;
+	ymin = rect.y() / height;
+	xmax = ( rect.x() + rect.width() ) / width;
+	if(( rect.x() + rect.width() ) % width )
+		xmax++;
+	ymax = ( rect.y() + rect.height() ) / height;
+	if(( rect.y() + rect.height() ) % height )
+		ymax++;
+	
+	for( int i=ymin; i < ymax; i++ )
+		for( int j=xmin; j < xmax; j++ )
+		{
+			int ndx = j * items + i;
+			if( ndx < maxNdx )
+				ndxList.append( _model->index( ndx, 0 ) );
+		}
+}

Modified: trunk/krusader_kde4/krusader/Panel/krinterbriefview.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krinterbriefview.h	2009-02-27 21:58:10 UTC (rev 6234)
+++ trunk/krusader_kde4/krusader/Panel/krinterbriefview.h	2009-03-02 19:34:12 UTC (rev 6235)
@@ -27,6 +27,7 @@
 class KrInterBriefViewItem;
 class KrMouseHandler;
 class KrVfsModel;
+class QHeaderView;
 
 class KrInterBriefView : public QAbstractItemView, public KrView {
 	friend class KrInterBriefViewItem;
@@ -113,6 +114,8 @@
 	int getItemHeight() const;
 	int elementWidth( const QModelIndex & index );
 	
+	void intersectionSet( const QRect &, QVector<QModelIndex> & );
+	
 private:
 	KrVfsModel *_model;
 	KrMouseHandler *_mouseHandler;
@@ -120,5 +123,6 @@
 	QFont _viewFont;
 	int _numOfColumns;
 	int _fileIconSize;
+	QHeaderView * _header;
 };
 #endif // __krinterbriefview__

Modified: trunk/krusader_kde4/krusader/Panel/krinterdetailedview.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krinterdetailedview.cpp	2009-02-27 21:58:10 UTC (rev 6234)
+++ trunk/krusader_kde4/krusader/Panel/krinterdetailedview.cpp	2009-03-02 19:34:12 UTC (rev 6235)
@@ -511,8 +511,7 @@
 {
 	KMenu popup( this );
 	popup.setTitle( i18n("Columns"));
-//
-//  bool refresh = false;
+	
 	bool hasExtension = !isColumnHidden( KrVfsModel::Extension );
 	bool hasMime      = !isColumnHidden( KrVfsModel::Mime );
 	bool hasSize      = !isColumnHidden( KrVfsModel::Size );

Modified: trunk/krusader_kde4/krusader/Panel/krmousehandler.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krmousehandler.cpp	2009-02-27 21:58:10 UTC (rev 6234)
+++ trunk/krusader_kde4/krusader/Panel/krmousehandler.cpp	2009-03-02 19:34:12 UTC (rev 6235)
@@ -26,7 +26,7 @@
 
 KrMouseHandler::KrMouseHandler( KrView * view, int contextMenuShift ) : _view( view ), _rightClickedItem( 0 ),
 	_contextMenuTimer(), _contextMenuShift( contextMenuShift ), _singleClicked( false ), _singleClickTime(),
-	_renameTimer(), _dragStartPos( -1, -1 )
+	_renameTimer(), _dragStartPos( -1, -1 ), _emptyContextMenu( false )
 {
 	KConfigGroup grpSvr( krConfig, "Look&Feel" );
 	// decide on single click/double click selection
@@ -37,6 +37,7 @@
 
 bool KrMouseHandler::mousePressEvent( QMouseEvent *e )
 {
+	_rightClickedItem = 0;
 	KrViewItem * item = _view->getKrViewItemAt( e->pos() );
 	if( !_view->isFocused() )
 		_view->op()->emitNeedFocus();
@@ -112,8 +113,8 @@
 					}
 				}
 				_view->setCurrentKrViewItem( item );
-				handleContextMenu( item, e->globalPos() );
 			}
+			handleContextMenu( item, e->globalPos() );
 			e->accept();
 			return true;
 		}
@@ -271,23 +272,27 @@
 {
 	if (_rightClickedItem)
 		_rightClickedItem->setSelected(true);
-	_view->op()->emitContextMenu( _contextMenuPoint );
+	if( _emptyContextMenu )
+		_view->op()->emitEmptyContextMenu( _contextMenuPoint );
+	else
+		_view->op()->emitContextMenu( _contextMenuPoint );
 }
 
 void KrMouseHandler::handleContextMenu( KrViewItem * it, const QPoint & pos ) {
 	if ( !_view->isFocused() )
 		_view->op()->emitNeedFocus();
-	if ( !it )
-		return;
-	if( it->isDummy() )
-		return;
 	int i = KrSelectionMode::getSelectionHandler()->showContextMenu();
 	_contextMenuPoint = QPoint( pos.x(), pos.y() - _contextMenuShift );
 	if (i < 0) {
-		_view->setCurrentKrViewItem( it );
-		_view->op()->emitContextMenu( _contextMenuPoint );
+		if ( !it || it->isDummy() )
+			_view->op()->emitEmptyContextMenu( _contextMenuPoint );
+		else {
+			_view->setCurrentKrViewItem( it );
+			_view->op()->emitContextMenu( _contextMenuPoint );
+		}
 	}
 	else if (i > 0) {
+		_emptyContextMenu = !it || it->isDummy();
 		_contextMenuTimer.setSingleShot( true );
 		_contextMenuTimer.start(i);
 	}

Modified: trunk/krusader_kde4/krusader/Panel/krmousehandler.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krmousehandler.h	2009-02-27 21:58:10 UTC (rev 6234)
+++ trunk/krusader_kde4/krusader/Panel/krmousehandler.h	2009-03-02 19:34:12 UTC (rev 6235)
@@ -70,6 +70,7 @@
 	QTime        _singleClickTime;
 	QTimer       _renameTimer;
 	QPoint       _dragStartPos;
+	bool         _emptyContextMenu;
 };
 
 #endif /* __KR_MOUSE_HANDLER */

Modified: trunk/krusader_kde4/krusader/Panel/krvfsmodel.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krvfsmodel.cpp	2009-02-27 21:58:10 UTC (rev 6234)
+++ trunk/krusader_kde4/krusader/Panel/krvfsmodel.cpp	2009-03-02 19:34:12 UTC (rev 6235)
@@ -128,7 +128,8 @@
 
 KrVfsModel::KrVfsModel( KrView * view ): QAbstractListModel(0), _extensionEnabled( true ), _view( view ),
                                          _lastSortOrder( KrVfsModel::Name ), _lastSortDir(Qt::AscendingOrder),
-                                         _dummyVfile( 0 ), _ready( false ), _justForSizeHint( false )
+                                         _dummyVfile( 0 ), _ready( false ), _justForSizeHint( false ), 
+                                         _alternatingTable( false )
 {
 	KConfigGroup grpSvr( krConfig, "Look&Feel" );
 	_defaultFont = grpSvr.readEntry( "Filelist Font", *_FilelistFont );
@@ -332,7 +333,16 @@
 		{
 			KrColorItemType colorItemType;
 			colorItemType.m_activePanel = (_view == ACTIVE_PANEL->view);
-			colorItemType.m_alternateBackgroundColor = (index.row() & 1);
+			int actRow = index.row();
+			if( _alternatingTable )
+			{
+				int itemNum = _view->itemsPerPage();
+				if( itemNum == 0 )
+					itemNum++;
+				if( ( itemNum & 1 ) == 0 )
+					actRow += (actRow / itemNum );
+			}
+			colorItemType.m_alternateBackgroundColor = (actRow & 1);
 			colorItemType.m_currentItem = _view->getCurrentIndex() == index;
 			colorItemType.m_selectedItem = _view->isSelected( index );
 			if (vf->vfile_isSymLink())

Modified: trunk/krusader_kde4/krusader/Panel/krvfsmodel.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krvfsmodel.h	2009-02-27 21:58:10 UTC (rev 6234)
+++ trunk/krusader_kde4/krusader/Panel/krvfsmodel.h	2009-03-02 19:34:12 UTC (rev 6235)
@@ -36,7 +36,6 @@
 	inline const KrViewProperties * properties() const { return _view->properties(); }
 	void sort() { sort( _lastSortOrder, _lastSortDir ); }
 	void clear();
-	virtual void sort ( int column, Qt::SortOrder order = Qt::AscendingOrder );
 	vfile * vfileAt( const QModelIndex &index );
 	vfile *dummyVfile() const { return _dummyVfile; }
 	const QModelIndex & vfileIndex( vfile * );
@@ -49,7 +48,11 @@
 	
 	Qt::SortOrder getLastSortDir() { return _lastSortDir; }
 	int getLastSortOrder() { return _lastSortOrder; }
+	void setAlternatingTable( bool altTable ) { _alternatingTable = altTable; }
 	
+public slots:
+	virtual void sort ( int column, Qt::SortOrder order = Qt::AscendingOrder );
+	
 protected:
 	QString nameWithoutExtension( const vfile * vf, bool checkEnabled = true ) const;
 	
@@ -66,5 +69,6 @@
 	QFont                       _defaultFont;
 	bool                        _justForSizeHint;
 	int                         _fileIconSize;
+	bool                        _alternatingTable;
 };
 #endif // __krvfsmodel__


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (98)	Sep (138)	Oct (100)	Nov (49)	Dec (131)
2004	Jan (94)	Feb (65)	Mar (100)	Apr (83)	May (72)	Jun (29)	Jul (167)	Aug (127)	Sep (131)	Oct (269)	Nov (122)	Dec (100)
2005	Jan (228)	Feb (266)	Mar (63)	Apr (135)	May (157)	Jun (52)	Jul (25)	Aug (49)	Sep (184)	Oct (159)	Nov (75)	Dec (37)
2006	Jan (60)	Feb (129)	Mar (110)	Apr (34)	May (31)	Jun (42)	Jul (72)	Aug (90)	Sep (57)	Oct (66)	Nov (42)	Dec (90)
2007	Jan (106)	Feb (54)	Mar (93)	Apr (27)	May (21)	Jun (17)	Jul (19)	Aug (22)	Sep (25)	Oct (2)	Nov (1)	Dec (1)
2008	Jan (65)	Feb (70)	Mar (29)	Apr (45)	May (91)	Jun (20)	Jul (11)	Aug (24)	Sep (23)	Oct (13)	Nov (23)	Dec (39)
2009	Jan (23)	Feb (39)	Mar (15)	Apr (56)	May (5)	Jun	Jul	Aug	Sep	Oct	Nov	Dec