only set the title synchronously for the file-protocol, otherwise use KIO::stat()

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index bcff50cea6225ae658e0ca13671d1d4cd33ce36e..9349ca7be63fdfcf9f42e556a4553c4aea68acb6 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -31,7 +31,6 @@
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 #include "search/dolphinsearchbox.h"
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 #include "search/dolphinsearchbox.h"

-#include "search/dolphinsearchoptionsconfigurator.h"

 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettingsdialog.h"
 #include "dolphinviewcontainer.h"
 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettingsdialog.h"
 #include "dolphinviewcontainer.h"


@@ -120,7 +119,8 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     m_viewTab(),
     m_actionHandler(0),
     m_remoteEncoding(0),
     m_viewTab(),
     m_actionHandler(0),
     m_remoteEncoding(0),

-    m_settingsDialog(0)
+    m_settingsDialog(0),
+    m_captionStatJob(0)

 {
     setObjectName("Dolphin#");
 
 {
     setObjectName("Dolphin#");
 


@@ -398,15 +398,19 @@ void DolphinMainWindow::openNewTab()
 
 void DolphinMainWindow::openNewTab(const KUrl& url)
 {
 
 void DolphinMainWindow::openNewTab(const KUrl& url)
 {

-    const KIcon icon = KIcon(KMimeType::iconNameForUrl(m_activeViewContainer->url()));
+    QWidget* focusWidget = QApplication::focusWidget();
+

     if (m_viewTab.count() == 1) {
         // Only one view is open currently and hence no tab is shown at
         // all. Before creating a tab for 'url', provide a tab for the current URL.
     if (m_viewTab.count() == 1) {
         // Only one view is open currently and hence no tab is shown at
         // all. Before creating a tab for 'url', provide a tab for the current URL.

-        m_tabBar->addTab(icon, squeezedText(tabName(m_activeViewContainer->url())));
+        const KUrl currentUrl = m_activeViewContainer->url();
+        m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(currentUrl)),
+                         squeezedText(tabName(currentUrl)));

         m_tabBar->blockSignals(false);
     }
 
         m_tabBar->blockSignals(false);
     }
 

-    m_tabBar->addTab(icon, squeezedText(tabName(url)));
+    m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(url)),
+                     squeezedText(tabName(url)));

 
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
 
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);


@@ -428,6 +432,12 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
         m_viewTab[tabIndex].secondaryView->setActive(true);
         m_viewTab[tabIndex].isPrimaryViewActive = false;
     }
         m_viewTab[tabIndex].secondaryView->setActive(true);
         m_viewTab[tabIndex].isPrimaryViewActive = false;
     }

+
+    if (focusWidget != 0) {
+        // The DolphinViewContainer grabbed the keyboard focus. As the tab is opened
+        // in background, assure that the previous focused widget gets the focus back.
+        focusWidget->setFocus();
+    }

 }
 
 void DolphinMainWindow::activateNextTab()
 }
 
 void DolphinMainWindow::activateNextTab()


@@ -486,6 +496,14 @@ void DolphinMainWindow::toggleActiveView()
     setActiveViewContainer(m_activeViewContainer == right ? left : right);
 }
 
     setActiveViewContainer(m_activeViewContainer == right ? left : right);
 }
 

