Draw dragged items. Better conditions (more accurate to our behavior, hey ! we have...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 0b2812a7ce1e7be18426353cf437ae1c237577ec..6e5b00af23368ad203fcff41425ca3f02430a433 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -60,9 +60,7 @@
 
 DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                                            QWidget* parent,
 
 DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                                            QWidget* parent,

-                                           const KUrl& url,
-                                           DolphinView::Mode mode,
-                                           bool showHiddenFiles) :
+                                           const KUrl& url) :

     QWidget(parent),
     m_showProgress(false),
     m_folderCount(0),
     QWidget(parent),
     m_showProgress(false),
     m_folderCount(0),


@@ -83,14 +81,15 @@ DolphinViewContainer::DolphinViewContainer(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()));
-

     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updateCutItems()));
 
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updateCutItems()));
 
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);

+    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
+            m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(activated()),
+            this, SLOT(activate()));

 
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
 
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());


@@ -99,7 +98,6 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_dirLister = new DolphinDirLister();
     m_dirLister->setAutoUpdate(true);
     m_dirLister->setMainWindow(this);
     m_dirLister = new DolphinDirLister();
     m_dirLister->setAutoUpdate(true);
     m_dirLister->setMainWindow(this);

-    m_dirLister->setShowingDotFiles(showHiddenFiles);

     m_dirLister->setDelayedMimeTypes(true);
 
     m_dirModel = new KDirModel();
     m_dirLister->setDelayedMimeTypes(true);
 
     m_dirModel = new KDirModel();


@@ -117,10 +115,6 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateItemCount()));
             this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateItemCount()));

-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(updateCutItems()));
-    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
-            this, SLOT(generatePreviews(const KFileItemList&)));

     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),


@@ -130,15 +124,21 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                              url,
                              m_dirLister,
                              m_dirModel,
                              url,
                              m_dirLister,
                              m_dirModel,

-                             m_proxyModel,
-                             mode,
-                             showHiddenFiles);
+                             m_proxyModel);

     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(const KUrl&)));
     connect(m_view, SIGNAL(requestContextMenu(KFileItem*, const KUrl&)),
             this, SLOT(openContextMenu(KFileItem*, const KUrl&)));
     connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(const KUrl&)));
     connect(m_view, SIGNAL(requestContextMenu(KFileItem*, const KUrl&)),
             this, SLOT(openContextMenu(KFileItem*, const KUrl&)));
     connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));

+    connect(m_view, SIGNAL(contentsMoved(int, int)),
+            this, SLOT(saveContentsPos(int, int)));
+    connect(m_view, SIGNAL(requestItemInfo(const KUrl&)),
+            this, SLOT(showItemInfo(const KUrl&)));
+    connect(m_view, SIGNAL(errorMessage(const QString&)),
+            this, SLOT(showErrorMessage(const QString&)));
+    connect(m_view, SIGNAL(infoMessage(const QString&)),
+            this, SLOT(showInfoMessage(const QString&)));

 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             m_view, SLOT(setUrl(const KUrl&)));
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             m_view, SLOT(setUrl(const KUrl&)));


@@ -256,11 +256,6 @@ void DolphinViewContainer::renameSelectedItems()
     }
 }
 
     }
 }
 

-DolphinStatusBar* DolphinViewContainer::statusBar() const
-{
-    return m_statusBar;
-}
-

 bool DolphinViewContainer::isFilterBarVisible() const
 {
     return m_filterBar->isVisible();
 bool DolphinViewContainer::isFilterBarVisible() const
 {
     return m_filterBar->isVisible();


@@ -277,68 +272,21 @@ KFileItem* DolphinViewContainer::fileItem(const QModelIndex index) const
     return m_dirModel->itemForIndex(dirModelIndex);
 }
 
     return m_dirModel->itemForIndex(dirModelIndex);
 }
 

