X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d52282f8a2a727ad332d4cceeeaa6b79af9267c1..abf8f1917d1ef044cf732eb873ce28bf805f27af:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index eae9ca31a..262bc8558 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -24,6 +24,7 @@
 #include <assert.h>
 
 #include "dolphinapplication.h"
+#include "dolphinnewmenu.h"
 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"
@@ -47,12 +48,12 @@
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
+#include <kio/deletejob.h>
 #include <kio/renamedialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenu.h>
 #include <kmessagebox.h>
-#include <knewmenu.h>
 #include <konqmimedata.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
@@ -255,6 +256,15 @@ void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
         case DolphinView::SortByDate:
             action = actionCollection()->action("by_date");
             break;
+        case DolphinView::SortByPermissions:
+            action = actionCollection()->action("by_permissions");
+            break;
+        case DolphinView::SortByOwner:
+            action = actionCollection()->action("by_owner");
+            break;
+        case DolphinView::SortByGroup:
+            action = actionCollection()->action("by_group");
+            break;
         default:
             break;
     }
@@ -324,7 +334,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
     // TODO: I assume there will be a generic way in KDE 4 to store the docks
     // of the main window. In the meantime they are stored manually:
-    QString filename = KStandardDirs::locateLocal("data", KGlobal::instance()->instanceName());
+    QString filename = KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName());
     filename.append("/panels_layout");
     QFile file(filename);
     if (file.open(QIODevice::WriteOnly)) {
@@ -488,6 +498,12 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
     }
 }
 
+void DolphinMainWindow::undo()
+{
+    clearStatusBar();
+    KonqUndoManager::self()->undo();
+}
+
 void DolphinMainWindow::cut()
 {
     QMimeData* mimeData = new QMimeData();
@@ -628,6 +644,21 @@ void DolphinMainWindow::sortByDate()
     m_activeView->setSorting(DolphinView::SortByDate);
 }
 
+void DolphinMainWindow::sortByPermissions()
+{
+    m_activeView->setSorting(DolphinView::SortByPermissions);
+}
+
+void DolphinMainWindow::sortByOwner()
+{
+    m_activeView->setSorting(DolphinView::SortByOwner);
+}
+
+void DolphinMainWindow::sortByGroup()
+{
+    m_activeView->setSorting(DolphinView::SortByGroup);
+}
+
 void DolphinMainWindow::toggleSortOrder()
 {
     const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::Ascending) ?
@@ -924,8 +955,7 @@ void DolphinMainWindow::loadSettings()
     // TODO: I assume there will be a generic way in KDE 4 to restore the docks
     // of the main window. In the meantime they are restored manually (see also
     // DolphinMainWindow::closeEvent() for more details):
-    QString filename = KStandardDirs::locateLocal("data", KGlobal::instance()->instanceName());
-    filename.append("/panels_layout");
+    QString filename = KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName());   filename.append("/panels_layout");
     QFile file(filename);
     if (file.open(QIODevice::ReadOnly)) {
         QByteArray data = file.readAll();
@@ -937,7 +967,7 @@ void DolphinMainWindow::loadSettings()
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
-    m_newMenu = new KNewMenu(actionCollection(), this, "create_new");
+    m_newMenu = new DolphinNewMenu(this);
     KMenu* menu = m_newMenu->menu();
     menu->setTitle(i18n("Create New..."));
     menu->setIcon(SmallIcon("filenew"));
@@ -974,7 +1004,7 @@ void DolphinMainWindow::setupActions()
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
     // setup 'Edit' menu
-    KStandardAction::undo(KonqUndoManager::self(),
+    KStandardAction::undo(this,
                           SLOT(undo()),
                           actionCollection());
 
@@ -1029,10 +1059,25 @@ void DolphinMainWindow::setupActions()
     sortByDate->setText(i18n("By Date"));
     connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate()));
 
+    KToggleAction* sortByPermissions = actionCollection()->add<KToggleAction>("by_permissions");
+    sortByPermissions->setText(i18n("By Permissions"));
+    connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions()));
+
+    KToggleAction* sortByOwner = actionCollection()->add<KToggleAction>("by_owner");
+    sortByOwner->setText(i18n("By Owner"));
+    connect(sortByOwner, SIGNAL(triggered()), this, SLOT(sortByOwner()));
+
+    KToggleAction* sortByGroup = actionCollection()->add<KToggleAction>("by_group");
+    sortByGroup->setText(i18n("By Group"));
+    connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup()));
+
     QActionGroup* sortGroup = new QActionGroup(this);
     sortGroup->addAction(sortByName);
     sortGroup->addAction(sortBySize);
     sortGroup->addAction(sortByDate);
+    sortGroup->addAction(sortByPermissions);
+    sortGroup->addAction(sortByOwner);
+    sortGroup->addAction(sortByGroup);
 
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
     sortDescending->setText(i18n("Descending"));