Create the new architecture for KCategorizedView. Now DolphinModel is created, inheri...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 01cc27896e24fce1beb37fcdee574e16681bb00b..c30b2d0bce7ccc4dd75bb6a1c3286e67873de604 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -27,7 +27,6 @@
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 

-#include <kdirmodel.h>

 #include <kfileitemdelegate.h>
 #include <kfileplacesmodel.h>
 #include <kglobalsettings.h>
 #include <kfileitemdelegate.h>
 #include <kfileplacesmodel.h>
 #include <kglobalsettings.h>


@@ -41,6 +40,7 @@
 #include <konq_operations.h>
 #include <kurl.h>
 
 #include <konq_operations.h>
 #include <kurl.h>
 

+#include "dolphinmodel.h"

 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
 #include "dolphinstatusbar.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
 #include "dolphinstatusbar.h"


@@ -50,7 +50,6 @@
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"

-#include "dolphinitemcategorizer.h"

 #include "filterbar.h"
 #include "renamedialog.h"
 #include "kurlnavigator.h"
 #include "filterbar.h"
 #include "renamedialog.h"
 #include "kurlnavigator.h"


@@ -60,9 +59,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),


@@ -73,7 +70,6 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_view(0),
     m_filterBar(0),
     m_statusBar(0),
     m_view(0),
     m_filterBar(0),
     m_statusBar(0),

-    m_dirModel(0),

     m_dirLister(0),
     m_proxyModel(0)
 {
     m_dirLister(0),
     m_proxyModel(0)
 {


@@ -83,13 +79,11 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

-    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&)));
     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());


@@ -98,15 +92,15 @@ 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_dirLister->setDelayedMimeTypes(true);
 

-    m_dirModel = new KDirModel();
-    m_dirModel->setDirLister(m_dirLister);
-    m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
+    m_dolphinModel = new DolphinModel();
+    m_dolphinModel->setDirLister(m_dirLister);
+    m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
+

 
     m_proxyModel = new DolphinSortFilterProxyModel(this);
 
     m_proxyModel = new DolphinSortFilterProxyModel(this);

-    m_proxyModel->setSourceModel(m_dirModel);
+    m_proxyModel->setSourceModel(m_dolphinModel);

 
     connect(m_dirLister, SIGNAL(clear()),
             this, SLOT(updateStatusBar()));
 
     connect(m_dirLister, SIGNAL(clear()),
             this, SLOT(updateStatusBar()));


@@ -124,28 +118,31 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_view = new DolphinView(this,
                              url,
                              m_dirLister,
     m_view = new DolphinView(this,
                              url,
                              m_dirLister,

-                             m_dirModel,
-                             m_proxyModel,
-                             mode);
+                             m_dolphinModel,
+                             m_proxyModel);

     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(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(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(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(requestItemInfo(KFileItem)),
+            this, SLOT(showItemInfo(KFileItem)));

     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_view, SIGNAL(errorMessage(const QString&)),
             this, SLOT(showErrorMessage(const QString&)));
     connect(m_view, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));

+    connect(m_view, SIGNAL(itemTriggered(KFileItem)),
+            this, SLOT(slotItemTriggered(KFileItem)));

 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             m_view, SLOT(setUrl(const KUrl&)));
 
     m_statusBar = new DolphinStatusBar(this, url);
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             m_view, SLOT(setUrl(const KUrl&)));
 
     m_statusBar = new DolphinStatusBar(this, url);

+    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
+            m_statusBar, SLOT(updateSpaceInfoContent(const KUrl&)));

 
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
 
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());


