Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 51772eac28b1abb7897abe3d58387f32f9298472..d08d6f6b396fe75bc9dda6cb48d67eabe354e41d 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1568,12 +1568,13 @@ void DolphinMainWindow::updateHamburgerMenu()
         menu->addAction(ac->action(QStringLiteral("view_mode")));
     }
     if (!toolBar()->isVisible() || !toolbarActions.contains(ac->action(QStringLiteral("view_settings")))) {
         menu->addAction(ac->action(QStringLiteral("view_mode")));
     }
     if (!toolBar()->isVisible() || !toolbarActions.contains(ac->action(QStringLiteral("view_settings")))) {

-        menu->addAction(ac->action(QStringLiteral("show_hidden_files")));
-        menu->addAction(ac->action(QStringLiteral("sort")));
-        menu->addAction(ac->action(QStringLiteral("additional_info")));
-        if (!GeneralSettings::showStatusBar() || !GeneralSettings::showZoomSlider()) {
-            menu->addAction(ac->action(QStringLiteral("zoom")));
-        }
+           menu->addAction(ac->action(QStringLiteral("show_hidden_files")));
+           menu->addAction(ac->action(QStringLiteral("sort")));
+           menu->addAction(ac->action(QStringLiteral("group")));
+           menu->addAction(ac->action(QStringLiteral("additional_info")));
+           if (!GeneralSettings::showStatusBar() || !GeneralSettings::showZoomSlider()) {
+                       menu->addAction(ac->action(QStringLiteral("zoom")));
+               }

     }
     menu->addAction(ac->action(QStringLiteral("panels")));
 
     }
     menu->addAction(ac->action(QStringLiteral("panels")));
 


@@ -2413,7 +2414,7 @@ void DolphinMainWindow::setupDockWidgets()
     placesDock->setLocked(lock);
     placesDock->setObjectName(QStringLiteral("placesDock"));
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     placesDock->setLocked(lock);
     placesDock->setObjectName(QStringLiteral("placesDock"));
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);

-
+    

     m_placesPanel = new PlacesPanel(placesDock);
     m_placesPanel->setCustomContextMenuActions({lockLayoutAction});
     placesDock->setWidget(m_placesPanel);
     m_placesPanel = new PlacesPanel(placesDock);
     m_placesPanel->setCustomContextMenuActions({lockLayoutAction});
     placesDock->setWidget(m_placesPanel);