diff options
Diffstat (limited to 'konqueror')
| -rw-r--r-- | konqueror/konqueror.kcfg | 6 | ||||
| -rw-r--r-- | konqueror/listview/konq_listviewwidget.cpp | 50 |
2 files changed, 33 insertions, 23 deletions
diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg index 4049e8791..041fe4a46 100644 --- a/konqueror/konqueror.kcfg +++ b/konqueror/konqueror.kcfg @@ -45,6 +45,12 @@ <whatsthis>Checking this option will allow files to be renamed by clicking directly on the icon name.</whatsthis> <!-- checked --> </entry> + <entry key="DoubleClickMoveToParent" type="Bool"> + <default>true</default> + <label>Double click on empty area to move to parent folder</label> + <whatsthis>When this option is enabled, double clicking an empty area will navigate to the parent folder.</whatsthis> + <!-- checked --> + </entry> <entry key="ShowDeleteCommand" type="Bool"> <default>true</default> <label>Show 'Delete' menu entries which bypass the trashcan</label> diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index ef70fe949..e1cfa9bb2 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -525,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); + } - if (item) { + TQPoint vp = contentsToViewport(e->pos()); + KonqBaseListViewItem* item = isExecuteArea(vp) ? + static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL; + + 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 ) |