X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/05fec8d24bcfbcb7bccc923df95776c4dc89e99d..40c71d5ce0f6978ce48eb67fd73ed211bab4e887:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 60fded631..aca4d15b6 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -41,6 +41,7 @@ #include "statusbar/dolphinstatusbar.h" #include "views/dolphinviewactionhandler.h" #include "views/dolphinremoteencoding.h" +#include "views/draganddrophelper.h" #include "views/viewproperties.h" #ifndef Q_OS_WIN @@ -102,18 +103,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 @@ -138,8 +127,7 @@ 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) @@ -262,7 +250,7 @@ DolphinMainWindow::DolphinMainWindow() : QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar)); showMenuBarAction->setChecked(showMenu); // workaround for bug #171080 if (!showMenu) { - createToolBarMenuButton(); + createControlButton(); } } @@ -1092,9 +1080,9 @@ void DolphinMainWindow::toggleShowMenuBar() const bool visible = menuBar()->isVisible(); menuBar()->setVisible(!visible); if (visible) { - createToolBarMenuButton(); + createControlButton(); } else { - deleteToolBarMenuButton(); + deleteControlButton(); } } @@ -1117,7 +1105,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); @@ -1327,9 +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(); - Q_UNUSED(destPath); - //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); } } @@ -1411,7 +1402,7 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos, delete contextMenu.data(); } -void DolphinMainWindow::updateToolBarMenu() +void DolphinMainWindow::updateControlMenu() { KMenu* menu = qobject_cast(sender()); Q_ASSERT(menu); @@ -1510,29 +1501,16 @@ 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() -{ - m_openToolBarMenuButton = 0; - m_updateToolBarTimer->start(); -} - -void DolphinMainWindow::slotToolBarIconSizeChanged(const QSize& iconSize) -{ - if (m_openToolBarMenuButton) { - m_openToolBarMenuButton->setIconSize(iconSize); - } -} - void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer) { Q_ASSERT(viewContainer); @@ -1953,48 +1931,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); - - m_toolBarSpacer = new QWidget(this); - m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + Q_ASSERT(!m_controlButton); - 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")); + 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* toolBarMenu = new ToolBarMenu(m_openToolBarMenuButton); - connect(toolBarMenu, SIGNAL(aboutToShow()), this, SLOT(updateToolBarMenu())); + KMenu* controlMenu = new KMenu(m_controlButton); + connect(controlMenu, SIGNAL(aboutToShow()), this, SLOT(updateControlMenu())); - m_openToolBarMenuButton->setMenu(toolBarMenu); + m_controlButton->setMenu(controlMenu); - 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; @@ -2065,9 +2038,9 @@ 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(); } } @@ -2115,10 +2088,14 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, SLOT(openNewTab(KUrl))); connect(view, SIGNAL(requestContextMenu(QPoint,KFileItem,KUrl,QList)), this, SLOT(openContextMenu(QPoint,KFileItem,KUrl,QList))); - connect(view, SIGNAL(startedPathLoading(KUrl)), + 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)), @@ -2263,47 +2240,4 @@ 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() < 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"