#include <assert.h>
+#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 <kaction.h>
#include <kactioncollection.h>
-#include <ktoggleaction.h>
#include <kbookmarkmanager.h>
+#include <kconfig.h>
+#include <kdesktopfile.h>
+#include <kdeversion.h>
+#include <kfiledialog.h>
#include <kglobal.h>
-#include <kpropertiesdialog.h>
#include <kicon.h>
#include <kiconloader.h>
-#include <kdeversion.h>
-#include <kstatusbar.h>
#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
-#include <kurl.h>
-#include <kstdaccel.h>
-#include <kaction.h>
-#include <kstdaction.h>
-#include <kmenu.h>
-#include <kio/renamedlg.h>
+#include <kio/renamedialog.h>
#include <kinputdialog.h>
-#include <kshell.h>
-#include <kdesktopfile.h>
-#include <kstandarddirs.h>
-#include <kprotocolinfo.h>
+#include <klocale.h>
+#include <kmenu.h>
#include <kmessagebox.h>
-#include <kservice.h>
-#include <kstandarddirs.h>
+#include <konqmimedata.h>
+#include <konq_undo.h>
+#include <kpropertiesdialog.h>
+#include <kprotocolinfo.h>
+#include <ktoggleaction.h>
#include <krun.h>
-#include <klocale.h>
+#include <kshell.h>
+#include <kstandarddirs.h>
+#include <kstatusbar.h>
+#include <kstandardaction.h>
+#include <kurl.h>
-#include <qclipboard.h>
-#include <q3dragobject.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <Q3ValueList> // TODO
#include <QCloseEvent>
+#include <QClipboard>
#include <QSplitter>
#include <QDockWidget>
-#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),
- m_activeView(0),
- m_clipboardContainsCutData(false)
+ m_activeView(0)
{
setObjectName("Dolphin");
m_view[PrimaryIdx] = 0;
m_view[SecondaryIdx] = 0;
- m_fileGroupActions.setAutoDelete(true);
+ KonqUndoManager::incRef();
- // TODO: the following members are not used yet. See documentation
- // of DolphinMainWindow::linkGroupActions() and DolphinMainWindow::linkToDeviceActions()
- // in the header file for details.
- //m_linkGroupActions.setAutoDelete(true);
- //m_linkToDeviceActions.setAutoDelete(true);
+ connect(KonqUndoManager::self(), SIGNAL(undoAvailable(bool)),
+ this, SLOT(slotUndoAvailable(bool)));
+ connect(KonqUndoManager::self(), SIGNAL(undoTextChanged(const QString&)),
+ this, SLOT(slotUndoTextChanged(const QString&)));
}
DolphinMainWindow::~DolphinMainWindow()
{
- /*
- * bye, bye managed window
- */
- DolphinApplication::app()->removeMainWindow( this );
+ KonqUndoManager::decRef();
+
+ qDeleteAll(m_fileGroupActions);
+ m_fileGroupActions.clear();
+
+ DolphinApplication::app()->removeMainWindow(this);
}
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();
// 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;
- }
-
- case 1: {
- // 'Copy Here' has been selected
- updateViewProperties(urls);
- copyUrls(urls, destination);
- break;
- }
+ QAction* cancelAction = popup.addAction(SmallIcon("stop"), i18n("Cancel"));
+ popup.insertSeparator(cancelAction);
- 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()
m_splitter,
url,
props.viewMode(),
- props.isShowHiddenFilesEnabled());
+ props.showHiddenFiles());
connectViewSignals(i);
m_view[i]->show();
}
{
KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- showHiddenFilesAction->setChecked(m_activeView->isShowHiddenFilesEnabled());
+ showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
}
void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
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);
}
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;
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()
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<CreateFileEntry, QString>::ConstIterator it = m_createFileTemplates.begin();
KSortableList<CreateFileEntry, QString>::ConstIterator end = m_createFileTemplates.end();
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
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 {
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()
const bool del = KMessageBox::warningContinueCancel(this,
text,
QString::null,
- KGuiItem(i18n("Delete"), SmallIcon("editdelete"))
+ KGuiItem(i18n("Delete"), KIcon("editdelete"))
) == KMessageBox::Continue;
if (del) {
KIO::Job* job = KIO::del(list);
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);
}
}
void DolphinMainWindow::cut()
{
- // TODO: this boolean doesn't work between instances of dolphin or with konqueror or with other
- // apps. The "application/x-kde-cutselection" mimetype should be used instead, see KonqMimeData
- // in libkonq
- m_clipboardContainsCutData = true;
- /* KDE4-TODO: Q3DragObject* data = new KUrlDrag(m_activeView->selectedUrls(),
- widget());
- QApplication::clipboard()->setData(data);*/
+ QMimeData* mimeData = new QMimeData();
+ const KUrl::List kdeUrls = m_activeView->selectedUrls();
+ const KUrl::List mostLocalUrls;
+ KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
+ QApplication::clipboard()->setMimeData(mimeData);
}
void DolphinMainWindow::copy()
{
- m_clipboardContainsCutData = false;
- /* KDE4-TODO:
- Q3DragObject* data = new KUrlDrag(m_activeView->selectedUrls(),
- widget());
- QApplication::clipboard()->setData(data);*/
+ QMimeData* mimeData = new QMimeData();
+ const KUrl::List kdeUrls = m_activeView->selectedUrls();
+ const KUrl::List mostLocalUrls;
+ KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
+
+ QApplication::clipboard()->setMimeData(mimeData);
}
void DolphinMainWindow::paste()
{
- /* KDE4-TODO: - see KonqOperations::doPaste
QClipboard* clipboard = QApplication::clipboard();
- QMimeSource* data = clipboard->data();
- if (!KUrlDrag::canDecode(data)) {
- return;
- }
+ const QMimeData* mimeData = clipboard->mimeData();
clearStatusBar();
- KUrl::List sourceUrls;
- KUrlDrag::decode(data, sourceUrls);
+ const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
// per default the pasting is done into the current Url of the view
KUrl destUrl(m_activeView->url());
}
}
-
- updateViewProperties(sourceUrls);
- if (m_clipboardContainsCutData) {
+ if (KonqMimeData::decodeIsCutSelection(mimeData)) {
moveUrls(sourceUrls, destUrl);
- m_clipboardContainsCutData = false;
clipboard->clear();
}
else {
copyUrls(sourceUrls, destUrl);
- }*/
+ }
}
void DolphinMainWindow::updatePasteAction()
{
- QAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
+ QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste));
if (pasteAction == 0) {
return;
}
QString text(i18n("Paste"));
QClipboard* clipboard = QApplication::clipboard();
- const QMimeData* data = clipboard->mimeData();
- /* KDE4-TODO:
- if (KUrlDrag::canDecode(data)) {
+ const QMimeData* mimeData = clipboard->mimeData();
+
+ KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+ if (!urls.isEmpty()) {
pasteAction->setEnabled(true);
- KUrl::List urls;
- KUrlDrag::decode(data, urls);
const int count = urls.count();
if (count == 1) {
pasteAction->setText(i18n("Paste 1 File"));
pasteAction->setText(i18n("Paste %1 Files").arg(count));
}
}
- else {*/
+ else {
pasteAction->setEnabled(false);
pasteAction->setText(i18n("Paste"));
- //}
+ }
if (pasteAction->isEnabled()) {
KUrl::List urls = m_activeView->selectedUrls();
m_activeView->setMode(DolphinView::DetailsView);
}
-void DolphinMainWindow::setPreviewsView()
-{
- m_activeView->setMode(DolphinView::PreviewsView);
-}
-
void DolphinMainWindow::sortByName()
{
m_activeView->setSorting(DolphinView::SortByName);
0,
m_view[PrimaryIdx]->url(),
m_view[PrimaryIdx]->mode(),
- m_view[PrimaryIdx]->isShowHiddenFilesEnabled());
+ m_view[PrimaryIdx]->showHiddenFiles());
connectViewSignals(SecondaryIdx);
m_splitter->addWidget(m_view[SecondaryIdx]);
m_splitter->setSizes(QList<int>() << newWidth << newWidth);
{
}
-void DolphinMainWindow::showHiddenFiles()
+void DolphinMainWindow::togglePreview()
+{
+ clearStatusBar();
+
+ const KToggleAction* showPreviewAction =
+ static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
+ const bool show = showPreviewAction->isChecked();
+ m_activeView->setShowPreview(show);
+}
+
+void DolphinMainWindow::toggleShowHiddenFiles()
{
clearStatusBar();
const KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
const bool show = showHiddenFilesAction->isChecked();
- m_activeView->setShowHiddenFilesEnabled(show);
+ m_activeView->setShowHiddenFiles(show);
}
void DolphinMainWindow::showFilterBar()
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<UndoInfo>::Iterator it = m_pendingUndoJobs.begin();
- const Q3ValueList<UndoInfo>::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<QString, QString> metaData;
- KIO::Job *kiojob = qobject_cast<KIO::Job*>( 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<QString, QString>::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
m_splitter,
homeUrl,
props.viewMode(),
- props.isShowHiddenFilesEnabled());
+ props.showHiddenFiles());
connectViewSignals(PrimaryIdx);
m_view[PrimaryIdx]->show();
}
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&)));
-
- 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::undo(KonqUndoManager::self(),
+ SLOT(undo()),
+ actionCollection());
- KStdAction::cut(this, SLOT(cut()), actionCollection());
- KStdAction::copy(this, SLOT(copy()), actionCollection());
- KStdAction::paste(this, SLOT(paste()), actionCollection());
+ KStandardAction::cut(this, SLOT(cut()), actionCollection());
+ KStandardAction::copy(this, SLOT(copy()), actionCollection());
+ KStandardAction::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<KToggleAction>("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<KToggleAction>("details");
+ detailsView->setText(i18n("Details"));
detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
detailsView->setIcon(KIcon("view_text"));
connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
- KToggleAction* previewsView = new KToggleAction(i18n("Previews"), actionCollection(), "previews");
- previewsView->setShortcut(Qt::CTRL | Qt::Key_3);
- previewsView->setIcon(KIcon("gvdirpart"));
- connect(previewsView, SIGNAL(triggered()), this, SLOT(setPreviewsView()));
-
QActionGroup* viewModeGroup = new QActionGroup(this);
viewModeGroup->addAction(iconsView);
viewModeGroup->addAction(detailsView);
- viewModeGroup->addAction(previewsView);
- KToggleAction* sortByName = new KToggleAction(i18n("By Name"), actionCollection(), "by_name");
+ KToggleAction* sortByName = actionCollection()->add<KToggleAction>("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<KToggleAction>("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<KToggleAction>("by_date");
+ sortByDate->setText(i18n("By Date"));
connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate()));
QActionGroup* sortGroup = new QActionGroup(this);
sortGroup->addAction(sortBySize);
sortGroup->addAction(sortByDate);
- KToggleAction* sortDescending = new KToggleAction(i18n("Descending"), actionCollection(), "descending");
+ KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
+ sortDescending->setText(i18n("Descending"));
connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
- KToggleAction* showHiddenFiles = new KToggleAction(i18n("Show Hidden Files"), actionCollection(), "show_hidden_files");
+ KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
+ showPreview->setText(i18n("Show Preview"));
+ connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
+
+ KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("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(showHiddenFiles()));
+ connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
- KToggleAction* split = new KToggleAction(i18n("Split View"), actionCollection(), "split_view");
+ KToggleAction* split = actionCollection()->add<KToggleAction>("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(i18n("Reload"), "F5", 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<KToggleAction>("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<KToggleAction>("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<KToggleAction>("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);
}
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());
}
case DolphinView::DetailsView:
action = actionCollection()->action("details");
break;
- case DolphinView::PreviewsView:
- action = actionCollection()->action("previews");
- break;
+ //case DolphinView::PreviewsView:
+ // action = actionCollection()->action("previews");
+ // break;
default:
break;
}
KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- showHiddenFilesAction->setChecked(m_activeView->isShowHiddenFilesEnabled());
+ showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
splitAction->setChecked(m_view[SecondaryIdx] != 0);
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()
projects / dolphin.git / blobdiff