X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ba6f7b0232b030b2b3eda4fc126cbc3aba05e5d2..07e07fd522cc278dffccc3b8b6faded0f6f5df20:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 640e7071c..de81af06d 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -23,60 +23,53 @@ #include +#include "dolphinapplication.h" +#include "dolphinsettings.h" +#include "dolphinsettingsdialog.h" +#include "dolphinstatusbar.h" +#include "dolphinapplication.h" +#include "urlnavigator.h" +#include "dolphinsettings.h" +#include "bookmarkssidebarpage.h" +#include "infosidebarpage.h" +#include "generalsettings.h" +#include "viewpropertiesdialog.h" +#include "viewproperties.h" + +#include #include -#include #include +#include +#include +#include +#include #include -#include #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -//Added by qt3to4: -#include +#include // TODO #include +#include #include #include -#include "urlnavigator.h" -#include "viewpropertiesdialog.h" -#include "viewproperties.h" -#include "dolphinsettings.h" -#include "dolphinsettingsdialog.h" -#include "dolphinstatusbar.h" -#include "dolphinapplication.h" -#include "undomanager.h" -#include "progressindicator.h" -#include "dolphinsettings.h" -#include "bookmarkssidebarpage.h" -#include "infosidebarpage.h" -#include "generalsettings.h" -#include "dolphinapplication.h" - - DolphinMainWindow::DolphinMainWindow() : KMainWindow(0), m_splitter(0), @@ -85,10 +78,19 @@ DolphinMainWindow::DolphinMainWindow() : setObjectName("Dolphin"); m_view[PrimaryIdx] = 0; m_view[SecondaryIdx] = 0; + + KonqUndoManager::incRef(); + + connect(KonqUndoManager::self(), SIGNAL(undoAvailable(bool)), + this, SLOT(slotUndoAvailable(bool))); + connect(KonqUndoManager::self(), SIGNAL(undoTextChanged(const QString&)), + this, SLOT(slotUndoTextChanged(const QString&))); } DolphinMainWindow::~DolphinMainWindow() { + KonqUndoManager::decRef(); + qDeleteAll(m_fileGroupActions); m_fileGroupActions.clear(); @@ -115,9 +117,10 @@ void DolphinMainWindow::setActiveView(DolphinView* view) } void DolphinMainWindow::dropUrls(const KUrl::List& urls, - const KUrl& destination) + const KUrl& destination) { - int selectedIndex = -1; + m_dropDestination = destination; + m_droppedUrls = urls; /* KDE4-TODO const ButtonState keyboardState = KApplication::keyboardMouseState(); @@ -142,49 +145,22 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, // no shortcut is used, hence open a popup menu KMenu popup(this); - popup.insertItem(SmallIcon("goto"), i18n("&Move Here") + "\t" /* KDE4-TODO: + KKey::modFlagLabel(KKey::SHIFT)*/, 0); - popup.insertItem(SmallIcon("editcopy"), i18n( "&Copy Here" ) /* KDE4-TODO + "\t" + KKey::modFlagLabel(KKey::CTRL)*/, 1); - popup.insertItem(i18n("&Link Here") /* KDE4-TODO + "\t" + KKey::modFlagLabel((KKey::ModFlag)(KKey::CTRL|KKey::SHIFT)) */, 2); - popup.insertSeparator(); - popup.insertItem(SmallIcon("stop"), i18n("Cancel"), 3); - popup.setAccel(i18n("Escape"), 3); + QAction* moveAction = popup.addAction(SmallIcon("goto"), i18n("&Move Here")); + connect(moveAction, SIGNAL(triggered()), this, SLOT(moveDroppedItems())); - /* KDE4-TODO: selectedIndex = popup.exec(QCursor::pos()); */ - popup.exec(QCursor::pos()); - selectedIndex = 0; // KD4-TODO: use QAction instead of switch below - // See libkonq/konq_operations.cc: KonqOperations::doDropFileCopy() (and doDrop, the main method) - } + QAction* copyAction = popup.addAction(SmallIcon("editcopy"), i18n( "&Copy Here" )); + connect(copyAction, SIGNAL(triggered()), this, SLOT(copyDroppedItems())); - if (selectedIndex < 0) { - return; - } + QAction* linkAction = popup.addAction(i18n("&Link Here")); + connect(linkAction, SIGNAL(triggered()), this, SLOT(linkDroppedItems())); - switch (selectedIndex) { - case 0: { - // 'Move Here' has been selected - updateViewProperties(urls); - moveUrls(urls, destination); - break; - } + QAction* cancelAction = popup.addAction(SmallIcon("stop"), i18n("Cancel")); + popup.insertSeparator(cancelAction); - case 1: { - // 'Copy Here' has been selected - updateViewProperties(urls); - copyUrls(urls, destination); - break; - } - - case 2: { - // 'Link Here' has been selected - KIO::Job* job = KIO::link(urls, destination); - addPendingUndoJob(job, DolphinCommand::Link, urls, destination); - break; - } - - default: - // 'Cancel' has been selected - break; + popup.exec(QCursor::pos()); } + + m_droppedUrls.clear(); } void DolphinMainWindow::refreshViews() @@ -301,34 +277,46 @@ void DolphinMainWindow::updateFilterBarAction(bool show) showFilterBarAction->setChecked(show); } -void DolphinMainWindow::redo() +void DolphinMainWindow::openNewMainWindow() { - UndoManager::instance().redo(this); + DolphinApplication::app()->createMainWindow()->show(); } -void DolphinMainWindow::undo() +void DolphinMainWindow::moveDroppedItems() { - UndoManager::instance().undo(this); + moveUrls(m_droppedUrls, m_dropDestination); } -void DolphinMainWindow::openNewMainWindow() +void DolphinMainWindow::copyDroppedItems() { - DolphinApplication::app()->createMainWindow()->show(); + copyUrls(m_droppedUrls, m_dropDestination); } -void DolphinMainWindow::closeEvent(QCloseEvent* event) +void DolphinMainWindow::linkDroppedItems() { - // KDE4-TODO - //KConfig* config = KGlobal::config(); - //config->setGroup("General"); - //config->writeEntry("First Run", false); + KonqOperations::copy(this, KonqOperations::LINK, m_droppedUrls, m_dropDestination); + m_undoOperations.append(KonqOperations::LINK); +} +void DolphinMainWindow::closeEvent(QCloseEvent* event) +{ DolphinSettings& settings = DolphinSettings::instance(); GeneralSettings* generalSettings = settings.generalSettings(); generalSettings->setFirstRun(false); settings.save(); + // TODO: I assume there will be a generic way in KDE 4 to store the docks + // of the main window. In the meantime they are stored manually: + QString filename = KStandardDirs::locateLocal("data", KGlobal::instance()->instanceName()); + filename.append("/panels_layout"); + QFile file(filename); + if (file.open(QIODevice::WriteOnly)) { + QByteArray data = saveState(); + file.write(data); + file.close(); + } + KMainWindow::closeEvent(event); } @@ -380,7 +368,7 @@ void DolphinMainWindow::createFolder() if (baseUrl.isLocalFile() && QFileInfo(baseUrl.path(KUrl::AddTrailingSlash) + name).exists()) { - name = KIO::RenameDlg::suggestName(baseUrl, i18n("New Folder")); + name = KIO::RenameDialog::suggestName(baseUrl, i18n("New Folder")); } bool ok = false; @@ -406,29 +394,26 @@ void DolphinMainWindow::createFolder() url = baseUrl; url.addPath(name); } - ok = KIO::NetAccess::mkdir(url, this); - // TODO: provide message type hint - if (ok) { + KonqOperations::mkdir(this, url); + + // TODO: is there a possability to check whether the mkdir operation + // has been successful? + //if (ok) { statusBar->setMessage(i18n("Created folder %1.",url.path()), DolphinStatusBar::OperationCompleted); - - DolphinCommand command(DolphinCommand::CreateFolder, KUrl::List(), url); - UndoManager::instance().addCommand(command); - } - else { - // Creating of the folder has been failed. Check whether the creating - // has been failed because a folder with the same name exists... - if (KIO::NetAccess::exists(url, true, this)) { - statusBar->setMessage(i18n("A folder named %1 already exists.",url.path()), - DolphinStatusBar::Error); - } - else { - statusBar->setMessage(i18n("Creating of folder %1 failed.",url.path()), - DolphinStatusBar::Error); - } - - } + //} + //else { + // // Creating of the folder has been failed. Check whether the creating + // // has been failed because a folder with the same name exists... + // if (KIO::NetAccess::exists(url, true, this)) { + // statusBar->setMessage(i18n("A folder named %1 already exists.",url.path()), + // DolphinStatusBar::Error); + // } + // else { + // statusBar->setMessage(i18n("Creating of folder %1 failed.",url.path()), + // DolphinStatusBar::Error); + // } } void DolphinMainWindow::createFile() @@ -442,7 +427,7 @@ void DolphinMainWindow::createFile() clearStatusBar(); // TODO: const Entry& entry = m_createFileTemplates[QString(sender->name())]; - // should be enough. Anyway: the implemantation of [] does a linear search internally too. + // should be enough. Anyway: the implementation of [] does a linear search internally too. KSortableList::ConstIterator it = m_createFileTemplates.begin(); KSortableList::ConstIterator end = m_createFileTemplates.end(); @@ -485,7 +470,7 @@ void DolphinMainWindow::createFile() const bool fileExists = viewUrl.isLocalFile() && QFileInfo(viewUrl.path(KUrl::AddTrailingSlash) + KIO::encodeFileName(name)).exists(); if (fileExists) { - name = KIO::RenameDlg::suggestName(viewUrl, name); + name = KIO::RenameDialog::suggestName(viewUrl, name); } // let the user change the suggested file name @@ -520,8 +505,10 @@ void DolphinMainWindow::createFile() KUrl::List list; list.append(sourceUrl); - DolphinCommand command(DolphinCommand::CreateFile, list, destUrl); - UndoManager::instance().addCommand(command); + + // TODO: use the KonqUndoManager/KonqOperations instead. + //DolphinCommand command(DolphinCommand::CreateFile, list, destUrl); + //UndoManager::instance().addCommand(command); } else { @@ -539,9 +526,12 @@ void DolphinMainWindow::rename() void DolphinMainWindow::moveToTrash() { clearStatusBar(); - KUrl::List selectedUrls = m_activeView->selectedUrls(); - KIO::Job* job = KIO::trash(selectedUrls); - addPendingUndoJob(job, DolphinCommand::Trash, selectedUrls, m_activeView->url()); + const KUrl::List selectedUrls = m_activeView->selectedUrls(); + // TODO: per default a message box is opened which asks whether the item + // should really be moved to the trash. This does not make sense, as the + // action can be undone anyway by the user. + KonqOperations::del(this, KonqOperations::TRASH, selectedUrls); + m_undoOperations.append(KonqOperations::TRASH); } void DolphinMainWindow::deleteItems() @@ -610,33 +600,43 @@ void DolphinMainWindow::slotDeleteFileFinished(KJob* job) void DolphinMainWindow::slotUndoAvailable(bool available) { - QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); + QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo)); if (undoAction != 0) { undoAction->setEnabled(available); } -} -void DolphinMainWindow::slotUndoTextChanged(const QString& text) -{ - QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); - if (undoAction != 0) { - undoAction->setText(text); - } -} + if (available && (m_undoOperations.count() > 0)) { + const KonqOperations::Operation op = m_undoOperations.takeFirst(); + DolphinStatusBar* statusBar = m_activeView->statusBar(); + switch (op) { + case KonqOperations::COPY: + statusBar->setMessage(i18n("Copy operation completed."), + DolphinStatusBar::OperationCompleted); + break; + case KonqOperations::MOVE: + statusBar->setMessage(i18n("Move operation completed."), + DolphinStatusBar::OperationCompleted); + break; + case KonqOperations::LINK: + statusBar->setMessage(i18n("Link operation completed."), + DolphinStatusBar::OperationCompleted); + break; + case KonqOperations::TRASH: + statusBar->setMessage(i18n("Move to trash operation completed."), + DolphinStatusBar::OperationCompleted); + break; + default: + break; + } -void DolphinMainWindow::slotRedoAvailable(bool available) -{ - QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); - if (redoAction != 0) { - redoAction->setEnabled(available); } } -void DolphinMainWindow::slotRedoTextChanged(const QString& text) +void DolphinMainWindow::slotUndoTextChanged(const QString& text) { - QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); - if (redoAction != 0) { - redoAction->setText(text); + QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo)); + if (undoAction != 0) { + undoAction->setText(text); } } @@ -696,7 +696,7 @@ void DolphinMainWindow::paste() void DolphinMainWindow::updatePasteAction() { - QAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); + QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); if (pasteAction == 0) { return; } @@ -837,6 +837,12 @@ void DolphinMainWindow::stopLoading() void DolphinMainWindow::togglePreview() { + clearStatusBar(); + + const KToggleAction* showPreviewAction = + static_cast(actionCollection()->action("show_preview")); + const bool show = showPreviewAction->isChecked(); + m_activeView->setShowPreview(show); } void DolphinMainWindow::toggleShowHiddenFiles() @@ -994,80 +1000,6 @@ void DolphinMainWindow::editSettings() dlg.exec(); } -void DolphinMainWindow::addUndoOperation(KJob* job) -{ - if (job->error() != 0) { - slotHandleJobError(job); - } - else { - const int id = job->progressId(); - - // set iterator to the executed command with the current id... - Q3ValueList::Iterator it = m_pendingUndoJobs.begin(); - const Q3ValueList::Iterator end = m_pendingUndoJobs.end(); - bool found = false; - while (!found && (it != end)) { - if ((*it).id == id) { - found = true; - } - else { - ++it; - } - } - - if (found) { - DolphinCommand command = (*it).command; - if (command.type() == DolphinCommand::Trash) { - // To be able to perform an undo for the 'Move to Trash' operation - // all source Urls must be updated with the trash Url. E. g. when moving - // a file "test.txt" and a second file "test.txt" to the trash, - // then the filenames in the trash are "0-test.txt" and "1-test.txt". - QMap metaData; - KIO::Job *kiojob = qobject_cast( job ); - if ( kiojob ) - { - metaData = kiojob->metaData(); - } - KUrl::List newSourceUrls; - - KUrl::List sourceUrls = command.source(); - KUrl::List::Iterator sourceIt = sourceUrls.begin(); - const KUrl::List::Iterator sourceEnd = sourceUrls.end(); - - while (sourceIt != sourceEnd) { - QMap::ConstIterator metaIt = metaData.find("trashUrl-" + (*sourceIt).path()); - if (metaIt != metaData.end()) { - newSourceUrls.append(KUrl(metaIt.value())); - } - ++sourceIt; - } - command.setSource(newSourceUrls); - } - - UndoManager::instance().addCommand(command); - m_pendingUndoJobs.erase(it); - - DolphinStatusBar* statusBar = m_activeView->statusBar(); - switch (command.type()) { - case DolphinCommand::Copy: - statusBar->setMessage(i18n("Copy operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case DolphinCommand::Move: - statusBar->setMessage(i18n("Move operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case DolphinCommand::Trash: - statusBar->setMessage(i18n("Move to trash operation completed."), - DolphinStatusBar::OperationCompleted); - break; - default: - break; - } - } - } -} - void DolphinMainWindow::init() { // Check whether Dolphin runs the first time. If yes then @@ -1143,84 +1075,94 @@ void DolphinMainWindow::loadSettings() } updateViewActions(); + + // TODO: I assume there will be a generic way in KDE 4 to restore the docks + // of the main window. In the meantime they are restored manually (see also + // DolphinMainWindow::closeEvent() for more details): + QString filename = KStandardDirs::locateLocal("data", KGlobal::instance()->instanceName()); + filename.append("/panels_layout"); + QFile file(filename); + if (file.open(QIODevice::ReadOnly)) { + QByteArray data = file.readAll(); + restoreState(data); + file.close(); + } } void DolphinMainWindow::setupActions() { // setup 'File' menu - KAction *action = new KAction(KIcon("window_new"), i18n( "New &Window" ), actionCollection(), "new_window" ); + QAction *action = actionCollection()->addAction("new_window"); + action->setIcon(KIcon("window_new")); + action->setText(i18n("New &Window")); connect(action, SIGNAL(triggered()), this, SLOT(openNewMainWindow())); - KAction* createFolder = new KAction(i18n("Folder..."), actionCollection(), "create_folder"); + QAction* createFolder = actionCollection()->addAction("create_folder"); + createFolder->setText(i18n("Folder...")); createFolder->setIcon(KIcon("folder")); createFolder->setShortcut(Qt::Key_N); connect(createFolder, SIGNAL(triggered()), this, SLOT(createFolder())); - KAction* rename = new KAction(i18n("Rename"), actionCollection(), "rename"); + QAction* rename = actionCollection()->addAction("rename"); + rename->setText(i18n("Rename")); rename->setShortcut(Qt::Key_F2); connect(rename, SIGNAL(triggered()), this, SLOT(rename())); - KAction* moveToTrash = new KAction(i18n("Move to Trash"), actionCollection(), "move_to_trash"); + QAction* moveToTrash = actionCollection()->addAction("move_to_trash"); + moveToTrash->setText(i18n("Move to Trash")); moveToTrash->setIcon(KIcon("edittrash")); moveToTrash->setShortcut(QKeySequence::Delete); connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash())); - KAction* deleteAction = new KAction(i18n("Delete"), actionCollection(), "delete"); + QAction* deleteAction = actionCollection()->addAction("delete"); + deleteAction->setText(i18n("Delete")); deleteAction->setShortcut(Qt::ALT | Qt::Key_Delete); deleteAction->setIcon(KIcon("editdelete")); connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems())); - KAction* properties = new KAction(i18n("Propert&ies"), actionCollection(), "properties"); + QAction* properties = actionCollection()->addAction("properties"); + properties->setText(i18n("Propert&ies")); properties->setShortcut(Qt::Key_Alt | Qt::Key_Return); connect(properties, SIGNAL(triggered()), this, SLOT(properties())); - KStdAction::quit(this, SLOT(quit()), actionCollection()); + KStandardAction::quit(this, SLOT(quit()), actionCollection()); // setup 'Edit' menu - UndoManager& undoManager = UndoManager::instance(); - KStdAction::undo(this, - SLOT(undo()), - actionCollection()); - connect(&undoManager, SIGNAL(undoAvailable(bool)), - this, SLOT(slotUndoAvailable(bool))); - connect(&undoManager, SIGNAL(undoTextChanged(const QString&)), - this, SLOT(slotUndoTextChanged(const QString&))); + KStandardAction::undo(KonqUndoManager::self(), + SLOT(undo()), + actionCollection()); - KStdAction::redo(this, - SLOT(redo()), - actionCollection()); - connect(&undoManager, SIGNAL(redoAvailable(bool)), - this, SLOT(slotRedoAvailable(bool))); - connect(&undoManager, SIGNAL(redoTextChanged(const QString&)), - this, SLOT(slotRedoTextChanged(const QString&))); + KStandardAction::cut(this, SLOT(cut()), actionCollection()); + KStandardAction::copy(this, SLOT(copy()), actionCollection()); + KStandardAction::paste(this, SLOT(paste()), actionCollection()); - KStdAction::cut(this, SLOT(cut()), actionCollection()); - KStdAction::copy(this, SLOT(copy()), actionCollection()); - KStdAction::paste(this, SLOT(paste()), actionCollection()); - - KAction* selectAll = new KAction(i18n("Select All"), actionCollection(), "select_all"); + QAction* selectAll = actionCollection()->addAction("select_all"); + selectAll->setText(i18n("Select All")); selectAll->setShortcut(Qt::CTRL + Qt::Key_A); connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll())); - KAction* invertSelection = new KAction(i18n("Invert Selection"), actionCollection(), "invert_selection"); + QAction* invertSelection = actionCollection()->addAction("invert_selection"); + invertSelection->setText(i18n("Invert Selection")); invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A); connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection())); // setup 'View' menu - KStdAction::zoomIn(this, + KStandardAction::zoomIn(this, SLOT(zoomIn()), actionCollection()); - KStdAction::zoomOut(this, + KStandardAction::zoomOut(this, SLOT(zoomOut()), actionCollection()); - KToggleAction* iconsView = new KToggleAction(i18n("Icons"), actionCollection(), "icons"); + KToggleAction* iconsView = actionCollection()->add("icons"); + iconsView->setText(i18n("Icons")); iconsView->setShortcut(Qt::CTRL | Qt::Key_1); iconsView->setIcon(KIcon("view_icon")); connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView())); - KToggleAction* detailsView = new KToggleAction(i18n("Details"), actionCollection(), "details"); + KToggleAction* detailsView = actionCollection()->add("details"); + detailsView->setText(i18n("Details")); detailsView->setShortcut(Qt::CTRL | Qt::Key_2); detailsView->setIcon(KIcon("view_text")); connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView())); @@ -1229,13 +1171,16 @@ void DolphinMainWindow::setupActions() viewModeGroup->addAction(iconsView); viewModeGroup->addAction(detailsView); - KToggleAction* sortByName = new KToggleAction(i18n("By Name"), actionCollection(), "by_name"); + KToggleAction* sortByName = actionCollection()->add("by_name"); + sortByName->setText(i18n("By Name")); connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName())); - KToggleAction* sortBySize = new KToggleAction(i18n("By Size"), actionCollection(), "by_size"); + KToggleAction* sortBySize = actionCollection()->add("by_size"); + sortBySize->setText(i18n("By Size")); connect(sortBySize, SIGNAL(triggered()), this, SLOT(sortBySize())); - KToggleAction* sortByDate = new KToggleAction(i18n("By Date"), actionCollection(), "by_date"); + KToggleAction* sortByDate = actionCollection()->add("by_date"); + sortByDate->setText(i18n("By Date")); connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate())); QActionGroup* sortGroup = new QActionGroup(this); @@ -1243,93 +1188,103 @@ void DolphinMainWindow::setupActions() sortGroup->addAction(sortBySize); sortGroup->addAction(sortByDate); - KToggleAction* sortDescending = new KToggleAction(i18n("Descending"), actionCollection(), "descending"); + KToggleAction* sortDescending = actionCollection()->add("descending"); + sortDescending->setText(i18n("Descending")); connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder())); - KToggleAction* showPreview = new KToggleAction(i18n("Show Preview"), actionCollection(), "show_preview"); + KToggleAction* showPreview = actionCollection()->add("show_preview"); + showPreview->setText(i18n("Show Preview")); connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview())); - KToggleAction* showHiddenFiles = new KToggleAction(i18n("Show Hidden Files"), actionCollection(), "show_hidden_files"); + KToggleAction* showHiddenFiles = actionCollection()->add("show_hidden_files"); + showHiddenFiles->setText(i18n("Show Hidden Files")); //showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_ KDE4-TODO: what Qt-Key represents '.'? connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles())); - KToggleAction* split = new KToggleAction(i18n("Split View"), actionCollection(), "split_view"); + KToggleAction* split = actionCollection()->add("split_view"); + split->setText(i18n("Split View")); split->setShortcut(Qt::Key_F10); split->setIcon(KIcon("view_left_right")); connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView())); - KAction* reload = new KAction(actionCollection(), "reload"); + QAction* reload = actionCollection()->addAction("reload"); reload->setText(i18n("Reload")); reload->setShortcut(Qt::Key_F5); reload->setIcon(KIcon("reload")); connect(reload, SIGNAL(triggered()), this, SLOT(reloadView())); - KAction* stop = new KAction(i18n("Stop"), actionCollection(), "stop"); + QAction* stop = actionCollection()->addAction("stop"); + stop->setText(i18n("Stop")); stop->setIcon(KIcon("stop")); connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading())); - KToggleAction* showFullLocation = new KToggleAction(i18n("Show Full Location"), actionCollection(), "editable_location"); + KToggleAction* showFullLocation = actionCollection()->add("editable_location"); + showFullLocation->setText(i18n("Show Full Location")); showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L); connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation())); - KToggleAction* editLocation = new KToggleAction(i18n("Edit Location"), actionCollection(), "edit_location"); + KToggleAction* editLocation = actionCollection()->add("edit_location"); + editLocation->setText(i18n("Edit Location")); editLocation->setShortcut(Qt::Key_F6); connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation())); - KAction* adjustViewProps = new KAction(i18n("Adjust View Properties..."), actionCollection(), "view_properties"); + QAction* adjustViewProps = actionCollection()->addAction("view_properties"); + adjustViewProps->setText(i18n("Adjust View Properties...")); connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties())); // setup 'Go' menu - KStdAction::back(this, SLOT(goBack()), actionCollection()); - KStdAction::forward(this, SLOT(goForward()), actionCollection()); - KStdAction::up(this, SLOT(goUp()), actionCollection()); - KStdAction::home(this, SLOT(goHome()), actionCollection()); + KStandardAction::back(this, SLOT(goBack()), actionCollection()); + KStandardAction::forward(this, SLOT(goForward()), actionCollection()); + KStandardAction::up(this, SLOT(goUp()), actionCollection()); + KStandardAction::home(this, SLOT(goHome()), actionCollection()); // setup 'Tools' menu - KAction* openTerminal = new KAction(i18n("Open Terminal"), actionCollection(), "open_terminal"); + QAction* openTerminal = actionCollection()->addAction("open_terminal"); + openTerminal->setText(i18n("Open Terminal")); openTerminal->setShortcut(Qt::Key_F4); openTerminal->setIcon(KIcon("konsole")); connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal())); - KAction* findFile = new KAction(i18n("Find File..."), actionCollection(), "find_file"); + QAction* findFile = actionCollection()->addAction("find_file"); + findFile->setText(i18n("Find File...")); findFile->setShortcut(Qt::Key_F); findFile->setIcon(KIcon("filefind")); connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); - KToggleAction* showFilterBar = new KToggleAction(i18n("Show Filter Bar"), actionCollection(), "show_filter_bar"); + KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); + showFilterBar->setText(i18n("Show Filter Bar")); showFilterBar->setShortcut(Qt::Key_Slash); connect(showFilterBar, SIGNAL(triggered()), this, SLOT(showFilterBar())); - KAction* compareFiles = new KAction(i18n("Compare Files"), actionCollection(), "compare_files"); + QAction* compareFiles = actionCollection()->addAction("compare_files"); + compareFiles->setText(i18n("Compare Files")); compareFiles->setIcon(KIcon("kompare")); compareFiles->setEnabled(false); connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles())); // setup 'Settings' menu - KStdAction::preferences(this, SLOT(editSettings()), actionCollection()); + KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); } void DolphinMainWindow::setupDockWidgets() { - QDockWidget *shortcutsDock = new QDockWidget(i18n("Shortcuts")); - - shortcutsDock->setObjectName("shortcutsDock"); + QDockWidget* shortcutsDock = new QDockWidget(i18n("Bookmarks")); + shortcutsDock->setObjectName("bookmarksDock"); + shortcutsDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); shortcutsDock->setWidget(new BookmarksSidebarPage(this)); - shortcutsDock->toggleViewAction()->setObjectName("show_shortcuts_pane"); - shortcutsDock->toggleViewAction()->setText(i18n("Show Shortcuts Panel")); - actionCollection()->insert(shortcutsDock->toggleViewAction()); + shortcutsDock->toggleViewAction()->setText(i18n("Show Bookmarks Panel")); + actionCollection()->addAction("show_bookmarks_panel", shortcutsDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock); - QDockWidget *infoDock = new QDockWidget(i18n("Information")); - + QDockWidget* infoDock = new QDockWidget(i18n("Information")); infoDock->setObjectName("infoDock"); + infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); infoDock->setWidget(new InfoSidebarPage(this)); - infoDock->toggleViewAction()->setObjectName("show_info_pane"); infoDock->toggleViewAction()->setText(i18n("Show Information Panel")); - actionCollection()->insert(infoDock->toggleViewAction()); + actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction()); addDockWidget(Qt::RightDockWidgetArea, infoDock); } @@ -1488,12 +1443,12 @@ void DolphinMainWindow::updateEditActions() void DolphinMainWindow::updateViewActions() { - QAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn)); + QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn)); if (zoomInAction != 0) { zoomInAction->setEnabled(m_activeView->isZoomInPossible()); } - QAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut)); + QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut)); if (zoomOutAction != 0) { zoomOutAction->setEnabled(m_activeView->isZoomOutPossible()); } @@ -1535,59 +1490,21 @@ void DolphinMainWindow::updateViewActions() void DolphinMainWindow::updateGoActions() { - QAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up)); + QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up)); const KUrl& currentUrl = m_activeView->url(); goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); } -void DolphinMainWindow::updateViewProperties(const KUrl::List& urls) -{ - if (urls.isEmpty()) { - return; - } - - // Updating the view properties might take up to several seconds - // when dragging several thousand Urls. Writing a KIO slave for this - // use case is not worth the effort, but at least the main widget - // must be disabled and a progress should be shown. - ProgressIndicator progressIndicator(this, - i18n("Updating view properties..."), - QString::null, - urls.count()); - - KUrl::List::ConstIterator end = urls.end(); - for(KUrl::List::ConstIterator it = urls.begin(); it != end; ++it) { - progressIndicator.execOperation(); - - ViewProperties props(*it); - props.save(); - } -} - void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest) { - KIO::Job* job = KIO::copy(source, dest); - addPendingUndoJob(job, DolphinCommand::Copy, source, dest); + KonqOperations::copy(this, KonqOperations::COPY, source, dest); + m_undoOperations.append(KonqOperations::COPY); } void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest) { - KIO::Job* job = KIO::move(source, dest); - addPendingUndoJob(job, DolphinCommand::Move, source, dest); -} - -void DolphinMainWindow::addPendingUndoJob(KIO::Job* job, - DolphinCommand::Type commandType, - const KUrl::List& source, - const KUrl& dest) -{ - connect(job, SIGNAL(result(KJob*)), - this, SLOT(addUndoOperation(KJob*))); - - UndoInfo undoInfo; - undoInfo.id = job->progressId(); - undoInfo.command = DolphinCommand(commandType, source, dest); - m_pendingUndoJobs.append(undoInfo); + KonqOperations::copy(this, KonqOperations::MOVE, source, dest); + m_undoOperations.append(KonqOperations::MOVE); } void DolphinMainWindow::clearStatusBar()