X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/214ee5de3fab8db92db116496b73200e466b41de..85bc196887fbed01187e3830cd28c2500cb01cb2:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 792c39c1e..e86ad13fa 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -19,23 +19,25 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ +#include #include "dolphinmainwindow.h" -#include - +#include "bookmarkssidebarpage.h" #include "dolphinapplication.h" +#include "dolphinnewmenu.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 "metadatawidget.h" +#include "mainwindowadaptor.h" +#include "treeviewsidebarpage.h" +#include "urlnavigator.h" #include "viewpropertiesdialog.h" #include "viewproperties.h" +#include "dolphin_generalsettings.h" + #include #include #include @@ -47,14 +49,14 @@ #include #include #include +#include #include #include #include #include #include -#include #include -#include +#include #include #include #include @@ -65,27 +67,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&))); } @@ -97,7 +105,7 @@ DolphinMainWindow::~DolphinMainWindow() void DolphinMainWindow::setActiveView(DolphinView* view) { - assert((view == m_view[PrimaryIdx]) || (view == m_view[SecondaryIdx])); + Q_ASSERT((view == m_view[PrimaryIdx]) || (view == m_view[SecondaryIdx])); if (m_activeView == view) { return; } @@ -117,48 +125,88 @@ 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*/ { - // no shortcut is used, hence open a popup menu + else if (controlPressed) { + // shortcut for 'Copy Here' is used + action = Qt::CopyAction; + } + 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-page"), + 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("edit-copy"), + 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("process-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::rename(const KUrl& oldUrl, const KUrl& newUrl) +{ + clearStatusBar(); + KonqOperations::rename(this, oldUrl, newUrl); + m_undoCommandTypes.append(KonqUndoManager::RENAME); } void DolphinMainWindow::refreshViews() @@ -190,17 +238,41 @@ void DolphinMainWindow::refreshViews() } m_activeView = isPrimaryViewActive ? m_view[PrimaryIdx] : m_view[SecondaryIdx]; - assert(m_activeView != 0); + Q_ASSERT(m_activeView != 0); updateViewActions(); emit activeViewChanged(); } +void DolphinMainWindow::changeUrl(const KUrl& url) +{ + if (activeView() != 0) { + activeView()->setUrl(url); + updateEditActions(); + updateViewActions(); + updateGoActions(); + setCaption(url.fileName()); + emit urlChanged(url); + } +} + +void DolphinMainWindow::changeSelection(const KFileItemList& selection) +{ + activeView()->changeSelection(selection); +} + void DolphinMainWindow::slotViewModeChanged() { updateViewActions(); } +void DolphinMainWindow::slotShowPreviewChanged() +{ + // It is not enough to update the 'Show Preview' action, also + // the 'Zoom In' and 'Zoom Out' actions must be adapted. + updateViewActions(); +} + void DolphinMainWindow::slotShowHiddenFilesChanged() { KToggleAction* showHiddenFilesAction = @@ -221,6 +293,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; } @@ -238,11 +319,40 @@ void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order) descending->setChecked(sortDescending); } -void DolphinMainWindow::slotSelectionChanged() +void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation info) +{ + QAction* action = 0; + switch (info) { + case KFileItemDelegate::FriendlyMimeType: + action = actionCollection()->action("show_mime_info"); + break; + case KFileItemDelegate::Size: + action = actionCollection()->action("show_size_info"); + break; + case KFileItemDelegate::ModificationTime: + action = actionCollection()->action("show_date_info"); + break; + case KFileItemDelegate::NoInformation: + default: + action = actionCollection()->action("clear_info"); + break; + } + + if (action != 0) { + KToggleAction* toggleAction = static_cast(action); + toggleAction->setChecked(true); + + QActionGroup* group = toggleAction->actionGroup(); + Q_ASSERT(group != 0); + group->setEnabled(m_activeView->mode() == DolphinView::IconsView); + } +} + +void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) { updateEditActions(); - assert(m_view[PrimaryIdx] != 0); + Q_ASSERT(m_view[PrimaryIdx] != 0); int selectedUrlsCount = m_view[PrimaryIdx]->selectedUrls().count(); if (m_view[SecondaryIdx] != 0) { selectedUrlsCount += m_view[SecondaryIdx]->selectedUrls().count(); @@ -253,7 +363,7 @@ void DolphinMainWindow::slotSelectionChanged() m_activeView->updateStatusBar(); - emit selectionChanged(); + emit selectionChanged(selection); } void DolphinMainWindow::slotHistoryChanged() @@ -261,13 +371,6 @@ void DolphinMainWindow::slotHistoryChanged() updateHistory(); } -void DolphinMainWindow::slotUrlChanged(const KUrl& url) -{ - updateEditActions(); - updateGoActions(); - setCaption(url.fileName()); -} - void DolphinMainWindow::updateFilterBarAction(bool show) { KToggleAction* showFilterBarAction = @@ -280,22 +383,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 +393,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)) { @@ -320,28 +407,28 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) void DolphinMainWindow::saveProperties(KConfig* config) { - config->setGroup("Primary view"); - config->writeEntry("Url", m_view[PrimaryIdx]->url().url()); - config->writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable()); + KConfigGroup primaryView = config->group("Primary view"); + primaryView.writeEntry("Url", m_view[PrimaryIdx]->url().url()); + primaryView.writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable()); if (m_view[SecondaryIdx] != 0) { - config->setGroup("Secondary view"); - config->writeEntry("Url", m_view[SecondaryIdx]->url().url()); - config->writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable()); + KConfigGroup secondaryView = config->group("Secondary view"); + secondaryView.writeEntry("Url", m_view[SecondaryIdx]->url().url()); + secondaryView.writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable()); } } void DolphinMainWindow::readProperties(KConfig* config) { - config->setGroup("Primary view"); - m_view[PrimaryIdx]->setUrl(config->readEntry("Url")); - m_view[PrimaryIdx]->setUrlEditable(config->readEntry("Editable Url", false)); + const KConfigGroup primaryView = config->group("Primary view"); + m_view[PrimaryIdx]->setUrl(primaryView.readEntry("Url")); + m_view[PrimaryIdx]->setUrlEditable(primaryView.readEntry("Editable Url", false)); if (config->hasGroup("Secondary view")) { - config->setGroup("Secondary view"); + const KConfigGroup secondaryView = config->group("Secondary view"); if (m_view[SecondaryIdx] == 0) { toggleSplitView(); } - m_view[SecondaryIdx]->setUrl(config->readEntry("Url")); - m_view[SecondaryIdx]->setUrlEditable(config->readEntry("Editable Url", false)); + m_view[SecondaryIdx]->setUrl(secondaryView.readEntry("Url")); + m_view[SecondaryIdx]->setUrlEditable(secondaryView.readEntry("Editable Url", false)); } else if (m_view[SecondaryIdx] != 0) { toggleSplitView(); @@ -365,30 +452,42 @@ void DolphinMainWindow::moveToTrash() clearStatusBar(); const KUrl::List selectedUrls = m_activeView->selectedUrls(); KonqOperations::del(this, KonqOperations::TRASH, selectedUrls); - m_undoOperations.append(KonqOperations::TRASH); + m_undoCommandTypes.append(KonqUndoManager::TRASH); } void DolphinMainWindow::deleteItems() { clearStatusBar(); + // TODO: if KonqOperations::askDeleteConfirmation() would indicate when + // the operation has been finished, this method should be used. + KUrl::List list = m_activeView->selectedUrls(); const uint itemCount = list.count(); - assert(itemCount >= 1); + Q_ASSERT(itemCount >= 1); QString text; if (itemCount > 1) { - text = i18n("Do you really want to delete the %1 selected items?",itemCount); + text = i18n("Do you really want to delete the %1 selected items?", itemCount); } else { const KUrl& url = list.first(); - text = i18n("Do you really want to delete '%1'?",url.fileName()); + QString itemName; + if (url.protocol() == "trash" ) { + itemName = url.path(); + // TODO: check comment in konq_undo.cc in the method askDeleteConfirmation() + itemName.remove(QRegExp("^/[0-9]*-")); + } + else { + itemName = url.pathOrUrl(); + } + text = i18n("Do you really want to delete '%1'?", itemName); } const bool del = KMessageBox::warningContinueCancel(this, text, - QString::null, - KGuiItem(i18n("Delete"), KIcon("editdelete")) + QString(), + KGuiItem(i18n("Delete"), KIcon("edit-delete")) ) == KMessageBox::Continue; if (del) { KIO::Job* job = KIO::del(list); @@ -413,22 +512,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); } } @@ -439,26 +534,36 @@ void DolphinMainWindow::slotUndoAvailable(bool available) undoAction->setEnabled(available); } - if (available && (m_undoOperations.count() > 0)) { - const KonqOperations::Operation op = m_undoOperations.takeFirst(); + if (available && (m_undoCommandTypes.count() > 0)) { + const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst(); DolphinStatusBar* statusBar = m_activeView->statusBar(); - switch (op) { - case KonqOperations::COPY: + switch (command) { + case KonqUndoManager::COPY: statusBar->setMessage(i18n("Copy operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqOperations::MOVE: + case KonqUndoManager::MOVE: statusBar->setMessage(i18n("Move operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqOperations::LINK: + case KonqUndoManager::LINK: statusBar->setMessage(i18n("Link operation completed."), DolphinStatusBar::OperationCompleted); break; - case KonqOperations::TRASH: + case KonqUndoManager::TRASH: statusBar->setMessage(i18n("Move to trash operation completed."), DolphinStatusBar::OperationCompleted); break; + case KonqUndoManager::RENAME: + statusBar->setMessage(i18n("Renaming operation completed."), + DolphinStatusBar::OperationCompleted); + break; + + case KonqUndoManager::MKDIR: + statusBar->setMessage(i18n("Created directory."), + DolphinStatusBar::OperationCompleted); + break; + default: break; } @@ -474,6 +579,12 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text) } } +void DolphinMainWindow::undo() +{ + clearStatusBar(); + KonqUndoManager::self()->undo(); +} + void DolphinMainWindow::cut() { QMimeData* mimeData = new QMimeData(); @@ -543,13 +654,7 @@ void DolphinMainWindow::updatePasteAction() if (!urls.isEmpty()) { pasteAction->setEnabled(true); - const int count = urls.count(); - if (count == 1) { - pasteAction->setText(i18n("Paste 1 File")); - } - else { - pasteAction->setText(i18n("Paste %1 Files").arg(count)); - } + pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count())); } else { pasteAction->setEnabled(false); @@ -614,6 +719,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) ? @@ -622,6 +742,29 @@ void DolphinMainWindow::toggleSortOrder() m_activeView->setSortOrder(order); } +void DolphinMainWindow::clearInfo() +{ + m_activeView->setAdditionalInfo(KFileItemDelegate::NoInformation); +} + +void DolphinMainWindow::showMimeInfo() +{ + clearStatusBar(); + m_activeView->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType); +} + +void DolphinMainWindow::showSizeInfo() +{ + clearStatusBar(); + m_activeView->setAdditionalInfo(KFileItemDelegate::Size); +} + +void DolphinMainWindow::showDateInfo() +{ + clearStatusBar(); + m_activeView->setAdditionalInfo(KFileItemDelegate::ModificationTime); +} + void DolphinMainWindow::toggleSplitView() { if (m_view[SecondaryIdx] == 0) { @@ -635,6 +778,7 @@ void DolphinMainWindow::toggleSplitView() connectViewSignals(SecondaryIdx); m_splitter->addWidget(m_view[SecondaryIdx]); m_splitter->setSizes(QList() << newWidth << newWidth); + m_view[SecondaryIdx]->reload(); m_view[SecondaryIdx]->show(); } else { @@ -657,6 +801,7 @@ void DolphinMainWindow::toggleSplitView() setActiveView(m_view[PrimaryIdx]); } } + emit activeViewChanged(); } void DolphinMainWindow::reloadView() @@ -721,8 +866,6 @@ void DolphinMainWindow::toggleEditLocation() void DolphinMainWindow::editLocation() { - KToggleAction* action = static_cast(actionCollection()->action("editable_location")); - action->setChecked(true); m_activeView->setUrlEditable(true); } @@ -779,7 +922,7 @@ void DolphinMainWindow::compareFiles() // - both in the secondary view // - one in the primary view and the other in the secondary // view - assert(m_view[PrimaryIdx] != 0); + Q_ASSERT(m_view[PrimaryIdx] != 0); KUrl urlA; KUrl urlB; @@ -787,9 +930,9 @@ void DolphinMainWindow::compareFiles() switch (urls.count()) { case 0: { - assert(m_view[SecondaryIdx] != 0); + Q_ASSERT(m_view[SecondaryIdx] != 0); urls = m_view[SecondaryIdx]->selectedUrls(); - assert(urls.count() == 2); + Q_ASSERT(urls.count() == 2); urlA = urls[0]; urlB = urls[1]; break; @@ -797,9 +940,9 @@ void DolphinMainWindow::compareFiles() case 1: { urlA = urls[0]; - assert(m_view[SecondaryIdx] != 0); + Q_ASSERT(m_view[SecondaryIdx] != 0); urls = m_view[SecondaryIdx]->selectedUrls(); - assert(urls.count() == 1); + Q_ASSERT(urls.count() == 1); urlB = urls[0]; break; } @@ -813,7 +956,7 @@ void DolphinMainWindow::compareFiles() default: { // may not happen: compareFiles may only get invoked if 2 // files are selected - assert(false); + Q_ASSERT(false); } } @@ -839,6 +982,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); @@ -847,19 +993,19 @@ void DolphinMainWindow::init() DolphinSettings& settings = DolphinSettings::instance(); KBookmarkManager* manager = settings.bookmarkManager(); - assert(manager != 0); + Q_ASSERT(manager != 0); KBookmarkGroup root = manager->root(); if (root.first().isNull()) { - root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "folder_home"); - root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "blockdevice"); - root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network_local"); - root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder_red"); - root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "trashcan_full"); + root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "folder-home"); + root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "hdd-mount"); + root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-local"); + root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder-red"); + root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash"); } setupActions(); - const KUrl& homeUrl = root.first().url(); + const KUrl& homeUrl = settings.generalSettings()->homeUrl(); setCaption(homeUrl.fileName()); ViewProperties props(homeUrl); m_view[PrimaryIdx] = new DolphinView(this, @@ -867,10 +1013,11 @@ void DolphinMainWindow::init() homeUrl, props.viewMode(), props.showHiddenFiles()); - connectViewSignals(PrimaryIdx); - m_view[PrimaryIdx]->show(); m_activeView = m_view[PrimaryIdx]; + connectViewSignals(PrimaryIdx); + m_view[PrimaryIdx]->reload(); + m_view[PrimaryIdx]->show(); setCentralWidget(m_splitter); setupDockWidgets(); @@ -893,6 +1040,12 @@ void DolphinMainWindow::init() // assure a proper default size if Dolphin runs the first time resize(640, 480); } + #ifdef HAVE_KMETADATA + if ( !MetaDataWidget::metaDataAvailable() ) + activeView()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error); + #endif + + emit urlChanged(homeUrl); } void DolphinMainWindow::loadSettings() @@ -910,8 +1063,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,17 +1075,18 @@ 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")); + menu->setIcon(SmallIcon("document-new")); connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateNewMenu())); - QAction* action = actionCollection()->addAction("new_window"); - action->setIcon(KIcon("window_new")); - action->setText(i18n("New &Window")); - connect(action, SIGNAL(triggered()), this, SLOT(openNewMainWindow())); + QAction* newWindow = actionCollection()->addAction("new_window"); + newWindow->setIcon(KIcon("window-new")); + newWindow->setText(i18n("New &Window")); + newWindow->setShortcut(Qt::CTRL | Qt::Key_N); + connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow())); QAction* rename = actionCollection()->addAction("rename"); rename->setText(i18n("Rename")); @@ -942,25 +1095,25 @@ void DolphinMainWindow::setupActions() QAction* moveToTrash = actionCollection()->addAction("move_to_trash"); moveToTrash->setText(i18n("Move to Trash")); - moveToTrash->setIcon(KIcon("edittrash")); + moveToTrash->setIcon(KIcon("edit-trash")); moveToTrash->setShortcut(QKeySequence::Delete); connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash())); QAction* deleteAction = actionCollection()->addAction("delete"); deleteAction->setText(i18n("Delete")); - deleteAction->setShortcut(Qt::ALT | Qt::Key_Delete); - deleteAction->setIcon(KIcon("editdelete")); + deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); + deleteAction->setIcon(KIcon("edit-delete")); 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()); @@ -990,13 +1143,13 @@ void DolphinMainWindow::setupActions() KToggleAction* iconsView = actionCollection()->add("icons"); iconsView->setText(i18n("Icons")); iconsView->setShortcut(Qt::CTRL | Qt::Key_1); - iconsView->setIcon(KIcon("view_icon")); + iconsView->setIcon(KIcon("view-icon")); connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView())); KToggleAction* detailsView = actionCollection()->add("details"); detailsView->setText(i18n("Details")); detailsView->setShortcut(Qt::CTRL | Qt::Key_2); - detailsView->setIcon(KIcon("view_text")); + detailsView->setIcon(KIcon("fileview-text")); connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView())); QActionGroup* viewModeGroup = new QActionGroup(this); @@ -1015,47 +1168,88 @@ 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")); connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder())); + KToggleAction* clearInfo = actionCollection()->add("clear_info"); + clearInfo->setText(i18n("No Information")); + connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo())); + + KToggleAction* showMimeInfo = actionCollection()->add("show_mime_info"); + showMimeInfo->setText(i18n("Type")); + connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(showMimeInfo())); + + KToggleAction* showSizeInfo = actionCollection()->add("show_size_info"); + showSizeInfo->setText(i18n("Size")); + connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(showSizeInfo())); + + KToggleAction* showDateInfo = actionCollection()->add("show_date_info"); + showDateInfo->setText(i18n("Date")); + connect(showDateInfo, SIGNAL(triggered()), this, SLOT(showDateInfo())); + + QActionGroup* infoGroup = new QActionGroup(this); + infoGroup->addAction(clearInfo); + infoGroup->addAction(showMimeInfo); + infoGroup->addAction(showSizeInfo); + infoGroup->addAction(showDateInfo); + KToggleAction* showPreview = actionCollection()->add("show_preview"); - showPreview->setText(i18n("Show Preview")); + showPreview->setText(i18n("Preview")); + showPreview->setIcon(KIcon("thumbnail-show")); connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview())); 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"); - split->setText(i18n("Split View")); + split->setText(i18n("Split")); split->setShortcut(Qt::Key_F10); - split->setIcon(KIcon("view_left_right")); + split->setIcon(KIcon("view-left-right")); connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView())); QAction* reload = actionCollection()->addAction("reload"); reload->setText(i18n("Reload")); reload->setShortcut(Qt::Key_F5); - reload->setIcon(KIcon("reload")); + reload->setIcon(KIcon("view-refresh")); connect(reload, SIGNAL(triggered()), this, SLOT(reloadView())); QAction* stop = actionCollection()->addAction("stop"); stop->setText(i18n("Stop")); - stop->setIcon(KIcon("stop")); + stop->setIcon(KIcon("process-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())); @@ -1080,7 +1274,7 @@ void DolphinMainWindow::setupActions() QAction* findFile = actionCollection()->addAction("find_file"); findFile->setText(i18n("Find File...")); findFile->setShortcut(Qt::Key_F); - findFile->setIcon(KIcon("filefind")); + findFile->setIcon(KIcon("file-find")); connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); @@ -1100,35 +1294,64 @@ void DolphinMainWindow::setupActions() void DolphinMainWindow::setupDockWidgets() { - QDockWidget* shortcutsDock = new QDockWidget(i18n("Bookmarks")); + // TODO: there's a lot copy/paste code here. Provide a generic approach + // after the dock concept has been finalized. + + // setup "Bookmarks" + QDockWidget* shortcutsDock = new QDockWidget(i18n("Bookmarks"), this); shortcutsDock->setObjectName("bookmarksDock"); shortcutsDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - shortcutsDock->setWidget(new BookmarksSidebarPage(this)); + SidebarPage* shortcutsWidget = new BookmarksSidebarPage(shortcutsDock); + shortcutsDock->setWidget(shortcutsWidget); + shortcutsDock->toggleViewAction()->setText(i18n("Show Bookmarks Panel")); actionCollection()->addAction("show_bookmarks_panel", shortcutsDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock); + connectSidebarPage(shortcutsWidget); - QDockWidget* infoDock = new QDockWidget(i18n("Information")); + // setup "Information" + QDockWidget* infoDock = new QDockWidget(i18n("Information"), this); infoDock->setObjectName("infoDock"); infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - infoDock->setWidget(new InfoSidebarPage(this)); + SidebarPage* infoWidget = new InfoSidebarPage(infoDock); + infoDock->setWidget(infoWidget); + infoDock->toggleViewAction()->setText(i18n("Show Information Panel")); actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction()); addDockWidget(Qt::RightDockWidgetArea, infoDock); + connectSidebarPage(infoWidget); + + // setup "Tree View" + QDockWidget* treeViewDock = new QDockWidget(i18n("Folders")); // TODO: naming? + treeViewDock->setObjectName("treeViewDock"); + treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock); + treeViewDock->setWidget(treeWidget); + + treeViewDock->toggleViewAction()->setText(i18n("Show Folders Panel")); + actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction()); + + addDockWidget(Qt::LeftDockWidgetArea, treeViewDock); + connectSidebarPage(treeWidget); + + const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun(); + if (firstRun) { + infoDock->hide(); + treeViewDock->hide(); + } } void DolphinMainWindow::updateHistory() { int index = 0; - const Q3ValueList list = m_activeView->urlHistory(index); QAction* backAction = actionCollection()->action("go_back"); if (backAction != 0) { - backAction->setEnabled(index < static_cast(list.count()) - 1); + backAction->setEnabled(index < m_activeView->urlNavigator()->historySize() - 1); } QAction* forwardAction = actionCollection()->action("go_forward"); @@ -1202,17 +1425,26 @@ void DolphinMainWindow::updateViewActions() slotSortingChanged(m_activeView->sorting()); slotSortOrderChanged(m_activeView->sortOrder()); + slotAdditionalInfoChanged(m_activeView->additionalInfo()); KToggleAction* showFilterBarAction = static_cast(actionCollection()->action("show_filter_bar")); showFilterBarAction->setChecked(m_activeView->isFilterBarVisible()); + KToggleAction* showPreviewAction = + static_cast(actionCollection()->action("show_preview")); + showPreviewAction->setChecked(m_activeView->showPreview()); + KToggleAction* showHiddenFilesAction = static_cast(actionCollection()->action("show_hidden_files")); showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles()); 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() @@ -1225,13 +1457,19 @@ void DolphinMainWindow::updateGoActions() void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest) { KonqOperations::copy(this, KonqOperations::COPY, source, dest); - m_undoOperations.append(KonqOperations::COPY); + m_undoCommandTypes.append(KonqUndoManager::COPY); } void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest) { KonqOperations::copy(this, KonqOperations::MOVE, source, dest); - m_undoOperations.append(KonqOperations::MOVE); + 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() @@ -1244,23 +1482,59 @@ void DolphinMainWindow::connectViewSignals(int viewIndex) DolphinView* view = m_view[viewIndex]; connect(view, SIGNAL(modeChanged()), this, SLOT(slotViewModeChanged())); + connect(view, SIGNAL(showPreviewChanged()), + this, SLOT(slotShowPreviewChanged())); connect(view, SIGNAL(showHiddenFilesChanged()), this, SLOT(slotShowHiddenFilesChanged())); connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(slotSortingChanged(DolphinView::Sorting))); connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(slotSortOrderChanged(Qt::SortOrder))); - connect(view, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::AdditionalInformation)), + this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation))); + connect(view, SIGNAL(selectionChanged(KFileItemList)), + this, SLOT(slotSelectionChanged(KFileItemList))); connect(view, SIGNAL(showFilterBarChanged(bool)), this, SLOT(updateFilterBarAction(bool))); + connect(view, SIGNAL(urlChanged(KUrl)), + this, SLOT(changeUrl(KUrl))); const UrlNavigator* navigator = view->urlNavigator(); connect(navigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(slotUrlChanged(const KUrl&))); + this, SLOT(changeUrl(const KUrl&))); connect(navigator, SIGNAL(historyChanged()), this, SLOT(slotHistoryChanged())); +} +void DolphinMainWindow::connectSidebarPage(SidebarPage* page) +{ + connect(page, SIGNAL(changeUrl(KUrl)), + this, SLOT(changeUrl(KUrl))); + connect(page, SIGNAL(changeSelection(KFileItemList)), + this, SLOT(changeSelection(KFileItemList))); + connect(page, SIGNAL(urlsDropped(KUrl::List,KUrl)), + this, SLOT(dropUrls(KUrl::List,KUrl))); + + connect(this, SIGNAL(urlChanged(KUrl)), + page, SLOT(setUrl(KUrl))); + connect(this, SIGNAL(selectionChanged(KFileItemList)), + page, SLOT(setSelection(KFileItemList))); +} + +DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) : + KonqUndoManager::UiInterface(mainWin), + m_mainWin(mainWin) +{ + Q_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"