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

List:       kde-commits
Subject:    [Amarok] 524171a: Correctly replace the model if activating a file b
From:       Nikolaj Hald Nielsen <nhnFreespirit () gmail ! com>
Date:       2010-05-16 10:54:03
Message-ID: 201005161054.o4GAs3rv005048 () kore ! kollide ! net
[Download RAW message or body]

commit 524171a8a7b41e66b9252a4d7f28353234b80f3d
Author: Nikolaj Hald Nielsen <nhnFreespirit@gmail.com>
Date:   Sun May 16 12:52:59 2010 +0200

    Correctly replace the model if activating a file browser bookmark while the file \
browser is showing "places". This makes the bookmarked ppath actually show.

diff --git a/src/browsers/filebrowser/FileBrowser.cpp \
b/src/browsers/filebrowser/FileBrowser.cpp index a892e01..f91c8b1 100644
--- a/src/browsers/filebrowser/FileBrowser.cpp
+++ b/src/browsers/filebrowser/FileBrowser.cpp
@@ -382,7 +382,19 @@ FileBrowser::setDir( const QString &dir )
     if( dir == "places:" )
         showPlaces();
     else
+    {
+        
+       //if we are currently showing "places" we need to remember to change the \
model +       //back to the regular file model
+       if( m_showingPlaces )
+       {
+           m_fileView->setModel( m_kdirModel );
+           m_showingPlaces = false;
+       }
+           
        addItemActivated( dir );  //This function just happens to do exactly what we \
need +
+    }
 }
 
 void


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