Add libkmetadata detection and minor fixes

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 58c33b250027e3c0e9ee46b24a252885a4de8a59..5ec8c901eecb9b86432aee5c7c7ba1725d7c5b29 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -79,9 +79,18 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

+    connect(m_mainWindow, SIGNAL(activeViewChanged()),
+            this, SLOT(updateActivationState()));
+

     m_urlNavigator = new UrlNavigator(url, this);
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(loadDirectory(const KUrl&)));
     m_urlNavigator = new UrlNavigator(url, this);
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(loadDirectory(const KUrl&)));

+    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
+            this, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(activated()),
+            this, SLOT(requestActivation()));
+    connect(this, SIGNAL(contentsMoved(int, int)),
+            m_urlNavigator, SLOT(storeContentsPosition(int, int)));

 
     m_statusBar = new DolphinStatusBar(this);
 
 
     m_statusBar = new DolphinStatusBar(this);
 


@@ -165,7 +174,7 @@ const KUrl& DolphinView::url() const
 
 bool DolphinView::isActive() const
 {
 
 bool DolphinView::isActive() const
 {

-    return (mainWindow()->activeView() == this);
+    return m_mainWindow->activeView() == this;

 }
 
 void DolphinView::setMode(Mode mode)
 }
 
 void DolphinView::setMode(Mode mode)


@@ -554,11 +563,6 @@ void DolphinView::reload()
     startDirLister(m_urlNavigator->url(), true);
 }
 
     startDirLister(m_urlNavigator->url(), true);
 }
 

-void DolphinView::declareViewActive()
-{
-    mainWindow()->setActiveView( this );
-}
-

 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);


@@ -650,7 +654,7 @@ void DolphinView::updateProgress(int percent)
 void DolphinView::updateItemCount()
 {
     if (m_showProgress) {
 void DolphinView::updateItemCount()
 {
     if (m_showProgress) {

-        m_statusBar->setProgressText(QString::null);
+        m_statusBar->setProgressText(QString());

         m_statusBar->setProgress(100);
         m_showProgress = false;
     }
         m_statusBar->setProgress(100);
         m_showProgress = false;
     }


@@ -886,9 +890,16 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 
     const KUrl& destination = (directory == 0) ? url() :
                                                  directory->url();
 
     const KUrl& destination = (directory == 0) ? url() :
                                                  directory->url();

+    dropUrls(urls, destination);
+}
+
+void DolphinView::dropUrls(const KUrl::List& urls,
+                           const KUrl& destination)
+{

     m_mainWindow->dropUrls(urls, destination);
 }
 
     m_mainWindow->dropUrls(urls, destination);
 }
 

+

 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());


@@ -914,6 +925,11 @@ void DolphinView::emitContentsMoved()
     emit contentsMoved(contentsX(), contentsY());
 }
 
     emit contentsMoved(contentsX(), contentsY());
 }
 

+void DolphinView::updateActivationState()
+{
+    m_urlNavigator->setActive(isActive());
+}
+

 void DolphinView::createView()
 {
     // delete current view
 void DolphinView::createView()
 {
     // delete current view