+void DolphinMainWindow::showEvent(QShowEvent* event)
+{
+    KXmlGuiWindow::showEvent(event);
+    if (!event->spontaneous()) {
+        m_activeViewContainer->view()->setFocus();
+    }
+}
+

 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 {
     DolphinSettings& settings = DolphinSettings::instance();
 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 {
     DolphinSettings& settings = DolphinSettings::instance();


@@ -1431,11 +1449,12 @@ void DolphinMainWindow::setupDockWidgets()
     connect(infoPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
     infoDock->setWidget(infoPanel);
 
     connect(infoPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
     infoDock->setWidget(infoPanel);
 

-    QAction* infoAction = infoDock->toggleViewAction();
+    KAction* infoAction = new KAction(this);

     infoAction->setText(i18nc("@title:window", "Information"));
     infoAction->setShortcut(Qt::Key_F11);
     infoAction->setIcon(KIcon("dialog-information"));
     infoAction->setText(i18nc("@title:window", "Information"));
     infoAction->setShortcut(Qt::Key_F11);
     infoAction->setIcon(KIcon("dialog-information"));

-    actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
+    actionCollection()->addAction("show_info_panel", infoAction);
+    connect(infoAction, SIGNAL(triggered()), infoDock->toggleViewAction(), SLOT(trigger()));

 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, SIGNAL(urlChanged(KUrl)),


@@ -1452,11 +1471,12 @@ void DolphinMainWindow::setupDockWidgets()
     FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
     foldersDock->setWidget(foldersPanel);
 
     FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
     foldersDock->setWidget(foldersPanel);
 

-    QAction* foldersAction = foldersDock->toggleViewAction();
+    KAction* foldersAction = new KAction(this);

     foldersAction->setText(i18nc("@title:window", "Folders"));
     foldersAction->setShortcut(Qt::Key_F7);
     foldersAction->setIcon(KIcon("folder"));
     foldersAction->setText(i18nc("@title:window", "Folders"));
     foldersAction->setShortcut(Qt::Key_F7);
     foldersAction->setIcon(KIcon("folder"));

-    actionCollection()->addAction("show_folders_panel", foldersDock->toggleViewAction());
+    actionCollection()->addAction("show_folders_panel", foldersAction);
+    connect(foldersAction, SIGNAL(triggered()), foldersDock->toggleViewAction(), SLOT(trigger()));

 
     addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
 
     addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
     connect(this, SIGNAL(urlChanged(KUrl)),


@@ -1474,11 +1494,12 @@ void DolphinMainWindow::setupDockWidgets()
 
     connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
 
 
     connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
 

-    QAction* terminalAction = terminalDock->toggleViewAction();
+    KAction* terminalAction = new KAction(this);

     terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal"));
     terminalAction->setShortcut(Qt::Key_F4);
     terminalAction->setIcon(KIcon("utilities-terminal"));
     terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal"));
     terminalAction->setShortcut(Qt::Key_F4);
     terminalAction->setIcon(KIcon("utilities-terminal"));

-    actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
+    actionCollection()->addAction("show_terminal_panel", terminalAction);
+    connect(terminalAction, SIGNAL(triggered()), terminalDock->toggleViewAction(), SLOT(trigger()));

 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),


@@ -1493,6 +1514,7 @@ void DolphinMainWindow::setupDockWidgets()
 #endif
     }
 
 #endif
     }
 

+    // setup "Places"

     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);


@@ -1502,11 +1524,12 @@ void DolphinMainWindow::setupDockWidgets()
     placesPanel->setModel(DolphinSettings::instance().placesModel());
     placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
     placesPanel->setModel(DolphinSettings::instance().placesModel());
     placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 

-    QAction* placesAction = placesDock->toggleViewAction();
+    KAction* placesAction = new KAction(this);

     placesAction->setText(i18nc("@title:window", "Places"));
     placesAction->setShortcut(Qt::Key_F9);
     placesAction->setIcon(KIcon("bookmarks"));
     placesAction->setText(i18nc("@title:window", "Places"));
     placesAction->setShortcut(Qt::Key_F9);
     placesAction->setIcon(KIcon("bookmarks"));

-    actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
+    actionCollection()->addAction("show_places_panel", placesAction);
+    connect(placesAction, SIGNAL(triggered()), placesDock->toggleViewAction(), SLOT(trigger()));

 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),


@@ -1703,29 +1726,45 @@ QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) co
 
 void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
 {
 
 void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
 {

-    QString caption;
-    if (url.equals(KUrl("file:///"))) {
-        caption = '/';
+    delete m_captionStatJob;
+    m_captionStatJob = 0;
+
+    if (url.protocol() == QLatin1String("file")) {
+        QString caption;
+        if (url.equals(KUrl("file:///"))) {
+            caption = '/';
+        } else {
+            caption = url.fileName();
+            if (caption.isEmpty()) {
+                caption = url.protocol();
+            }
+        }
+
+        setCaption(caption);

     } else {
     } else {

-        caption = url.fileName();
-        if (caption.isEmpty()) {
-            caption = url.protocol();
-       }
+        m_captionStatJob = KIO::stat(url, KIO::HideProgressInfo);
+        connect(m_captionStatJob, SIGNAL(result(KJob*)),
+                this, SLOT(slotCaptionStatFinished(KJob*)));

     }
     }

-
-    setCaption(caption);

 }
 
 void DolphinMainWindow::handleUrl(const KUrl& url)
 {
     if (KProtocolManager::supportsListing(url)) {
         activeViewContainer()->setUrl(url);
 }
 
 void DolphinMainWindow::handleUrl(const KUrl& url)
 {
     if (KProtocolManager::supportsListing(url)) {
         activeViewContainer()->setUrl(url);

-    }
-    else {
+    } else {

         new KRun(url, this);
     }
 }
 
         new KRun(url, this);
     }
 }
 

+void DolphinMainWindow::slotCaptionStatFinished(KJob* job)
+{  
+    m_captionStatJob = 0;
+    const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
+    const QString name = entry.stringValue(KIO::UDSEntry::UDS_DISPLAY_NAME);
+    setCaption(name);
+}
+

 QString DolphinMainWindow::squeezedText(const QString& text) const
 {
     const QFontMetrics fm = fontMetrics();
 QString DolphinMainWindow::squeezedText(const QString& text) const
 {
     const QFontMetrics fm = fontMetrics();