SVN_SILENT: minor coding style fix (Sebastian likes spaces :-))

[dolphin.git] / src / dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index dc4d6a9095a7cfc41265876dc1542d7826a1f702..49a5f7e984246631315f3298286d76f7355c51ae 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -22,16 +22,17 @@
 #include "settings/viewpropertiesdialog.h"
 #include "dolphinview.h"
 #include "zoomlevelinfo.h"
 #include "settings/viewpropertiesdialog.h"
 #include "dolphinview.h"
 #include "zoomlevelinfo.h"

-

 #include <konq_operations.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <klocale.h>
 #include <konq_operations.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <klocale.h>

+#include <knewmenu.h>

 #include <ktoggleaction.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
 
 #include <ktoggleaction.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
 

+

 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
     : QObject(parent),
       m_actionCollection(collection),
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
     : QObject(parent),
       m_actionCollection(collection),


@@ -56,6 +57,8 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view)
             this, SLOT(slotShowPreviewChanged()));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
             this, SLOT(slotShowPreviewChanged()));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));

+    connect(view, SIGNAL(sortFoldersFirstChanged(bool)),
+            this, SLOT(slotSortFoldersFirstChanged(bool)));

     connect(view, SIGNAL(additionalInfoChanged()),
             this, SLOT(slotAdditionalInfoChanged()));
     connect(view, SIGNAL(categorizedSortingChanged()),
     connect(view, SIGNAL(additionalInfoChanged()),
             this, SLOT(slotAdditionalInfoChanged()));
     connect(view, SIGNAL(categorizedSortingChanged()),


@@ -68,6 +71,11 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view)
             this, SLOT(slotZoomLevelChanged(int)));
 }
 
             this, SLOT(slotZoomLevelChanged(int)));
 }
 

+DolphinView* DolphinViewActionHandler::currentView()
+{
+    return m_currentView;
+}
+

 void DolphinViewActionHandler::createActions()
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.
 void DolphinViewActionHandler::createActions()
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.


@@ -76,9 +84,9 @@ void DolphinViewActionHandler::createActions()
     newDirAction->setText(i18nc("@action", "Create Folder..."));
     newDirAction->setShortcut(Qt::Key_F10);
     newDirAction->setIcon(KIcon("folder-new"));
     newDirAction->setText(i18nc("@action", "Create Folder..."));
     newDirAction->setShortcut(Qt::Key_F10);
     newDirAction->setIcon(KIcon("folder-new"));

-    connect(newDirAction, SIGNAL(triggered()), SLOT(slotCreateDir()));
+    connect(newDirAction, SIGNAL(triggered()), this, SIGNAL(createDirectory()));

 
 

-    // Edit menu
+    // File menu

 
     KAction* rename = m_actionCollection->addAction("rename");
     rename->setText(i18nc("@action:inmenu File", "Rename..."));
 
     KAction* rename = m_actionCollection->addAction("rename");
     rename->setText(i18nc("@action:inmenu File", "Rename..."));


@@ -135,6 +143,7 @@ void DolphinViewActionHandler::createActions()
 
     KToggleAction* showPreview = m_actionCollection->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));
 
     KToggleAction* showPreview = m_actionCollection->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));

+    showPreview->setToolTip(i18nc("@info", "Show preview of files and folders"));

     showPreview->setIcon(KIcon("view-preview"));
     connect(showPreview, SIGNAL(triggered(bool)), this, SLOT(togglePreview(bool)));
 
     showPreview->setIcon(KIcon("view-preview"));
     connect(showPreview, SIGNAL(triggered(bool)), this, SLOT(togglePreview(bool)));
 


@@ -142,6 +151,10 @@ void DolphinViewActionHandler::createActions()
     sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 
     sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 

+    KToggleAction* sortFoldersFirst = m_actionCollection->add<KToggleAction>("folders_first");
+    sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First"));
+    connect(sortFoldersFirst, SIGNAL(triggered()), this, SLOT(toggleSortFoldersFirst()));
+

     QActionGroup* sortByActionGroup = createSortByActionGroup();
     connect(sortByActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotSortTriggered(QAction*)));
 
     QActionGroup* sortByActionGroup = createSortByActionGroup();
     connect(sortByActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotSortTriggered(QAction*)));
 


