X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4caebde3cb9e31fcb18b36e45afa287e9c03abd4..51cbeaf512da9ebaefb0bfcaa21cca0f47d1b79d:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 3fec8fdfb..5ce9cb6e1 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -86,9 +86,6 @@ DolphinView::DolphinView(QWidget* parent, m_topLayout->setSpacing(0); m_topLayout->setMargin(0); - connect(m_dirLister, SIGNAL(completed()), - this, SLOT(updateCutItems())); - m_controller = new DolphinController(this); m_controller->setUrl(url); @@ -230,7 +227,7 @@ void DolphinView::setShowPreview(bool show) m_iconManager->setShowPreview(show); emit showPreviewChanged(); - loadDirectory(viewPropsUrl, true); + loadDirectory(viewPropsUrl); } bool DolphinView::showPreview() const @@ -251,7 +248,7 @@ void DolphinView::setShowHiddenFiles(bool show) m_dirLister->setShowingDotFiles(show); emit showHiddenFilesChanged(); - loadDirectory(viewPropsUrl, true); + loadDirectory(viewPropsUrl); } bool DolphinView::showHiddenFiles() const @@ -455,7 +452,7 @@ void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info) if (itemView() != m_detailsView) { // the details view requires no reloading of the directory, as it maps // the file item delegate info to its columns internally - loadDirectory(viewPropsUrl, true); + loadDirectory(viewPropsUrl); } } @@ -976,49 +973,6 @@ bool DolphinView::isCutItem(const KFileItem& item) const return false; } -KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection) -{ - KToggleAction* iconsView = actionCollection->add("icons"); - iconsView->setText(i18nc("@action:inmenu View Mode", "Icons")); - iconsView->setShortcut(Qt::CTRL | Qt::Key_1); - iconsView->setIcon(KIcon("view-list-icons")); - iconsView->setData(QVariant::fromValue(IconsView)); - return iconsView; -} - -KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollection) -{ - KToggleAction* detailsView = actionCollection->add("details"); - detailsView->setText(i18nc("@action:inmenu View Mode", "Details")); - detailsView->setShortcut(Qt::CTRL | Qt::Key_2); - detailsView->setIcon(KIcon("view-list-details")); - detailsView->setData(QVariant::fromValue(DetailsView)); - return detailsView; -} - -KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollection) -{ - KToggleAction* columnView = actionCollection->add("columns"); - columnView->setText(i18nc("@action:inmenu View Mode", "Columns")); - columnView->setShortcut(Qt::CTRL | Qt::Key_3); - columnView->setIcon(KIcon("view-file-columns")); - columnView->setData(QVariant::fromValue(ColumnView)); - return columnView; -} - -QString DolphinView::currentViewModeActionName() const -{ - switch (m_mode) { - case DolphinView::IconsView: - return "icons"; - case DolphinView::DetailsView: - return "details"; - case DolphinView::ColumnView: - return "columns"; - } - return QString(); // can't happen -} - void DolphinView::renameSelectedItems() { const KFileItemList items = selectedItems();