Use non-deprecated method, avoids conversion KDateTime->time_t->KDateTime.

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 46a80629b6bc1a416dffee7a3e1a33b7f9f8d2f9..2e376bc68f6995a738e73f57cc19a9e0895e0e7b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -60,6 +60,7 @@
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <konqmimedata.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <konqmimedata.h>

+#include <konq_operations.h>

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


@@ -69,11 +70,13 @@
 #include <kstatusbar.h>
 #include <kstandardaction.h>
 #include <kurl.h>
 #include <kstatusbar.h>
 #include <kstandardaction.h>
 #include <kurl.h>

+#include <kurlcombobox.h>

 
 

-#include <QtGui/QKeyEvent>
-#include <QtGui/QClipboard>
-#include <QtGui/QSplitter>
-#include <QtGui/QDockWidget>
+#include <QKeyEvent>
+#include <QClipboard>
+#include <QLineEdit>
+#include <QSplitter>
+#include <QDockWidget>

 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),


@@ -271,9 +274,8 @@ void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::Information
 
     const DolphinView* view = m_activeViewContainer->view();
 
 
     const DolphinView* view = m_activeViewContainer->view();
 

-    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();

     const bool enable = (view->mode() == DolphinView::DetailsView) ||
     const bool enable = (view->mode() == DolphinView::DetailsView) ||

-                         ((view->mode() == DolphinView::IconsView) && settings->showAdditionalInfo());
+                        (view->mode() == DolphinView::IconsView);

 
     showSizeInfo->setEnabled(enable);
     showDateInfo->setEnabled(enable);
 
     showSizeInfo->setEnabled(enable);
     showDateInfo->setEnabled(enable);


@@ -319,7 +321,12 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");

-    compareFilesAction->setEnabled(selectedUrlsCount == 2);
+    if (selectedUrlsCount == 2) {
+        const bool kompareInstalled = !KGlobal::dirs()->findExe("kompare").isEmpty();
+        compareFilesAction->setEnabled(selectedUrlsCount == 2 && kompareInstalled);
+    } else {
+        compareFilesAction->setEnabled(false);
+    }

 
     m_activeViewContainer->updateStatusBar();
 
 
     m_activeViewContainer->updateStatusBar();
 


@@ -416,6 +423,12 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
     }
 }
 
     }
 }
 

+void DolphinMainWindow::createDir()
+{
+    const KUrl& url = m_activeViewContainer->view()->url();
+    KonqOperations::newDir(this, url);
+}
+

 void DolphinMainWindow::updateNewMenu()
 {
     m_newMenu->slotCheckUpToDate();
 void DolphinMainWindow::updateNewMenu()
 {
     m_newMenu->slotCheckUpToDate();


@@ -559,7 +572,19 @@ void DolphinMainWindow::updatePasteAction()
 void DolphinMainWindow::selectAll()
 {
     clearStatusBar();
 void DolphinMainWindow::selectAll()
 {
     clearStatusBar();

-    m_activeViewContainer->view()->selectAll();
+
+    // if the URL navigator is editable and focused, select the whole
+    // URL instead of all items of the view
+
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    QLineEdit* lineEdit = urlNavigator->editor()->lineEdit();
+    const bool selectUrl = urlNavigator->isUrlEditable() &&
+                           lineEdit->hasFocus();
+    if (selectUrl) {
+        lineEdit->selectAll();
+    } else {
+        m_activeViewContainer->view()->selectAll();
+    }

 }
 
 void DolphinMainWindow::invertSelection()
 }
 
 void DolphinMainWindow::invertSelection()


@@ -625,11 +650,7 @@ void DolphinMainWindow::sortByTags()
 
 void DolphinMainWindow::toggleSortOrder()
 {
 
 void DolphinMainWindow::toggleSortOrder()
 {

-    DolphinView* view = m_activeViewContainer->view();
-    const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ?
-                                Qt::DescendingOrder :
-                                Qt::AscendingOrder;
-    view->setSortOrder(order);
+    m_activeViewContainer->view()->toggleSortOrder();

 }
 
 void DolphinMainWindow::toggleSortCategorization()
 }
 
 void DolphinMainWindow::toggleSortCategorization()


@@ -967,6 +988,9 @@ void DolphinMainWindow::setupActions()
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 

+    KAction* newDirAction = DolphinView::createNewDirAction(actionCollection());
+    connect(newDirAction, SIGNAL(triggered()), SLOT(createDir()));
+

     KAction* newWindow = actionCollection()->addAction("new_window");
     newWindow->setIcon(KIcon("window-new"));
     newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
     KAction* newWindow = actionCollection()->addAction("new_window");
     newWindow->setIcon(KIcon("window-new"));
     newWindow->setText(i18nc("@action:inmenu File", "New &Window"));


@@ -994,8 +1018,8 @@ void DolphinMainWindow::setupActions()
                           SLOT(undo()),
                           actionCollection());
 
                           SLOT(undo()),
                           actionCollection());
 

