SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ff3cfa3bfbbbe9152c145afd762225eb8c063e8c..166091ca7e9ef70cf909952a365d141d02894ab1 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -912,6 +912,8 @@ void DolphinMainWindow::togglePanelLockState()
         }
     }
 
         }
     }
 

+    DolphinPlacesModelSingleton::instance().placesModel()->setPanelsLocked(newLockState);
+

     GeneralSettings::setLockPanels(newLockState);
 }
 
     GeneralSettings::setLockPanels(newLockState);
 }
 


@@ -1177,6 +1179,16 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
     }
 }
 
     }
 }
 

+QMenu *DolphinMainWindow::createPopupMenu()
+{
+    QMenu *menu = KXmlGuiWindow::createPopupMenu();
+
+    menu->addSeparator();
+    menu->addAction(actionCollection()->action(QStringLiteral("lock_panels")));
+
+    return menu;
+}
+

 void DolphinMainWindow::updateHamburgerMenu()
 {
     KActionCollection* ac = actionCollection();
 void DolphinMainWindow::updateHamburgerMenu()
 {
     KActionCollection* ac = actionCollection();


@@ -1804,6 +1816,8 @@ void DolphinMainWindow::setupDockWidgets()
 {
     const bool lock = GeneralSettings::lockPanels();
 
 {
     const bool lock = GeneralSettings::lockPanels();
 

+    DolphinPlacesModelSingleton::instance().placesModel()->setPanelsLocked(lock);
+

     KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>(QStringLiteral("lock_panels"));
     lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));
     lockLayoutAction->setActiveIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
     KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>(QStringLiteral("lock_panels"));
     lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));
     lockLayoutAction->setActiveIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));


@@ -2278,6 +2292,7 @@ void DolphinMainWindow::createPanelAction(const QIcon& icon,
     panelAction->setChecked(dockAction->isChecked());
     panelAction->setText(dockAction->text());
     panelAction->setIcon(icon);
     panelAction->setChecked(dockAction->isChecked());
     panelAction->setText(dockAction->text());
     panelAction->setIcon(icon);

+    dockAction->setIcon(icon);

     actionCollection()->setDefaultShortcut(panelAction, shortcut);
 
     connect(panelAction, &QAction::triggered, dockAction, &QAction::trigger);
     actionCollection()->setDefaultShortcut(panelAction, shortcut);
 
     connect(panelAction, &QAction::triggered, dockAction, &QAction::trigger);