X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d3496b12310d9fec0e52e537c341e87fcaa2f8b5..40c71d5ce0f6978ce48eb67fd73ed211bab4e887:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 11597fe1e..aca4d15b6 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -28,16 +28,15 @@ #include "dolphincontextmenu.h" #include "dolphinnewfilemenu.h" #include "dolphinviewcontainer.h" -#include "mainwindowadaptor.h" #ifdef HAVE_NEPOMUK - #include "panels/filter/filterpanel.h" + #include "panels/search/searchpanel.h" #include #endif #include "panels/folders/folderspanel.h" #include "panels/places/placespanel.h" #include "panels/information/informationpanel.h" +#include "search/dolphinsearchbox.h" #include "search/dolphinsearchinformation.h" -#include "settings/dolphinsettings.h" #include "settings/dolphinsettingsdialog.h" #include "statusbar/dolphinstatusbar.h" #include "views/dolphinviewactionhandler.h" @@ -50,8 +49,9 @@ #endif #include "dolphin_generalsettings.h" -#include "dolphin_iconsmodesettings.h" +#include "dolphin_searchsettings.h" +#include #include #include #include @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include #include #include @@ -88,11 +88,20 @@ #include #include +#include "views/dolphinplacesmodel.h" + +#include #include #include #include +#include #include -#include + +namespace { + // Used for GeneralSettings::version() to determine whether + // an updated version of Dolphin is running. + const int CurrentDolphinVersion = 200; +}; /* * Remembers the tab configuration if a tab has been closed. @@ -107,22 +116,26 @@ struct ClosedTab }; Q_DECLARE_METATYPE(ClosedTab) -DolphinMainWindow::DolphinMainWindow(int id) : +DolphinMainWindow::DolphinMainWindow() : KXmlGuiWindow(0), m_newFileMenu(0), - m_showMenuBar(0), m_tabBar(0), m_activeViewContainer(0), m_centralWidgetLayout(0), - m_id(id), m_tabIndex(0), m_viewTab(), m_actionHandler(0), m_remoteEncoding(0), - m_settingsDialog(0), + m_settingsDialog(), + m_controlButton(0), + m_updateToolBarTimer(0), m_lastHandleUrlStatJob(0), - m_filterDockIsTemporaryVisible(false) + m_searchDockIsTemporaryVisible(false) { + DolphinPlacesModel::setModel(new KFilePlacesModel(this)); + connect(DolphinPlacesModel::instance(), SIGNAL(errorMessage(QString)), + this, SLOT(showErrorMessage(QString))); + // Workaround for a X11-issue in combination with KModifierInfo // (see DolphinContextMenu::initializeModifierKeyInfo() for // more information): @@ -131,30 +144,118 @@ DolphinMainWindow::DolphinMainWindow(int id) : setObjectName("Dolphin#"); m_viewTab.append(ViewTab()); - - new MainWindowAdaptor(this); - QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this); + ViewTab& viewTab = m_viewTab[m_tabIndex]; + viewTab.wasActive = true; // The first opened tab is automatically active KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self(); undoManager->setUiInterface(new UndoUiInterface()); connect(undoManager, SIGNAL(undoAvailable(bool)), this, SLOT(slotUndoAvailable(bool))); - connect(undoManager, SIGNAL(undoTextChanged(const QString&)), - this, SLOT(slotUndoTextChanged(const QString&))); + connect(undoManager, SIGNAL(undoTextChanged(QString)), + this, SLOT(slotUndoTextChanged(QString))); connect(undoManager, SIGNAL(jobRecordingStarted(CommandType)), this, SLOT(clearStatusBar())); connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)), this, SLOT(showCommand(CommandType))); - connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)), - this, SLOT(showErrorMessage(const QString&))); - connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(const QString&)), - this, SLOT(showErrorMessage(const QString&))); + + GeneralSettings* generalSettings = GeneralSettings::self(); + const bool firstRun = (generalSettings->version() < 200); + if (firstRun) { + generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime()); + } + + setAcceptDrops(true); + + viewTab.splitter = new QSplitter(this); + viewTab.splitter->setChildrenCollapsible(false); + + setupActions(); + + const KUrl homeUrl(generalSettings->homeUrl()); + setUrlAsCaption(homeUrl); + m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); + connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar())); + connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory())); + + viewTab.primaryView = createViewContainer(homeUrl, viewTab.splitter); + + m_activeViewContainer = viewTab.primaryView; + connectViewSignals(m_activeViewContainer); + DolphinView* view = m_activeViewContainer->view(); + m_activeViewContainer->show(); + m_actionHandler->setCurrentView(view); + + m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); + connect(this, SIGNAL(urlChanged(KUrl)), + m_remoteEncoding, SLOT(slotAboutToOpenUrl())); + + m_tabBar = new KTabBar(this); + m_tabBar->setMovable(true); + m_tabBar->setTabsClosable(true); + connect(m_tabBar, SIGNAL(currentChanged(int)), + this, SLOT(setActiveTab(int))); + connect(m_tabBar, SIGNAL(tabCloseRequested(int)), + this, SLOT(closeTab(int))); + connect(m_tabBar, SIGNAL(contextMenu(int,QPoint)), + this, SLOT(openTabContextMenu(int,QPoint))); + connect(m_tabBar, SIGNAL(newTabRequest()), + this, SLOT(openNewTab())); + connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*,bool&)), + this, SLOT(slotTestCanDecode(const QDragMoveEvent*,bool&))); + connect(m_tabBar, SIGNAL(mouseMiddleClick(int)), + this, SLOT(closeTab(int))); + connect(m_tabBar, SIGNAL(tabMoved(int,int)), + this, SLOT(slotTabMoved(int,int))); + connect(m_tabBar, SIGNAL(receivedDropEvent(int,QDropEvent*)), + this, SLOT(tabDropEvent(int,QDropEvent*))); + + m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open + + QWidget* centralWidget = new QWidget(this); + m_centralWidgetLayout = new QVBoxLayout(centralWidget); + m_centralWidgetLayout->setSpacing(0); + m_centralWidgetLayout->setMargin(0); + m_centralWidgetLayout->addWidget(m_tabBar); + m_centralWidgetLayout->addWidget(viewTab.splitter, 1); + + setCentralWidget(centralWidget); + setupDockWidgets(); + emit urlChanged(homeUrl); + + setupGUI(Keys | Save | Create | ToolBar); + stateChanged("new_file"); + + QClipboard* clipboard = QApplication::clipboard(); + connect(clipboard, SIGNAL(dataChanged()), + this, SLOT(updatePasteAction())); + + if (generalSettings->splitView()) { + toggleSplitView(); + } + updateEditActions(); + updateViewActions(); + updateGoActions(); + + QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); + showFilterBarAction->setChecked(generalSettings->filterBar()); + + if (firstRun) { + menuBar()->setVisible(false); + // Assure a proper default size if Dolphin runs the first time + resize(750, 500); + } + + const bool showMenu = !menuBar()->isHidden(); + QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar)); + showMenuBarAction->setChecked(showMenu); // workaround for bug #171080 + if (!showMenu) { + createControlButton(); + } } DolphinMainWindow::~DolphinMainWindow() { - DolphinApplication::app()->removeMainWindow(this); } void DolphinMainWindow::openDirectories(const QList& dirs) @@ -163,10 +264,14 @@ 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(); - const bool hasSplitView = generalSettings->splitView(); + const bool hasSplitView = GeneralSettings::splitView(); // Open each directory inside a new tab. If the "split view" option has been enabled, // always show two directories within one tab. @@ -182,7 +287,7 @@ void DolphinMainWindow::openDirectories(const QList& dirs) } } - // remove the previously opened tabs + // Remove the previously opened tabs for (int i = 0; i < oldOpenTabsCount; ++i) { closeTab(0); } @@ -213,8 +318,10 @@ 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); + m_viewTab[i].primaryView->view()->markUrlAsCurrent(files.at(0)); if (m_viewTab[i].secondaryView) { m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files); + m_viewTab[i].secondaryView->view()->markUrlAsCurrent(files.at(0)); } } } @@ -254,39 +361,6 @@ void DolphinMainWindow::showCommand(CommandType command) } } -void DolphinMainWindow::refreshViews() -{ - Q_ASSERT(m_viewTab[m_tabIndex].primaryView); - - // remember the current active view, as because of - // the refreshing the active view might change to - // the secondary view - DolphinViewContainer* activeViewContainer = m_activeViewContainer; - - const int tabCount = m_viewTab.count(); - for (int i = 0; i < tabCount; ++i) { - m_viewTab[i].primaryView->refresh(); - if (m_viewTab[i].secondaryView) { - m_viewTab[i].secondaryView->refresh(); - } - } - - setActiveViewContainer(activeViewContainer); - - const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); - if (generalSettings->modifiedStartupSettings()) { - // The startup settings have been changed by the user (see bug #254947). - // 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) - || (!splitView && activeTab.secondaryView); - if (toggle) { - toggleSplitView(); - } - } -} - void DolphinMainWindow::pasteIntoFolder() { m_activeViewContainer->view()->pasteIntoFolder(); @@ -355,14 +429,14 @@ void DolphinMainWindow::updateHistory() const int index = urlNavigator->historyIndex(); QAction* backAction = actionCollection()->action("go_back"); - backAction->setToolTip(i18nc("@info", "Go back")); if (backAction) { + backAction->setToolTip(i18nc("@info", "Go back")); backAction->setEnabled(index < urlNavigator->historySize() - 1); } QAction* forwardAction = actionCollection()->action("go_forward"); - forwardAction->setToolTip(i18nc("@info", "Go forward")); if (forwardAction) { + forwardAction->setToolTip(i18nc("@info", "Go forward")); forwardAction->setEnabled(index > 0); } } @@ -375,7 +449,7 @@ void DolphinMainWindow::updateFilterBarAction(bool show) void DolphinMainWindow::openNewMainWindow() { - DolphinApplication::app()->createMainWindow()->show(); + KRun::run("dolphin", KUrl::List(), this); } void DolphinMainWindow::openNewTab() @@ -416,22 +490,20 @@ 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); actionCollection()->action("close_tab")->setEnabled(true); - // provide a split view, if the startup settings are set this way - const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); - if (generalSettings->splitView()) { - const int tabIndex = m_viewTab.count() - 1; - createSecondaryView(tabIndex); - m_viewTab[tabIndex].secondaryView->setActive(true); - m_viewTab[tabIndex].isPrimaryViewActive = false; + // Provide a split view, if the startup settings are set this way + if (GeneralSettings::splitView()) { + const int newTabIndex = m_viewTab.count() - 1; + createSecondaryView(newTabIndex); + m_viewTab[newTabIndex].secondaryView->setActive(true); + m_viewTab[newTabIndex].isPrimaryViewActive = false; } if (focusWidget) { @@ -443,25 +515,21 @@ void DolphinMainWindow::openNewTab(const KUrl& url) void DolphinMainWindow::activateNextTab() { - if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) { - return; + if (m_viewTab.count() >= 2) { + const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count(); + m_tabBar->setCurrentIndex(tabIndex); } - - const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count(); - m_tabBar->setCurrentIndex(tabIndex); } void DolphinMainWindow::activatePrevTab() { - if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) { - return; - } - - int tabIndex = m_tabBar->currentIndex() - 1; - if (tabIndex == -1) { - tabIndex = m_tabBar->count() - 1; + if (m_viewTab.count() >= 2) { + int tabIndex = m_tabBar->currentIndex() - 1; + if (tabIndex == -1) { + tabIndex = m_tabBar->count() - 1; + } + m_tabBar->setCurrentIndex(tabIndex); } - m_tabBar->setCurrentIndex(tabIndex); } void DolphinMainWindow::openInNewTab() @@ -486,9 +554,7 @@ void DolphinMainWindow::openInNewWindow() } if (!newWindowUrl.isEmpty()) { - DolphinMainWindow* window = DolphinApplication::app()->createMainWindow(); - window->changeUrl(newWindowUrl); - window->show(); + KRun::run("dolphin", KUrl::List() << newWindowUrl, this); } } @@ -517,9 +583,6 @@ void DolphinMainWindow::showEvent(QShowEvent* event) void DolphinMainWindow::closeEvent(QCloseEvent* event) { - DolphinSettings& settings = DolphinSettings::instance(); - GeneralSettings* generalSettings = settings.generalSettings(); - // Find out if Dolphin is closed directly by the user or // by the session manager because the session is closed bool closedByUser = true; @@ -528,7 +591,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) closedByUser = false; } - if ((m_viewTab.count() > 1) && generalSettings->confirmClosingMultipleTabs() && closedByUser) { + if (m_viewTab.count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) { // Ask the user if he really wants to quit and close all tabs. // Open a confirmation dialog with 3 buttons: // KDialog::Yes -> Quit @@ -554,7 +617,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) KMessageBox::Notify); if (doNotAskAgainCheckboxResult) { - generalSettings->setConfirmClosingMultipleTabs(false); + GeneralSettings::setConfirmClosingMultipleTabs(false); } switch (result) { @@ -570,16 +633,15 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) } } - generalSettings->setFirstRun(false); + GeneralSettings::setVersion(CurrentDolphinVersion); + GeneralSettings::self()->writeConfig(); - settings.save(); - - if (m_filterDockIsTemporaryVisible) { - QDockWidget* filterDock = findChild("filterDock"); - if (filterDock) { - filterDock->hide(); + if (m_searchDockIsTemporaryVisible) { + QDockWidget* searchDock = findChild("searchDock"); + if (searchDock) { + searchDock->hide(); } - m_filterDockIsTemporaryVisible = false; + m_searchDockIsTemporaryVisible = false; } KXmlGuiWindow::closeEvent(event); @@ -648,14 +710,14 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group) void DolphinMainWindow::updateNewMenu() { - m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles()); + m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown()); m_newFileMenu->checkUpToDate(); m_newFileMenu->setPopupFiles(activeViewContainer()->url()); } void DolphinMainWindow::createDirectory() { - m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles()); + m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown()); m_newFileMenu->setPopupFiles(activeViewContainer()->url()); m_newFileMenu->createDirectory(); } @@ -745,6 +807,23 @@ void DolphinMainWindow::find() m_activeViewContainer->setSearchModeEnabled(true); } +void DolphinMainWindow::slotSearchLocationChanged() +{ +#ifdef HAVE_NEPOMUK + QDockWidget* searchDock = findChild("searchDock"); + if (!searchDock) { + return; + } + + SearchPanel* searchPanel = qobject_cast(searchDock->widget()); + if (searchPanel) { + searchPanel->setSearchLocation(SearchSettings::location() == QLatin1String("FromHere") + ? SearchPanel::FromCurrentDir + : SearchPanel::Everywhere); + } +#endif +} + void DolphinMainWindow::updatePasteAction() { QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); @@ -854,9 +933,7 @@ void DolphinMainWindow::replaceLocation() void DolphinMainWindow::togglePanelLockState() { - GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); - - const bool newLockState = !generalSettings->lockPanels(); + const bool newLockState = !GeneralSettings::lockPanels(); foreach (QObject* child, children()) { DolphinDockWidget* dock = qobject_cast(child); if (dock) { @@ -864,13 +941,24 @@ void DolphinMainWindow::togglePanelLockState() } } - generalSettings->setLockPanels(newLockState); + 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(); @@ -883,16 +971,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(). @@ -921,10 +1012,12 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons) } } -void DolphinMainWindow::goHome() +void DolphinMainWindow::goHome(Qt::MouseButtons buttons) { - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goHome(); + // The default case (left button pressed) is handled in goHome(). + if (buttons == Qt::MidButton) { + openNewTab(GeneralSettings::self()->homeUrl()); + } } void DolphinMainWindow::compareFiles() @@ -986,6 +1079,11 @@ void DolphinMainWindow::toggleShowMenuBar() { const bool visible = menuBar()->isVisible(); menuBar()->setVisible(!visible); + if (visible) { + createControlButton(); + } else { + deleteControlButton(); + } } void DolphinMainWindow::openTerminal() @@ -1007,12 +1105,17 @@ void DolphinMainWindow::openTerminal() void DolphinMainWindow::editSettings() { if (!m_settingsDialog) { - const KUrl url = activeViewContainer()->url(); - m_settingsDialog = new DolphinSettingsDialog(url, this); - m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose); - m_settingsDialog->show(); + DolphinViewContainer* container = activeViewContainer(); + container->view()->writeSettings(); + + const KUrl url = container->url(); + DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this); + connect(settingsDialog, SIGNAL(settingsChanged()), this, SLOT(refreshViews())); + settingsDialog->setAttribute(Qt::WA_DeleteOnClose); + settingsDialog->show(); + m_settingsDialog = settingsDialog; } else { - m_settingsDialog->raise(); + m_settingsDialog.data()->raise(); } } @@ -1046,6 +1149,18 @@ void DolphinMainWindow::setActiveTab(int index) } viewTab.splitter->show(); + if (!viewTab.wasActive) { + viewTab.wasActive = true; + + // If the tab has not been activated yet the size of the KItemListView is + // undefined and results in an unwanted animation. To prevent this a + // reloading of the directory gets triggered. + viewTab.primaryView->view()->reload(); + if (viewTab.secondaryView) { + viewTab.secondaryView->view()->reload(); + } + } + setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView : viewTab.secondaryView); } @@ -1119,25 +1234,20 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos) openNewTab(url); m_tabBar->setCurrentIndex(m_viewTab.count() - 1); } else if (selectedAction == detachTabAction) { + const QString separator(QLatin1Char(' ')); + QString command = QLatin1String("dolphin"); + const ViewTab& tab = m_viewTab[index]; Q_ASSERT(tab.primaryView); - const KUrl primaryUrl = tab.primaryView->url(); - DolphinMainWindow* window = DolphinApplication::app()->createMainWindow(); - window->changeUrl(primaryUrl); + command += separator + tab.primaryView->url().url(); if (tab.secondaryView) { - const KUrl secondaryUrl = tab.secondaryView->url(); - 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); - } else { - window->m_viewTab[0].secondaryView->setActive(true); - } + command += separator + tab.secondaryView->url().url(); + command += separator + QLatin1String("-split"); } - window->show(); + + KRun::runCommand(command, this); + closeTab(index); } else if (selectedAction == closeOtherTabsAction) { const int count = m_tabBar->count(); @@ -1208,8 +1318,9 @@ void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event) const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); if (!urls.isEmpty() && tab != -1) { const ViewTab& viewTab = m_viewTab[tab]; - const KUrl destPath = viewTab.isPrimaryViewActive ? viewTab.primaryView->url() : viewTab.secondaryView->url(); - DragAndDropHelper::instance().dropUrls(KFileItem(), destPath, event, m_tabBar); + const DolphinView* view = viewTab.isPrimaryViewActive ? viewTab.primaryView->view() + : viewTab.secondaryView->view(); + DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event); } } @@ -1221,46 +1332,61 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable) void DolphinMainWindow::slotSearchModeChanged(bool enabled) { #ifdef HAVE_NEPOMUK - const KUrl url = m_activeViewContainer->url(); const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance(); - if (!searchInfo.isIndexingEnabled() || !searchInfo.isPathIndexed(url)) { + if (!searchInfo.isIndexingEnabled()) { return; } - QDockWidget* filterDock = findChild("filterDock"); - if (!filterDock) { + 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_filterDockIsTemporaryVisible = false; + m_searchDockIsTemporaryVisible = false; + } + + SearchPanel* searchPanel = qobject_cast(searchDock->widget()); + if (!searchPanel) { + return; + } + + if (enabled) { + SearchPanel::SearchLocation searchLocation = SearchPanel::Everywhere; + const KUrl url = m_activeViewContainer->url(); + const bool isSearchUrl = (url.protocol() == QLatin1String("nepomuksearch")); + if ((SearchSettings::location() == QLatin1String("FromHere") && !isSearchUrl)) { + searchLocation = SearchPanel::FromCurrentDir; + } + searchPanel->setSearchLocation(searchLocation); + } else { + searchPanel->setSearchLocation(SearchPanel::Everywhere); } #else Q_UNUSED(enabled); #endif } -void DolphinMainWindow::openContextMenu(const KFileItem& item, +void DolphinMainWindow::openContextMenu(const QPoint& pos, + const KFileItem& item, const KUrl& url, const QList& customActions) { - QPointer contextMenu = new DolphinContextMenu(this, item, url); - contextMenu->setCustomActions(customActions); - const DolphinContextMenu::Command command = contextMenu->open(); + QWeakPointer contextMenu = new DolphinContextMenu(this, pos, item, url); + contextMenu.data()->setCustomActions(customActions); + const DolphinContextMenu::Command command = contextMenu.data()->open(); switch (command) { case DolphinContextMenu::OpenParentFolderInNewWindow: { - DolphinMainWindow* window = DolphinApplication::app()->createMainWindow(); - window->changeUrl(item.url().upUrl()); - window->show(); + KRun::run("dolphin", KUrl::List() << item.url().upUrl(), this); break; } @@ -1273,104 +1399,116 @@ void DolphinMainWindow::openContextMenu(const KFileItem& item, break; } - delete contextMenu; + delete contextMenu.data(); } -void DolphinMainWindow::init() +void DolphinMainWindow::updateControlMenu() { - DolphinSettings& settings = DolphinSettings::instance(); + KMenu* menu = qobject_cast(sender()); + Q_ASSERT(menu); - // Check whether Dolphin runs the first time. If yes then - // a proper default window size is given at the end of DolphinMainWindow::init(). - GeneralSettings* generalSettings = settings.generalSettings(); - const bool firstRun = generalSettings->firstRun(); - if (firstRun) { - generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime()); - } + // All actions get cleared by KMenu::clear(). The sub-menus are deleted + // by connecting to the aboutToHide() signal from the parent-menu. + menu->clear(); - setAcceptDrops(true); + KActionCollection* ac = actionCollection(); - m_viewTab[m_tabIndex].splitter = new QSplitter(this); - m_viewTab[m_tabIndex].splitter->setChildrenCollapsible(false); + // 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); - setupActions(); + if (added) { + menu->addSeparator(); + } - const KUrl homeUrl(generalSettings->homeUrl()); - setUrlAsCaption(homeUrl); - 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); + // Add "View" actions + if (!GeneralSettings::showZoomSlider()) { + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu); + menu->addSeparator(); + } - m_activeViewContainer = m_viewTab[m_tabIndex].primaryView; - connectViewSignals(m_activeViewContainer); - DolphinView* view = m_activeViewContainer->view(); - view->reload(); - m_activeViewContainer->show(); - m_actionHandler->setCurrentView(view); + 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); - m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); - connect(this, SIGNAL(urlChanged(const KUrl&)), - m_remoteEncoding, SLOT(slotAboutToOpenUrl())); + if (added) { + menu->addSeparator(); + } - m_tabBar = new KTabBar(this); - m_tabBar->setMovable(true); - m_tabBar->setTabsClosable(true); - connect(m_tabBar, SIGNAL(currentChanged(int)), - this, SLOT(setActiveTab(int))); - connect(m_tabBar, SIGNAL(tabCloseRequested(int)), - this, SLOT(closeTab(int))); - connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)), - this, SLOT(openTabContextMenu(int, const QPoint&))); - connect(m_tabBar, SIGNAL(newTabRequest()), - this, SLOT(openNewTab())); - connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)), - this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&))); - connect(m_tabBar, SIGNAL(mouseMiddleClick(int)), - this, SLOT(closeTab(int))); - connect(m_tabBar, SIGNAL(tabMoved(int, int)), - this, SLOT(slotTabMoved(int, int))); - connect(m_tabBar, SIGNAL(receivedDropEvent(int, QDropEvent*)), - this, SLOT(tabDropEvent(int, QDropEvent*))); + added = addActionToMenu(ac->action("split_view"), menu) | + addActionToMenu(ac->action("reload"), menu) | + addActionToMenu(ac->action("view_properties"), menu); + if (added) { + menu->addSeparator(); + } - m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open + 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); - QWidget* centralWidget = new QWidget(this); - m_centralWidgetLayout = new QVBoxLayout(centralWidget); - m_centralWidgetLayout->setSpacing(0); - m_centralWidgetLayout->setMargin(0); - m_centralWidgetLayout->addWidget(m_tabBar); - m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1); + menu->addSeparator(); - setCentralWidget(centralWidget); - setupDockWidgets(); - emit urlChanged(homeUrl); + // 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); - setupGUI(Keys | Save | Create | ToolBar); - stateChanged("new_file"); + // 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); - QClipboard* clipboard = QApplication::clipboard(); - connect(clipboard, SIGNAL(dataChanged()), - this, SLOT(updatePasteAction())); + // 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); - if (generalSettings->splitView()) { - toggleSplitView(); - } - updateEditActions(); - updateViewActions(); - updateGoActions(); + // 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->addSeparator(); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::ReportBug))); + helpMenu->addSeparator(); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::SwitchApplicationLanguage))); + helpMenu->addSeparator(); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutApp))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutKDE))); + menu->addMenu(helpMenu); - QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); - showFilterBarAction->setChecked(generalSettings->filterBar()); + menu->addSeparator(); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu); +} - if (firstRun) { - // assure a proper default size if Dolphin runs the first time - resize(750, 500); +void DolphinMainWindow::updateToolBar() +{ + if (!menuBar()->isVisible()) { + createControlButton(); } +} - m_showMenuBar->setChecked(!menuBar()->isHidden()); // workaround for bug #171080 +void DolphinMainWindow::slotControlButtonDeleted() +{ + m_controlButton = 0; + m_updateToolBarTimer->start(); } void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer) @@ -1409,10 +1547,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")); @@ -1449,7 +1599,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()); @@ -1462,7 +1612,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"); @@ -1490,10 +1640,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")); @@ -1502,7 +1652,7 @@ void DolphinMainWindow::setupActions() // setup 'Go' menu KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection()); - connect(backAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goBack(Qt::MouseButtons))); + connect(backAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goBack(Qt::MouseButtons))); KShortcut backShortcut = backAction->shortcut(); backShortcut.setAlternate(Qt::Key_Backspace); backAction->setShortcut(backShortcut); @@ -1510,10 +1660,10 @@ void DolphinMainWindow::setupActions() m_recentTabsMenu = new KActionMenu(i18n("Recently Closed Tabs"), this); m_recentTabsMenu->setIcon(KIcon("edit-undo")); actionCollection()->addAction("closed_tabs", m_recentTabsMenu); - connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)), - this, SLOT(restoreClosedTab(QAction *))); + 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); @@ -1521,12 +1671,13 @@ void DolphinMainWindow::setupActions() m_recentTabsMenu->setEnabled(false); KAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection()); - connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons))); + connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons))); KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection()); - connect(upAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons))); + connect(upAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons))); - KStandardAction::home(this, SLOT(goHome()), actionCollection()); + KAction* homeAction = KStandardAction::home(this, SLOT(goHome()), actionCollection()); + connect(homeAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goHome(Qt::MouseButtons))); // setup 'Tools' menu KAction* showFilterBar = actionCollection()->addAction("show_filter_bar"); @@ -1548,17 +1699,19 @@ void DolphinMainWindow::setupActions() connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal())); // setup 'Settings' menu - m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); + KToggleAction* showMenuBar = KStandardAction::showMenubar(0, 0, actionCollection()); + connect(showMenuBar, SIGNAL(triggered(bool)), // Fixes #286822 + this, SLOT(toggleShowMenuBar()), Qt::QueuedConnection); 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")); @@ -1584,7 +1737,7 @@ void DolphinMainWindow::setupActions() void DolphinMainWindow::setupDockWidgets() { - const bool lock = DolphinSettings::instance().generalSettings()->lockPanels(); + const bool lock = GeneralSettings::lockPanels(); KDualAction* lockLayoutAction = actionCollection()->add("lock_panels"); lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels")); @@ -1605,9 +1758,7 @@ void DolphinMainWindow::setupDockWidgets() infoDock->setWidget(infoPanel); QAction* infoAction = infoDock->toggleViewAction(); - infoAction->setIcon(KIcon("dialog-information")); - infoAction->setShortcut(Qt::Key_F11); - addActionCloneToCollection(infoAction, "show_information_panel"); + createPanelAction(KIcon("dialog-information"), Qt::Key_F11, infoAction, "show_information_panel"); addDockWidget(Qt::RightDockWidgetArea, infoDock); connect(this, SIGNAL(urlChanged(KUrl)), @@ -1627,15 +1778,13 @@ void DolphinMainWindow::setupDockWidgets() foldersDock->setWidget(foldersPanel); QAction* foldersAction = foldersDock->toggleViewAction(); - foldersAction->setShortcut(Qt::Key_F7); - foldersAction->setIcon(KIcon("folder")); - addActionCloneToCollection(foldersAction, "show_folders_panel"); + createPanelAction(KIcon("folder"), Qt::Key_F7, foldersAction, "show_folders_panel"); addDockWidget(Qt::LeftDockWidgetArea, foldersDock); connect(this, SIGNAL(urlChanged(KUrl)), foldersPanel, SLOT(setUrl(KUrl))); - connect(foldersPanel, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)), - this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); + connect(foldersPanel, SIGNAL(changeUrl(KUrl,Qt::MouseButtons)), + this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons))); // Setup "Terminal" #ifndef Q_OS_WIN @@ -1648,46 +1797,43 @@ void DolphinMainWindow::setupDockWidgets() terminalDock->setWidget(terminalPanel); connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide())); + connect(terminalDock, SIGNAL(visibilityChanged(bool)), + terminalPanel, SLOT(dockVisibilityChanged())); QAction* terminalAction = terminalDock->toggleViewAction(); - terminalAction->setShortcut(Qt::Key_F4); - terminalAction->setIcon(KIcon("utilities-terminal")); - addActionCloneToCollection(terminalAction, "show_terminal_panel"); + createPanelAction(KIcon("utilities-terminal"), Qt::Key_F4, terminalAction, "show_terminal_panel"); addDockWidget(Qt::BottomDockWidgetArea, terminalDock); connect(this, SIGNAL(urlChanged(KUrl)), 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(); + createPanelAction(KIcon("system-search"), Qt::Key_F12, 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(); - if (firstRun) { + if (GeneralSettings::version() < 200) { infoDock->hide(); foldersDock->hide(); #ifndef Q_OS_WIN terminalDock->hide(); #endif #ifdef HAVE_NEPOMUK - filterDock->hide(); + searchDock->hide(); #endif } @@ -1704,33 +1850,34 @@ void DolphinMainWindow::setupDockWidgets() placesActions.append(separator); placesActions.append(lockLayoutAction); placesPanel->addActions(placesActions); - placesPanel->setModel(DolphinSettings::instance().placesModel()); + placesPanel->setModel(DolphinPlacesModel::instance()); placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); placesDock->setWidget(placesPanel); QAction* placesAction = placesDock->toggleViewAction(); - placesAction->setShortcut(Qt::Key_F9); - placesAction->setIcon(KIcon("bookmarks")); - addActionCloneToCollection(placesAction, "show_places_panel"); + createPanelAction(KIcon("bookmarks"), Qt::Key_F9, placesAction, "show_places_panel"); addDockWidget(Qt::LeftDockWidgetArea, placesDock); - connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)), - this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); + connect(placesPanel, SIGNAL(urlChanged(KUrl,Qt::MouseButtons)), + 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); actionCollection()->addAction("panels", panelsMenu); panelsMenu->setDelayed(false); - panelsMenu->addAction(placesAction); - panelsMenu->addAction(infoAction); - panelsMenu->addAction(foldersAction); + const KActionCollection* ac = actionCollection(); + panelsMenu->addAction(ac->action("show_places_panel")); + panelsMenu->addAction(ac->action("show_information_panel")); + panelsMenu->addAction(ac->action("show_folders_panel")); #ifndef Q_OS_WIN - panelsMenu->addAction(terminalAction); + panelsMenu->addAction(ac->action("show_terminal_panel")); #endif #ifdef HAVE_NEPOMUK - panelsMenu->addAction(filterAction); + panelsMenu->addAction(ac->action("show_search_panel")); #endif panelsMenu->addSeparator(); panelsMenu->addAction(lockLayoutAction); @@ -1784,6 +1931,64 @@ void DolphinMainWindow::updateGoActions() goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); } +void DolphinMainWindow::createControlButton() +{ + if (m_controlButton) { + return; + } + Q_ASSERT(!m_controlButton); + + m_controlButton = new QToolButton(this); + m_controlButton->setIcon(KIcon("applications-system")); + m_controlButton->setText(i18nc("@action", "Control")); + m_controlButton->setPopupMode(QToolButton::InstantPopup); + m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle()); + + KMenu* controlMenu = new KMenu(m_controlButton); + connect(controlMenu, SIGNAL(aboutToShow()), this, SLOT(updateControlMenu())); + + m_controlButton->setMenu(controlMenu); + + toolBar()->addWidget(m_controlButton); + connect(toolBar(), SIGNAL(iconSizeChanged(QSize)), + m_controlButton, SLOT(setIconSize(QSize))); + connect(toolBar(), SIGNAL(toolButtonStyleChanged(Qt::ToolButtonStyle)), + m_controlButton, SLOT(setToolButtonStyle(Qt::ToolButtonStyle))); + + // 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_controlButton, SIGNAL(destroyed()), this, SLOT(slotControlButtonDeleted())); + m_updateToolBarTimer = new QTimer(this); + m_updateToolBarTimer->setInterval(500); + connect(m_updateToolBarTimer, SIGNAL(timeout()), this, SLOT(updateToolBar())); +} + +void DolphinMainWindow::deleteControlButton() +{ + delete m_controlButton; + m_controlButton = 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(); @@ -1822,6 +2027,38 @@ void DolphinMainWindow::rememberClosedTab(int index) KAcceleratorManager::manage(tabsMenu); } +void DolphinMainWindow::refreshViews() +{ + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); + + // remember the current active view, as because of + // the refreshing the active view might change to + // the secondary view + DolphinViewContainer* activeViewContainer = m_activeViewContainer; + + const int tabCount = m_viewTab.count(); + for (int i = 0; i < tabCount; ++i) { + m_viewTab[i].primaryView->readSettings(); + if (m_viewTab[i].secondaryView) { + m_viewTab[i].secondaryView->readSettings(); + } + } + + setActiveViewContainer(activeViewContainer); + + if (GeneralSettings::modifiedStartupSettings()) { + // The startup settings have been changed by the user (see bug #254947). + // 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) + || (!splitView && activeTab.secondaryView); + if (toggle) { + toggleSplitView(); + } + } +} + void DolphinMainWindow::clearStatusBar() { m_activeViewContainer->statusBar()->clear(); @@ -1836,6 +2073,10 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) connect(container, SIGNAL(searchModeChanged(bool)), this, SLOT(slotSearchModeChanged(bool))); + const DolphinSearchBox* searchBox = container->searchBox(); + connect(searchBox, SIGNAL(searchLocationChanged(SearchLocation)), + this, SLOT(slotSearchLocationChanged())); + DolphinView* view = container->view(); connect(view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(slotSelectionChanged(KFileItemList))); @@ -1843,23 +2084,27 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, SLOT(slotRequestItemInfo(KFileItem))); connect(view, SIGNAL(activated()), this, SLOT(toggleActiveView())); - connect(view, SIGNAL(tabRequested(const KUrl&)), - this, SLOT(openNewTab(const KUrl&))); - connect(view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList&)), - this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList&))); - connect(view, SIGNAL(startedPathLoading(KUrl)), + connect(view, SIGNAL(tabRequested(KUrl)), + this, SLOT(openNewTab(KUrl))); + connect(view, SIGNAL(requestContextMenu(QPoint,KFileItem,KUrl,QList)), + this, SLOT(openContextMenu(QPoint,KFileItem,KUrl,QList))); + connect(view, SIGNAL(directoryLoadingStarted()), this, SLOT(enableStopAction())); - connect(view, SIGNAL(finishedPathLoading(KUrl)), + connect(view, SIGNAL(directoryLoadingCompleted()), this, SLOT(disableStopAction())); + connect(view, SIGNAL(goBackRequested()), + this, SLOT(goBack())); + connect(view, SIGNAL(goForwardRequested()), + this, SLOT(goForward())); const KUrlNavigator* navigator = container->urlNavigator(); - connect(navigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(changeUrl(const KUrl&))); + connect(navigator, SIGNAL(urlChanged(KUrl)), + this, SLOT(changeUrl(KUrl))); connect(navigator, SIGNAL(historyChanged()), this, SLOT(updateHistory())); connect(navigator, SIGNAL(editableStateChanged(bool)), this, SLOT(slotEditableStateChanged(bool))); - connect(navigator, SIGNAL(tabRequested(const KUrl&)), + connect(navigator, SIGNAL(tabRequested(KUrl)), this, SLOT(openNewTab(KUrl))); } @@ -1916,17 +2161,20 @@ bool DolphinMainWindow::isKompareInstalled() const void DolphinMainWindow::createSecondaryView(int tabIndex) { - QSplitter* splitter = m_viewTab[tabIndex].splitter; - const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2; + ViewTab& viewTab = m_viewTab[tabIndex]; + + QSplitter* splitter = viewTab.splitter; + const int newWidth = (viewTab.primaryView->width() - splitter->handleWidth()) / 2; - const DolphinView* view = m_viewTab[tabIndex].primaryView->view(); - m_viewTab[tabIndex].secondaryView = new DolphinViewContainer(view->rootUrl(), 0); - splitter->addWidget(m_viewTab[tabIndex].secondaryView); + const DolphinView* view = viewTab.primaryView->view(); + viewTab.secondaryView = createViewContainer(view->url(), 0); + splitter->addWidget(viewTab.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(); + + connectViewSignals(viewTab.secondaryView); + viewTab.secondaryView->setActive(false); + viewTab.secondaryView->resize(newWidth, viewTab.primaryView->height()); + viewTab.secondaryView->show(); } QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const @@ -1956,12 +2204,20 @@ QString DolphinMainWindow::squeezedText(const QString& text) const return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10); } -void DolphinMainWindow::addActionCloneToCollection(QAction* action, const QString& actionName) +void DolphinMainWindow::createPanelAction(const KIcon& icon, + const QKeySequence& shortcut, + QAction* dockAction, + const QString& actionName) { - KAction* actionClone = actionCollection()->addAction(actionName); - actionClone->setText(action->text()); - actionClone->setIcon(action->icon()); - connect(actionClone, SIGNAL(triggered()), action, SLOT(trigger())); + KAction* panelAction = actionCollection()->addAction(actionName); + panelAction->setCheckable(true); + panelAction->setChecked(dockAction->isChecked()); + panelAction->setText(dockAction->text()); + panelAction->setIcon(icon); + panelAction->setShortcut(shortcut); + + connect(panelAction, SIGNAL(triggered()), dockAction, SLOT(trigger())); + connect(dockAction, SIGNAL(toggled(bool)), panelAction, SLOT(setChecked(bool))); } DolphinMainWindow::UndoUiInterface::UndoUiInterface() :