-    //Need to remove shift+del from cut action, else the shortcut for deletejob
-    //doesn't work
+    // need to remove shift+del from cut action, else the shortcut for deletejob
+    // doesn't work

     KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KShortcut cutShortcut = cut->shortcut();
     cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
     KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KShortcut cutShortcut = cut->shortcut();
     cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);


@@ -1022,7 +1046,6 @@ void DolphinMainWindow::setupActions()
                              SLOT(zoomOut()),
                              actionCollection());
 
                              SLOT(zoomOut()),
                              actionCollection());
 

-

     KToggleAction* iconsView = DolphinView::iconsModeAction(actionCollection());
     KToggleAction* detailsView = DolphinView::detailsModeAction(actionCollection());
     KToggleAction* columnView = DolphinView::columnsModeAction(actionCollection());
     KToggleAction* iconsView = DolphinView::iconsModeAction(actionCollection());
     KToggleAction* detailsView = DolphinView::detailsModeAction(actionCollection());
     KToggleAction* columnView = DolphinView::columnsModeAction(actionCollection());


@@ -1098,8 +1121,7 @@ void DolphinMainWindow::setupActions()
     //sortGroup->addAction(sortByRating);
     //sortGroup->addAction(sortByTags);
 
     //sortGroup->addAction(sortByRating);
     //sortGroup->addAction(sortByTags);
 

-    KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
-    sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
+    KAction* sortDescending = DolphinView::createSortDescendingAction(actionCollection());

     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 
     KToggleAction* showInGroups = actionCollection()->add<KToggleAction>("show_in_groups");
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 
     KToggleAction* showInGroups = actionCollection()->add<KToggleAction>("show_in_groups");


@@ -1132,7 +1154,7 @@ void DolphinMainWindow::setupActions()
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));

-    showPreview->setIcon(KIcon("fileview-preview"));
+    showPreview->setIcon(KIcon("view-preview"));

     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");


@@ -1141,7 +1163,7 @@ void DolphinMainWindow::setupActions()
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     KAction* split = actionCollection()->addAction("split_view");
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     KAction* split = actionCollection()->addAction("split_view");

-    split->setShortcut(Qt::Key_F10);
+    split->setShortcut(Qt::Key_F3);

     updateSplitAction();
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     updateSplitAction();
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 


@@ -1255,6 +1277,8 @@ void DolphinMainWindow::setupDockWidgets()
     SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
     terminalDock->setWidget(terminalWidget);
 
     SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
     terminalDock->setWidget(terminalWidget);
 

+    connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
+

     terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
     terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
     terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
     terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());


@@ -1436,14 +1460,14 @@ void DolphinMainWindow::updateSplitAction()
     if (m_viewContainer[SecondaryView] != 0) {
         if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
     if (m_viewContainer[SecondaryView] != 0) {
         if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));

-            splitAction->setIcon(KIcon("fileview-close-right"));
+            splitAction->setIcon(KIcon("view-right-close"));

         } else {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));

-            splitAction->setIcon(KIcon("fileview-close-left"));
+            splitAction->setIcon(KIcon("view-left-close"));

         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));

-        splitAction->setIcon(KIcon("fileview-split"));
+        splitAction->setIcon(KIcon("view-right-new"));

     }
 }
 
     }
 }