backport: fixed issue that the item height does not match to the number of lines...

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index d26f14061fd00722fd383fd8cba7ace4f0de0e5b..16caae9d69e85339bfc06ef3bdfe3f625320e73a 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,14 +18,15 @@
 */
 
 #include "dolphinpart.h"
 */
 
 #include "dolphinpart.h"

-#include <kpropertiesdialog.h>
-#include <kglobalsettings.h>
+#include "dolphinviewactionhandler.h"

 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinmodel.h"
 
 #include <konq_operations.h>
 
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinmodel.h"
 
 #include <konq_operations.h>
 

+#include <kpropertiesdialog.h>
+#include <kglobalsettings.h>

 #include <kactioncollection.h>
 #include <kdirlister.h>
 #include <kiconloader.h>
 #include <kactioncollection.h>
 #include <kdirlister.h>
 #include <kiconloader.h>


@@ -92,21 +93,20 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
     connect(m_view, SIGNAL(urlChanged(KUrl)),
             this, SLOT(slotUrlChanged(KUrl)));
     connect(m_view, SIGNAL(modeChanged()),
     connect(m_view, SIGNAL(urlChanged(KUrl)),
             this, SLOT(slotUrlChanged(KUrl)));
     connect(m_view, SIGNAL(modeChanged()),

-            this, SLOT(updateViewActions()));
+            this, SIGNAL(viewModeChanged())); // relay signal
+
+    m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
+    m_actionHandler->setCurrentView(m_view);

 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updatePasteAction()));
 
     createActions();
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updatePasteAction()));
 
     createActions();

-    updateViewActions();
+    m_actionHandler->updateViewActions();

     slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions
 
     slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions
 

-    // TODO provide the viewmode actions in the menu, merged with the existing view-mode-actions somehow
-    // [Q_PROPERTY introspection?]
-

     // TODO sort_by_* actions
     // TODO sort_by_* actions

-    // TODO show_*_info actions

 
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
 
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)


@@ -119,22 +119,6 @@ DolphinPart::~DolphinPart()
 
 void DolphinPart::createActions()
 {
 
 void DolphinPart::createActions()
 {

-    QActionGroup* viewModeActions = new QActionGroup(this);
-    viewModeActions->addAction(DolphinView::iconsModeAction(actionCollection()));
-    viewModeActions->addAction(DolphinView::detailsModeAction(actionCollection()));
-    viewModeActions->addAction(DolphinView::columnsModeAction(actionCollection()));
-    connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*)));
-
-    KAction* renameAction = DolphinView::createRenameAction(actionCollection());
-    connect(renameAction, SIGNAL(triggered()), m_view, SLOT(renameSelectedItems()));
-
-    KAction* moveToTrashAction = DolphinView::createMoveToTrashAction(actionCollection());
-    connect(moveToTrashAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
-            this, SLOT(slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers)));
-
-    KAction* deleteAction = DolphinView::createDeleteAction(actionCollection());
-    connect(deleteAction, SIGNAL(triggered()), m_view, SLOT(deleteSelectedItems()));
-

     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType()));
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType()));


@@ -144,13 +128,7 @@ void DolphinPart::createActions()
     propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return);
     connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
 
     propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return);
     connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
 

-    // This action doesn't appear in the GUI, it's for the shortcut only.
-    // KNewMenu takes care of the GUI stuff.
-    KAction* newDirAction = actionCollection()->addAction( "create_dir" );
-    newDirAction->setText( i18n("Create Folder..." ) );
-    connect(newDirAction, SIGNAL(triggered()), SLOT(slotNewDir()));
-    newDirAction->setShortcut(Qt::Key_F10);
-    widget()->addAction(newDirAction);
+    // View menu: all done by DolphinViewActionHandler

 
     // Go menu
 
 
     // Go menu
 


@@ -222,15 +200,6 @@ void DolphinPart::updatePasteAction()
     emit m_extension->setActionText( "paste", pasteInfo.second );
 }
 
     emit m_extension->setActionText( "paste", pasteInfo.second );
 }
 

-void DolphinPart::updateViewActions()
-{
-    QAction* action = actionCollection()->action(m_view->currentViewModeActionName());
-    if (action != 0) {
-        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
-        toggleAction->setChecked(true);
-    }
-}
-

 KAboutData* DolphinPart::createAboutData()
 {
     return new KAboutData("dolphinpart", "dolphin", ki18nc("@title", "Dolphin Part"), "0.1");
 KAboutData* DolphinPart::createAboutData()
 {
     return new KAboutData("dolphinpart", "dolphin", ki18nc("@title", "Dolphin Part"), "0.1");


@@ -368,12 +337,6 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
     }
 }
 
     }
 }
 

-void DolphinPart::slotViewModeActionTriggered(QAction* action)
-{
-    const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
-    m_view->setMode(mode);
-}
-

 void DolphinPart::slotUrlChanged(const KUrl& url)
 {
     if (m_view->url() != url) {
 void DolphinPart::slotUrlChanged(const KUrl& url)
 {
     if (m_view->url() != url) {


@@ -403,22 +366,6 @@ void DolphinPartBrowserExtension::paste()
 
 ////
 
 
 ////
 

-void DolphinPart::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers)
-{
-    // Note: kde3's konq_mainwindow.cpp used to check
-    // reason == KAction::PopupMenuActivation && ...
-    // but this isn't supported anymore
-    if (modifiers & Qt::ShiftModifier)
-        m_view->deleteSelectedItems();
-    else
-        m_view->trashSelectedItems();
-}
-
-void DolphinPart::slotNewDir()
-{
-    KonqOperations::newDir(widget(), url());
-}
-

 void DolphinPart::slotEditMimeType()
 {
     const KFileItemList items = m_view->selectedItems();
 void DolphinPart::slotEditMimeType()
 {
     const KFileItemList items = m_view->selectedItems();


@@ -436,4 +383,16 @@ void DolphinPart::slotProperties()
     }
 }
 
     }
 }
 

+void DolphinPart::setCurrentViewMode(const QString& viewModeName)
+{
+    QAction* action = actionCollection()->action(viewModeName);
+    Q_ASSERT(action);
+    action->trigger();
+}
+
+QString DolphinPart::currentViewMode() const
+{
+    return m_actionHandler->currentViewModeActionName();
+}
+

 #include "dolphinpart.moc"
 #include "dolphinpart.moc"