X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9ca11175a4c9e93607131c45b8e5470e1e5014b7..3e2cf9721b7b9726af37d679d1afd6eaf306ad29:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 6ca6e59f7..355bc6fd4 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -21,27 +21,19 @@ #include "dolphinmainwindow.h" -#include - #include "dolphinapplication.h" #include "dolphindockwidget.h" #include "dolphincontextmenu.h" #include "dolphinnewfilemenu.h" #include "dolphinviewcontainer.h" -#ifdef HAVE_NEPOMUK - #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" #include "views/dolphinremoteencoding.h" +#include "views/draganddrophelper.h" #include "views/viewproperties.h" #ifndef Q_OS_WIN @@ -49,7 +41,6 @@ #endif #include "dolphin_generalsettings.h" -#include "dolphin_searchsettings.h" #include #include @@ -67,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -88,6 +80,8 @@ #include #include +#include "views/dolphinplacesmodel.h" + #include #include #include @@ -101,18 +95,6 @@ namespace { const int CurrentDolphinVersion = 200; }; -/* - * 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. * Each closed tab can be restored by the menu @@ -137,12 +119,14 @@ DolphinMainWindow::DolphinMainWindow() : m_actionHandler(0), m_remoteEncoding(0), m_settingsDialog(), - m_toolBarSpacer(0), - m_openToolBarMenuButton(0), + m_controlButton(0), m_updateToolBarTimer(0), - m_lastHandleUrlStatJob(0), - m_searchDockIsTemporaryVisible(false) + m_lastHandleUrlStatJob(0) { + 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): @@ -151,6 +135,8 @@ DolphinMainWindow::DolphinMainWindow() : setObjectName("Dolphin#"); m_viewTab.append(ViewTab()); + 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()); @@ -163,14 +149,8 @@ DolphinMainWindow::DolphinMainWindow() : this, SLOT(clearStatusBar())); connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)), this, SLOT(showCommand(CommandType))); - connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(QString)), - this, SLOT(showErrorMessage(QString))); - //connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(QString)), - // this, SLOT(showErrorMessage(QString))); - - const DolphinSettings& settings = DolphinSettings::instance(); - GeneralSettings* generalSettings = settings.generalSettings(); + GeneralSettings* generalSettings = GeneralSettings::self(); const bool firstRun = (generalSettings->version() < 200); if (firstRun) { generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime()); @@ -178,8 +158,8 @@ DolphinMainWindow::DolphinMainWindow() : setAcceptDrops(true); - m_viewTab[m_tabIndex].splitter = new QSplitter(this); - m_viewTab[m_tabIndex].splitter->setChildrenCollapsible(false); + viewTab.splitter = new QSplitter(this); + viewTab.splitter->setChildrenCollapsible(false); setupActions(); @@ -189,9 +169,9 @@ DolphinMainWindow::DolphinMainWindow() : connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar())); connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory())); - m_viewTab[m_tabIndex].primaryView = createViewContainer(homeUrl, m_viewTab[m_tabIndex].splitter); + viewTab.primaryView = createViewContainer(homeUrl, viewTab.splitter); - m_activeViewContainer = m_viewTab[m_tabIndex].primaryView; + m_activeViewContainer = viewTab.primaryView; connectViewSignals(m_activeViewContainer); DolphinView* view = m_activeViewContainer->view(); m_activeViewContainer->show(); @@ -228,7 +208,7 @@ DolphinMainWindow::DolphinMainWindow() : m_centralWidgetLayout->setSpacing(0); m_centralWidgetLayout->setMargin(0); m_centralWidgetLayout->addWidget(m_tabBar); - m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1); + m_centralWidgetLayout->addWidget(viewTab.splitter, 1); setCentralWidget(centralWidget); setupDockWidgets(); @@ -261,7 +241,7 @@ DolphinMainWindow::DolphinMainWindow() : QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar)); showMenuBarAction->setChecked(showMenu); // workaround for bug #171080 if (!showMenu) { - createToolBarMenuButton(); + createControlButton(); } } @@ -282,8 +262,7 @@ void DolphinMainWindow::openDirectories(const QList& dirs) 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. @@ -343,29 +322,23 @@ void DolphinMainWindow::showCommand(CommandType command) DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); switch (command) { case KIO::FileUndoManager::Copy: - statusBar->setMessage(i18nc("@info:status", "Successfully copied."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully copied.")); break; case KIO::FileUndoManager::Move: - statusBar->setMessage(i18nc("@info:status", "Successfully moved."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully moved.")); break; case KIO::FileUndoManager::Link: - statusBar->setMessage(i18nc("@info:status", "Successfully linked."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully linked.")); break; case KIO::FileUndoManager::Trash: - statusBar->setMessage(i18nc("@info:status", "Successfully moved to trash."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully moved to trash.")); break; case KIO::FileUndoManager::Rename: - statusBar->setMessage(i18nc("@info:status", "Successfully renamed."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Successfully renamed.")); break; case KIO::FileUndoManager::Mkdir: - statusBar->setMessage(i18nc("@info:status", "Created folder."), - DolphinStatusBar::OperationCompleted); + statusBar->setText(i18nc("@info:status", "Created folder.")); break; default: @@ -403,6 +376,13 @@ void DolphinMainWindow::changeUrl(const KUrl& url) } } +void DolphinMainWindow::slotTerminalDirectoryChanged(const KUrl& url) +{ + m_activeViewContainer->setAutoGrabFocus(false); + changeUrl(url); + m_activeViewContainer->setAutoGrabFocus(true); +} + void DolphinMainWindow::slotEditableStateChanged(bool editable) { KToggleAction* editableLocationAction = @@ -441,14 +421,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); } } @@ -510,13 +490,12 @@ void DolphinMainWindow::openNewTab(const KUrl& url) 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) { @@ -526,27 +505,29 @@ void DolphinMainWindow::openNewTab(const KUrl& url) } } +void DolphinMainWindow::openNewActivatedTab(const KUrl& url) +{ + openNewTab(url); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); +} + 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() @@ -600,9 +581,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; @@ -611,7 +589,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 @@ -637,7 +615,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) KMessageBox::Notify); if (doNotAskAgainCheckboxResult) { - generalSettings->setConfirmClosingMultipleTabs(false); + GeneralSettings::setConfirmClosingMultipleTabs(false); } switch (result) { @@ -653,16 +631,8 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) } } - generalSettings->setVersion(CurrentDolphinVersion); - settings.save(); - - if (m_searchDockIsTemporaryVisible) { - QDockWidget* searchDock = findChild("searchDock"); - if (searchDock) { - searchDock->hide(); - } - m_searchDockIsTemporaryVisible = false; - } + GeneralSettings::setVersion(CurrentDolphinVersion); + GeneralSettings::self()->writeConfig(); KXmlGuiWindow::closeEvent(event); } @@ -749,10 +719,7 @@ void DolphinMainWindow::quit() void DolphinMainWindow::showErrorMessage(const QString& message) { - if (!message.isEmpty()) { - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - statusBar->setMessage(message, DolphinStatusBar::Error); - } + m_activeViewContainer->showMessage(message, DolphinViewContainer::Error); } void DolphinMainWindow::slotUndoAvailable(bool available) @@ -827,23 +794,6 @@ 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)); @@ -953,9 +903,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) { @@ -963,7 +911,7 @@ void DolphinMainWindow::togglePanelLockState() } } - generalSettings->setLockPanels(newLockState); + GeneralSettings::setLockPanels(newLockState); } void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible) @@ -1034,6 +982,14 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons) } } +void DolphinMainWindow::goHome(Qt::MouseButtons buttons) +{ + // The default case (left button pressed) is handled in goHome(). + if (buttons == Qt::MidButton) { + openNewTab(GeneralSettings::self()->homeUrl()); + } +} + void DolphinMainWindow::compareFiles() { // The method is only invoked if exactly 2 files have @@ -1094,9 +1050,9 @@ void DolphinMainWindow::toggleShowMenuBar() const bool visible = menuBar()->isVisible(); menuBar()->setVisible(!visible); if (visible) { - createToolBarMenuButton(); + createControlButton(); } else { - deleteToolBarMenuButton(); + deleteControlButton(); } } @@ -1119,7 +1075,10 @@ void DolphinMainWindow::openTerminal() void DolphinMainWindow::editSettings() { if (!m_settingsDialog) { - const KUrl url = activeViewContainer()->url(); + 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); @@ -1160,6 +1119,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); } @@ -1267,16 +1238,6 @@ void DolphinMainWindow::slotTabMoved(int from, int to) m_tabIndex = m_tabBar->currentIndex(); } -void DolphinMainWindow::handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons) -{ - if (buttons & Qt::MidButton) { - openNewTab(url); - m_tabBar->setCurrentIndex(m_viewTab.count() - 1); - } else { - changeUrl(url); - } -} - void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode) { canDecode = KUrl::List::canDecode(event->mimeData()); @@ -1292,11 +1253,14 @@ void DolphinMainWindow::handleUrl(const KUrl& url) } else if (KProtocolManager::supportsListing(url)) { // stat the URL to see if it is a dir or not m_lastHandleUrlStatJob = KIO::stat(url, KIO::HideProgressInfo); + if (m_lastHandleUrlStatJob->ui()) { + m_lastHandleUrlStatJob->ui()->setWindow(this); + } connect(m_lastHandleUrlStatJob, SIGNAL(result(KJob*)), this, SLOT(slotHandleUrlStatFinished(KJob*))); } else { - new KRun(url, this); + new KRun(url, this); // Automatically deletes itself after being finished } } @@ -1308,7 +1272,7 @@ void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job) if (entry.isDir()) { activeViewContainer()->setUrl(url); } else { - new KRun(url, this); + new KRun(url, this); // Automatically deletes itself after being finished } } @@ -1317,9 +1281,12 @@ 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(); - Q_UNUSED(destPath); - //DragAndDropHelper::instance().dropUrls(KFileItem(), destPath, event, m_tabBar); + const DolphinView* view = viewTab.isPrimaryViewActive ? viewTab.primaryView->view() + : viewTab.secondaryView->view(); + const QString error = DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event); + if (!error.isEmpty()) { + activeViewContainer()->showMessage(error, DolphinViewContainer::Error); + } } } @@ -1328,59 +1295,14 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable) newFileMenu()->setEnabled(isFolderWritable); } -void DolphinMainWindow::slotSearchModeChanged(bool enabled) -{ -#ifdef HAVE_NEPOMUK - const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance(); - if (!searchInfo.isIndexingEnabled()) { - return; - } - - QDockWidget* searchDock = findChild("searchDock"); - if (!searchDock) { - return; - } - - if (enabled) { - if (!searchDock->isVisible()) { - m_searchDockIsTemporaryVisible = true; - } - searchDock->show(); - } else { - if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) { - searchDock->hide(); - } - 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: { @@ -1397,10 +1319,10 @@ void DolphinMainWindow::openContextMenu(const KFileItem& item, break; } - delete contextMenu; + delete contextMenu.data(); } -void DolphinMainWindow::updateToolBarMenu() +void DolphinMainWindow::updateControlMenu() { KMenu* menu = qobject_cast(sender()); Q_ASSERT(menu); @@ -1409,8 +1331,6 @@ void DolphinMainWindow::updateToolBarMenu() // by connecting to the aboutToHide() signal from the parent-menu. menu->clear(); - const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); - KActionCollection* ac = actionCollection(); // Add "Edit" actions @@ -1424,7 +1344,7 @@ void DolphinMainWindow::updateToolBarMenu() } // Add "View" actions - if (!generalSettings->showZoomSlider()) { + if (!GeneralSettings::showZoomSlider()) { addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu); addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu); menu->addSeparator(); @@ -1501,27 +1421,19 @@ void DolphinMainWindow::updateToolBarMenu() void DolphinMainWindow::updateToolBar() { if (!menuBar()->isVisible()) { - createToolBarMenuButton(); + createControlButton(); } } -void DolphinMainWindow::slotToolBarSpacerDeleted() +void DolphinMainWindow::slotControlButtonDeleted() { - m_toolBarSpacer = 0; + m_controlButton = 0; m_updateToolBarTimer->start(); } -void DolphinMainWindow::slotToolBarMenuButtonDeleted() +void DolphinMainWindow::slotPanelErrorMessage(const QString& error) { - m_openToolBarMenuButton = 0; - m_updateToolBarTimer->start(); -} - -void DolphinMainWindow::slotToolBarIconSizeChanged(const QSize& iconSize) -{ - if (m_openToolBarMenuButton) { - m_openToolBarMenuButton->setIconSize(iconSize); - } + activeViewContainer()->showMessage(error, DolphinViewContainer::Error); } void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer) @@ -1689,7 +1601,8 @@ void DolphinMainWindow::setupActions() KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection()); 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"); @@ -1711,7 +1624,9 @@ void DolphinMainWindow::setupActions() connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal())); // setup 'Settings' menu - 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 @@ -1747,7 +1662,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")); @@ -1768,9 +1683,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)), @@ -1790,15 +1703,17 @@ 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(folderActivated(KUrl)), + this, SLOT(changeUrl(KUrl))); + connect(foldersPanel, SIGNAL(folderMiddleClicked(KUrl)), + this, SLOT(openNewActivatedTab(KUrl))); + connect(foldersPanel, SIGNAL(errorMessage(QString)), + this, SLOT(slotPanelErrorMessage(QString))); // Setup "Terminal" #ifndef Q_OS_WIN @@ -1811,47 +1726,23 @@ void DolphinMainWindow::setupDockWidgets() terminalDock->setWidget(terminalPanel); connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide())); + connect(terminalPanel, SIGNAL(changeUrl(KUrl)), this, SLOT(slotTerminalDirectoryChanged(KUrl))); 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 "Search" -#ifdef HAVE_NEPOMUK - 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)), - searchPanel, SLOT(setUrl(KUrl))); -#endif - - if (DolphinSettings::instance().generalSettings()->version() < 200) { + if (GeneralSettings::version() < 200) { infoDock->hide(); foldersDock->hide(); #ifndef Q_OS_WIN terminalDock->hide(); -#endif -#ifdef HAVE_NEPOMUK - searchDock->hide(); #endif } @@ -1862,24 +1753,19 @@ void DolphinMainWindow::setupDockWidgets() placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); PlacesPanel* placesPanel = new PlacesPanel(placesDock); - QAction* separator = new QAction(placesPanel); - separator->setSeparator(true); - QList placesActions; - placesActions.append(separator); - placesActions.append(lockLayoutAction); - placesPanel->addActions(placesActions); - placesPanel->setModel(DolphinSettings::instance().placesModel()); - placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + placesPanel->setCustomContextMenuActions(QList() << lockLayoutAction); 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(placeActivated(KUrl)), + this, SLOT(changeUrl(KUrl))); + connect(placesPanel, SIGNAL(placeMiddleClicked(KUrl)), + this, SLOT(openNewActivatedTab(KUrl))); + connect(placesPanel, SIGNAL(errorMessage(QString)), + this, SLOT(slotPanelErrorMessage(QString))); connect(this, SIGNAL(urlChanged(KUrl)), placesPanel, SLOT(setUrl(KUrl))); connect(placesDock, SIGNAL(visibilityChanged(bool)), @@ -1889,14 +1775,12 @@ void DolphinMainWindow::setupDockWidgets() 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); -#endif -#ifdef HAVE_NEPOMUK - panelsMenu->addAction(searchAction); + panelsMenu->addAction(ac->action("show_terminal_panel")); #endif panelsMenu->addSeparator(); panelsMenu->addAction(lockLayoutAction); @@ -1950,48 +1834,43 @@ void DolphinMainWindow::updateGoActions() goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); } -void DolphinMainWindow::createToolBarMenuButton() +void DolphinMainWindow::createControlButton() { - if (m_toolBarSpacer && m_openToolBarMenuButton) { + if (m_controlButton) { return; } - Q_ASSERT(!m_toolBarSpacer); - Q_ASSERT(!m_openToolBarMenuButton); + Q_ASSERT(!m_controlButton); - m_toolBarSpacer = new QWidget(this); - m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + 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()); - 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* controlMenu = new KMenu(m_controlButton); + connect(controlMenu, SIGNAL(aboutToShow()), this, SLOT(updateControlMenu())); - KMenu* toolBarMenu = new ToolBarMenu(m_openToolBarMenuButton); - connect(toolBarMenu, SIGNAL(aboutToShow()), this, SLOT(updateToolBarMenu())); + m_controlButton->setMenu(controlMenu); - m_openToolBarMenuButton->setMenu(toolBarMenu); - - toolBar()->addWidget(m_toolBarSpacer); - toolBar()->addWidget(m_openToolBarMenuButton); - connect(toolBar(), SIGNAL(iconSizeChanged(QSize)), this, SLOT(slotToolBarIconSizeChanged(QSize))); + 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_toolBarSpacer, SIGNAL(destroyed()), this, SLOT(slotToolBarSpacerDeleted())); - connect(m_openToolBarMenuButton, SIGNAL(destroyed()), this, SLOT(slotToolBarMenuButtonDeleted())); + 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::deleteToolBarMenuButton() +void DolphinMainWindow::deleteControlButton() { - delete m_toolBarSpacer; - m_toolBarSpacer = 0; - - delete m_openToolBarMenuButton; - m_openToolBarMenuButton = 0; + delete m_controlButton; + m_controlButton = 0; delete m_updateToolBarTimer; m_updateToolBarTimer = 0; @@ -2062,19 +1941,18 @@ void DolphinMainWindow::refreshViews() const int tabCount = m_viewTab.count(); for (int i = 0; i < tabCount; ++i) { - m_viewTab[i].primaryView->refresh(); + m_viewTab[i].primaryView->readSettings(); if (m_viewTab[i].secondaryView) { - m_viewTab[i].secondaryView->refresh(); + m_viewTab[i].secondaryView->readSettings(); } } setActiveViewContainer(activeViewContainer); - const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); - if (generalSettings->modifiedStartupSettings()) { + 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 bool splitView = GeneralSettings::splitView(); const ViewTab& activeTab = m_viewTab[m_tabIndex]; const bool toggle = ( splitView && !activeTab.secondaryView) || (!splitView && activeTab.secondaryView); @@ -2086,7 +1964,7 @@ void DolphinMainWindow::refreshViews() void DolphinMainWindow::clearStatusBar() { - m_activeViewContainer->statusBar()->clear(); + m_activeViewContainer->statusBar()->resetToDefaultText(); } void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) @@ -2095,12 +1973,6 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, SLOT(updateFilterBarAction(bool))); connect(container, SIGNAL(writeStateChanged(bool)), this, SLOT(slotWriteStateChanged(bool))); - 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)), @@ -2111,12 +1983,16 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, SLOT(toggleActiveView())); connect(view, SIGNAL(tabRequested(KUrl)), this, SLOT(openNewTab(KUrl))); - connect(view, SIGNAL(requestContextMenu(KFileItem,KUrl,QList)), - this, SLOT(openContextMenu(KFileItem,KUrl,QList))); - connect(view, SIGNAL(startedPathLoading(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(KUrl)), @@ -2182,16 +2058,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 = createViewContainer(view->url(), 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->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 @@ -2221,12 +2101,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() : @@ -2242,54 +2130,11 @@ void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job) { DolphinMainWindow* mainWin= qobject_cast(parentWidget()); if (mainWin) { - DolphinStatusBar* statusBar = mainWin->activeViewContainer()->statusBar(); - statusBar->setMessage(job->errorString(), DolphinStatusBar::Error); + DolphinViewContainer* container = mainWin->activeViewContainer(); + container->showMessage(job->errorString(), DolphinViewContainer::Error); } else { KIO::FileUndoManager::UiInterface::jobError(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() < screen.x()) { - pos.rx() = screen.x(); - } else if (pos.x() + width() > screen.x() + screen.width()) { - pos.rx() = screen.x() + screen.width() - width(); - } - - if (pos.y() < screen.y()) { - pos.ry() = screen.y(); - } else if (pos.y() + height() > screen.y() + screen.height()) { - pos.ry() = button->mapToGlobal(QPoint(0, 0)).y() - height(); - } - - move(pos); -} - #include "dolphinmainwindow.moc"