@@ -154,7 +167,7 @@ void DolphinViewActionHandler::createActions()
 
     KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>("show_hidden_files");
     showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
 
     KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>("show_hidden_files");
     showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));

-    showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
+    showHiddenFiles->setShortcuts(QList<QKeySequence>() << Qt::ALT + Qt::Key_Period << Qt::Key_F8);

     connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool)));
 
     KAction* adjustViewProps = m_actionCollection->addAction("view_properties");
     connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool)));
 
     KAction* adjustViewProps = m_actionCollection->addAction("view_properties");


@@ -168,6 +181,13 @@ void DolphinViewActionHandler::createActions()
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("edit-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile()));
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("edit-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile()));

+       
+    // Settings menu
+
+    KAction* getServiceMenu = m_actionCollection->addAction("get_servicemenu");
+    getServiceMenu->setText(i18nc("@action:inmenu Settings", "Get Service Menu..."));
+    getServiceMenu->setIcon(KIcon("get-hot-new-stuff"));
+    connect(getServiceMenu, SIGNAL(triggered()), this, SLOT(slotGetServiceMenu()));

 }
 
 QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
 }
 
 QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()


@@ -250,40 +270,9 @@ QActionGroup* DolphinViewActionHandler::createSortByActionGroup()
     sortByType->setData(QVariant::fromValue(DolphinView::SortByType));
     sortByActionGroup->addAction(sortByType);
 
     sortByType->setData(QVariant::fromValue(DolphinView::SortByType));
     sortByActionGroup->addAction(sortByType);
 

-    // TODO: Hid "sort by rating" and "sort by tags" as without caching the performance
-    // is too slow currently (Nepomuk will support caching in future releases).
-    //
-    // KToggleAction* sortByRating = m_actionCollection->add<KToggleAction>("sort_by_rating");
-    // sortByRating->setData(QVariant::fromValue(DolphinView::SortByRating));
-    // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
-    // sortByActionGroup->addAction(sortByRating);
-    //
-    // KToggleAction* sortByTags = m_actionCollection->add<KToggleAction>("sort_by_tags");
-    // sortByTags->setData(QVariant::fromValue(DolphinView::SortByTags));
-    // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
-    // sortByActionGroup->addAction(sortByTags);
-    //
-#ifdef HAVE_NEPOMUK
-    // if (!MetaDataWidget::metaDataAvailable()) {
-    //     sortByRating->setEnabled(false);
-    //     sortByTags->setEnabled(false);
-    // }
-#else
-    // sortByRating->setEnabled(false);
-    // sortByTags->setEnabled(false);
-#endif
-
-
-

     return sortByActionGroup;
 }
 
     return sortByActionGroup;
 }
 

-void DolphinViewActionHandler::slotCreateDir()
-{
-    Q_ASSERT(m_currentView);
-    KonqOperations::newDir(m_currentView, m_currentView->url());
-}
-

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


@@ -340,6 +329,11 @@ QString DolphinViewActionHandler::currentViewModeActionName() const
     return QString(); // can't happen
 }
 
     return QString(); // can't happen
 }
 

+KActionCollection* DolphinViewActionHandler::actionCollection()
+{
+    return m_actionCollection;
+}
+

 void DolphinViewActionHandler::updateViewActions()
 {
     QAction* viewModeAction = m_actionCollection->action(currentViewModeActionName());
 void DolphinViewActionHandler::updateViewActions()
 {
     QAction* viewModeAction = m_actionCollection->action(currentViewModeActionName());


@@ -351,6 +345,7 @@ void DolphinViewActionHandler::updateViewActions()
     showPreviewAction->setChecked(m_currentView->showPreview());
 
     slotSortOrderChanged(m_currentView->sortOrder());
     showPreviewAction->setChecked(m_currentView->showPreview());
 
     slotSortOrderChanged(m_currentView->sortOrder());

+    slotSortFoldersFirstChanged(m_currentView->sortFoldersFirst());

     slotAdditionalInfoChanged();
     slotCategorizedSortingChanged();
     slotSortingChanged(m_currentView->sorting());
     slotAdditionalInfoChanged();
     slotCategorizedSortingChanged();
     slotSortingChanged(m_currentView->sorting());


@@ -380,6 +375,11 @@ void DolphinViewActionHandler::toggleSortOrder()
     m_currentView->toggleSortOrder();
 }
 
     m_currentView->toggleSortOrder();
 }
 

