Use a KIO Job for applying the view properties recursively to sub directories.

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 938d41cbc5248c365d15038d754747b5655026e5..64678202a4627f778e2342e413a9e4ab998ad0d1 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -77,11 +77,12 @@
 
 
 DolphinMainWindow::DolphinMainWindow() :
-    KMainWindow(0, "Dolphin"),
+    KMainWindow(0),
     m_splitter(0),
     m_activeView(0),
     m_clipboardContainsCutData(false)
 {
+    setObjectName("Dolphin");
     m_view[PrimaryIdx] = 0;
     m_view[SecondaryIdx] = 0;
 
@@ -267,7 +268,7 @@ void DolphinMainWindow::slotShowFilterBarChanged()
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
 {
-    KAction* action = 0;
+    QAction* action = 0;
     switch (sorting) {
         case DolphinView::SortByName:
             action = actionCollection()->action("by_name");
@@ -305,7 +306,7 @@ void DolphinMainWindow::slotSelectionChanged()
         selectedUrlsCount += m_view[SecondaryIdx]->selectedUrls().count();
     }
 
-    KAction* compareFilesAction = actionCollection()->action("compare_files");
+    QAction* compareFilesAction = actionCollection()->action("compare_files");
     compareFilesAction->setEnabled(selectedUrlsCount == 2);
 
     m_activeView->updateStatusBar();
@@ -458,7 +459,7 @@ void DolphinMainWindow::createFile()
     KSortableList<CreateFileEntry, QString>::ConstIterator it = m_createFileTemplates.begin();
     KSortableList<CreateFileEntry, QString>::ConstIterator end = m_createFileTemplates.end();
 
-    const QString senderName(sender()->name());
+    const QString senderName(sender()->objectName());
     bool found = false;
     CreateFileEntry entry;
     while (!found && (it != end)) {
@@ -483,7 +484,7 @@ void DolphinMainWindow::createFile()
     QString sourcePath(entry.templatePath.left(pos + 1));
     sourcePath += KDesktopFile(entry.templatePath, true).readPathEntry("Url");
 
-    QString name(i18n(entry.name.ascii()));
+    QString name(i18n(entry.name.toAscii()));
     // Most entry names end with "..." (e. g. "HTML File..."), which is ok for
     // menus but no good choice for a new file name -> remove the dots...
     name.replace("...", QString::null);
@@ -589,20 +590,7 @@ void DolphinMainWindow::deleteItems()
 
 void DolphinMainWindow::properties()
 {
-    const KFileItemList* sourceList = m_activeView->selectedItems();
-    if (sourceList == 0) {
-        return;
-    }
-
-    KFileItemList list;
-    KFileItemList::const_iterator it = sourceList->begin();
-    const KFileItemList::const_iterator end = sourceList->end();
-    KFileItem* item = 0;
-    while (it != end) {
-        list.append(item);
-        ++it;
-    }
-
+    const KFileItemList list = m_activeView->selectedItems();
     new KPropertiesDialog(list, this);
 }
 
@@ -635,7 +623,7 @@ void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
 
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
-    KAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
+    QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
     if (undoAction != 0) {
         undoAction->setEnabled(available);
     }
@@ -643,7 +631,7 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
 
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 {
-    KAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
+    QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
     if (undoAction != 0) {
         undoAction->setText(text);
     }
@@ -651,7 +639,7 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 
 void DolphinMainWindow::slotRedoAvailable(bool available)
 {
-    KAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
+    QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
     if (redoAction != 0) {
         redoAction->setEnabled(available);
     }
@@ -659,7 +647,7 @@ void DolphinMainWindow::slotRedoAvailable(bool available)
 
 void DolphinMainWindow::slotRedoTextChanged(const QString& text)
 {
-    KAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
+    QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
     if (redoAction != 0) {
         redoAction->setText(text);
     }
@@ -730,7 +718,7 @@ void DolphinMainWindow::paste()
 
 void DolphinMainWindow::updatePasteAction()
 {
-    KAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
+    QAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
     if (pasteAction == 0) {
         return;
     }
@@ -831,12 +819,15 @@ void DolphinMainWindow::toggleSortOrder()
 void DolphinMainWindow::toggleSplitView()
 {
     if (m_view[SecondaryIdx] == 0) {
+        const int newWidth = (m_view[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2;
         // create a secondary view
         m_view[SecondaryIdx] = new DolphinView(this,
-                                               m_splitter,
+                                               0,
                                                m_view[PrimaryIdx]->url(),
                                                m_view[PrimaryIdx]->mode(),
                                                m_view[PrimaryIdx]->isShowHiddenFilesEnabled());
+        m_splitter->addWidget(m_view[SecondaryIdx]);
+        m_splitter->setSizes(QList<int>() << newWidth << newWidth);
         m_view[SecondaryIdx]->show();
     }
     else {
@@ -853,7 +844,7 @@ void DolphinMainWindow::toggleSplitView()
             // From an implementation point of view it is more efficient to close
             // the primary view and exchange the internal pointers afterwards.
             m_view[PrimaryIdx]->close();
-            m_view[PrimaryIdx]->deleteLater();
+            delete m_view[PrimaryIdx];
             m_view[PrimaryIdx] = m_view[SecondaryIdx];
             m_view[SecondaryIdx] = 0;
             setActiveView(m_view[PrimaryIdx]);
@@ -1134,6 +1125,7 @@ void DolphinMainWindow::init()
                                          homeUrl,
                                          props.viewMode(),
                                          props.isShowHiddenFilesEnabled());
+    m_view[PrimaryIdx]->show();
 
     m_activeView = m_view[PrimaryIdx];
 
@@ -1448,12 +1440,12 @@ void DolphinMainWindow::updateHistory()
     int index = 0;
     const Q3ValueList<UrlNavigator::HistoryElem> list = m_activeView->urlHistory(index);
 
-    KAction* backAction = actionCollection()->action("go_back");
+    QAction* backAction = actionCollection()->action("go_back");
     if (backAction != 0) {
         backAction->setEnabled(index < static_cast<int>(list.count()) - 1);
     }
 
-    KAction* forwardAction = actionCollection()->action("go_forward");
+    QAction* forwardAction = actionCollection()->action("go_forward");
     if (forwardAction != 0) {
         forwardAction->setEnabled(index > 0);
     }
@@ -1461,22 +1453,22 @@ void DolphinMainWindow::updateHistory()
 
 void DolphinMainWindow::updateEditActions()
 {
-    const KFileItemList* list = m_activeView->selectedItems();
-    if ((list == 0) || (*list).isEmpty()) {
+    const KFileItemList list = m_activeView->selectedItems();
+    if (list.isEmpty()) {
         stateChanged("has_no_selection");
     }
     else {
         stateChanged("has_selection");
 
-        KAction* renameAction = actionCollection()->action("rename");
+        QAction* renameAction = actionCollection()->action("rename");
         if (renameAction != 0) {
-            renameAction->setEnabled(list->count() >= 1);
+            renameAction->setEnabled(list.count() >= 1);
         }
 
         bool enableMoveToTrash = true;
 
-        KFileItemList::const_iterator it = list->begin();
-        const KFileItemList::const_iterator end = list->end();
+        KFileItemList::const_iterator it = list.begin();
+        const KFileItemList::const_iterator end = list.end();
         while (it != end) {
             KFileItem* item = *it;
             const KUrl& url = item->url();
@@ -1487,7 +1479,7 @@ void DolphinMainWindow::updateEditActions()
             ++it;
         }
 
-        KAction* moveToTrashAction = actionCollection()->action("move_to_trash");
+        QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
         moveToTrashAction->setEnabled(enableMoveToTrash);
     }
     updatePasteAction();
@@ -1495,17 +1487,17 @@ void DolphinMainWindow::updateEditActions()
 
 void DolphinMainWindow::updateViewActions()
 {
-    KAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn));
+    QAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn));
     if (zoomInAction != 0) {
         zoomInAction->setEnabled(m_activeView->isZoomInPossible());
     }
 
-    KAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut));
+    QAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut));
     if (zoomOutAction != 0) {
         zoomOutAction->setEnabled(m_activeView->isZoomOutPossible());
     }
 
-    KAction* action = 0;
+    QAction* action = 0;
     switch (m_activeView->mode()) {
         case DolphinView::IconsView:
             action = actionCollection()->action("icons");
@@ -1542,7 +1534,7 @@ void DolphinMainWindow::updateViewActions()
 
 void DolphinMainWindow::updateGoActions()
 {
-    KAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up));
+    QAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up));
     const KUrl& currentUrl = m_activeView->url();
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
@@ -1605,15 +1597,25 @@ void DolphinMainWindow::clearStatusBar()
 void DolphinMainWindow::setupDockWidgets()
 {
     QDockWidget *shortcutsDock = new QDockWidget(i18n("Shortcuts"));
+
     shortcutsDock->setObjectName("shortcutsDock");
-    shortcutsDock->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
     shortcutsDock->setWidget(new BookmarksSidebarPage(this));
+
+    shortcutsDock->toggleViewAction()->setObjectName("show_shortcuts_pane");
+    shortcutsDock->toggleViewAction()->setText(i18n("Show Shortcuts Panel"));
+    actionCollection()->insert(shortcutsDock->toggleViewAction());
+
     addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock);
 
     QDockWidget *infoDock = new QDockWidget(i18n("Information"));
+
     infoDock->setObjectName("infoDock");
-    infoDock->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
     infoDock->setWidget(new InfoSidebarPage(this));
+
+    infoDock->toggleViewAction()->setObjectName("show_info_pane");
+    infoDock->toggleViewAction()->setText(i18n("Show Information Panel"));
+    actionCollection()->insert(infoDock->toggleViewAction());
+
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
 }