kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed obsolete renaming code, which is not needed anymore due to the DolphinView/DolphinViewWidget split

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=672696
This commit is contained in:
Peter Penz 2007-06-07 21:30:02 +00:00
parent be9746e87b
commit c6ab90e776
4 changed files with 0 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
src/dolphinview.cpp
View file

@ -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());

13
src/dolphinview.h
View file

@ -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

55
src/dolphinviewcontainer.cpp
View file

@ -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;

7
src/dolphinviewcontainer.h
View file

@ -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;
/**