X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/214ee5de3fab8db92db116496b73200e466b41de..abf17941f7a052d25788d2f2f3c84e5aae935e29:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 792c39c1e..a25c61038 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -24,6 +24,7 @@ #include #include "dolphinapplication.h" +#include "dolphinnewmenu.h" #include "dolphinsettings.h" #include "dolphinsettingsdialog.h" #include "dolphinstatusbar.h" @@ -35,6 +36,7 @@ #include "generalsettings.h" #include "viewpropertiesdialog.h" #include "viewproperties.h" +#include "mainwindowadaptor.h" #include #include @@ -47,14 +49,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include -#include #include #include #include @@ -65,27 +66,33 @@ #include #include -#include // TODO #include #include #include #include -DolphinMainWindow::DolphinMainWindow() : +DolphinMainWindow::DolphinMainWindow(int id) : KMainWindow(0), m_newMenu(0), m_splitter(0), - m_activeView(0) + m_activeView(0), + m_id(id) { setObjectName("Dolphin"); m_view[PrimaryIdx] = 0; m_view[SecondaryIdx] = 0; + new MainWindowAdaptor(this); + QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this); + KonqUndoManager::incRef(); - connect(KonqUndoManager::self(), SIGNAL(undoAvailable(bool)), + KonqUndoManager* undoManager = KonqUndoManager::self(); + undoManager->setUiInterface(new UndoUiInterface(this)); + + connect(undoManager, SIGNAL(undoAvailable(bool)), this, SLOT(slotUndoAvailable(bool))); - connect(KonqUndoManager::self(), SIGNAL(undoTextChanged(const QString&)), + connect(undoManager, SIGNAL(undoTextChanged(const QString&)), this, SLOT(slotUndoTextChanged(const QString&))); } @@ -117,48 +124,81 @@ void DolphinMainWindow::setActiveView(DolphinView* view) void DolphinMainWindow::dropUrls(const KUrl::List& urls, const KUrl& destination) { - m_dropDestination = destination; - m_droppedUrls = urls; - - /* KDE4-TODO - const ButtonState keyboardState = KApplication::keyboardMouseState(); - const bool shiftPressed = (keyboardState & ShiftButton) > 0; - const bool controlPressed = (keyboardState & ControlButton) > 0; - - + Qt::DropAction action = Qt::CopyAction; + Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); + const bool shiftPressed = modifier & Qt::ShiftModifier; + const bool controlPressed = modifier & Qt::ControlModifier; if (shiftPressed && controlPressed) { - // shortcut for 'Linke Here' is used - selectedIndex = 2; - } - else if (controlPressed) { - // shortcut for 'Copy Here' is used - selectedIndex = 1; + // shortcut for 'Link Here' is used + action = Qt::LinkAction; } else if (shiftPressed) { // shortcut for 'Move Here' is used - selectedIndex = 0; + action = Qt::MoveAction; + } + else if (controlPressed) { + // shortcut for 'Copy Here' is used + action = Qt::CopyAction; } - else*/ { - // no shortcut is used, hence open a popup menu + else { + // open a context menu which offers the following actions: + // - Move Here + // - Copy Here + // - Link Here + // - Cancel + KMenu popup(this); - QAction* moveAction = popup.addAction(SmallIcon("goto"), i18n("&Move Here")); - connect(moveAction, SIGNAL(triggered()), this, SLOT(moveDroppedItems())); + QString seq = QKeySequence(Qt::ShiftModifier).toString(); + seq.chop(1); // chop superfluous '+' + QAction* moveAction = popup.addAction(KIcon("goto"), + i18n("&Move Here") + "\t" + seq); - QAction* copyAction = popup.addAction(SmallIcon("editcopy"), i18n( "&Copy Here" )); - connect(copyAction, SIGNAL(triggered()), this, SLOT(copyDroppedItems())); + seq = QKeySequence(Qt::ControlModifier).toString(); + seq.chop(1); + QAction* copyAction = popup.addAction(KIcon("editcopy"), + i18n("&Copy Here") + "\t" + seq); - QAction* linkAction = popup.addAction(i18n("&Link Here")); - connect(linkAction, SIGNAL(triggered()), this, SLOT(linkDroppedItems())); + seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString(); + seq.chop(1); + QAction* linkAction = popup.addAction(KIcon("www"), + i18n("&Link Here") + "\t" + seq); - QAction* cancelAction = popup.addAction(SmallIcon("stop"), i18n("Cancel")); - popup.insertSeparator(cancelAction); + popup.addSeparator(); + popup.addAction(KIcon("stop"), i18n("Cancel")); - popup.exec(QCursor::pos()); + QAction* activatedAction = popup.exec(QCursor::pos()); + if (activatedAction == moveAction) { + action = Qt::MoveAction; + } + else if (activatedAction == copyAction) { + action = Qt::CopyAction; + } + else if (activatedAction == linkAction) { + action = Qt::LinkAction; + } + else { + return; + } } - m_droppedUrls.clear(); + switch (action) { + case Qt::MoveAction: + moveUrls(urls, destination); + break; + + case Qt::CopyAction: + copyUrls(urls, destination); + break; + + case Qt::LinkAction: + linkUrls(urls, destination); + break; + + default: + break; + } } void DolphinMainWindow::refreshViews() @@ -196,6 +236,13 @@ void DolphinMainWindow::refreshViews() emit activeViewChanged(); } +void DolphinMainWindow::changeUrl(const QString& url) +{ + if (activeView() != 0) { + activeView()->setUrl(KUrl(url)); + } +} + void DolphinMainWindow::slotViewModeChanged() { updateViewActions(); @@ -221,6 +268,15 @@ void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting) case DolphinView::SortByDate: action = actionCollection()->action("by_date"); break; + case DolphinView::SortByPermissions: + action = actionCollection()->action("by_permissions"); + break; + case DolphinView::SortByOwner: + action = actionCollection()->action("by_owner"); + break; + case DolphinView::SortByGroup: + action = actionCollection()->action("by_group"); + break; default: break; } @@ -280,22 +336,6 @@ void DolphinMainWindow::openNewMainWindow() DolphinApplication::app()->createMainWindow()->show(); } -void DolphinMainWindow::moveDroppedItems() -{ - moveUrls(m_droppedUrls, m_dropDestination); -} - -void DolphinMainWindow::copyDroppedItems() -{ - copyUrls(m_droppedUrls, m_dropDestination); -} - -void DolphinMainWindow::linkDroppedItems() -{ - KonqOperations::copy(this, KonqOperations::LINK, m_droppedUrls, m_dropDestination); - m_undoOperations.append(KonqOperations::LINK); -} - void DolphinMainWindow::closeEvent(QCloseEvent* event) { DolphinSettings& settings = DolphinSettings::instance(); @@ -306,7 +346,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) // 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()); + QString filename = KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName()); filename.append("/panels_layout"); QFile file(filename); if (file.open(QIODevice::WriteOnly)) { @@ -413,22 +453,18 @@ void DolphinMainWindow::quit() void DolphinMainWindow::slotHandleJobError(KJob* job) { if (job->error() != 0) { - m_activeView->statusBar()->setMessage(job->errorString(), - DolphinStatusBar::Error); + DolphinStatusBar* statusBar = m_activeView->statusBar(); + statusBar->setMessage(job->errorString(), + DolphinStatusBar::Error); } } void DolphinMainWindow::slotDeleteFileFinished(KJob* job) { if (job->error() == 0) { - m_activeView->statusBar()->setMessage(i18n("Delete operation completed."), - DolphinStatusBar::OperationCompleted); - - // TODO: In opposite to the 'Move to Trash' operation in the class KFileIconView - // no rearranging of the item position is done when a file has been deleted. - // This is bypassed by reloading the view, but it might be worth to investigate - // deeper for the root of this issue. - m_activeView->reload(); + DolphinStatusBar* statusBar = m_activeView->statusBar(); + statusBar->setMessage(i18n("Delete operation completed."), + DolphinStatusBar::OperationCompleted); } } @@ -474,6 +510,12 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text) } } +void DolphinMainWindow::undo() +{ + clearStatusBar(); + KonqUndoManager::self()->undo(); +} + void DolphinMainWindow::cut() { QMimeData* mimeData = new QMimeData(); @@ -614,6 +656,21 @@ void DolphinMainWindow::sortByDate() m_activeView->setSorting(DolphinView::SortByDate); } +void DolphinMainWindow::sortByPermissions() +{ + m_activeView->setSorting(DolphinView::SortByPermissions); +} + +void DolphinMainWindow::sortByOwner() +{ + m_activeView->setSorting(DolphinView::SortByOwner); +} + +void DolphinMainWindow::sortByGroup() +{ + m_activeView->setSorting(DolphinView::SortByGroup); +} + void DolphinMainWindow::toggleSortOrder() { const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::Ascending) ? @@ -657,6 +714,7 @@ void DolphinMainWindow::toggleSplitView() setActiveView(m_view[PrimaryIdx]); } } + emit activeViewChanged(); } void DolphinMainWindow::reloadView() @@ -721,8 +779,6 @@ void DolphinMainWindow::toggleEditLocation() void DolphinMainWindow::editLocation() { - KToggleAction* action = static_cast(actionCollection()->action("editable_location")); - action->setChecked(true); m_activeView->setUrlEditable(true); } @@ -839,6 +895,9 @@ void DolphinMainWindow::init() // a proper default window size is given at the end of DolphinMainWindow::init(). GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); const bool firstRun = generalSettings->firstRun(); + if (firstRun) { + generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime()); + } setAcceptDrops(true); @@ -910,8 +969,7 @@ void DolphinMainWindow::loadSettings() // 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"); + QString filename = KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName()); filename.append("/panels_layout"); QFile file(filename); if (file.open(QIODevice::ReadOnly)) { QByteArray data = file.readAll(); @@ -923,7 +981,7 @@ void DolphinMainWindow::loadSettings() void DolphinMainWindow::setupActions() { // setup 'File' menu - m_newMenu = new KNewMenu(actionCollection(), this, "create_new"); + m_newMenu = new DolphinNewMenu(this); KMenu* menu = m_newMenu->menu(); menu->setTitle(i18n("Create New...")); menu->setIcon(SmallIcon("filenew")); @@ -953,14 +1011,14 @@ void DolphinMainWindow::setupActions() connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems())); QAction* properties = actionCollection()->addAction("properties"); - properties->setText(i18n("Propert&ies")); - properties->setShortcut(Qt::Key_Alt | Qt::Key_Return); + properties->setText(i18n("Properties")); + properties->setShortcut(Qt::ALT | Qt::Key_Return); connect(properties, SIGNAL(triggered()), this, SLOT(properties())); KStandardAction::quit(this, SLOT(quit()), actionCollection()); // setup 'Edit' menu - KStandardAction::undo(KonqUndoManager::self(), + KStandardAction::undo(this, SLOT(undo()), actionCollection()); @@ -1015,10 +1073,25 @@ void DolphinMainWindow::setupActions() sortByDate->setText(i18n("By Date")); connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate())); + KToggleAction* sortByPermissions = actionCollection()->add("by_permissions"); + sortByPermissions->setText(i18n("By Permissions")); + connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions())); + + KToggleAction* sortByOwner = actionCollection()->add("by_owner"); + sortByOwner->setText(i18n("By Owner")); + connect(sortByOwner, SIGNAL(triggered()), this, SLOT(sortByOwner())); + + KToggleAction* sortByGroup = actionCollection()->add("by_group"); + sortByGroup->setText(i18n("By Group")); + connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup())); + QActionGroup* sortGroup = new QActionGroup(this); sortGroup->addAction(sortByName); sortGroup->addAction(sortBySize); sortGroup->addAction(sortByDate); + sortGroup->addAction(sortByPermissions); + sortGroup->addAction(sortByOwner); + sortGroup->addAction(sortByGroup); KToggleAction* sortDescending = actionCollection()->add("descending"); sortDescending->setText(i18n("Descending")); @@ -1030,7 +1103,7 @@ void DolphinMainWindow::setupActions() 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 '.'? + showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period); connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles())); KToggleAction* split = actionCollection()->add("split_view"); @@ -1050,12 +1123,15 @@ void DolphinMainWindow::setupActions() stop->setIcon(KIcon("stop")); connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading())); + // TODO: the URL navigator must emit a signal if the editable state has been + // changed, so that the corresponding showFullLocation action is updated. Also + // the naming "Show full Location" is currently confusing... 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 = actionCollection()->add("edit_location"); + QAction* editLocation = actionCollection()->addAction("edit_location"); editLocation->setText(i18n("Edit Location")); editLocation->setShortcut(Qt::Key_F6); connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation())); @@ -1124,7 +1200,7 @@ void DolphinMainWindow::setupDockWidgets() void DolphinMainWindow::updateHistory() { int index = 0; - const Q3ValueList list = m_activeView->urlHistory(index); + const QLinkedList list = m_activeView->urlHistory(index); QAction* backAction = actionCollection()->action("go_back"); if (backAction != 0) { @@ -1213,6 +1289,10 @@ void DolphinMainWindow::updateViewActions() KToggleAction* splitAction = static_cast(actionCollection()->action("split_view")); splitAction->setChecked(m_view[SecondaryIdx] != 0); + + KToggleAction* editableLocactionAction = + static_cast(actionCollection()->action("editable_location")); + editableLocactionAction->setChecked(m_activeView->isUrlEditable()); } void DolphinMainWindow::updateGoActions() @@ -1234,6 +1314,12 @@ void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest) m_undoOperations.append(KonqOperations::MOVE); } +void DolphinMainWindow::linkUrls(const KUrl::List& source, const KUrl& dest) +{ + KonqOperations::copy(this, KonqOperations::LINK, source, dest); + m_undoOperations.append(KonqOperations::LINK); +} + void DolphinMainWindow::clearStatusBar() { m_activeView->statusBar()->clear(); @@ -1263,4 +1349,21 @@ void DolphinMainWindow::connectViewSignals(int viewIndex) } +DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) : + KonqUndoManager::UiInterface(mainWin), + m_mainWin(mainWin) +{ + assert(m_mainWin != 0); +} + +DolphinMainWindow::UndoUiInterface::~UndoUiInterface() +{ +} + +void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job) +{ + DolphinStatusBar* statusBar = m_mainWin->activeView()->statusBar(); + statusBar->setMessage(job->errorString(), DolphinStatusBar::Error); +} + #include "dolphinmainwindow.moc"