]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/panels/places/placespanel.cpp
Merge remote-tracking branch 'origin/KDE/4.9'
[dolphin.git] / src / panels / places / placespanel.cpp
index ccf9d8cffc11783cbaf18f5e027976004a65d5f4..61c15a7a12631d0a8d36e96e0298cd96646f5d32 100644 (file)
@@ -23,7 +23,8 @@
 
 #include "placespanel.h"
 
-#include <KConfigGroup>
+#include "dolphin_generalsettings.h"
+
 #include <KDebug>
 #include <KDirNotify>
 #include <KIcon>
@@ -34,7 +35,6 @@
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemlistselectionmanager.h>
 #include <kitemviews/kstandarditem.h>
-#include <kitemviews/kstandarditemlistview.h>
 #include <KMenu>
 #include <KMessageBox>
 #include <KNotification>
 #include "placesitemlistgroupheader.h"
 #include "placesitemlistwidget.h"
 #include "placesitemmodel.h"
+#include "placesview.h"
 #include <views/draganddrophelper.h>
+#include <QGraphicsSceneDragDropEvent>
 #include <QVBoxLayout>
 #include <QShowEvent>
 
 PlacesPanel::PlacesPanel(QWidget* parent) :
     Panel(parent),
     m_controller(0),
-    m_model(0)
+    m_model(0),
+    m_storageSetupFailedUrl(),
+    m_triggerStorageSetupButton(),
+    m_itemDropEventIndex(-1),
+    m_itemDropEventMimeData(0),
+    m_itemDropEvent(0)
 {
 }
 
@@ -60,9 +67,27 @@ PlacesPanel::~PlacesPanel()
 
 bool PlacesPanel::urlChanged()
 {
+    if (!url().isValid() || url().protocol().contains("search")) {
+        // Skip results shown by a search, as possible identical
+        // directory names are useless without parent-path information.
+        return false;
+    }
+
+    if (m_controller) {
+        selectClosestItem();
+    }
+
     return true;
 }
 