@@ -191,11 +188,11 @@ bool DolphinViewContainer::isActive() const
 void DolphinViewContainer::renameSelectedItems()
 {
     DolphinViewContainer* view = m_mainWindow->activeViewContainer();
 void DolphinViewContainer::renameSelectedItems()
 {
     DolphinViewContainer* view = m_mainWindow->activeViewContainer();

-    const KUrl::List urls = m_view->selectedUrls();
-    if (urls.count() > 1) {
+    const QList<KFileItem> items = m_view->selectedItems();
+    if (items.count() > 1) {

         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.
         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.

-        RenameDialog dialog(urls);
+        RenameDialog dialog(items);

         if (dialog.exec() == QDialog::Rejected) {
             return;
         }
         if (dialog.exec() == QDialog::Rejected) {
             return;
         }


@@ -214,10 +211,10 @@ void DolphinViewContainer::renameSelectedItems()
             Q_ASSERT(replaceIndex >= 0);
             int index = 1;
 
             Q_ASSERT(replaceIndex >= 0);
             int index = 1;
 

-            KUrl::List::const_iterator it = urls.begin();
-            KUrl::List::const_iterator end = urls.end();
+            QList<KFileItem>::const_iterator it = items.begin();
+            QList<KFileItem>::const_iterator end = items.end();

             while (it != end) {
             while (it != end) {

-                const KUrl& oldUrl = *it;
+                const KUrl& oldUrl = (*it).url();

                 QString number;
                 number.setNum(index++);
 
                 QString number;
                 number.setNum(index++);
 


@@ -235,12 +232,12 @@ void DolphinViewContainer::renameSelectedItems()
     } else {
         // Only one item has been selected for renaming. Use the custom
         // renaming mechanism from the views.
     } else {
         // Only one item has been selected for renaming. Use the custom
         // renaming mechanism from the views.

-        Q_ASSERT(urls.count() == 1);
+        Q_ASSERT(items.count() == 1);

 
         // TODO: Think about using KFileItemDelegate as soon as it supports editing.
         // Currently the RenameDialog is used, but I'm not sure whether inline renaming
         // is a benefit for the user at all -> let's wait for some input first...
 
         // TODO: Think about using KFileItemDelegate as soon as it supports editing.
         // Currently the RenameDialog is used, but I'm not sure whether inline renaming
         // is a benefit for the user at all -> let's wait for some input first...

-        RenameDialog dialog(urls);
+        RenameDialog dialog(items);

         if (dialog.exec() == QDialog::Rejected) {
             return;
         }
         if (dialog.exec() == QDialog::Rejected) {
             return;
         }


@@ -250,7 +247,7 @@ void DolphinViewContainer::renameSelectedItems()
             view->statusBar()->setMessage(dialog.errorString(),
                                           DolphinStatusBar::Error);
         } else {
             view->statusBar()->setMessage(dialog.errorString(),
                                           DolphinStatusBar::Error);
         } else {

-            const KUrl& oldUrl = urls.first();
+            const KUrl& oldUrl = items.first().url();

             KUrl newUrl = oldUrl;
             newUrl.setFileName(newName);
             m_mainWindow->rename(oldUrl, newUrl);
             KUrl newUrl = oldUrl;
             newUrl.setFileName(newName);
             m_mainWindow->rename(oldUrl, newUrl);


@@ -258,11 +255,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();


@@ -273,15 +265,10 @@ bool DolphinViewContainer::isUrlEditable() const
     return m_urlNavigator->isUrlEditable();
 }
 
     return m_urlNavigator->isUrlEditable();
 }
 

-KFileItem* DolphinViewContainer::fileItem(const QModelIndex index) const
+KFileItem DolphinViewContainer::fileItem(const QModelIndex& index) const

 {
 {

-    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
-    return m_dirModel->itemForIndex(dirModelIndex);
-}
-
-DolphinMainWindow* DolphinViewContainer::mainWindow() const
-{
-    return m_mainWindow;
+    const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
+    return m_dolphinModel->itemForIndex(dolphinModelIndex);

 }
 
 void DolphinViewContainer::updateProgress(int percent)
 }
 
 void DolphinViewContainer::updateProgress(int percent)


@@ -291,10 +278,10 @@ void DolphinViewContainer::updateProgress(int percent)
         // not contain another progress information. This means that
         // the directory loading progress information has the lowest priority.
         const QString progressText(m_statusBar->progressText());
         // 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..."));
+        const QString loadingText(i18nc("@info:progress", "Loading folder..."));
+        m_showProgress = progressText.isEmpty() || (progressText == loadingText);

         if (m_showProgress) {
         if (m_showProgress) {

-            m_statusBar->setProgressText(i18n("Loading folder..."));
+            m_statusBar->setProgressText(loadingText);

             m_statusBar->setProgress(0);
         }
     }
             m_statusBar->setProgress(0);
         }
     }


@@ -334,17 +321,12 @@ void DolphinViewContainer::updateItemCount()
     QTimer::singleShot(100, this, SLOT(restoreContentsPos()));
 }
 
     QTimer::singleShot(100, this, SLOT(restoreContentsPos()));
 }
 

-void DolphinViewContainer::showItemInfo(const KUrl& url)
+void DolphinViewContainer::showItemInfo(const KFileItem& item)

 {
 {

-    if (url.isEmpty()) {
+    if (item.isNull()) {

         m_statusBar->clear();
         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);
+    } else {
+        m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);

     }
 }
 
     }
 }
 


