From c6ab90e776878db783812afa7f63fcbef90dcbca Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Thu, 7 Jun 2007 21:30:02 +0000 Subject: [PATCH] removed obsolete renaming code, which is not needed anymore due to the DolphinView/DolphinViewWidget split svn path=/trunk/KDE/kdebase/apps/; revision=672696 --- src/dolphinview.cpp | 129 ----------------------------------- src/dolphinview.h | 13 ---- src/dolphinviewcontainer.cpp | 55 --------------- src/dolphinviewcontainer.h | 7 -- 4 files changed, 204 deletions(-) diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 8d3bf1e2f..617764335 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -267,78 +267,6 @@ bool DolphinView::supportsCategorizedSorting() const return m_iconsView != 0; } -void DolphinView::renameSelectedItems() -{ - // TODO: temporary deactivate due to DolphinView/DolphinViewController split - - /*DolphinView* view = 0; //mainWindow()->activeView(); - const KUrl::List urls = selectedUrls(); - if (urls.count() > 1) { - // More than one item has been selected for renaming. Open - // a rename dialog and rename all items afterwards. - RenameDialog dialog(urls); - if (dialog.exec() == QDialog::Rejected) { - return; - } - - const QString& newName = dialog.newName(); - if (newName.isEmpty()) { - view->statusBar()->setMessage(dialog.errorString(), - DolphinStatusBar::Error); - } else { - // TODO: check how this can be integrated into KonqUndoManager/KonqOperations - // as one operation instead of n rename operations like it is done now... - Q_ASSERT(newName.contains('#')); - - // iterate through all selected items and rename them... - const int replaceIndex = newName.indexOf('#'); - Q_ASSERT(replaceIndex >= 0); - int index = 1; - - KUrl::List::const_iterator it = urls.begin(); - KUrl::List::const_iterator end = urls.end(); - while (it != end) { - const KUrl& oldUrl = *it; - QString number; - number.setNum(index++); - - QString name(newName); - name.replace(replaceIndex, 1, number); - - if (oldUrl.fileName() != name) { - KUrl newUrl = oldUrl; - newUrl.setFileName(name); - m_mainWindow->rename(oldUrl, newUrl); - } - ++it; - } - } - } else { - // Only one item has been selected for renaming. Use the custom - // renaming mechanism from the views. - Q_ASSERT(urls.count() == 1); - - // TODO: Think about using KFileItemDelegate as soon as it supports editing. - // Currently the RenameDialog is used, but I'm not sure whether inline renaming - // is a benefit for the user at all -> let's wait for some input first... - RenameDialog dialog(urls); - if (dialog.exec() == QDialog::Rejected) { - return; - } - - const QString& newName = dialog.newName(); - if (newName.isEmpty()) { - view->statusBar()->setMessage(dialog.errorString(), - DolphinStatusBar::Error); - } else { - const KUrl& oldUrl = urls.first(); - KUrl newUrl = oldUrl; - newUrl.setFileName(newName); - m_mainWindow->rename(oldUrl, newUrl); - } - }*/ -} - void DolphinView::selectAll() { selectAll(QItemSelectionModel::Select); @@ -477,63 +405,6 @@ KFileItem* DolphinView::fileItem(const QModelIndex index) const return m_dirModel->itemForIndex(dirModelIndex); } -void DolphinView::rename(const KUrl& source, const QString& newName) -{ - bool ok = false; - - if (newName.isEmpty() || (source.fileName() == newName)) { - return; - } - - KUrl dest(source.upUrl()); - dest.addPath(newName); - - const bool destExists = KIO::NetAccess::exists(dest, false, this); - if (destExists) { - // the destination already exists, hence ask the user - // how to proceed... - KIO::RenameDialog renameDialog(this, - i18n("File Already Exists"), - source.path(), - dest.path(), - KIO::M_OVERWRITE); - switch (renameDialog.exec()) { - case KIO::R_OVERWRITE: - // the destination should be overwritten - ok = KIO::NetAccess::file_move(source, dest, -1, true); - break; - - case KIO::R_RENAME: { - // a new name for the destination has been used - KUrl newDest(renameDialog.newDestUrl()); - ok = KIO::NetAccess::file_move(source, newDest); - break; - } - - default: - // the renaming operation has been canceled - return; - } - } else { - // no destination exists, hence just move the file to - // do the renaming - ok = KIO::NetAccess::file_move(source, dest); - } - - const QString destFileName = dest.fileName(); - if (ok) { - // XYDZ - //m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName), - // DolphinStatusBar::OperationCompleted); - - KonqOperations::rename(this, source, destFileName); - } else { - // XYDZ - //m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName), - // DolphinStatusBar::Error); - } -} - void DolphinView::reload() { setUrl(url()); diff --git a/src/dolphinview.h b/src/dolphinview.h index 24c4f60a1..b4aef3468 100644 --- a/src/dolphinview.h +++ b/src/dolphinview.h @@ -199,12 +199,6 @@ public: */ bool supportsCategorizedSorting() const; - /** - * Triggers the renaming of the currently selected items, where - * the user must input a new name for the items. - */ - void renameSelectedItems(); - /** * Selects all items. * @see DolphinView::selectedItems() @@ -242,13 +236,6 @@ public: */ KFileItem* fileItem(const QModelIndex index) const; - /** - * Renames the filename of the source URL by the new file name. - * If the new file name already exists, a dialog is opened which - * asks the user to enter a new name. - */ - void rename(const KUrl& source, const QString& newName); - /** * Returns the x-position of the view content. * The content of the view might be larger than the visible area diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 0b2812a7c..3c687c8d2 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -277,61 +277,6 @@ KFileItem* DolphinViewContainer::fileItem(const QModelIndex index) const return m_dirModel->itemForIndex(dirModelIndex); } -void DolphinViewContainer::rename(const KUrl& source, const QString& newName) -{ - bool ok = false; - - if (newName.isEmpty() || (source.fileName() == newName)) { - return; - } - - KUrl dest(source.upUrl()); - dest.addPath(newName); - - const bool destExists = KIO::NetAccess::exists(dest, false, this); - if (destExists) { - // the destination already exists, hence ask the user - // how to proceed... - KIO::RenameDialog renameDialog(this, - i18n("File Already Exists"), - source.path(), - dest.path(), - KIO::M_OVERWRITE); - switch (renameDialog.exec()) { - case KIO::R_OVERWRITE: - // the destination should be overwritten - ok = KIO::NetAccess::file_move(source, dest, -1, true); - break; - - case KIO::R_RENAME: { - // a new name for the destination has been used - KUrl newDest(renameDialog.newDestUrl()); - ok = KIO::NetAccess::file_move(source, newDest); - break; - } - - default: - // the renaming operation has been canceled - return; - } - } else { - // no destination exists, hence just move the file to - // do the renaming - ok = KIO::NetAccess::file_move(source, dest); - } - - const QString destFileName = dest.fileName(); - if (ok) { - m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName), - DolphinStatusBar::OperationCompleted); - - KonqOperations::rename(this, source, destFileName); - } else { - m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName), - DolphinStatusBar::Error); - } -} - DolphinMainWindow* DolphinViewContainer::mainWindow() const { return m_mainWindow; diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 5652e4b4a..f6ab8d1c1 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -107,13 +107,6 @@ public: KFileItem* fileItem(const QModelIndex index) const; - /** - * Renames the filename of the source URL by the new file name. - * If the new file name already exists, a dialog is opened which - * asks the user to enter a new name. - */ - void rename(const KUrl& source, const QString& newName); - DolphinStatusBar* statusBar() const; /** -- 2.47.3