X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/75a6e8fb2ae418960769d4870f4b3dbabb20d049..2baa9ec45a3e7e169e73ee74c74c0954702ab882:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 0c9a1f4e7..dbb46a239 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2006 by Peter Penz * * Copyright (C) 2006 by Stefan Monov * * Copyright (C) 2006 by Cvetoslav Ludmiloff * * * @@ -30,12 +30,13 @@ #include "dolphinviewcontainer.h" #include "mainwindowadaptor.h" #ifdef HAVE_NEPOMUK - #include "panels/filter/filterpanel.h" - #include + #include "panels/search/searchpanel.h" + #include #endif #include "panels/folders/folderspanel.h" #include "panels/places/placespanel.h" #include "panels/information/informationpanel.h" +#include "search/dolphinsearchinformation.h" #include "settings/dolphinsettings.h" #include "settings/dolphinsettingsdialog.h" #include "statusbar/dolphinstatusbar.h" @@ -50,48 +51,63 @@ #include "dolphin_generalsettings.h" #include "dolphin_iconsmodesettings.h" - -#include -#include -#include -#include -#include +#include "dolphin_searchsettings.h" + +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include +#include #include -#include + +/* + * Menu shown when pressing the configure-button in the toolbar. + */ +class ToolBarMenu : public KMenu +{ +public: + ToolBarMenu(QWidget* parent); + virtual ~ToolBarMenu(); +protected: + virtual void showEvent(QShowEvent* event); +}; /* * Remembers the tab configuration if a tab has been closed. @@ -109,7 +125,6 @@ Q_DECLARE_METATYPE(ClosedTab) DolphinMainWindow::DolphinMainWindow(int id) : KXmlGuiWindow(0), m_newFileMenu(0), - m_showMenuBar(0), m_tabBar(0), m_activeViewContainer(0), m_centralWidgetLayout(0), @@ -119,8 +134,11 @@ DolphinMainWindow::DolphinMainWindow(int id) : m_actionHandler(0), m_remoteEncoding(0), m_settingsDialog(0), + m_toolBarSpacer(0), + m_openToolBarMenuButton(0), + m_updateToolBarTimer(0), m_lastHandleUrlStatJob(0), - m_filterDockIsTemporaryVisible(false) + m_searchDockIsTemporaryVisible(false) { // Workaround for a X11-issue in combination with KModifierInfo // (see DolphinContextMenu::initializeModifierKeyInfo() for @@ -162,6 +180,11 @@ void DolphinMainWindow::openDirectories(const QList& dirs) return; } + if (dirs.count() == 1) { + m_activeViewContainer->setUrl(dirs.first()); + return; + } + const int oldOpenTabsCount = m_viewTab.count(); const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); @@ -212,7 +235,7 @@ void DolphinMainWindow::openFiles(const QList& files) const int tabCount = m_viewTab.count(); for (int i = 0; i < tabCount; ++i) { m_viewTab[i].primaryView->view()->markUrlsAsSelected(files); - if (m_viewTab[i].secondaryView != 0) { + if (m_viewTab[i].secondaryView) { m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files); } } @@ -255,7 +278,7 @@ void DolphinMainWindow::showCommand(CommandType command) void DolphinMainWindow::refreshViews() { - Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); // remember the current active view, as because of // the refreshing the active view might change to @@ -265,7 +288,7 @@ void DolphinMainWindow::refreshViews() const int tabCount = m_viewTab.count(); for (int i = 0; i < tabCount; ++i) { m_viewTab[i].primaryView->refresh(); - if (m_viewTab[i].secondaryView != 0) { + if (m_viewTab[i].secondaryView) { m_viewTab[i].secondaryView->refresh(); } } @@ -278,8 +301,8 @@ void DolphinMainWindow::refreshViews() // Synchronize the split-view setting with the active view: const bool splitView = generalSettings->splitView(); const ViewTab& activeTab = m_viewTab[m_tabIndex]; - const bool toggle = ( splitView && (activeTab.secondaryView == 0)) - || (!splitView && (activeTab.secondaryView != 0)); + const bool toggle = ( splitView && !activeTab.secondaryView) + || (!splitView && activeTab.secondaryView); if (toggle) { toggleSplitView(); } @@ -301,7 +324,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url) } DolphinViewContainer* view = activeViewContainer(); - if (view != 0) { + if (view) { view->setUrl(url); updateEditActions(); updateViewActions(); @@ -327,9 +350,9 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) { updateEditActions(); - Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount(); - if (m_viewTab[m_tabIndex].secondaryView != 0) { + if (m_viewTab[m_tabIndex].secondaryView) { selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount(); } @@ -355,13 +378,13 @@ void DolphinMainWindow::updateHistory() QAction* backAction = actionCollection()->action("go_back"); backAction->setToolTip(i18nc("@info", "Go back")); - if (backAction != 0) { + if (backAction) { backAction->setEnabled(index < urlNavigator->historySize() - 1); } QAction* forwardAction = actionCollection()->action("go_forward"); forwardAction->setToolTip(i18nc("@info", "Go forward")); - if (forwardAction != 0) { + if (forwardAction) { forwardAction->setEnabled(index > 0); } } @@ -415,10 +438,9 @@ void DolphinMainWindow::openNewTab(const KUrl& url) ViewTab viewTab; viewTab.splitter = new QSplitter(this); viewTab.splitter->setChildrenCollapsible(false); - viewTab.primaryView = new DolphinViewContainer(url, viewTab.splitter); + viewTab.primaryView = createViewContainer(url, viewTab.splitter); viewTab.primaryView->setActive(false); connectViewSignals(viewTab.primaryView); - viewTab.primaryView->view()->reload(); m_viewTab.append(viewTab); @@ -433,7 +455,7 @@ void DolphinMainWindow::openNewTab(const KUrl& url) m_viewTab[tabIndex].isPrimaryViewActive = false; } - if (focusWidget != 0) { + if (focusWidget) { // The DolphinViewContainer grabbed the keyboard focus. As the tab is opened // in background, assure that the previous focused widget gets the focus back. focusWidget->setFocus(); @@ -493,13 +515,13 @@ void DolphinMainWindow::openInNewWindow() void DolphinMainWindow::toggleActiveView() { - if (m_viewTab[m_tabIndex].secondaryView == 0) { + if (!m_viewTab[m_tabIndex].secondaryView) { // only one view is available return; } - Q_ASSERT(m_activeViewContainer != 0); - Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0); + Q_ASSERT(m_activeViewContainer); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); DolphinViewContainer* left = m_viewTab[m_tabIndex].primaryView; DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView; @@ -573,12 +595,12 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) settings.save(); - if (m_filterDockIsTemporaryVisible) { - QDockWidget* filterDock = findChild("filterDock"); - if (filterDock != 0) { - filterDock->hide(); + if (m_searchDockIsTemporaryVisible) { + QDockWidget* searchDock = findChild("searchDock"); + if (searchDock) { + searchDock->hide(); } - m_filterDockIsTemporaryVisible = false; + m_searchDockIsTemporaryVisible = false; } KXmlGuiWindow::closeEvent(event); @@ -597,7 +619,7 @@ void DolphinMainWindow::saveProperties(KConfigGroup& group) cont->urlNavigator()->isUrlEditable()); cont = m_viewTab[i].secondaryView; - if (cont != 0) { + if (cont) { group.writeEntry(tabProperty("Secondary URL", i), cont->url().url()); group.writeEntry(tabProperty("Secondary Editable", i), cont->urlNavigator()->isUrlEditable()); @@ -618,18 +640,18 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group) cont = m_viewTab[i].secondaryView; const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i)); if (!secondaryUrl.isEmpty()) { - if (cont == 0) { + if (!cont) { // a secondary view should be shown, but no one is available // currently -> create a new view toggleSplitView(); cont = m_viewTab[i].secondaryView; - Q_ASSERT(cont != 0); + Q_ASSERT(cont); } cont->setUrl(secondaryUrl); const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false); cont->urlNavigator()->setUrlEditable(editable); - } else if (cont != 0) { + } else if (cont) { // no secondary view should be shown, but the default setting shows // one already -> close the view toggleSplitView(); @@ -675,7 +697,7 @@ void DolphinMainWindow::showErrorMessage(const QString& message) void DolphinMainWindow::slotUndoAvailable(bool available) { QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); - if (undoAction != 0) { + if (undoAction) { undoAction->setEnabled(available); } } @@ -712,7 +734,7 @@ void DolphinMainWindow::restoreClosedTab(QAction* action) void DolphinMainWindow::slotUndoTextChanged(const QString& text) { QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); - if (undoAction != 0) { + if (undoAction) { undoAction->setText(text); } } @@ -778,7 +800,7 @@ void DolphinMainWindow::invertSelection() void DolphinMainWindow::toggleSplitView() { - if (m_viewTab[m_tabIndex].secondaryView == 0) { + if (!m_viewTab[m_tabIndex].secondaryView) { createSecondaryView(m_tabIndex); setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView); } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { @@ -858,7 +880,7 @@ void DolphinMainWindow::togglePanelLockState() const bool newLockState = !generalSettings->lockPanels(); foreach (QObject* child, children()) { DolphinDockWidget* dock = qobject_cast(child); - if (dock != 0) { + if (dock) { dock->setLocked(newLockState); } } @@ -866,10 +888,21 @@ void DolphinMainWindow::togglePanelLockState() generalSettings->setLockPanels(newLockState); } -void DolphinMainWindow::goBack() +void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible) { - clearStatusBar(); + const int tabCount = m_viewTab.count(); + for (int i = 0; i < tabCount; ++i) { + ViewTab& tab = m_viewTab[i]; + Q_ASSERT(tab.primaryView); + tab.primaryView->urlNavigator()->setPlacesSelectorVisible(!visible); + if (tab.secondaryView) { + tab.secondaryView->urlNavigator()->setPlacesSelectorVisible(!visible); + } + } +} +void DolphinMainWindow::goBack() +{ KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); urlNavigator->goBack(); @@ -882,16 +915,19 @@ void DolphinMainWindow::goBack() void DolphinMainWindow::goForward() { - clearStatusBar(); m_activeViewContainer->urlNavigator()->goForward(); } void DolphinMainWindow::goUp() { - clearStatusBar(); m_activeViewContainer->urlNavigator()->goUp(); } +void DolphinMainWindow::goHome() +{ + m_activeViewContainer->urlNavigator()->goHome(); +} + void DolphinMainWindow::goBack(Qt::MouseButtons buttons) { // The default case (left button pressed) is handled in goBack(). @@ -920,12 +956,6 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons) } } -void DolphinMainWindow::goHome() -{ - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goHome(); -} - void DolphinMainWindow::compareFiles() { // The method is only invoked if exactly 2 files have @@ -934,7 +964,7 @@ void DolphinMainWindow::compareFiles() // - both in the secondary view // - one in the primary view and the other in the secondary // view - Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); KUrl urlA; KUrl urlB; @@ -943,7 +973,7 @@ void DolphinMainWindow::compareFiles() switch (items.count()) { case 0: { - Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0); + Q_ASSERT(m_viewTab[m_tabIndex].secondaryView); items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems(); Q_ASSERT(items.count() == 2); urlA = items[0].url(); @@ -953,7 +983,7 @@ void DolphinMainWindow::compareFiles() case 1: { urlA = items[0].url(); - Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0); + Q_ASSERT(m_viewTab[m_tabIndex].secondaryView); items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems(); Q_ASSERT(items.count() == 1); urlB = items[0].url(); @@ -985,6 +1015,11 @@ void DolphinMainWindow::toggleShowMenuBar() { const bool visible = menuBar()->isVisible(); menuBar()->setVisible(!visible); + if (visible) { + createToolBarMenuButton(); + } else { + deleteToolBarMenuButton(); + } } void DolphinMainWindow::openTerminal() @@ -1005,7 +1040,7 @@ void DolphinMainWindow::openTerminal() void DolphinMainWindow::editSettings() { - if (m_settingsDialog == 0) { + if (!m_settingsDialog) { const KUrl url = activeViewContainer()->url(); m_settingsDialog = new DolphinSettingsDialog(url, this); m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose); @@ -1027,7 +1062,7 @@ void DolphinMainWindow::setActiveTab(int index) ViewTab& hiddenTab = m_viewTab[m_tabIndex]; hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive(); hiddenTab.primaryView->setActive(false); - if (hiddenTab.secondaryView != 0) { + if (hiddenTab.secondaryView) { hiddenTab.secondaryView->setActive(false); } QSplitter* splitter = m_viewTab[m_tabIndex].splitter; @@ -1040,7 +1075,7 @@ void DolphinMainWindow::setActiveTab(int index) ViewTab& viewTab = m_viewTab[index]; m_centralWidgetLayout->addWidget(viewTab.splitter, 1); viewTab.primaryView->show(); - if (viewTab.secondaryView != 0) { + if (viewTab.secondaryView) { viewTab.secondaryView->show(); } viewTab.splitter->show(); @@ -1072,7 +1107,7 @@ void DolphinMainWindow::closeTab(int index) // delete tab m_viewTab[index].primaryView->deleteLater(); - if (m_viewTab[index].secondaryView != 0) { + if (m_viewTab[index].secondaryView) { m_viewTab[index].secondaryView->deleteLater(); } m_viewTab[index].splitter->deleteLater(); @@ -1112,21 +1147,23 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos) QAction* selectedAction = menu.exec(pos); if (selectedAction == newTabAction) { const ViewTab& tab = m_viewTab[index]; - Q_ASSERT(tab.primaryView != 0); - const KUrl url = (tab.secondaryView != 0) && tab.secondaryView->isActive() ? + Q_ASSERT(tab.primaryView); + const KUrl url = tab.secondaryView && tab.secondaryView->isActive() ? tab.secondaryView->url() : tab.primaryView->url(); openNewTab(url); m_tabBar->setCurrentIndex(m_viewTab.count() - 1); } else if (selectedAction == detachTabAction) { const ViewTab& tab = m_viewTab[index]; - Q_ASSERT(tab.primaryView != 0); + Q_ASSERT(tab.primaryView); const KUrl primaryUrl = tab.primaryView->url(); DolphinMainWindow* window = DolphinApplication::app()->createMainWindow(); window->changeUrl(primaryUrl); - if (tab.secondaryView != 0) { + if (tab.secondaryView) { const KUrl secondaryUrl = tab.secondaryView->url(); - window->toggleSplitView(); + if (!window->m_viewTab[0].secondaryView) { + window->toggleSplitView(); + } window->m_viewTab[0].secondaryView->setUrl(secondaryUrl); if (tab.primaryView->isActive()) { window->m_viewTab[0].primaryView->setActive(true); @@ -1218,26 +1255,41 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable) void DolphinMainWindow::slotSearchModeChanged(bool enabled) { #ifdef HAVE_NEPOMUK - if (Nepomuk::ResourceManager::instance()->init() != 0) { - // Currently the Filter Panel only works with Nepomuk enabled + const KUrl url = m_activeViewContainer->url(); + const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance(); + if (!searchInfo.isIndexingEnabled() || !searchInfo.isPathIndexed(url)) { return; } - QDockWidget* filterDock = findChild("filterDock"); - if ((filterDock == 0) || !filterDock->isEnabled()) { + QDockWidget* searchDock = findChild("searchDock"); + if (!searchDock) { return; } if (enabled) { - if (!filterDock->isVisible()) { - m_filterDockIsTemporaryVisible = true; + if (!searchDock->isVisible()) { + m_searchDockIsTemporaryVisible = true; } - filterDock->show(); + searchDock->show(); } else { - if (filterDock->isVisible() && m_filterDockIsTemporaryVisible) { - filterDock->hide(); + if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) { + searchDock->hide(); + } + m_searchDockIsTemporaryVisible = false; + } + + SearchPanel* searchPanel = qobject_cast(searchDock->widget()); + if (searchPanel) { + // Per default any search-operation triggered by the Search Panel is done + // "Everywhere". + SearchPanel::SearchMode searchMode = SearchPanel::Everywhere; + + if (enabled && (SearchSettings::location() == QLatin1String("FromHere"))) { + // Only if the search-mode is enabled it is visible for the user whether + // a searching is done "Everywhere" or "From Here" (= current directory). + searchMode = SearchPanel::FromCurrentDir; } - m_filterDockIsTemporaryVisible = false; + searchPanel->setSearchMode(searchMode); } #else Q_UNUSED(enabled); @@ -1272,6 +1324,125 @@ void DolphinMainWindow::openContextMenu(const KFileItem& item, delete contextMenu; } +void DolphinMainWindow::updateToolBarMenu() +{ + KMenu* menu = qobject_cast(sender()); + Q_ASSERT(menu); + + // All actions get cleared by KMenu::clear(). The sub-menus are deleted + // by connecting to the aboutToHide() signal from the parent-menu. + menu->clear(); + + const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); + + KActionCollection* ac = actionCollection(); + + // Add "Edit" actions + bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) | + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) | + addActionToMenu(ac->action("select_all"), menu) | + addActionToMenu(ac->action("invert_selection"), menu); + + if (added) { + menu->addSeparator(); + } + + // Add "View" actions + if (!generalSettings->showZoomSlider()) { + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu); + menu->addSeparator(); + } + + added = addActionToMenu(ac->action("view_mode"), menu) | + addActionToMenu(ac->action("sort"), menu) | + addActionToMenu(ac->action("additional_info"), menu) | + addActionToMenu(ac->action("show_preview"), menu) | + addActionToMenu(ac->action("show_in_groups"), menu) | + addActionToMenu(ac->action("show_hidden_files"), menu); + + if (added) { + menu->addSeparator(); + } + + added = addActionToMenu(ac->action("split_view"), menu) | + addActionToMenu(ac->action("reload"), menu) | + addActionToMenu(ac->action("view_properties"), menu); + if (added) { + menu->addSeparator(); + } + + addActionToMenu(ac->action("panels"), menu); + KMenu* locationBarMenu = new KMenu(i18nc("@action:inmenu", "Location Bar"), menu); + locationBarMenu->addAction(ac->action("editable_location")); + locationBarMenu->addAction(ac->action("replace_location")); + menu->addMenu(locationBarMenu); + + menu->addSeparator(); + + // Add "Go" menu + KMenu* goMenu = new KMenu(i18nc("@action:inmenu", "Go"), menu); + connect(menu, SIGNAL(aboutToHide()), goMenu, SLOT(deleteLater())); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home))); + goMenu->addAction(ac->action("closed_tabs")); + menu->addMenu(goMenu); + + // Add "Tool" menu + KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu); + connect(menu, SIGNAL(aboutToHide()), toolsMenu, SLOT(deleteLater())); + toolsMenu->addAction(ac->action("show_filter_bar")); + toolsMenu->addAction(ac->action("compare_files")); + toolsMenu->addAction(ac->action("open_terminal")); + toolsMenu->addAction(ac->action("change_remote_encoding")); + menu->addMenu(toolsMenu); + + // Add "Settings" menu entries + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); + + // Add "Help" menu + KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu); + connect(menu, SIGNAL(aboutToHide()), helpMenu, SLOT(deleteLater())); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutApp))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutKDE))); + menu->addMenu(helpMenu); + + menu->addSeparator(); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu); +} + +void DolphinMainWindow::updateToolBar() +{ + if (!menuBar()->isVisible()) { + createToolBarMenuButton(); + } +} + +void DolphinMainWindow::slotToolBarSpacerDeleted() +{ + m_toolBarSpacer = 0; + m_updateToolBarTimer->start(); +} + +void DolphinMainWindow::slotToolBarMenuButtonDeleted() +{ + m_openToolBarMenuButton = 0; + m_updateToolBarTimer->start(); +} + +void DolphinMainWindow::slotToolBarIconSizeChanged(const QSize& iconSize) +{ + if (m_openToolBarMenuButton) { + m_openToolBarMenuButton->setIconSize(iconSize); + } +} + void DolphinMainWindow::init() { DolphinSettings& settings = DolphinSettings::instance(); @@ -1296,14 +1467,12 @@ void DolphinMainWindow::init() m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar())); connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory())); - ViewProperties props(homeUrl); - m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(homeUrl, - m_viewTab[m_tabIndex].splitter); + + m_viewTab[m_tabIndex].primaryView = createViewContainer(homeUrl, m_viewTab[m_tabIndex].splitter); m_activeViewContainer = m_viewTab[m_tabIndex].primaryView; connectViewSignals(m_activeViewContainer); DolphinView* view = m_activeViewContainer->view(); - view->reload(); m_activeViewContainer->show(); m_actionHandler->setCurrentView(view); @@ -1362,16 +1531,22 @@ void DolphinMainWindow::init() showFilterBarAction->setChecked(generalSettings->filterBar()); if (firstRun) { - // assure a proper default size if Dolphin runs the first time + menuBar()->setVisible(false); + // Assure a proper default size if Dolphin runs the first time resize(750, 500); } - m_showMenuBar->setChecked(!menuBar()->isHidden()); // workaround for bug #171080 + const bool showMenu = !menuBar()->isHidden(); + QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar)); + showMenuBarAction->setChecked(showMenu); // workaround for bug #171080 + if (!showMenu) { + createToolBarMenuButton(); + } } void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer) { - Q_ASSERT(viewContainer != 0); + Q_ASSERT(viewContainer); Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) || (viewContainer == m_viewTab[m_tabIndex].secondaryView)); if (m_activeViewContainer == viewContainer) { @@ -1405,10 +1580,22 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain emit urlChanged(url); } +DolphinViewContainer* DolphinMainWindow::createViewContainer(const KUrl& url, QWidget* parent) +{ + DolphinViewContainer* container = new DolphinViewContainer(url, parent); + + // The places-selector from the URL navigator should only be shown + // if the places dock is invisible + QDockWidget* placesDock = findChild("placesDock"); + container->urlNavigator()->setPlacesSelectorVisible(!placesDock || !placesDock->isVisible()); + + return container; +} + void DolphinMainWindow::setupActions() { // setup 'File' menu - m_newFileMenu = new DolphinNewFileMenu(this, this); + m_newFileMenu = new DolphinNewFileMenu(this); KMenu* menu = m_newFileMenu->menu(); menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); menu->setIcon(KIcon("document-new")); @@ -1445,7 +1632,7 @@ void DolphinMainWindow::setupActions() // doesn't work KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection()); KShortcut cutShortcut = cut->shortcut(); - cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty); + cutShortcut.remove(Qt::SHIFT | Qt::Key_Delete, KShortcut::KeepEmpty); cut->setShortcut(cutShortcut); KStandardAction::copy(this, SLOT(copy()), actionCollection()); KAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection()); @@ -1458,7 +1645,7 @@ void DolphinMainWindow::setupActions() KAction* selectAll = actionCollection()->addAction("select_all"); selectAll->setText(i18nc("@action:inmenu Edit", "Select All")); - selectAll->setShortcut(Qt::CTRL + Qt::Key_A); + selectAll->setShortcut(Qt::CTRL | Qt::Key_A); connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll())); KAction* invertSelection = actionCollection()->addAction("invert_selection"); @@ -1486,10 +1673,10 @@ void DolphinMainWindow::setupActions() stop->setIcon(KIcon("process-stop")); connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading())); - KToggleAction* showFullLocation = actionCollection()->add("editable_location"); - showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location")); - showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L); - connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation())); + KToggleAction* editableLocation = actionCollection()->add("editable_location"); + editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location")); + editableLocation->setShortcut(Qt::CTRL | Qt::Key_L); + connect(editableLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation())); KAction* replaceLocation = actionCollection()->addAction("replace_location"); replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location")); @@ -1509,7 +1696,7 @@ void DolphinMainWindow::setupActions() connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)), this, SLOT(restoreClosedTab(QAction *))); - QAction* action = new QAction("Empty Recently Closed Tabs", m_recentTabsMenu); + QAction* action = new QAction(i18n("Empty Recently Closed Tabs"), m_recentTabsMenu); action->setIcon(KIcon("edit-clear-list")); action->setData(QVariant::fromValue(true)); m_recentTabsMenu->addAction(action); @@ -1544,17 +1731,17 @@ void DolphinMainWindow::setupActions() connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal())); // setup 'Settings' menu - m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); + KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); // not in menu actions QList nextTabKeys; nextTabKeys.append(KStandardShortcut::tabNext().primary()); - nextTabKeys.append(QKeySequence(Qt::CTRL + Qt::Key_Tab)); + nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab)); QList prevTabKeys; prevTabKeys.append(KStandardShortcut::tabPrev().primary()); - prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab)); + prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab)); KAction* activateNextTab = actionCollection()->addAction("activate_next_tab"); activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab")); @@ -1655,24 +1842,24 @@ void DolphinMainWindow::setupDockWidgets() terminalPanel, SLOT(setUrl(KUrl))); #endif - // Setup "Filter" + // Setup "Search" #ifdef HAVE_NEPOMUK - DolphinDockWidget* filterDock = new DolphinDockWidget(i18nc("@title:window", "Filter")); - filterDock->setLocked(lock); - filterDock->setObjectName("filterDock"); - filterDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - Panel* filterPanel = new FilterPanel(filterDock); - filterPanel->setCustomContextMenuActions(QList() << lockLayoutAction); - connect(filterPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl))); - filterDock->setWidget(filterPanel); - - QAction* filterAction = filterDock->toggleViewAction(); - filterAction->setShortcut(Qt::Key_F12); - filterAction->setIcon(KIcon("view-filter")); - addActionCloneToCollection(filterAction, "show_filter_panel"); - addDockWidget(Qt::RightDockWidgetArea, filterDock); + DolphinDockWidget* searchDock = new DolphinDockWidget(i18nc("@title:window", "Search")); + searchDock->setLocked(lock); + searchDock->setObjectName("searchDock"); + searchDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + Panel* searchPanel = new SearchPanel(searchDock); + searchPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + connect(searchPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl))); + searchDock->setWidget(searchPanel); + + QAction* searchAction = searchDock->toggleViewAction(); + searchAction->setShortcut(Qt::Key_F12); + searchAction->setIcon(KIcon("system-search")); + addActionCloneToCollection(searchAction, "show_search_panel"); + addDockWidget(Qt::RightDockWidgetArea, searchDock); connect(this, SIGNAL(urlChanged(KUrl)), - filterPanel, SLOT(setUrl(KUrl))); + searchPanel, SLOT(setUrl(KUrl))); #endif const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun(); @@ -1683,7 +1870,7 @@ void DolphinMainWindow::setupDockWidgets() terminalDock->hide(); #endif #ifdef HAVE_NEPOMUK - filterDock->hide(); + searchDock->hide(); #endif } @@ -1714,6 +1901,8 @@ void DolphinMainWindow::setupDockWidgets() this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); connect(this, SIGNAL(urlChanged(KUrl)), placesPanel, SLOT(setUrl(KUrl))); + connect(placesDock, SIGNAL(visibilityChanged(bool)), + this, SLOT(slotPlacesPanelVisibilityChanged(bool))); // Add actions into the "Panels" menu KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this); @@ -1726,7 +1915,7 @@ void DolphinMainWindow::setupDockWidgets() panelsMenu->addAction(terminalAction); #endif #ifdef HAVE_NEPOMUK - panelsMenu->addAction(filterAction); + panelsMenu->addAction(searchAction); #endif panelsMenu->addSeparator(); panelsMenu->addAction(lockLayoutAction); @@ -1780,6 +1969,69 @@ void DolphinMainWindow::updateGoActions() goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); } +void DolphinMainWindow::createToolBarMenuButton() +{ + if (m_toolBarSpacer && m_openToolBarMenuButton) { + return; + } + Q_ASSERT(!m_toolBarSpacer); + Q_ASSERT(!m_openToolBarMenuButton); + + m_toolBarSpacer = new QWidget(this); + m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + + m_openToolBarMenuButton = new QToolButton(this); + m_openToolBarMenuButton->setIcon(KIcon("configure")); + m_openToolBarMenuButton->setPopupMode(QToolButton::InstantPopup); + m_openToolBarMenuButton->setToolTip(i18nc("@info:tooltip", "Configure and control Dolphin")); + + KMenu* toolBarMenu = new ToolBarMenu(m_openToolBarMenuButton); + connect(toolBarMenu, SIGNAL(aboutToShow()), this, SLOT(updateToolBarMenu())); + + m_openToolBarMenuButton->setMenu(toolBarMenu); + + toolBar()->addWidget(m_toolBarSpacer); + toolBar()->addWidget(m_openToolBarMenuButton); + connect(toolBar(), SIGNAL(iconSizeChanged(QSize)), this, SLOT(slotToolBarIconSizeChanged(QSize))); + + // The added widgets are owned by the toolbar and may get deleted when e.g. the toolbar + // gets edited. In this case we must add them again. The adding is done asynchronously by + // m_updateToolBarTimer. + connect(m_toolBarSpacer, SIGNAL(destroyed()), this, SLOT(slotToolBarSpacerDeleted())); + connect(m_openToolBarMenuButton, SIGNAL(destroyed()), this, SLOT(slotToolBarMenuButtonDeleted())); + m_updateToolBarTimer = new QTimer(this); + m_updateToolBarTimer->setInterval(500); + connect(m_updateToolBarTimer, SIGNAL(timeout()), this, SLOT(updateToolBar())); +} + +void DolphinMainWindow::deleteToolBarMenuButton() +{ + delete m_toolBarSpacer; + m_toolBarSpacer = 0; + + delete m_openToolBarMenuButton; + m_openToolBarMenuButton = 0; + + delete m_updateToolBarTimer; + m_updateToolBarTimer = 0; +} + +bool DolphinMainWindow::addActionToMenu(QAction* action, KMenu* menu) +{ + Q_ASSERT(action); + Q_ASSERT(menu); + + const KToolBar* toolBarWidget = toolBar(); + foreach (const QWidget* widget, action->associatedWidgets()) { + if (widget == toolBarWidget) { + return false; + } + } + + menu->addAction(action); + return true; +} + void DolphinMainWindow::rememberClosedTab(int index) { KMenu* tabsMenu = m_recentTabsMenu->menu(); @@ -1792,7 +2044,7 @@ void DolphinMainWindow::rememberClosedTab(int index) ClosedTab closedTab; closedTab.primaryUrl = m_viewTab[index].primaryView->url(); - if (m_viewTab[index].secondaryView != 0) { + if (m_viewTab[index].secondaryView) { closedTab.secondaryUrl = m_viewTab[index].secondaryView->url(); closedTab.isSplit = true; } else { @@ -1862,7 +2114,7 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) void DolphinMainWindow::updateSplitAction() { QAction* splitAction = actionCollection()->action("split_view"); - if (m_viewTab[m_tabIndex].secondaryView != 0) { + if (m_viewTab[m_tabIndex].secondaryView) { if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { splitAction->setText(i18nc("@action:intoolbar Close right view", "Close")); splitAction->setToolTip(i18nc("@info", "Close right view")); @@ -1916,11 +2168,10 @@ void DolphinMainWindow::createSecondaryView(int tabIndex) const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2; const DolphinView* view = m_viewTab[tabIndex].primaryView->view(); - m_viewTab[tabIndex].secondaryView = new DolphinViewContainer(view->rootUrl(), 0); + m_viewTab[tabIndex].secondaryView = createViewContainer(view->rootUrl(), 0); splitter->addWidget(m_viewTab[tabIndex].secondaryView); splitter->setSizes(QList() << newWidth << newWidth); connectViewSignals(m_viewTab[tabIndex].secondaryView); - m_viewTab[tabIndex].secondaryView->view()->reload(); m_viewTab[tabIndex].secondaryView->setActive(false); m_viewTab[tabIndex].secondaryView->show(); } @@ -1980,4 +2231,47 @@ void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job) } } +ToolBarMenu::ToolBarMenu(QWidget* parent) : + KMenu(parent) +{ +} + +ToolBarMenu::~ToolBarMenu() +{ +} + +void ToolBarMenu::showEvent(QShowEvent* event) +{ + KMenu::showEvent(event); + + // Adjust the position of the menu to be shown within the + // Dolphin window to reduce the cases that sub-menus might overlap + // the right screen border. + QPoint pos; + QWidget* button = parentWidget(); + if (layoutDirection() == Qt::RightToLeft) { + pos = button->mapToGlobal(QPoint(0, button->height())); + } else { + pos = button->mapToGlobal(QPoint(button->width(), button->height())); + pos.rx() -= width(); + } + + // Assure that the menu is not shown outside the screen boundaries and + // that it does not overlap with the parent button. + const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos()); + if (pos.x() < 0) { + pos.rx() = 0; + } else if (pos.x() + width() >= screen.width()) { + pos.rx() = screen.width() - width(); + } + + if (pos.y() < 0) { + pos.ry() = 0; + } else if (pos.y() + height() >= screen.height()) { + pos.ry() = button->mapToGlobal(QPoint(0, 0)).y() - height(); + } + + move(pos); +} + #include "dolphinmainwindow.moc"