X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/abf17941f7a052d25788d2f2f3c84e5aae935e29..8f9baef848c3056cd1df772f0774decad509cff3:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index a25c61038..775ef9864 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -19,24 +19,24 @@ * 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 "mainwindowadaptor.h" + +#include "dolphin_generalsettings.h" #include #include @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -104,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; } @@ -152,21 +153,21 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, QString seq = QKeySequence(Qt::ShiftModifier).toString(); seq.chop(1); // chop superfluous '+' - QAction* moveAction = popup.addAction(KIcon("goto"), - i18n("&Move Here") + "\t" + seq); + QAction* moveAction = popup.addAction(KIcon("goto-page"), + i18n("&Move Here") + '\t' + seq); seq = QKeySequence(Qt::ControlModifier).toString(); seq.chop(1); - QAction* copyAction = popup.addAction(KIcon("editcopy"), - i18n("&Copy Here") + "\t" + seq); + QAction* copyAction = popup.addAction(KIcon("edit-copy"), + i18n("&Copy Here") + '\t' + seq); seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString(); seq.chop(1); QAction* linkAction = popup.addAction(KIcon("www"), - i18n("&Link Here") + "\t" + seq); + i18n("&Link Here") + '\t' + seq); popup.addSeparator(); - popup.addAction(KIcon("stop"), i18n("Cancel")); + popup.addAction(KIcon("process-stop"), i18n("Cancel")); QAction* activatedAction = popup.exec(QCursor::pos()); if (activatedAction == moveAction) { @@ -201,6 +202,13 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, } } +void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl) +{ + clearStatusBar(); + KonqOperations::rename(this, oldUrl, newUrl); + m_undoCommandTypes.append(KonqUndoManager::RENAME); +} + void DolphinMainWindow::refreshViews() { const bool split = DolphinSettings::instance().generalSettings()->splitView(); @@ -230,24 +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 QString& url) +void DolphinMainWindow::changeUrl(const KUrl& url) { if (activeView() != 0) { - activeView()->setUrl(KUrl(url)); + 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 = @@ -294,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(); @@ -309,7 +363,7 @@ void DolphinMainWindow::slotSelectionChanged() m_activeView->updateStatusBar(); - emit selectionChanged(); + emit selectionChanged(selection); } void DolphinMainWindow::slotHistoryChanged() @@ -317,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 = @@ -360,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(); @@ -405,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); @@ -475,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; } @@ -585,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); @@ -679,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) { @@ -692,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 { @@ -835,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; @@ -843,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; @@ -853,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; } @@ -869,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); } } @@ -906,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, @@ -926,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(); @@ -952,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() @@ -984,14 +1078,15 @@ void DolphinMainWindow::setupActions() 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")); @@ -1000,14 +1095,14 @@ 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"); @@ -1048,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); @@ -1097,8 +1192,31 @@ void DolphinMainWindow::setupActions() 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"); @@ -1107,20 +1225,20 @@ void DolphinMainWindow::setupActions() 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 @@ -1156,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"); @@ -1176,25 +1294,55 @@ 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() @@ -1278,11 +1426,16 @@ 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()); @@ -1305,19 +1458,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_undoOperations.append(KonqOperations::LINK); + m_undoCommandTypes.append(KonqUndoManager::LINK); } void DolphinMainWindow::clearStatusBar() @@ -1330,30 +1483,49 @@ 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) { - assert(m_mainWin != 0); + Q_ASSERT(m_mainWin != 0); } DolphinMainWindow::UndoUiInterface::~UndoUiInterface()