-void DolphinViewContainer::rename(const KUrl& source, const QString& newName)
+void DolphinViewContainer::updateProgress(int percent)

 {
 {

-    bool ok = false;
-
-    if (newName.isEmpty() || (source.fileName() == newName)) {
-        return;
-    }
-
-    KUrl dest(source.upUrl());
-    dest.addPath(newName);
-
-    const bool destExists = KIO::NetAccess::exists(dest, false, this);
-    if (destExists) {
-        // the destination already exists, hence ask the user
-        // how to proceed...
-        KIO::RenameDialog renameDialog(this,
-                                       i18n("File Already Exists"),
-                                       source.path(),
-                                       dest.path(),
-                                       KIO::M_OVERWRITE);
-        switch (renameDialog.exec()) {
-        case KIO::R_OVERWRITE:
-            // the destination should be overwritten
-            ok = KIO::NetAccess::file_move(source, dest, -1, true);
-            break;
-
-        case KIO::R_RENAME: {
-            // a new name for the destination has been used
-            KUrl newDest(renameDialog.newDestUrl());
-            ok = KIO::NetAccess::file_move(source, newDest);
-            break;
-        }
-
-        default:
-            // the renaming operation has been canceled
-            return;
+    if (!m_showProgress) {
+        // Only show the directory loading progress if the status bar does
+        // not contain another progress information. This means that
+        // the directory loading progress information has the lowest priority.
+        const QString progressText(m_statusBar->progressText());
+        m_showProgress = progressText.isEmpty() ||
+                        (progressText == i18n("Loading folder..."));
+        if (m_showProgress) {
+            m_statusBar->setProgressText(i18n("Loading folder..."));
+            m_statusBar->setProgress(0);

         }
         }

-    } else {
-        // no destination exists, hence just move the file to
-        // do the renaming
-        ok = KIO::NetAccess::file_move(source, dest);

     }
 
     }
 

-    const QString destFileName = dest.fileName();
-    if (ok) {
-        m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName),
-                                DolphinStatusBar::OperationCompleted);
-
-        KonqOperations::rename(this, source, destFileName);
-    } else {
-        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName),
-                                DolphinStatusBar::Error);
-    }
-}
-
-DolphinMainWindow* DolphinViewContainer::mainWindow() const
-{
-    return m_mainWindow;
-}
-
-void DolphinViewContainer::updateProgress(int percent)
-{

     if (m_showProgress) {
         m_statusBar->setProgress(percent);
     }
     if (m_showProgress) {
         m_statusBar->setProgress(percent);
     }


@@ -371,7 +319,21 @@ void DolphinViewContainer::updateItemCount()
 
     updateStatusBar();
 
 
     updateStatusBar();
 

-    QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
+    QTimer::singleShot(100, this, SLOT(restoreContentsPos()));
+}
+
+void DolphinViewContainer::showItemInfo(const KUrl& url)
+{
+    if (url.isEmpty()) {
+        m_statusBar->clear();
+        return;
+    }
+
+    const QModelIndex index = m_dirModel->indexForUrl(url);
+    const KFileItem* item = m_dirModel->itemForIndex(index);
+    if (item != 0) {
+        m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default);
+    }

 }
 
 void DolphinViewContainer::showInfoMessage(const QString& msg)
 }
 
 void DolphinViewContainer::showInfoMessage(const QString& msg)


@@ -500,4 +462,22 @@ void DolphinViewContainer::openContextMenu(KFileItem* item,
     contextMenu.open();
 }
 
     contextMenu.open();
 }
 

+void DolphinViewContainer::saveContentsPos(int x, int y)
+{
+    m_urlNavigator->savePosition(x, y);
+}
+
+void DolphinViewContainer::restoreContentsPos()
+{
+    if (!url().isEmpty()) {
+        const QPoint pos = m_urlNavigator->savedPosition();
+        m_view->setContentsPosition(pos.x(), pos.y());
+    }
+}
+
+void DolphinViewContainer::activate()
+{
+    setActive(true);
+}
+

 #include "dolphinviewcontainer.moc"
 #include "dolphinviewcontainer.moc"