X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8d4fb3608927960d9e45e672ce1cbe1fa3a548f9..1ab719d490d467218d65f2b03b3ec0ec717515b5:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 74869e967..13406a6b5 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -41,6 +41,7 @@ #include "kfileplacesview.h" #include "dolphin_generalsettings.h" +#include "dolphin_iconsmodesettings.h" #include #include @@ -52,11 +53,10 @@ #include #include #include -#include -#include #include #include #include +#include #include #include #include @@ -78,6 +78,7 @@ DolphinMainWindow::DolphinMainWindow(int id) : KXmlGuiWindow(0), m_newMenu(0), + m_showMenuBar(0), m_splitter(0), m_activeViewContainer(0), m_id(id) @@ -89,9 +90,9 @@ DolphinMainWindow::DolphinMainWindow(int id) : new MainWindowAdaptor(this); QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this); - KonqUndoManager::incRef(); + KonqFileUndoManager::incRef(); - KonqUndoManager* undoManager = KonqUndoManager::self(); + KonqFileUndoManager* undoManager = KonqFileUndoManager::self(); undoManager->setUiInterface(new UndoUiInterface(this)); connect(undoManager, SIGNAL(undoAvailable(bool)), @@ -104,7 +105,7 @@ DolphinMainWindow::DolphinMainWindow(int id) : DolphinMainWindow::~DolphinMainWindow() { - KonqUndoManager::decRef(); + KonqFileUndoManager::decRef(); DolphinApplication::app()->removeMainWindow(this); } @@ -123,11 +124,10 @@ void DolphinMainWindow::toggleViews() m_viewContainer[SecondaryView] = container; } -void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl) +void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType commandType) { clearStatusBar(); - KonqOperations::rename(this, oldUrl, newUrl); - m_undoCommandTypes.append(KonqUndoManager::RENAME); + m_undoCommandTypes.append(commandType); } void DolphinMainWindow::refreshViews() @@ -178,7 +178,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, QString seq = QKeySequence(Qt::ShiftModifier).toString(); seq.chop(1); // chop superfluous '+' - QAction* moveAction = popup.addAction(KIcon("goto-page"), + QAction* moveAction = popup.addAction(KIcon("go-jump"), i18nc("@action:inmenu", "&Move Here\t%1", seq)); @@ -190,7 +190,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString(); seq.chop(1); - QAction* linkAction = popup.addAction(KIcon("www"), + QAction* linkAction = popup.addAction(KIcon("insert-link"), i18nc("@action:inmenu", "&Link Here\t%1", seq)); @@ -211,15 +211,18 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, switch (action) { case Qt::MoveAction: - moveUrls(urls, destination); + KonqOperations::copy(this, KonqOperations::MOVE, urls, destination); + m_undoCommandTypes.append(KonqFileUndoManager::MOVE); break; case Qt::CopyAction: - copyUrls(urls, destination); + KonqOperations::copy(this, KonqOperations::COPY, urls, destination); + m_undoCommandTypes.append(KonqFileUndoManager::COPY); break; case Qt::LinkAction: - linkUrls(urls, destination); + KonqOperations::copy(this, KonqOperations::LINK, urls, destination); + m_undoCommandTypes.append(KonqFileUndoManager::LINK); break; default: @@ -326,32 +329,53 @@ void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order) void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list) { - QAction* showMimeInfo = actionCollection()->action("show_mime_info"); QAction* showSizeInfo = actionCollection()->action("show_size_info"); QAction* showDateInfo = actionCollection()->action("show_date_info"); + QAction* showPermissionsInfo = actionCollection()->action("show_permissions_info"); + QAction* showOwnerInfo = actionCollection()->action("show_owner_info"); + QAction* showGroupInfo = actionCollection()->action("show_group_info"); + QAction* showMimeInfo = actionCollection()->action("show_mime_info"); - showMimeInfo->setChecked(false); showSizeInfo->setChecked(false); showDateInfo->setChecked(false); + showPermissionsInfo->setChecked(false); + showOwnerInfo->setChecked(false); + showGroupInfo->setChecked(false); + showMimeInfo->setChecked(false); const DolphinView* view = m_activeViewContainer->view(); - // currently only the icons view supports additional information - const bool enable = (view->mode() == DolphinView::IconsView); - showMimeInfo->setEnabled(enable); + + const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); + const bool enable = (view->mode() == DolphinView::DetailsView) || + ((view->mode() == DolphinView::IconsView) && settings->showAdditionalInfo()); + showSizeInfo->setEnabled(enable); showDateInfo->setEnabled(enable); + showPermissionsInfo->setEnabled(enable); + showOwnerInfo->setEnabled(enable); + showGroupInfo->setEnabled(enable); + showMimeInfo->setEnabled(enable); foreach (KFileItemDelegate::Information info, list) { switch (info) { - case KFileItemDelegate::FriendlyMimeType: - showMimeInfo->setChecked(true); - break; case KFileItemDelegate::Size: showSizeInfo->setChecked(true); break; case KFileItemDelegate::ModificationTime: showDateInfo->setChecked(true); break; + case KFileItemDelegate::Permissions: + showPermissionsInfo->setChecked(true); + break; + case KFileItemDelegate::Owner: + showOwnerInfo->setChecked(true); + break; + case KFileItemDelegate::OwnerAndGroup: + showGroupInfo->setChecked(true); + break; + case KFileItemDelegate::FriendlyMimeType: + showMimeInfo->setChecked(true); + break; default: break; } @@ -424,34 +448,44 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) KXmlGuiWindow::closeEvent(event); } -void DolphinMainWindow::saveProperties(KConfig* config) +void DolphinMainWindow::saveProperties(KConfigGroup& group) { - KConfigGroup primaryView = config->group("Primary view"); - primaryView.writeEntry("Url", m_viewContainer[PrimaryView]->url().url()); - primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryView]->isUrlEditable()); - if (m_viewContainer[SecondaryView] != 0) { - KConfigGroup secondaryView = config->group("Secondary view"); - secondaryView.writeEntry("Url", m_viewContainer[SecondaryView]->url().url()); - secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryView]->isUrlEditable()); + DolphinViewContainer* cont = m_viewContainer[PrimaryView]; + group.writeEntry("Primary Url", cont->url().url()); + group.writeEntry("Primary Editable Url", cont->isUrlEditable()); + + cont = m_viewContainer[SecondaryView]; + if (cont != 0) { + group.writeEntry("Secondary Url", cont->url().url()); + group.writeEntry("Secondary Editable Url", cont->isUrlEditable()); } } -void DolphinMainWindow::readProperties(KConfig* config) +void DolphinMainWindow::readProperties(const KConfigGroup& group) { - const KConfigGroup primaryViewGroup = config->group("Primary view"); - m_viewContainer[PrimaryView]->setUrl(primaryViewGroup.readEntry("Url")); - bool editable = primaryViewGroup.readEntry("Editable Url", false); - m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable); + DolphinViewContainer* cont = m_viewContainer[PrimaryView]; + + cont->setUrl(group.readEntry("Primary Url")); + bool editable = group.readEntry("Primary Editable Url", false); + cont->urlNavigator()->setUrlEditable(editable); - if (config->hasGroup("Secondary view")) { - const KConfigGroup secondaryViewGroup = config->group("Secondary view"); - if (m_viewContainer[PrimaryView] == 0) { + cont = m_viewContainer[SecondaryView]; + const QString secondaryUrl = group.readEntry("Secondary Url"); + if (!secondaryUrl.isEmpty()) { + if (cont == 0) { + // a secondary view should be shown, but no one is available + // currently -> create a new view toggleSplitView(); + cont = m_viewContainer[SecondaryView]; + Q_ASSERT(cont != 0); } - m_viewContainer[PrimaryView]->setUrl(secondaryViewGroup.readEntry("Url")); - editable = secondaryViewGroup.readEntry("Editable Url", false); - m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable); - } else if (m_viewContainer[SecondaryView] != 0) { + + cont->setUrl(secondaryUrl); + bool editable = group.readEntry("Secondary Editable Url", false); + cont->urlNavigator()->setUrlEditable(editable); + } else if (cont != 0) { + // no secondary view should be shown, but the default setting shows + // one already -> close the view toggleSplitView(); } } @@ -465,42 +499,37 @@ void DolphinMainWindow::updateNewMenu() void DolphinMainWindow::rename() { clearStatusBar(); - m_activeViewContainer->renameSelectedItems(); + m_activeViewContainer->view()->renameSelectedItems(); } void DolphinMainWindow::moveToTrash() { clearStatusBar(); - const KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls(); - KonqOperations::del(this, KonqOperations::TRASH, selectedUrls); - m_undoCommandTypes.append(KonqUndoManager::TRASH); + + DolphinView* view = m_activeViewContainer->view(); + + if (QApplication::keyboardModifiers() & Qt::ShiftModifier) { + view->deleteSelectedItems(); + } else { + view->trashSelectedItems(); + } } void DolphinMainWindow::deleteItems() { clearStatusBar(); - - const KUrl::List list = m_activeViewContainer->view()->selectedUrls(); - const bool del = KonqOperations::askDeleteConfirmation(list, - KonqOperations::DEL, - KonqOperations::DEFAULT_CONFIRMATION, - this); - - if (del) { - KIO::Job* job = KIO::del(list); - connect(job, SIGNAL(result(KJob*)), - this, SLOT(slotHandleJobError(KJob*))); - connect(job, SIGNAL(result(KJob*)), - this, SLOT(slotDeleteFileFinished(KJob*))); - } + m_activeViewContainer->view()->deleteSelectedItems(); } void DolphinMainWindow::properties() { const KFileItemList list = m_activeViewContainer->view()->selectedItems(); - KPropertiesDialog dialog(list, this); - dialog.exec(); + KPropertiesDialog *dialog = new KPropertiesDialog(list, this); + dialog->setAttribute(Qt::WA_DeleteOnClose); + dialog->show(); + dialog->raise(); + dialog->activateWindow(); } void DolphinMainWindow::quit() @@ -516,24 +545,6 @@ void DolphinMainWindow::slotHandlePlacesError(const QString &message) } } -void DolphinMainWindow::slotHandleJobError(KJob* job) -{ - if (job->error() != 0) { - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - statusBar->setMessage(job->errorString(), - DolphinStatusBar::Error); - } -} - -void DolphinMainWindow::slotDeleteFileFinished(KJob* job) -{ - if (job->error() == 0) { - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - statusBar->setMessage(i18nc("@info:status", "Delete operation completed."), - DolphinStatusBar::OperationCompleted); - } -} - void DolphinMainWindow::slotUndoAvailable(bool available) { QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo)); @@ -542,31 +553,31 @@ void DolphinMainWindow::slotUndoAvailable(bool available) } if (available && (m_undoCommandTypes.count() > 0)) { - const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst(); + const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst(); DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); switch (command) { - case KonqUndoManager::COPY: + case KonqFileUndoManager::COPY: statusBar->setMessage(i18nc("@info:status", "Copy operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqUndoManager::MOVE: + case KonqFileUndoManager::MOVE: statusBar->setMessage(i18nc("@info:status", "Move operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqUndoManager::LINK: + case KonqFileUndoManager::LINK: statusBar->setMessage(i18nc("@info:status", "Link operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqUndoManager::TRASH: + case KonqFileUndoManager::TRASH: statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqUndoManager::RENAME: + case KonqFileUndoManager::RENAME: statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqUndoManager::MKDIR: + case KonqFileUndoManager::MKDIR: statusBar->setMessage(i18nc("@info:status", "Created folder."), DolphinStatusBar::OperationCompleted); break; @@ -589,60 +600,22 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text) void DolphinMainWindow::undo() { clearStatusBar(); - KonqUndoManager::self()->undo(); + KonqFileUndoManager::self()->undo(); } void DolphinMainWindow::cut() { - QMimeData* mimeData = new QMimeData(); - const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls(); - const KUrl::List mostLocalUrls; - KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true); - QApplication::clipboard()->setMimeData(mimeData); + m_activeViewContainer->view()->cutSelectedItems(); } void DolphinMainWindow::copy() { - QMimeData* mimeData = new QMimeData(); - const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls(); - const KUrl::List mostLocalUrls; - KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false); - - QApplication::clipboard()->setMimeData(mimeData); + m_activeViewContainer->view()->copySelectedItems(); } void DolphinMainWindow::paste() { - QClipboard* clipboard = QApplication::clipboard(); - const QMimeData* mimeData = clipboard->mimeData(); - - clearStatusBar(); - - const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData); - - // per default the pasting is done into the current Url of the view - KUrl destUrl(m_activeViewContainer->url()); - - // check whether the pasting should be done into a selected directory - KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls(); - if (selectedUrls.count() == 1) { - const KFileItem fileItem(S_IFDIR, - KFileItem::Unknown, - selectedUrls.first(), - true); - if (fileItem.isDir()) { - // only one item is selected which is a directory, hence paste - // into this directory - destUrl = selectedUrls.first(); - } - } - - if (KonqMimeData::decodeIsCutSelection(mimeData)) { - moveUrls(sourceUrls, destUrl); - clipboard->clear(); - } else { - copyUrls(sourceUrls, destUrl); - } + m_activeViewContainer->view()->paste(); } void DolphinMainWindow::updatePasteAction() @@ -652,39 +625,9 @@ void DolphinMainWindow::updatePasteAction() return; } - QString text(i18nc("@action:inmenu", "Paste")); - QClipboard* clipboard = QApplication::clipboard(); - const QMimeData* mimeData = clipboard->mimeData(); - - KUrl::List urls = KUrl::List::fromMimeData(mimeData); - if (!urls.isEmpty()) { - pasteAction->setEnabled(true); - - pasteAction->setText(i18ncp("@action:inmenu", "Paste One File", "Paste %1 Files", urls.count())); - } else { - pasteAction->setEnabled(false); - pasteAction->setText(i18nc("@action:inmenu", "Paste")); - } - - if (pasteAction->isEnabled()) { - KUrl::List urls = m_activeViewContainer->view()->selectedUrls(); - const uint count = urls.count(); - if (count > 1) { - // pasting should not be allowed when more than one file - // is selected - pasteAction->setEnabled(false); - } else if (count == 1) { - // Only one file is selected. Pasting is only allowed if this - // file is a directory. - // TODO: this doesn't work with remote protocols; instead we need a - // m_activeViewContainer->selectedFileItems() to get the real KFileItems - const KFileItem fileItem(S_IFDIR, - KFileItem::Unknown, - urls.first(), - true); - pasteAction->setEnabled(fileItem.isDir()); - } - } + QPair pasteInfo = m_activeViewContainer->view()->pasteInfo(); + pasteAction->setEnabled(pasteInfo.first); + pasteAction->setText(pasteInfo.second); } void DolphinMainWindow::selectAll() @@ -770,11 +713,6 @@ void DolphinMainWindow::toggleSortCategorization() view->setCategorizedSorting(!categorizedSorting); } -void DolphinMainWindow::toggleMimeInfo() -{ - toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType); -} - void DolphinMainWindow::toggleSizeInfo() { toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size); @@ -785,6 +723,26 @@ void DolphinMainWindow::toggleDateInfo() toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime); } +void DolphinMainWindow::togglePermissionsInfo() +{ + toggleAdditionalInfo("show_permissions_info", KFileItemDelegate::Permissions); +} + +void DolphinMainWindow::toggleOwnerInfo() +{ + toggleAdditionalInfo("show_owner_info", KFileItemDelegate::Owner); +} + +void DolphinMainWindow::toggleGroupInfo() +{ + toggleAdditionalInfo("show_group_info", KFileItemDelegate::OwnerAndGroup); +} + +void DolphinMainWindow::toggleMimeInfo() +{ + toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType); +} + void DolphinMainWindow::toggleSplitView() { if (m_viewContainer[SecondaryView] == 0) { @@ -883,7 +841,9 @@ void DolphinMainWindow::toggleEditLocation() void DolphinMainWindow::editLocation() { - m_activeViewContainer->urlNavigator()->setUrlEditable(true); + KUrlNavigator* navigator = m_activeViewContainer->urlNavigator(); + navigator->setUrlEditable(true); + navigator->setFocus(); } void DolphinMainWindow::adjustViewProperties() @@ -977,6 +937,12 @@ void DolphinMainWindow::compareFiles() } +void DolphinMainWindow::toggleShowMenuBar() +{ + const bool visible = menuBar()->isVisible(); + menuBar()->setVisible(!visible); +} + void DolphinMainWindow::editSettings() { DolphinSettingsDialog dialog(this); @@ -1037,14 +1003,6 @@ void DolphinMainWindow::init() // assure a proper default size if Dolphin runs the first time resize(700, 500); } -#ifdef HAVE_NEPOMUK - if (!MetaDataWidget::metaDataAvailable()) { - DolphinStatusBar* statusBar = activeViewContainer()->statusBar(); - statusBar->setMessage(i18nc("@info:status", - "Failed to contact Nepomuk service, annotation and tagging are disabled."), - DolphinStatusBar::Error); - } -#endif emit urlChanged(homeUrl); } @@ -1083,30 +1041,22 @@ void DolphinMainWindow::setupActions() connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateNewMenu())); - QAction* newWindow = actionCollection()->addAction("new_window"); + KAction* newWindow = actionCollection()->addAction("new_window"); newWindow->setIcon(KIcon("window-new")); newWindow->setText(i18nc("@action:inmenu File", "New &Window")); newWindow->setShortcut(Qt::CTRL | Qt::Key_N); connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow())); - QAction* rename = actionCollection()->addAction("rename"); - rename->setText(i18nc("@action:inmenu File", "Rename...")); - rename->setShortcut(Qt::Key_F2); + KAction* rename = DolphinView::createRenameAction(actionCollection()); connect(rename, SIGNAL(triggered()), this, SLOT(rename())); - QAction* moveToTrash = actionCollection()->addAction("move_to_trash"); - moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash")); - moveToTrash->setIcon(KIcon("edit-trash")); - moveToTrash->setShortcut(QKeySequence::Delete); + KAction* moveToTrash = DolphinView::createMoveToTrashAction(actionCollection()); connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash())); - QAction* deleteAction = actionCollection()->addAction("delete"); - deleteAction->setText(i18nc("@action:inmenu File", "Delete")); - deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); - deleteAction->setIcon(KIcon("edit-delete")); + KAction* deleteAction = DolphinView::createDeleteAction(actionCollection()); connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems())); - QAction* properties = actionCollection()->addAction("properties"); + KAction* properties = actionCollection()->addAction("properties"); properties->setText(i18nc("@action:inmenu File", "Properties")); properties->setShortcut(Qt::ALT | Qt::Key_Return); connect(properties, SIGNAL(triggered()), this, SLOT(properties())); @@ -1118,16 +1068,21 @@ void DolphinMainWindow::setupActions() SLOT(undo()), actionCollection()); - KStandardAction::cut(this, SLOT(cut()), actionCollection()); + //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); + cut->setShortcut(cutShortcut); KStandardAction::copy(this, SLOT(copy()), actionCollection()); KStandardAction::paste(this, SLOT(paste()), actionCollection()); - QAction* selectAll = actionCollection()->addAction("select_all"); + KAction* selectAll = actionCollection()->addAction("select_all"); selectAll->setText(i18nc("@action:inmenu Edit", "Select All")); selectAll->setShortcut(Qt::CTRL + Qt::Key_A); connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll())); - QAction* invertSelection = actionCollection()->addAction("invert_selection"); + KAction* invertSelection = actionCollection()->addAction("invert_selection"); invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection")); invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A); connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection())); @@ -1180,24 +1135,27 @@ void DolphinMainWindow::setupActions() sortByType->setText(i18nc("@action:inmenu Sort By", "Type")); connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType())); - KToggleAction* sortByRating = actionCollection()->add("sort_by_rating"); - sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating")); - - KToggleAction* sortByTags = actionCollection()->add("sort_by_tags"); - sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags")); - + // TODO: Hided "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 = actionCollection()->add("sort_by_rating"); + // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating")); + // + // KToggleAction* sortByTags = actionCollection()->add("sort_by_tags"); + // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags")); + // #ifdef HAVE_NEPOMUK - if (MetaDataWidget::metaDataAvailable()) { - connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating())); - connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags())); - } - else { - sortByRating->setEnabled(false); - sortByTags->setEnabled(false); - } + // if (MetaDataWidget::metaDataAvailable()) { + // connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating())); + // connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags())); + // } + // else { + // sortByRating->setEnabled(false); + // sortByTags->setEnabled(false); + // } #else - sortByRating->setEnabled(false); - sortByTags->setEnabled(false); + // sortByRating->setEnabled(false); + // sortByTags->setEnabled(false); #endif QActionGroup* sortGroup = new QActionGroup(this); @@ -1208,8 +1166,11 @@ void DolphinMainWindow::setupActions() sortGroup->addAction(sortByOwner); sortGroup->addAction(sortByGroup); sortGroup->addAction(sortByType); - sortGroup->addAction(sortByRating); - sortGroup->addAction(sortByTags); + + // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance + // is too slow currently (Nepomuk will support caching in future releases). + //sortGroup->addAction(sortByRating); + //sortGroup->addAction(sortByTags); KToggleAction* sortDescending = actionCollection()->add("descending"); sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); @@ -1219,10 +1180,6 @@ void DolphinMainWindow::setupActions() showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization())); - KToggleAction* showMimeInfo = actionCollection()->add("show_mime_info"); - showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type")); - connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo())); - KToggleAction* showSizeInfo = actionCollection()->add("show_size_info"); showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size")); connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo())); @@ -1231,6 +1188,22 @@ void DolphinMainWindow::setupActions() showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date")); connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo())); + KToggleAction* showPermissionsInfo = actionCollection()->add("show_permissions_info"); + showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions")); + connect(showPermissionsInfo, SIGNAL(triggered()), this, SLOT(togglePermissionsInfo())); + + KToggleAction* showOwnerInfo = actionCollection()->add("show_owner_info"); + showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner")); + connect(showOwnerInfo, SIGNAL(triggered()), this, SLOT(toggleOwnerInfo())); + + KToggleAction* showGroupInfo = actionCollection()->add("show_group_info"); + showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group")); + connect(showGroupInfo, SIGNAL(triggered()), this, SLOT(toggleGroupInfo())); + + KToggleAction* showMimeInfo = actionCollection()->add("show_mime_info"); + showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type")); + connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo())); + KToggleAction* showPreview = actionCollection()->add("show_preview"); showPreview->setText(i18nc("@action:intoolbar", "Preview")); showPreview->setIcon(KIcon("fileview-preview")); @@ -1241,18 +1214,18 @@ void DolphinMainWindow::setupActions() showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period); connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles())); - QAction* split = actionCollection()->addAction("split_view"); + KAction* split = actionCollection()->addAction("split_view"); split->setShortcut(Qt::Key_F10); updateSplitAction(); connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView())); - QAction* reload = actionCollection()->addAction("reload"); + KAction* reload = actionCollection()->addAction("reload"); reload->setText(i18nc("@action:inmenu View", "Reload")); reload->setShortcut(Qt::Key_F5); reload->setIcon(KIcon("view-refresh")); connect(reload, SIGNAL(triggered()), this, SLOT(reloadView())); - QAction* stop = actionCollection()->addAction("stop"); + KAction* stop = actionCollection()->addAction("stop"); stop->setText(i18nc("@action:inmenu View", "Stop")); stop->setIcon(KIcon("process-stop")); connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading())); @@ -1265,12 +1238,12 @@ void DolphinMainWindow::setupActions() showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L); connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation())); - QAction* editLocation = actionCollection()->addAction("edit_location"); + KAction* editLocation = actionCollection()->addAction("edit_location"); editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location")); editLocation->setShortcut(Qt::Key_F6); connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation())); - QAction* adjustViewProps = actionCollection()->addAction("view_properties"); + KAction* adjustViewProps = actionCollection()->addAction("view_properties"); adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties())); @@ -1288,7 +1261,7 @@ void DolphinMainWindow::setupActions() QAction* findFile = actionCollection()->addAction("find_file"); findFile->setText(i18nc("@action:inmenu Tools", "Find File...")); findFile->setShortcut(Qt::CTRL | Qt::Key_F); - findFile->setIcon(KIcon("file-find")); + findFile->setIcon(KIcon("edit-find")); connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); @@ -1296,13 +1269,14 @@ void DolphinMainWindow::setupActions() showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I); connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility())); - QAction* compareFiles = actionCollection()->addAction("compare_files"); + KAction* compareFiles = actionCollection()->addAction("compare_files"); compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files")); compareFiles->setIcon(KIcon("kompare")); compareFiles->setEnabled(false); connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles())); // setup 'Settings' menu + m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); } @@ -1370,22 +1344,23 @@ void DolphinMainWindow::setupDockWidgets() terminalDock->hide(); } - QDockWidget *placesDock = new QDockWidget(i18nc("@title:window", "Places")); + QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places")); placesDock->setObjectName("placesDock"); placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - KFilePlacesView *listView = new KFilePlacesView(placesDock); - placesDock->setWidget(listView); - listView->setModel(DolphinSettings::instance().placesModel()); + KFilePlacesView* placesView = new KFilePlacesView(placesDock); + placesDock->setWidget(placesView); + placesView->setModel(DolphinSettings::instance().placesModel()); + placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places")); placesDock->toggleViewAction()->setShortcut(Qt::Key_F9); actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, placesDock); - connect(listView, SIGNAL(urlChanged(KUrl)), + connect(placesView, SIGNAL(urlChanged(KUrl)), this, SLOT(changeUrl(KUrl))); connect(this, SIGNAL(urlChanged(KUrl)), - listView, SLOT(setUrl(KUrl))); + placesView, SLOT(setUrl(KUrl))); } void DolphinMainWindow::updateHistory() @@ -1414,7 +1389,7 @@ void DolphinMainWindow::updateEditActions() QAction* renameAction = actionCollection()->action("rename"); if (renameAction != 0) { - renameAction->setEnabled(list.count() >= 1); + renameAction->setEnabled(true); } bool enableMoveToTrash = true; @@ -1487,24 +1462,6 @@ void DolphinMainWindow::updateGoActions() goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); } -void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest) -{ - KonqOperations::copy(this, KonqOperations::COPY, source, dest); - m_undoCommandTypes.append(KonqUndoManager::COPY); -} - -void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest) -{ - KonqOperations::copy(this, KonqOperations::MOVE, source, dest); - m_undoCommandTypes.append(KonqUndoManager::MOVE); -} - -void DolphinMainWindow::linkUrls(const KUrl::List& source, const KUrl& dest) -{ - KonqOperations::copy(this, KonqOperations::LINK, source, dest); - m_undoCommandTypes.append(KonqUndoManager::LINK); -} - void DolphinMainWindow::clearStatusBar() { m_activeViewContainer->statusBar()->clear(); @@ -1537,6 +1494,8 @@ void DolphinMainWindow::connectViewSignals(int viewIndex) this, SLOT(slotRequestItemInfo(KFileItem))); connect(view, SIGNAL(activated()), this, SLOT(toggleActiveView())); + connect(view, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)), + this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType))); const KUrlNavigator* navigator = container->urlNavigator(); connect(navigator, SIGNAL(urlChanged(const KUrl&)), @@ -1585,7 +1544,7 @@ void DolphinMainWindow::toggleAdditionalInfo(const char* actionName, } DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) : - KonqUndoManager::UiInterface(mainWin), + KonqFileUndoManager::UiInterface(mainWin), m_mainWin(mainWin) { Q_ASSERT(m_mainWin != 0);