#include <kicon.h>
#include <kiconloader.h>
#include <kio/netaccess.h>
-#include <kio/deletejob.h>
-#include <kio/renamedialog.h>
#include <kinputdialog.h>
#include <klocale.h>
#include <kmenu.h>
+#include <kmenubar.h>
#include <kmessagebox.h>
#include <konqmimedata.h>
#include <konq_operations.h>
DolphinMainWindow::DolphinMainWindow(int id) :
KXmlGuiWindow(0),
m_newMenu(0),
+ m_showMenuBar(0),
m_splitter(0),
m_activeViewContainer(0),
m_id(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)),
DolphinMainWindow::~DolphinMainWindow()
{
- KonqUndoManager::decRef();
+ KonqFileUndoManager::decRef();
DolphinApplication::app()->removeMainWindow(this);
}
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()
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:
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()
}
}
-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));
}
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;
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()
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<bool, QString> pasteInfo = m_activeViewContainer->view()->pasteInfo();
+ pasteAction->setEnabled(pasteInfo.first);
+ pasteAction->setText(pasteInfo.second);
}
void DolphinMainWindow::selectAll()
void DolphinMainWindow::editLocation()
{
- m_activeViewContainer->urlNavigator()->setUrlEditable(true);
+ KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
+ navigator->setUrlEditable(true);
+ navigator->setFocus();
}
void DolphinMainWindow::adjustViewProperties()
}
+void DolphinMainWindow::toggleShowMenuBar()
+{
+ const bool visible = menuBar()->isVisible();
+ menuBar()->setVisible(!visible);
+}
+
void DolphinMainWindow::editSettings()
{
DolphinSettingsDialog dialog(this);
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("user-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()));
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()));
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()));
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()));
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<KToggleAction>("show_filter_bar");
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());
}
QAction* renameAction = actionCollection()->action("rename");
if (renameAction != 0) {
- renameAction->setEnabled(list.count() >= 1);
+ renameAction->setEnabled(true);
}
bool enableMoveToTrash = true;
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();
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&)),
}
DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
- KonqUndoManager::UiInterface(mainWin),
+ KonqFileUndoManager::UiInterface(mainWin),
m_mainWin(mainWin)
{
Q_ASSERT(m_mainWin != 0);
projects / dolphin.git / blobdiff