X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2eb009455bec2fcdbd394a276ce40b3ff5efc35f..64f38f89a63c7afe5fbd5181f9de65c4b3be48b7:/src/views/dolphinviewactionhandler.cpp diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 079cd22fd..e504fd831 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -12,6 +12,7 @@ #include "selectionmode/actiontexthelper.h" #include "settings/viewpropertiesdialog.h" #include "views/zoomlevelinfo.h" +#include "views/zoomwidgetaction.h" #if HAVE_BALOO #include @@ -251,13 +252,8 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac QAction *zoomOutAction = KStandardAction::zoomOut(this, &DolphinViewActionHandler::zoomOut, m_actionCollection); zoomOutAction->setWhatsThis(i18nc("@info:whatsthis zoom out", "This reduces the icon size.")); - KActionMenu *zoomMenu = m_actionCollection->add(QStringLiteral("zoom")); - zoomMenu->setText(i18nc("@action:inmenu menu of zoom actions", "Zoom")); - zoomMenu->setIcon(QIcon::fromTheme(QStringLiteral("zoom"))); - zoomMenu->setPopupMode(QToolButton::InstantPopup); - zoomMenu->addAction(zoomInAction); - zoomMenu->addAction(zoomResetAction); - zoomMenu->addAction(zoomOutAction); + ZoomWidgetAction *zoomWidgetAction = new ZoomWidgetAction(zoomInAction, zoomResetAction, zoomOutAction, m_actionCollection); + m_actionCollection->addAction(QStringLiteral("zoom"), zoomWidgetAction); KToggleAction *showPreview = m_actionCollection->add(QStringLiteral("show_preview")); showPreview->setText(i18nc("@action:intoolbar", "Show Previews")); @@ -364,11 +360,12 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac viewSettings->setText(i18nc("@action:intoolbar", "View Settings")); viewSettings->setWhatsThis( xi18nc("@info:whatsthis View Settings Toolbutton", "This cycles through all view modes. The dropdown menu contains various view-related actions.")); - for (QAction *action : viewModeActions->actions()) { + const auto actions = viewModeActions->actions(); + for (QAction *action : actions) { viewSettings->addAction(action); } viewSettings->addSeparator(); - viewSettings->addAction(zoomMenu); + viewSettings->addAction(zoomWidgetAction); viewSettings->addAction(sortByActionMenu); viewSettings->addAction(visibleRolesMenu); viewSettings->addAction(showPreview);