@@ -366,6 +348,21 @@ void DolphinViewContainer::closeFilterBar()
 
 QString DolphinViewContainer::defaultStatusBarText() const
 {
 
 QString DolphinViewContainer::defaultStatusBarText() const
 {

+    int m_fileCount = 0;
+    int m_folderCount = 0;
+
+    for (int i = 0; i < m_proxyModel->rowCount(); i++)
+    {
+        if (m_dolphinModel->itemForIndex(m_proxyModel->mapToSource(m_proxyModel->index(i, m_proxyModel->sortColumn()))).isDir())
+        {
+            m_folderCount++;
+        }
+        else
+        {
+            m_fileCount++;
+        }
+    }
+

     return KIO::itemsSummaryString(m_fileCount + m_folderCount,
                                    m_fileCount,
                                    m_folderCount,
     return KIO::itemsSummaryString(m_fileCount + m_folderCount,
                                    m_fileCount,
                                    m_folderCount,


@@ -375,7 +372,7 @@ QString DolphinViewContainer::defaultStatusBarText() const
 QString DolphinViewContainer::selectionStatusBarText() const
 {
     QString text;
 QString DolphinViewContainer::selectionStatusBarText() const
 {
     QString text;

-    const KFileItemList list = m_view->selectedItems();
+    const QList<KFileItem> list = m_view->selectedItems();

     if (list.isEmpty()) {
         // when an item is triggered, it is temporary selected but selectedItems()
         // will return an empty list
     if (list.isEmpty()) {
         // when an item is triggered, it is temporary selected but selectedItems()
         // will return an empty list


@@ -385,21 +382,21 @@ QString DolphinViewContainer::selectionStatusBarText() const
     int fileCount = 0;
     int folderCount = 0;
     KIO::filesize_t byteSize = 0;
     int fileCount = 0;
     int folderCount = 0;
     KIO::filesize_t byteSize = 0;

-    KFileItemList::const_iterator it = list.begin();
-    const KFileItemList::const_iterator end = list.end();
+    QList<KFileItem>::const_iterator it = list.begin();
+    const QList<KFileItem>::const_iterator end = list.end();

     while (it != end) {
     while (it != end) {

-        KFileItem* item = *it;
-        if (item->isDir()) {
+        const KFileItem& item = *it;
+        if (item.isDir()) {

             ++folderCount;
         } else {
             ++fileCount;
             ++folderCount;
         } else {
             ++fileCount;

-            byteSize += item->size();
+            byteSize += item.size();

         }
         ++it;
     }
 
     if (folderCount > 0) {
         }
         ++it;
     }
 
     if (folderCount > 0) {

-        text = i18np("1 Folder selected", "%1 Folders selected", folderCount);
+        text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);

         if (fileCount > 0) {
             text += ", ";
         }
         if (fileCount > 0) {
             text += ", ";
         }


@@ -407,7 +404,7 @@ QString DolphinViewContainer::selectionStatusBarText() const
 
     if (fileCount > 0) {
         const QString sizeText(KIO::convertSize(byteSize));
 
     if (fileCount > 0) {
         const QString sizeText(KIO::convertSize(byteSize));

-        text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
+        text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);

     }
 
     return text;
     }
 
     return text;


@@ -465,9 +462,11 @@ void DolphinViewContainer::changeNameFilter(const QString& nameFilter)
 #else
     m_proxyModel->setFilterRegExp(nameFilter);
 #endif
 #else
     m_proxyModel->setFilterRegExp(nameFilter);
 #endif

+
+    updateStatusBar();

 }
 
 }
 

-void DolphinViewContainer::openContextMenu(KFileItem* item,
+void DolphinViewContainer::openContextMenu(const KFileItem& item,

                                            const KUrl& url)
 {
     DolphinContextMenu contextMenu(m_mainWindow, item, url);
                                            const KUrl& url)
 {
     DolphinContextMenu contextMenu(m_mainWindow, item, url);


@@ -487,5 +486,38 @@ void DolphinViewContainer::restoreContentsPos()
     }
 }
 
     }
 }
 

+void DolphinViewContainer::activate()
+{
+    setActive(true);
+}
+
+void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
+{
+    // Prefer the local path over the URL.
+    bool isLocal;
+    KUrl url = item.mostLocalUrl(isLocal);
+
+    if (item.isDir()) {
+        m_view->setUrl(url);
+    } else if (item.isFile()) {
+        // allow to browse through ZIP and tar files
+        KMimeType::Ptr mime = item.mimeTypePtr();
+        if (mime->is("application/zip")) {
+            url.setProtocol("zip");
+            m_view->setUrl(url);
+        } else if (mime->is("application/x-tar") ||
+                   mime->is("application/x-tarz") ||
+                   mime->is("application/x-bzip-compressed-tar") ||
+                   mime->is("application/x-compressed-tar") ||
+                   mime->is("application/x-tzo")) {
+            url.setProtocol("tar");
+            m_view->setUrl(url);
+        } else {
+            item.run();
+        }
+    } else {
+        item.run();
+    }
+}

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