X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4908c5e60cc55cb1bf7337418b87d1fc0ee1d734..2ed4d8dcc483ac6067149647eb457d46be7111c5:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 4090d6939..43b699ee2 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -22,7 +22,6 @@ #include #include "dolphinmainwindow.h" -#include "bookmarkssidebarpage.h" #include "dolphinapplication.h" #include "dolphinnewmenu.h" #include "dolphinsettings.h" @@ -31,16 +30,18 @@ #include "infosidebarpage.h" #include "metadatawidget.h" #include "mainwindowadaptor.h" +#include "terminalsidebarpage.h" #include "treeviewsidebarpage.h" -#include "urlnavigator.h" +#include "kurlnavigator.h" #include "viewpropertiesdialog.h" #include "viewproperties.h" +#include "kfileplacesmodel.h" +#include "kfileplacesview.h" #include "dolphin_generalsettings.h" #include #include -#include #include #include #include @@ -67,13 +68,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include DolphinMainWindow::DolphinMainWindow(int id) : - KMainWindow(0), + KXmlGuiWindow(0), m_newMenu(0), m_splitter(0), m_activeView(0), @@ -133,16 +134,13 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, if (shiftPressed && controlPressed) { // shortcut for 'Link Here' is used action = Qt::LinkAction; - } - else if (shiftPressed) { + } else if (shiftPressed) { // shortcut for 'Move Here' is used action = Qt::MoveAction; - } - else if (controlPressed) { + } else if (controlPressed) { // shortcut for 'Copy Here' is used action = Qt::CopyAction; - } - else { + } else { // open a context menu which offers the following actions: // - Move Here // - Copy Here @@ -172,33 +170,30 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, QAction* activatedAction = popup.exec(QCursor::pos()); if (activatedAction == moveAction) { action = Qt::MoveAction; - } - else if (activatedAction == copyAction) { + } else if (activatedAction == copyAction) { action = Qt::CopyAction; - } - else if (activatedAction == linkAction) { + } else if (activatedAction == linkAction) { action = Qt::LinkAction; - } - else { + } else { return; } } switch (action) { - case Qt::MoveAction: - moveUrls(urls, destination); - break; + case Qt::MoveAction: + moveUrls(urls, destination); + break; - case Qt::CopyAction: - copyUrls(urls, destination); - break; + case Qt::CopyAction: + copyUrls(urls, destination); + break; - case Qt::LinkAction: - linkUrls(urls, destination); - break; + case Qt::LinkAction: + linkUrls(urls, destination); + break; - default: - break; + default: + break; } } @@ -211,38 +206,19 @@ void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl) void DolphinMainWindow::refreshViews() { - const bool split = DolphinSettings::instance().generalSettings()->splitView(); - const bool isPrimaryViewActive = (m_activeView == m_view[PrimaryIdx]); - KUrl url; - for (int i = PrimaryIdx; i <= SecondaryIdx; ++i) { - if (m_view[i] != 0) { - url = m_view[i]->url(); - - // delete view instance... - m_view[i]->close(); - m_view[i]->deleteLater(); - m_view[i] = 0; - } + Q_ASSERT(m_view[PrimaryIdx] != 0); - if (split || (i == PrimaryIdx)) { - // ... and recreate it - ViewProperties props(url); - m_view[i] = new DolphinView(this, - m_splitter, - url, - props.viewMode(), - props.showHiddenFiles()); - connectViewSignals(i); - m_view[i]->reload(); - m_view[i]->show(); - } - } + // remember the current active view, as because of + // the refreshing the active view might change to + // the secondary view + DolphinView* activeView = m_activeView; - m_activeView = isPrimaryViewActive ? m_view[PrimaryIdx] : m_view[SecondaryIdx]; - Q_ASSERT(m_activeView != 0); + m_view[PrimaryIdx]->refresh(); + if (m_view[SecondaryIdx] != 0) { + m_view[SecondaryIdx]->refresh(); + } - updateViewActions(); - emit activeViewChanged(); + setActiveView(activeView); } void DolphinMainWindow::changeUrl(const KUrl& url) @@ -281,30 +257,40 @@ void DolphinMainWindow::slotShowHiddenFilesChanged() showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles()); } +void DolphinMainWindow::slotCategorizedSortingChanged() +{ + KToggleAction* categorizedSortingAction = + static_cast(actionCollection()->action("categorized")); + categorizedSortingAction->setChecked(m_activeView->categorizedSorting()); + categorizedSortingAction->setEnabled(m_activeView->supportsCategorizedSorting()); +} + void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting) { QAction* action = 0; switch (sorting) { - case DolphinView::SortByName: - action = actionCollection()->action("by_name"); - break; - case DolphinView::SortBySize: - action = actionCollection()->action("by_size"); - break; - 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; + case DolphinView::SortByName: + action = actionCollection()->action("by_name"); + break; + case DolphinView::SortBySize: + action = actionCollection()->action("by_size"); + break; + 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; + case DolphinView::SortByType: + action = actionCollection()->action("by_type"); + default: + break; } if (action != 0) { @@ -316,7 +302,7 @@ void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting) void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order) { KToggleAction* descending = static_cast(actionCollection()->action("descending")); - const bool sortDescending = (order == Qt::Descending); + const bool sortDescending = (order == Qt::DescendingOrder); descending->setChecked(sortDescending); } @@ -324,19 +310,19 @@ void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::AdditionalI { 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; + 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) { @@ -367,6 +353,11 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) emit selectionChanged(selection); } +void DolphinMainWindow::slotRequestItemInfo(const KUrl& url) +{ + emit requestItemInfo(url); +} + void DolphinMainWindow::slotHistoryChanged() { updateHistory(); @@ -392,18 +383,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) 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::mainComponent().componentName()); - filename.append("/panels_layout"); - QFile file(filename); - if (file.open(QIODevice::WriteOnly)) { - QByteArray data = saveState(); - file.write(data); - file.close(); - } - - KMainWindow::closeEvent(event); + KXmlGuiWindow::closeEvent(event); } void DolphinMainWindow::saveProperties(KConfig* config) @@ -430,8 +410,7 @@ void DolphinMainWindow::readProperties(KConfig* config) } m_view[SecondaryIdx]->setUrl(secondaryView.readEntry("Url")); m_view[SecondaryIdx]->setUrlEditable(secondaryView.readEntry("Editable Url", false)); - } - else if (m_view[SecondaryIdx] != 0) { + } else if (m_view[SecondaryIdx] != 0) { toggleSplitView(); } } @@ -460,36 +439,12 @@ 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(); - Q_ASSERT(itemCount >= 1); - - QString text; - if (itemCount > 1) { - text = i18n("Do you really want to delete the %1 selected items?", itemCount); - } - else { - const KUrl& url = list.first(); - 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 KUrl::List list = m_activeView->selectedUrls(); + const bool del = KonqOperations::askDeleteConfirmation(list, + KonqOperations::DEL, + KonqOperations::DEFAULT_CONFIRMATION, + this); - const bool del = KMessageBox::warningContinueCancel(this, - text, - QString(), - KGuiItem(i18n("Delete"), KIcon("edit-delete")) - ) == KMessageBox::Continue; if (del) { KIO::Job* job = KIO::del(list); connect(job, SIGNAL(result(KJob*)), @@ -539,34 +494,34 @@ void DolphinMainWindow::slotUndoAvailable(bool available) const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst(); DolphinStatusBar* statusBar = m_activeView->statusBar(); switch (command) { - case KonqUndoManager::COPY: - statusBar->setMessage(i18n("Copy operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqUndoManager::MOVE: - statusBar->setMessage(i18n("Move operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqUndoManager::LINK: - statusBar->setMessage(i18n("Link operation completed."), - DolphinStatusBar::OperationCompleted); - break; - 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; + case KonqUndoManager::COPY: + statusBar->setMessage(i18n("Copy operation completed."), + DolphinStatusBar::OperationCompleted); + break; + case KonqUndoManager::MOVE: + statusBar->setMessage(i18n("Move operation completed."), + DolphinStatusBar::OperationCompleted); + break; + case KonqUndoManager::LINK: + statusBar->setMessage(i18n("Link operation completed."), + DolphinStatusBar::OperationCompleted); + break; + 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 folder."), + DolphinStatusBar::OperationCompleted); + break; + + default: + break; } } @@ -634,8 +589,7 @@ void DolphinMainWindow::paste() if (KonqMimeData::decodeIsCutSelection(mimeData)) { moveUrls(sourceUrls, destUrl); clipboard->clear(); - } - else { + } else { copyUrls(sourceUrls, destUrl); } } @@ -656,8 +610,7 @@ void DolphinMainWindow::updatePasteAction() pasteAction->setEnabled(true); pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count())); - } - else { + } else { pasteAction->setEnabled(false); pasteAction->setText(i18n("Paste")); } @@ -669,8 +622,7 @@ void DolphinMainWindow::updatePasteAction() // pasting should not be allowed when more than one file // is selected pasteAction->setEnabled(false); - } - else if (count == 1) { + } else if (count == 1) { // Only one file is selected. Pasting is only allowed if this // file is a directory. // TODO: this doesn't work with remote protocols; instead we need a @@ -740,14 +692,25 @@ void DolphinMainWindow::sortByGroup() m_activeView->setSorting(DolphinView::SortByGroup); } +void DolphinMainWindow::sortByType() +{ + m_activeView->setSorting(DolphinView::SortByType); +} + void DolphinMainWindow::toggleSortOrder() { - const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::Ascending) ? - Qt::Descending : - Qt::Ascending; + const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::AscendingOrder) ? + Qt::DescendingOrder : + Qt::AscendingOrder; m_activeView->setSortOrder(order); } +void DolphinMainWindow::toggleSortCategorization() +{ + const bool categorizedSorting = m_activeView->categorizedSorting(); + m_activeView->setCategorizedSorting(!categorizedSorting); +} + void DolphinMainWindow::clearInfo() { m_activeView->setAdditionalInfo(KFileItemDelegate::NoInformation); @@ -778,7 +741,7 @@ void DolphinMainWindow::toggleSplitView() // create a secondary view m_view[SecondaryIdx] = new DolphinView(this, 0, - m_view[PrimaryIdx]->url(), + m_view[PrimaryIdx]->rootUrl(), m_view[PrimaryIdx]->mode(), m_view[PrimaryIdx]->showHiddenFiles()); connectViewSignals(SecondaryIdx); @@ -786,16 +749,13 @@ void DolphinMainWindow::toggleSplitView() m_splitter->setSizes(QList() << newWidth << newWidth); m_view[SecondaryIdx]->reload(); m_view[SecondaryIdx]->show(); - } - else { + } else { // remove secondary view if (m_activeView == m_view[PrimaryIdx]) { m_view[SecondaryIdx]->close(); m_view[SecondaryIdx]->deleteLater(); m_view[SecondaryIdx] = 0; - setActiveView(m_view[PrimaryIdx]); - } - else { + } else { // The secondary view is active, hence from the users point of view // the content of the secondary view should be moved to the primary view. // From an implementation point of view it is more efficient to close @@ -804,9 +764,9 @@ void DolphinMainWindow::toggleSplitView() delete m_view[PrimaryIdx]; m_view[PrimaryIdx] = m_view[SecondaryIdx]; m_view[SecondaryIdx] = 0; - setActiveView(m_view[PrimaryIdx]); } } + setActiveView(m_view[PrimaryIdx]); emit activeViewChanged(); } @@ -817,8 +777,7 @@ void DolphinMainWindow::reloadView() } void DolphinMainWindow::stopLoading() -{ -} +{} void DolphinMainWindow::togglePreview() { @@ -840,7 +799,7 @@ void DolphinMainWindow::toggleShowHiddenFiles() m_activeView->setShowHiddenFiles(show); } -void DolphinMainWindow::showFilterBar() +void DolphinMainWindow::toggleFilterBarVisibility() { const KToggleAction* showFilterBarAction = static_cast(actionCollection()->action("show_filter_bar")); @@ -906,18 +865,9 @@ void DolphinMainWindow::goHome() m_activeView->goHome(); } -void DolphinMainWindow::openTerminal() -{ - QString command("konsole --workdir \""); - command.append(m_activeView->url().path()); - command.append('\"'); - - KRun::runCommand(command, "Konsole", "konsole"); -} - void DolphinMainWindow::findFile() { - KRun::run("kfind", m_activeView->url()); + KRun::run("kfind", m_activeView->url(), this); } void DolphinMainWindow::compareFiles() @@ -935,35 +885,35 @@ void DolphinMainWindow::compareFiles() KUrl::List urls = m_view[PrimaryIdx]->selectedUrls(); switch (urls.count()) { - case 0: { - Q_ASSERT(m_view[SecondaryIdx] != 0); - urls = m_view[SecondaryIdx]->selectedUrls(); - Q_ASSERT(urls.count() == 2); - urlA = urls[0]; - urlB = urls[1]; - break; - } + case 0: { + Q_ASSERT(m_view[SecondaryIdx] != 0); + urls = m_view[SecondaryIdx]->selectedUrls(); + Q_ASSERT(urls.count() == 2); + urlA = urls[0]; + urlB = urls[1]; + break; + } - case 1: { - urlA = urls[0]; - Q_ASSERT(m_view[SecondaryIdx] != 0); - urls = m_view[SecondaryIdx]->selectedUrls(); - Q_ASSERT(urls.count() == 1); - urlB = urls[0]; - break; - } + case 1: { + urlA = urls[0]; + Q_ASSERT(m_view[SecondaryIdx] != 0); + urls = m_view[SecondaryIdx]->selectedUrls(); + Q_ASSERT(urls.count() == 1); + urlB = urls[0]; + break; + } - case 2: { - urlA = urls[0]; - urlB = urls[1]; - break; - } + case 2: { + urlA = urls[0]; + urlB = urls[1]; + break; + } - default: { - // may not happen: compareFiles may only get invoked if 2 - // files are selected - Q_ASSERT(false); - } + default: { + // may not happen: compareFiles may only get invoked if 2 + // files are selected + Q_ASSERT(false); + } } QString command("kompare -c \""); @@ -971,15 +921,14 @@ void DolphinMainWindow::compareFiles() command.append("\" \""); command.append(urlB.pathOrUrl()); command.append('\"'); - KRun::runCommand(command, "Kompare", "kompare"); + KRun::runCommand(command, "Kompare", "kompare", this); } void DolphinMainWindow::editSettings() { - // TODO: make a static method for opening the settings dialog - DolphinSettingsDialog dlg(this); - dlg.exec(); + DolphinSettingsDialog dialog(this); + dialog.exec(); } void DolphinMainWindow::init() @@ -998,17 +947,6 @@ void DolphinMainWindow::init() DolphinSettings& settings = DolphinSettings::instance(); - KBookmarkManager* manager = settings.bookmarkManager(); - 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:/"), "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 = settings.generalSettings()->homeUrl(); @@ -1028,7 +966,7 @@ void DolphinMainWindow::init() setCentralWidget(m_splitter); setupDockWidgets(); - setupGUI(Keys|Save|Create|ToolBar); + setupGUI(Keys | Save | Create | ToolBar); createGUI(); stateChanged("new_file"); @@ -1046,10 +984,10 @@ void DolphinMainWindow::init() // assure a proper default size if Dolphin runs the first time resize(640, 480); } - #ifdef HAVE_KMETADATA - if ( !MetaDataWidget::metaDataAvailable() ) +#ifdef HAVE_KMETADATA + if (!MetaDataWidget::metaDataAvailable()) activeView()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error); - #endif +#endif emit urlChanged(homeUrl); } @@ -1065,17 +1003,6 @@ 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::mainComponent().componentName()); filename.append("/panels_layout"); - QFile file(filename); - if (file.open(QIODevice::ReadOnly)) { - QByteArray data = file.readAll(); - restoreState(data); - file.close(); - } } void DolphinMainWindow::setupActions() @@ -1083,7 +1010,7 @@ void DolphinMainWindow::setupActions() // setup 'File' menu m_newMenu = new DolphinNewMenu(this); KMenu* menu = m_newMenu->menu(); - menu->setTitle(i18n("Create New...")); + menu->setTitle(i18n("Create New")); menu->setIcon(KIcon("document-new")); connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateNewMenu())); @@ -1095,7 +1022,7 @@ void DolphinMainWindow::setupActions() connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow())); QAction* rename = actionCollection()->addAction("rename"); - rename->setText(i18n("Rename")); + rename->setText(i18n("Rename...")); rename->setShortcut(Qt::Key_F2); connect(rename, SIGNAL(triggered()), this, SLOT(rename())); @@ -1139,12 +1066,12 @@ void DolphinMainWindow::setupActions() // setup 'View' menu KStandardAction::zoomIn(this, - SLOT(zoomIn()), - actionCollection()); + SLOT(zoomIn()), + actionCollection()); KStandardAction::zoomOut(this, - SLOT(zoomOut()), - actionCollection()); + SLOT(zoomOut()), + actionCollection()); KToggleAction* iconsView = actionCollection()->add("icons"); iconsView->setText(i18n("Icons")); @@ -1161,7 +1088,7 @@ void DolphinMainWindow::setupActions() KToggleAction* columnView = actionCollection()->add("columns"); columnView->setText(i18n("Columns")); columnView->setShortcut(Qt::CTRL | Qt::Key_3); - columnView->setIcon(KIcon("view-tree")); + columnView->setIcon(KIcon("fileview-column")); connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView())); QActionGroup* viewModeGroup = new QActionGroup(this); @@ -1193,6 +1120,10 @@ void DolphinMainWindow::setupActions() sortByGroup->setText(i18n("By Group")); connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup())); + KToggleAction* sortByType = actionCollection()->add("by_type"); + sortByType->setText(i18n("By Type")); + connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType())); + QActionGroup* sortGroup = new QActionGroup(this); sortGroup->addAction(sortByName); sortGroup->addAction(sortBySize); @@ -1200,11 +1131,16 @@ void DolphinMainWindow::setupActions() sortGroup->addAction(sortByPermissions); sortGroup->addAction(sortByOwner); sortGroup->addAction(sortByGroup); + sortGroup->addAction(sortByType); KToggleAction* sortDescending = actionCollection()->add("descending"); sortDescending->setText(i18n("Descending")); connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder())); + KToggleAction* sortCategorized = actionCollection()->add("categorized"); + sortCategorized->setText(i18n("Show in Groups")); + connect(sortCategorized, SIGNAL(triggered()), this, SLOT(toggleSortCategorization())); + KToggleAction* clearInfo = actionCollection()->add("clear_info"); clearInfo->setText(i18n("No Information")); connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo())); @@ -1278,22 +1214,16 @@ void DolphinMainWindow::setupActions() KStandardAction::home(this, SLOT(goHome()), actionCollection()); // setup 'Tools' menu - 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())); - QAction* findFile = actionCollection()->addAction("find_file"); findFile->setText(i18n("Find File...")); - findFile->setShortcut(Qt::Key_F); + findFile->setShortcut(Qt::CTRL | Qt::Key_F); findFile->setIcon(KIcon("file-find")); connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); 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())); + showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I); + connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility())); QAction* compareFiles = actionCollection()->addAction("compare_files"); compareFiles->setText(i18n("Compare Files")); @@ -1307,64 +1237,90 @@ void DolphinMainWindow::setupActions() void DolphinMainWindow::setupDockWidgets() { - // 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); - 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); - // setup "Information" - QDockWidget* infoDock = new QDockWidget(i18n("Information"), this); + QDockWidget* infoDock = new QDockWidget(i18n("Information")); infoDock->setObjectName("infoDock"); infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); SidebarPage* infoWidget = new InfoSidebarPage(infoDock); infoDock->setWidget(infoWidget); - - infoDock->toggleViewAction()->setText(i18n("Show Information Panel")); + infoDock->toggleViewAction()->setText(i18n("Information")); actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction()); addDockWidget(Qt::RightDockWidgetArea, infoDock); - connectSidebarPage(infoWidget); + connect(this, SIGNAL(urlChanged(KUrl)), + infoWidget, SLOT(setUrl(KUrl))); + connect(this, SIGNAL(selectionChanged(KFileItemList)), + infoWidget, SLOT(setSelection(KFileItemList))); + connect(this, SIGNAL(requestItemInfo(KUrl)), + infoWidget, SLOT(requestDelayedItemInfo(KUrl))); // setup "Tree View" - QDockWidget* treeViewDock = new QDockWidget(i18n("Folders")); // TODO: naming? + QDockWidget* treeViewDock = new QDockWidget(i18n("Folders")); treeViewDock->setObjectName("treeViewDock"); treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock); treeViewDock->setWidget(treeWidget); - treeViewDock->toggleViewAction()->setText(i18n("Show Folders Panel")); + treeViewDock->toggleViewAction()->setText(i18n("Folders")); actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, treeViewDock); - connectSidebarPage(treeWidget); + connect(this, SIGNAL(urlChanged(KUrl)), + treeWidget, SLOT(setUrl(KUrl))); + connect(treeWidget, SIGNAL(changeUrl(KUrl)), + this, SLOT(changeUrl(KUrl))); + connect(treeWidget, SIGNAL(changeSelection(KFileItemList)), + this, SLOT(changeSelection(KFileItemList))); + connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)), + this, SLOT(dropUrls(KUrl::List, KUrl))); + + // setup "Terminal" + QDockWidget* terminalDock = new QDockWidget(i18n("Terminal")); + terminalDock->setObjectName("terminalDock"); + terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); + SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock); + terminalDock->setWidget(terminalWidget); + + terminalDock->toggleViewAction()->setText(i18n("Terminal")); + actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction()); + + addDockWidget(Qt::RightDockWidgetArea, terminalDock); + connect(this, SIGNAL(urlChanged(KUrl)), + terminalWidget, SLOT(setUrl(KUrl))); const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun(); if (firstRun) { infoDock->hide(); treeViewDock->hide(); + terminalDock->hide(); } + + QDockWidget *placesDock = new QDockWidget(i18n("Places")); + placesDock->setObjectName("placesDock"); + placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + KFilePlacesView *listView = new KFilePlacesView(placesDock); + placesDock->setWidget(listView); + listView->setModel(DolphinSettings::instance().placesModel()); + + placesDock->toggleViewAction()->setText(i18n("Show Places Panel")); + actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction()); + + addDockWidget(Qt::LeftDockWidgetArea, placesDock); + connect(listView, SIGNAL(urlChanged(KUrl)), + this, SLOT(changeUrl(KUrl))); + connect(this, SIGNAL(urlChanged(KUrl)), + listView, SLOT(setUrl(KUrl))); } void DolphinMainWindow::updateHistory() { - int index = 0; + const KUrlNavigator* urlNavigator = m_activeView->urlNavigator(); + const int index = urlNavigator->historyIndex(); QAction* backAction = actionCollection()->action("go_back"); if (backAction != 0) { - backAction->setEnabled(index < m_activeView->urlNavigator()->historySize() - 1); + backAction->setEnabled(index < urlNavigator->historySize() - 1); } QAction* forwardAction = actionCollection()->action("go_forward"); @@ -1378,8 +1334,7 @@ void DolphinMainWindow::updateEditActions() const KFileItemList list = m_activeView->selectedItems(); if (list.isEmpty()) { stateChanged("has_no_selection"); - } - else { + } else { stateChanged("has_selection"); QAction* renameAction = actionCollection()->action("rename"); @@ -1421,17 +1376,17 @@ void DolphinMainWindow::updateViewActions() QAction* action = 0; switch (m_activeView->mode()) { - case DolphinView::IconsView: - action = actionCollection()->action("icons"); - break; - case DolphinView::DetailsView: - action = actionCollection()->action("details"); - break; - case DolphinView::ColumnView: - action = actionCollection()->action("columns"); - break; - default: - break; + case DolphinView::IconsView: + action = actionCollection()->action("icons"); + break; + case DolphinView::DetailsView: + action = actionCollection()->action("details"); + break; + case DolphinView::ColumnView: + action = actionCollection()->action("columns"); + break; + default: + break; } if (action != 0) { @@ -1441,6 +1396,7 @@ void DolphinMainWindow::updateViewActions() slotSortingChanged(m_activeView->sorting()); slotSortOrderChanged(m_activeView->sortOrder()); + slotCategorizedSortingChanged(); slotAdditionalInfoChanged(m_activeView->additionalInfo()); KToggleAction* showFilterBarAction = @@ -1502,6 +1458,8 @@ void DolphinMainWindow::connectViewSignals(int viewIndex) this, SLOT(slotShowPreviewChanged())); connect(view, SIGNAL(showHiddenFilesChanged()), this, SLOT(slotShowHiddenFilesChanged())); + connect(view, SIGNAL(categorizedSortingChanged()), + this, SLOT(slotCategorizedSortingChanged())); connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(slotSortingChanged(DolphinView::Sorting))); connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)), @@ -1510,31 +1468,19 @@ void DolphinMainWindow::connectViewSignals(int viewIndex) this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation))); connect(view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(slotSelectionChanged(KFileItemList))); + connect(view, SIGNAL(requestItemInfo(KUrl)), + this, SLOT(slotRequestItemInfo(KUrl))); connect(view, SIGNAL(showFilterBarChanged(bool)), this, SLOT(updateFilterBarAction(bool))); connect(view, SIGNAL(urlChanged(KUrl)), this, SLOT(changeUrl(KUrl))); - const UrlNavigator* navigator = view->urlNavigator(); + const KUrlNavigator* navigator = view->urlNavigator(); connect(navigator, SIGNAL(urlChanged(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),