+void PlacesPanel::readSettings()
+{
+    if (m_controller) {
+       const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
+       m_controller->setAutoActivationDelay(delay);
+    }
+}
+
 void PlacesPanel::showEvent(QShowEvent* event)
 {
     if (event->spontaneous()) {
@@ -79,16 +104,22 @@ void PlacesPanel::showEvent(QShowEvent* event)
         connect(m_model, SIGNAL(errorMessage(QString)),
                 this, SIGNAL(errorMessage(QString)));
 
-        KStandardItemListView* view = new KStandardItemListView();
-        view->setWidgetCreator(new KItemListWidgetCreator<PlacesItemListWidget>());
-        view->setGroupHeaderCreator(new KItemListGroupHeaderCreator<PlacesItemListGroupHeader>());
+        m_view = new PlacesView();
+        m_view->setWidgetCreator(new KItemListWidgetCreator<PlacesItemListWidget>());
+        m_view->setGroupHeaderCreator(new KItemListGroupHeaderCreator<PlacesItemListGroupHeader>());
 
-        m_controller = new KItemListController(m_model, view, this);
+        m_controller = new KItemListController(m_model, m_view, this);
         m_controller->setSelectionBehavior(KItemListController::SingleSelection);
+        m_controller->setSingleClickActivation(true);
+
+       readSettings();
+
         connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
         connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
         connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
         connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
+        connect(m_controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
+        connect(m_controller, SIGNAL(aboveItemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotAboveItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
 
         KItemListContainer* container = new KItemListContainer(m_controller, this);
         container->setEnabledFrame(false);
@@ -105,18 +136,12 @@ void PlacesPanel::showEvent(QShowEvent* event)
 
 void PlacesPanel::slotItemActivated(int index)
 {
-    const KUrl url = m_model->data(index).value("url").value<KUrl>();
-    if (!url.isEmpty()) {
-        emit placeActivated(PlacesItemModel::convertedUrl(url));
-    }
+    triggerItem(index, Qt::LeftButton);
 }
 
 void PlacesPanel::slotItemMiddleClicked(int index)
 {
-    const KUrl url = m_model->data(index).value("url").value<KUrl>();
-    if (!url.isEmpty()) {
-        emit placeMiddleClicked(PlacesItemModel::convertedUrl(url));
-    }
+    triggerItem(index, Qt::MiddleButton);
 }
 
 void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
@@ -157,8 +182,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
     } else {
         if (item->url() == KUrl("trash:/")) {
             emptyTrashAction = menu.addAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"));
-            KConfig trashConfig("trashrc", KConfig::SimpleConfig);
-            emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
+            emptyTrashAction->setEnabled(item->icon() == "user-trash-full");
             menu.addSeparator();
         }
         addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry..."));
@@ -192,6 +216,41 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
         showAllAction->setChecked(m_model->hiddenItemsShown());
     }
 
+    menu.addSeparator();
+    KMenu* iconSizeSubMenu = new KMenu(i18nc("@item:inmenu", "Icon Size"), &menu);
+
+    struct IconSizeInfo
+    {
+        int size;
+        const char* context;
+        const char* text;
+    };
+
+    const int iconSizeCount = 4;
+    static const IconSizeInfo iconSizes[iconSizeCount] = {
+        {KIconLoader::SizeSmall,        I18N_NOOP2_NOSTRIP("Small icon size", "Small (%1x%2)")},
+        {KIconLoader::SizeSmallMedium,  I18N_NOOP2_NOSTRIP("Medium icon size", "Medium (%1x%2)")},
+        {KIconLoader::SizeMedium,       I18N_NOOP2_NOSTRIP("Large icon size", "Large (%1x%2)")},
+        {KIconLoader::SizeLarge,        I18N_NOOP2_NOSTRIP("Huge icon size", "Huge (%1x%2)")}
+    };
+
+    QMap<QAction*, int> iconSizeActionMap;
+    QActionGroup* iconSizeGroup = new QActionGroup(iconSizeSubMenu);
+
+    for (int i = 0; i < iconSizeCount; ++i) {
+        const int size = iconSizes[i].size;
+        const QString text = i18nc(iconSizes[i].context, iconSizes[i].text,
+                                   size, size);
+
+        QAction* action = iconSizeSubMenu->addAction(text);
+        iconSizeActionMap.insert(action, size);
+        action->setActionGroup(iconSizeGroup);
+        action->setCheckable(true);
+        action->setChecked(m_view->iconSize() == size);
+    }
+
+    menu.addMenu(iconSizeSubMenu);
+
     menu.addSeparator();
     foreach (QAction* action, customContextMenuActions()) {
         menu.addAction(action);
@@ -218,6 +277,8 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
             m_model->requestTeardown(index);
         } else if (action == ejectAction) {
             m_model->requestEject(index);
+        } else if (iconSizeActionMap.contains(action)) {
+            m_view->setIconSize(iconSizeActionMap.value(action));
         }
     }
 
@@ -254,6 +315,72 @@ void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
     selectClosestItem();
 }
 
+void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+{
+    if (index < 0) {
+        return;
+    }
+
+    if (m_model->storageSetupNeeded(index)) {
+        connect(m_model, SIGNAL(storageSetupDone(int,bool)),
+                this, SLOT(slotItemDropEventStorageSetupDone(int,bool)));
+
+        m_itemDropEventIndex = index;
+
+        // Make a full copy of the Mime-Data
+        m_itemDropEventMimeData = new QMimeData;
+        m_itemDropEventMimeData->setText(event->mimeData()->text());
+        m_itemDropEventMimeData->setHtml(event->mimeData()->html());
+        m_itemDropEventMimeData->setUrls(event->mimeData()->urls());
+        m_itemDropEventMimeData->setImageData(event->mimeData()->imageData());
+        m_itemDropEventMimeData->setColorData(event->mimeData()->colorData());
+
+        m_itemDropEvent = new QDropEvent(event->pos().toPoint(),
+                                         event->possibleActions(),
+                                         m_itemDropEventMimeData,
+                                         event->buttons(),
+                                         event->modifiers());
+
+        m_model->requestStorageSetup(index);
+        return;
+    }
+
+    KUrl destUrl = m_model->placesItem(index)->url();
+    QDropEvent dropEvent(event->pos().toPoint(),
+                         event->possibleActions(),
+                         event->mimeData(),
+                         event->buttons(),
+                         event->modifiers());
+
+    DragAndDropHelper::dropUrls(KFileItem(), destUrl, &dropEvent);
+}
+
+void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
+{
+    disconnect(m_model, SIGNAL(storageSetupDone(int,bool)),
+               this, SLOT(slotItemDropEventStorageSetupDone(int,bool)));
+
+    if ((index == m_itemDropEventIndex) && m_itemDropEvent && m_itemDropEventMimeData) {
+        if (success) {
+            KUrl destUrl = m_model->placesItem(index)->url();
+
+            DragAndDropHelper::dropUrls(KFileItem(), destUrl, m_itemDropEvent);
+        }
+
+        delete m_itemDropEventMimeData;
+        delete m_itemDropEvent;
+
+        m_itemDropEventIndex = -1;
+        m_itemDropEventMimeData = 0;
+        m_itemDropEvent = 0;
+    }
+}
+
+void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+{
+    m_model->dropMimeDataBefore(index, event->mimeData());
+}
+
 void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
 {
     Q_UNUSED(parent);
@@ -272,6 +399,25 @@ void PlacesPanel::slotTrashUpdated(KJob* job)
     org::kde::KDirNotify::emitFilesAdded("trash:/");
 }
 
+void PlacesPanel::slotStorageSetupDone(int index, bool success)
+{
+    disconnect(m_model, SIGNAL(storageSetupDone(int,bool)),
+               this, SLOT(slotStorageSetupDone(int,bool)));
+
+    if (m_triggerStorageSetupButton == Qt::NoButton) {
+        return;
+    }
+
+    if (success) {
+        Q_ASSERT(!m_model->storageSetupNeeded(index));
+        triggerItem(index, m_triggerStorageSetupButton);
+        m_triggerStorageSetupButton = Qt::NoButton;
+    } else {
+        setUrl(m_storageSetupFailedUrl);
+        m_storageSetupFailedUrl = KUrl();
+    }
+}
+
 void PlacesPanel::emptyTrash()
 {
     const QString text = i18nc("@info", "Do you really want to empty the Trash? All items will be deleted.");
@@ -303,25 +449,7 @@ void PlacesPanel::addEntry()
     dialog->setUrl(url);
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* item = m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon());
-
-        // Insert the item as last item of the corresponding group.
-        int i = 0;
-        while (i < m_model->count() && m_model->placesItem(i)->group() != item->group()) {
-            ++i;
-        }
-
-        bool inserted = false;
-        while (!inserted && i < m_model->count()) {
-            if (m_model->placesItem(i)->group() != item->group()) {
-                m_model->insertItem(i, item);
-                inserted = true;
-            }
-            ++i;
-        }
-
-        if (!inserted) {
-            m_model->appendItem(item);
-        }
+        m_model->appendItemToGroup(item);
     }
 
     delete dialog;
@@ -358,4 +486,34 @@ void PlacesPanel::selectClosestItem()
     selectionManager->setSelected(index);
 }
 
+void PlacesPanel::triggerItem(int index, Qt::MouseButton button)
+{
+    const PlacesItem* item = m_model->placesItem(index);
+    if (!item) {
+        return;
+    }
+
+    if (m_model->storageSetupNeeded(index)) {
+        m_triggerStorageSetupButton = button;
+        m_storageSetupFailedUrl = url();
+
+        connect(m_model, SIGNAL(storageSetupDone(int,bool)),
+                this, SLOT(slotStorageSetupDone(int,bool)));
+
+        m_model->requestStorageSetup(index);
+    } else {
+        m_triggerStorageSetupButton = Qt::NoButton;
+
+        const KUrl url = m_model->data(index).value("url").value<KUrl>();
+        if (!url.isEmpty()) {
+            if (button == Qt::MiddleButton) {
+                emit placeMiddleClicked(PlacesItemModel::convertedUrl(url));
+            } else {
+                emit placeActivated(PlacesItemModel::convertedUrl(url));
+            }
+        }
+    }
+}
+
+
 #include "placespanel.moc"