X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/453131d6e8a59af87e943455e26074ce8e3ddae3..9a8f75e93cbddca787cbfea8d27ed60009a44512:/src/dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index a424bcbb5..3fec8fdfb 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -185,16 +185,6 @@ void DolphinView::setMode(Mode mode)
 
     m_mode = mode;
 
-    if (isColumnViewActive()) {
-        // When changing the mode in the column view, it makes sense
-        // to go back to the root URL of the column view automatically.
-        // Otherwise there it would not be possible to turn off the column view
-        // without focusing the first column.
-        const KUrl root = rootUrl();
-        setUrl(root);
-        m_controller->setUrl(root);
-    }
-
     deleteView();
 
     const KUrl viewPropsUrl = viewPropertiesUrl();
@@ -547,6 +537,20 @@ void DolphinView::mouseReleaseEvent(QMouseEvent* event)
     QWidget::mouseReleaseEvent(event);
     setActive(true);
 }
+
+void DolphinView::wheelEvent(QWheelEvent* event)
+{
+    if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) {
+        int d = event->delta();
+        if (d > 0 && isZoomInPossible()) {
+            zoomIn();
+        } else if (d < 0 && isZoomOutPossible()) {
+            zoomOut();
+        }
+	event->accept();
+    }
+}
+
 void DolphinView::activate()
 {
     setActive(true);
@@ -604,7 +608,7 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
 KUrl DolphinView::viewPropertiesUrl() const
 {
     if (isColumnViewActive()) {
-        return m_dirLister->url();
+        return m_columnView->rootUrl();
     }
 
     return url();
@@ -764,7 +768,7 @@ void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList&
 
     m_fileItemDelegate->setShowInformation(info);
 
-    emit additionalInfoChanged(); // will call updateAdditionalInfoActions just below
+    emit additionalInfoChanged();
 }
 
 void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
@@ -1191,85 +1195,4 @@ QPair<bool, QString> DolphinView::pasteInfo() const
     return ret;
 }
 
-KAction* DolphinView::createRenameAction(KActionCollection* collection)
-{
-    KAction* rename = collection->addAction("rename");
-    rename->setText(i18nc("@action:inmenu File", "Rename..."));
-    rename->setShortcut(Qt::Key_F2);
-    return rename;
-}
-
-KAction* DolphinView::createMoveToTrashAction(KActionCollection* collection)
-{
-    KAction* moveToTrash = collection->addAction("move_to_trash");
-    moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash"));
-    moveToTrash->setIcon(KIcon("user-trash"));
-    moveToTrash->setShortcut(QKeySequence::Delete);
-    return moveToTrash;
-}
-
-KAction* DolphinView::createDeleteAction(KActionCollection* collection)
-{
-    KAction* deleteAction = collection->addAction("delete");
-    deleteAction->setIcon(KIcon("edit-delete"));
-    deleteAction->setText(i18nc("@action:inmenu File", "Delete"));
-    deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
-    return deleteAction;
-}
-
-KAction* DolphinView::createNewDirAction(KActionCollection* collection)
-{
-    // This action doesn't appear in the GUI, it's for the shortcut only.
-    // KNewMenu takes care of the GUI stuff.
-    KAction* newDirAction = collection->addAction("create_dir");
-    newDirAction->setText(i18n("Create Folder..."));
-    newDirAction->setShortcut(Qt::Key_F10);
-    return newDirAction;
-}
-
-KAction* DolphinView::createSortDescendingAction(KActionCollection* collection)
-{
-    KToggleAction* sortDescending = collection->add<KToggleAction>("descending");
-    sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
-    return sortDescending;
-}
-
-QActionGroup* DolphinView::createAdditionalInformationActionGroup(KActionCollection* collection)
-{
-    QActionGroup* showInformationGroup = new QActionGroup(collection);
-    showInformationGroup->setExclusive(false);
-
-    KToggleAction* showSizeInfo = collection->add<KToggleAction>("show_size_info");
-    showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
-    showSizeInfo->setData(KFileItemDelegate::Size);
-    showSizeInfo->setActionGroup(showInformationGroup);
-
-    KToggleAction* showDateInfo = collection->add<KToggleAction>("show_date_info");
-    showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
-    showDateInfo->setData(KFileItemDelegate::ModificationTime);
-    showDateInfo->setActionGroup(showInformationGroup);
-
-    KToggleAction* showPermissionsInfo = collection->add<KToggleAction>("show_permissions_info");
-    showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
-    showPermissionsInfo->setData(KFileItemDelegate::Permissions);
-    showPermissionsInfo->setActionGroup(showInformationGroup);
-
-    KToggleAction* showOwnerInfo = collection->add<KToggleAction>("show_owner_info");
-    showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
-    showOwnerInfo->setData(KFileItemDelegate::Owner);
-    showOwnerInfo->setActionGroup(showInformationGroup);
-
-    KToggleAction* showGroupInfo = collection->add<KToggleAction>("show_group_info");
-    showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
-    showGroupInfo->setData(KFileItemDelegate::OwnerAndGroup);
-    showGroupInfo->setActionGroup(showInformationGroup);
-
-    KToggleAction* showMimeInfo = collection->add<KToggleAction>("show_mime_info");
-    showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
-    showMimeInfo->setData(KFileItemDelegate::FriendlyMimeType);
-    showMimeInfo->setActionGroup(showInformationGroup);
-
-    return showInformationGroup;
-}
-
 #include "dolphinview.moc"