+void DolphinViewActionHandler::toggleSortFoldersFirst()
+{
+    m_currentView->toggleSortFoldersFirst();
+}
+

 void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)
 {
     QAction* descending = m_actionCollection->action("descending");
 void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)
 {
     QAction* descending = m_actionCollection->action("descending");


@@ -387,6 +387,11 @@ void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)
     descending->setChecked(sortDescending);
 }
 
     descending->setChecked(sortDescending);
 }
 

+void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst)
+{
+    m_actionCollection->action("folders_first")->setChecked(foldersFirst);
+}
+

 void DolphinViewActionHandler::toggleAdditionalInfo(QAction* action)
 {
     emit actionBeingHandled();
 void DolphinViewActionHandler::toggleAdditionalInfo(QAction* action)
 {
     emit actionBeingHandled();


@@ -427,6 +432,7 @@ KToggleAction* DolphinViewActionHandler::iconsModeAction()
 {
     KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons");
     iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
 {
     KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons");
     iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));

+    iconsView->setToolTip(i18nc("@info", "Icons view mode"));

     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
     iconsView->setIcon(KIcon("view-list-icons"));
     iconsView->setData(QVariant::fromValue(DolphinView::IconsView));
     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
     iconsView->setIcon(KIcon("view-list-icons"));
     iconsView->setData(QVariant::fromValue(DolphinView::IconsView));


@@ -437,6 +443,7 @@ KToggleAction* DolphinViewActionHandler::detailsModeAction()
 {
     KToggleAction* detailsView = m_actionCollection->add<KToggleAction>("details");
     detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
 {
     KToggleAction* detailsView = m_actionCollection->add<KToggleAction>("details");
     detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));

+    detailsView->setToolTip(i18nc("@info", "Details view mode"));

     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
     detailsView->setIcon(KIcon("view-list-details"));
     detailsView->setData(QVariant::fromValue(DolphinView::DetailsView));
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
     detailsView->setIcon(KIcon("view-list-details"));
     detailsView->setData(QVariant::fromValue(DolphinView::DetailsView));


@@ -447,6 +454,7 @@ KToggleAction* DolphinViewActionHandler::columnsModeAction()
 {
     KToggleAction* columnView = m_actionCollection->add<KToggleAction>("columns");
     columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
 {
     KToggleAction* columnView = m_actionCollection->add<KToggleAction>("columns");
     columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));

+    columnView->setToolTip(i18nc("@info", "Columns view mode"));

     columnView->setShortcut(Qt::CTRL | Qt::Key_3);
     columnView->setIcon(KIcon("view-file-columns"));
     columnView->setData(QVariant::fromValue(DolphinView::ColumnView));
     columnView->setShortcut(Qt::CTRL | Qt::Key_3);
     columnView->setIcon(KIcon("view-file-columns"));
     columnView->setData(QVariant::fromValue(DolphinView::ColumnView));


@@ -478,14 +486,6 @@ void DolphinViewActionHandler::slotSortingChanged(DolphinView::Sorting sorting)
     case DolphinView::SortByType:
         action = m_actionCollection->action("sort_by_type");
         break;
     case DolphinView::SortByType:
         action = m_actionCollection->action("sort_by_type");
         break;

-#ifdef HAVE_NEPOMUK
-    case DolphinView::SortByRating:
-        action = m_actionCollection->action("sort_by_rating");
-        break;
-    case DolphinView::SortByTags:
-        action = m_actionCollection->action("sort_by_tags");
-        break;
-#endif

     default:
         break;
     }
     default:
         break;
     }


@@ -517,8 +517,9 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action)
 void DolphinViewActionHandler::slotAdjustViewProperties()
 {
     emit actionBeingHandled();
 void DolphinViewActionHandler::slotAdjustViewProperties()
 {
     emit actionBeingHandled();

-    ViewPropertiesDialog dlg(m_currentView);
-    dlg.exec();
+    QPointer<ViewPropertiesDialog> dialog = new ViewPropertiesDialog(m_currentView);
+    dialog->exec();
+    delete dialog;

 }
 
 void DolphinViewActionHandler::slotFindFile()
 }
 
 void DolphinViewActionHandler::slotFindFile()