[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok] 911cd5c: fix keyboard navigation issues in the file browser
From:       hkoller <hannes.koller () gmail ! com>
Date:       2010-06-10 3:27:03
Message-ID: 201006100327.o5A3R3r8000324 () kore ! kollide ! net
[Download RAW message or body]

commit 911cd5ccc8a90f42bd124fafdc3bc3a1b3dadad2
Author: hkoller <hannes.koller@gmail.com>
Date:   Tue Jun 8 20:18:01 2010 +0200

    fix keyboard navigation issues in the file browser
    
    BUG: 240668

diff --git a/ChangeLog b/ChangeLog
index 76ebc2a..d4203dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@ VERSION 2.3.2-Beta 1
       Patch by Richard Longland <rlongland@hotmail.com>.
 
   BUGFIXES:
+    * Fixed keyboard navigation in file browser. (BR 240668)
+      Patch thanks to Hannes Koller.
     * Fixed dropping files to playlist from Konqueror. (BR 235722)
     * Fixed keyboard shortcuts of actions from scripts lost after restart.
       Thanks to Martin Blumenstingl <darklight.xdarklight@googlemail.com>.
diff --git a/src/browsers/filebrowser/FileBrowser.cpp \
b/src/browsers/filebrowser/FileBrowser.cpp index ab7d786..35ff68c 100644
--- a/src/browsers/filebrowser/FileBrowser.cpp
+++ b/src/browsers/filebrowser/FileBrowser.cpp
@@ -53,6 +53,7 @@ FileBrowser::FileBrowser( const char * name, QWidget *parent )
     m_upAction = new QAction( KIcon( "go-up" ), i18nc( "Go one level up in the \
directory hierarchy", "Up one level" ), this );  navigationToolbar->addAction( \
                m_upAction );
     connect( m_upAction, SIGNAL( triggered( bool) ), this, SLOT( up() ) );
+    m_upAction->setShortcut(Qt::ALT + Qt::Key_Up );
 
     m_homeAction = new QAction( KIcon( "user-home" ), i18nc( "Go to the home \
directory",  "Home" ), this );  navigationToolbar->addAction( m_homeAction );
@@ -201,12 +202,7 @@ FileBrowser::itemActivated( const QModelIndex &index )
 
         if( file.isDir() ) {
             debug() << "setting root path to: " << filePath.path();
-            m_kdirModel->dirLister()->openUrl( filePath );
-            m_fileView->setRootIndex( index );
-
-            //add this dir to the breadcrumb
-            setupAddItems();
-            activate();
+	    setDir(filePath.path());
         }
         else
         {


[prev in list] [next in list] [prev in thread] [next in thread]