summaryrefslogtreecommitdiffstats
path: root/konqueror/listview/konq_listviewwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/listview/konq_listviewwidget.cpp')
-rw-r--r--konqueror/listview/konq_listviewwidget.cpp202
1 files changed, 99 insertions, 103 deletions
diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp
index 4c89f529d..e1b1a5a66 100644
--- a/konqueror/listview/konq_listviewwidget.cpp
+++ b/konqueror/listview/konq_listviewwidget.cpp
@@ -100,6 +100,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
,m_bAscending(true)
,m_itemFound(false)
,m_restored(false)
+ ,m_sortOrder(0)
,m_filenameColumn(0)
,m_itemToGoTo("")
,m_backgroundTimer(0)
@@ -120,61 +121,61 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
initConfig();
#if 0
- connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),
- this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
+ connect( this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),
+ this, TQ_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
#endif
- connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )),
- this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) );
- connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
- this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
- connect( this, TQT_SIGNAL(executed( TQListViewItem * )),
- this, TQT_SLOT(slotExecuted( TQListViewItem * )) );
- connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )),
- this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) );
- connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
- this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
- connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
- this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
- connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )),
- this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) );
- connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )),
- this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) );
- connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
-
- connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )),
- this, TQT_SIGNAL(viewportAdjusted()) );
- connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )),
- this, TQT_SIGNAL(viewportAdjusted()) );
+ connect( this, TQ_SIGNAL(returnPressed( TQListViewItem * )),
+ this, TQ_SLOT(slotReturnPressed( TQListViewItem * )) );
+ connect( this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
+ this, TQ_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
+ connect( this, TQ_SIGNAL(executed( TQListViewItem * )),
+ this, TQ_SLOT(slotExecuted( TQListViewItem * )) );
+ connect( this, TQ_SIGNAL(currentChanged( TQListViewItem * )),
+ this, TQ_SLOT(slotCurrentChanged( TQListViewItem * )) );
+ connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
+ this, TQ_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
+ connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
+ this, TQ_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
+ connect( this, TQ_SIGNAL(renameNext( TQListViewItem *, int )),
+ this, TQ_SLOT(slotRenameNextItem( TQListViewItem*, int)) );
+ connect( this, TQ_SIGNAL(renamePrev( TQListViewItem *, int )),
+ this, TQ_SLOT(slotRenamePrevItem( TQListViewItem*, int)) );
+ connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
+
+ connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged( int )),
+ this, TQ_SIGNAL(viewportAdjusted()) );
+ connect( verticalScrollBar(), TQ_SIGNAL(valueChanged( int )),
+ this, TQ_SIGNAL(viewportAdjusted()) );
// Connect the directory lister
- connect( m_dirLister, TQT_SIGNAL(started( const KURL & )),
- this, TQT_SLOT(slotStarted()) );
- connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) );
- connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) );
- connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) );
- connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ),
- this, TQT_SLOT(slotNewItems( const KFileItemList & )) );
- connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )),
- this, TQT_SLOT(slotDeleteItem( KFileItem * )) );
- connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )),
- this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) );
- connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )),
- this, TQT_SLOT(slotRedirection( const KURL & )) );
- connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )),
- m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) );
-
- connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )),
- m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) );
- connect( m_dirLister, TQT_SIGNAL(percent( int )),
- m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) );
- connect( m_dirLister, TQT_SIGNAL(speed( int )),
- m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) );
-
- connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) );
+ connect( m_dirLister, TQ_SIGNAL(started( const KURL & )),
+ this, TQ_SLOT(slotStarted()) );
+ connect( m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()) );
+ connect( m_dirLister, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) );
+ connect( m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear()) );
+ connect( m_dirLister, TQ_SIGNAL(newItems( const KFileItemList & ) ),
+ this, TQ_SLOT(slotNewItems( const KFileItemList & )) );
+ connect( m_dirLister, TQ_SIGNAL(deleteItem( KFileItem * )),
+ this, TQ_SLOT(slotDeleteItem( KFileItem * )) );
+ connect( m_dirLister, TQ_SIGNAL(refreshItems( const KFileItemList & )),
+ this, TQ_SLOT( slotRefreshItems( const KFileItemList & )) );
+ connect( m_dirLister, TQ_SIGNAL(redirection( const KURL & )),
+ this, TQ_SLOT(slotRedirection( const KURL & )) );
+ connect( m_dirLister, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )),
+ m_pBrowserView, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )) );
+
+ connect( m_dirLister, TQ_SIGNAL(infoMessage( const TQString& )),
+ m_pBrowserView->extension(), TQ_SIGNAL(infoMessage( const TQString& )) );
+ connect( m_dirLister, TQ_SIGNAL(percent( int )),
+ m_pBrowserView->extension(), TQ_SIGNAL(loadingProgress( int )) );
+ connect( m_dirLister, TQ_SIGNAL(speed( int )),
+ m_pBrowserView->extension(), TQ_SIGNAL(speedProgress( int )) );
+
+ connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), TQ_SLOT(slotUpdateBackground()) );
viewport()->setMouseTracking( true );
- viewport()->setFocusPolicy( TQ_WheelFocus );
- setFocusPolicy( TQ_WheelFocus );
+ viewport()->setFocusPolicy( TQWidget::WheelFocus );
+ setFocusPolicy( TQWidget::WheelFocus );
setAcceptDrops( true );
//looks better with the statusbar
@@ -236,9 +237,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
lstColumns << column;
const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting
TQVariant::Type t = TQVariant::Invalid;
- if ( type.lower() == TQString(TQSTRING_OBJECT_NAME_STRING).lower() )
+ if ( type.lower() == TQString("TQString").lower() )
t = TQVariant::String;
- else if ( type.lower() == TQString(TQDATETIME_OBJECT_NAME_STRING).lower() )
+ else if ( type.lower() == TQString("TQDateTime").lower() )
t = TQVariant::DateTime;
else
kdWarning() << "Unsupported ExtraType '" << type << "'" << endl;
@@ -411,7 +412,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) {
TQRect r( m_rubber->normalize() );
delete m_rubber;
m_rubber = 0;
- repaintContents( r, FALSE );
+ repaintContents( r, false );
}
delete m_selected;
@@ -425,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) {
TDEListView::contentsMousePressEvent( e );
}
else {
- if ( e->button() == Qt::LeftButton ) {
+ if ( e->button() == TQt::LeftButton ) {
m_rubber = new TQRect( e->x(), e->y(), 0, 0 );
clearSelection();
emit selectionChanged();
m_fileTip->setItem( 0 );
}
- if ( e->button() != Qt::RightButton ) {
+ if ( e->button() != TQt::RightButton ) {
TQListView::contentsMousePressEvent( e );
}
}
@@ -448,11 +449,11 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) {
TQRect r( m_rubber->normalize() );
delete m_rubber;
m_rubber = 0;
- repaintContents( r, FALSE );
+ repaintContents( r, false );
}
if ( m_scrollTimer ) {
- disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) );
+ disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) );
m_scrollTimer->stop();
delete m_scrollTimer;
m_scrollTimer = 0;
@@ -524,33 +525,37 @@ void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e )
void KonqBaseListViewWidget::contentsMouseDoubleClickEvent(TQMouseEvent *e)
{
- if (m_rubber) {
- TQRect r(m_rubber->normalize());
- delete m_rubber;
- m_rubber = NULL;
- repaintContents(r, false);
- }
-
- TQPoint vp = contentsToViewport(e->pos());
- KonqBaseListViewItem* item = isExecuteArea(vp) ?
- static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL;
+ if (m_rubber)
+ {
+ TQRect r(m_rubber->normalize());
+ delete m_rubber;
+ m_rubber = NULL;
+ repaintContents(r, false);
+ }
+
+ TQPoint vp = contentsToViewport(e->pos());
+ KonqBaseListViewItem* item = isExecuteArea(vp) ?
+ static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL;
- if (item) {
+ if (item)
+ {
TDEListView::contentsMouseDoubleClickEvent(e);
- }
- else {
+ }
+ else if (m_pSettings->doubleClickMoveToParent())
+ {
KParts::URLArgs args;
args.trustedSource = true;
- KURL baseURL(m_dirLister->url().internalReferenceURL());
- if (baseURL.isEmpty())
- {
- baseURL = m_dirLister->url();
- }
- KURL upURL = baseURL.upURL();
- if (!upURL.isEmpty()) {
- m_pBrowserView->extension()->openURLRequest(upURL, args);
- }
- }
+ KURL baseURL(m_dirLister->url().internalReferenceURL());
+ if (baseURL.isEmpty())
+ {
+ baseURL = m_dirLister->url();
+ }
+ KURL upURL = baseURL.upURL();
+ if (!upURL.isEmpty())
+ {
+ m_pBrowserView->extension()->openURLRequest(upURL, args);
+ }
+ }
}
void KonqBaseListViewWidget::leaveEvent( TQEvent *e )
@@ -580,7 +585,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
TQPoint pt( m_rubber->x(), m_rubber->y() );
pt = contentsToViewport( pt );
- style().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
+ style().drawPrimitive( TQStyle::PE_RubberBand, p,
TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
colorGroup(), TQStyle::Style_Default, colorGroup().base() );
}
@@ -614,7 +619,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
TQRect rr;
TQRect nr = m_rubber->normalize();
- bool changed = FALSE;
+ bool changed = false;
if ( cur )
{
@@ -652,7 +657,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
setSelected( cur, true );
setActiveMultiSelectItem( at );
- changed = TRUE;
+ changed = true;
rr = rr.unite( itemRect( cur ) );
}
}
@@ -660,7 +665,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
if ( cur->isSelected() )
{
- changed = TRUE;
+ changed = true;
rr = rr.unite( itemRect( cur ) );
}
@@ -690,7 +695,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
setSelected( cur, true );
setActiveMultiSelectItem( at );
- changed = TRUE;
+ changed = true;
rr = rr.unite( itemRect( cur ) );
}
}
@@ -698,7 +703,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
if ( cur->isSelected() )
{
- changed = TRUE;
+ changed = true;
rr = rr.unite( itemRect( cur ) );
}
@@ -757,15 +762,15 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
m_scrollTimer = new TQTimer( this );
- connect( m_scrollTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotAutoScroll() ) );
+ connect( m_scrollTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotAutoScroll() ) );
m_scrollTimer->start( 100, false );
}
}
else if ( m_scrollTimer )
{
- disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotAutoScroll() ) );
+ disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotAutoScroll() ) );
m_scrollTimer->stop();
delete m_scrollTimer;
m_scrollTimer = 0;
@@ -967,7 +972,7 @@ void KonqBaseListViewWidget::slotSelectionChanged()
void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
TQListViewItem *_item, const TQPoint& pos, int )
{
- if ( _button == Qt::MidButton )
+ if ( _button == TQt::MidButton )
{
if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) )
m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() );
@@ -1211,11 +1216,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url )
{
m_pBrowserView->newIconSize( m_pBrowserView->m_pProps->iconSize() );
m_pBrowserView->m_paShowDot->setChecked( m_pBrowserView->m_pProps->isShowingDotFiles() );
- if ( m_pBrowserView->m_paCaseInsensitive->isChecked() != m_pBrowserView->m_pProps->isCaseInsensitiveSort() ) {
- m_pBrowserView->m_paCaseInsensitive->setChecked( m_pBrowserView->m_pProps->isCaseInsensitiveSort() );
- // This is in case openURL returned all items synchronously.
- sort();
- }
+ m_sortOrder = m_pBrowserView->m_pProps->getSortOrder();
// It has to be "viewport()" - this is what KonqDirPart's slots act upon,
// and otherwise we get a color/pixmap in the square between the scrollbars.
@@ -1489,7 +1490,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r )
{
- const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap());
+ const TQPixmap *pm = viewport()->paletteBackgroundPixmap();
if (!pm || pm->isNull())
p->fillRect(r, viewport()->backgroundColor());
@@ -1562,7 +1563,7 @@ void KonqBaseListViewWidget::slotUpdateBackground()
if ( !m_backgroundTimer )
{
m_backgroundTimer = new TQTimer( this );
- connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) );
+ connect( m_backgroundTimer, TQ_SIGNAL( timeout() ), viewport(), TQ_SLOT( update() ) );
}
else
m_backgroundTimer->stop();
@@ -1571,11 +1572,6 @@ void KonqBaseListViewWidget::slotUpdateBackground()
}
}
-bool KonqBaseListViewWidget::caseInsensitiveSort() const
-{
- return m_pBrowserView->m_pProps->isCaseInsensitiveSort();
-}
-
// based on isExecuteArea from tdelistview.cpp
int KonqBaseListViewWidget::executeArea( TQListViewItem *_item )
{