mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge branch 'Applications/17.12'
This commit is contained in:
commit
0dd0b65bf0
|
@ -1299,7 +1299,6 @@ void DolphinMainWindow::setupDockWidgets()
|
||||||
DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
|
DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
|
||||||
terminalDock->setLocked(lock);
|
terminalDock->setLocked(lock);
|
||||||
terminalDock->setObjectName(QStringLiteral("terminalDock"));
|
terminalDock->setObjectName(QStringLiteral("terminalDock"));
|
||||||
terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
|
|
||||||
m_terminalPanel = new TerminalPanel(terminalDock);
|
m_terminalPanel = new TerminalPanel(terminalDock);
|
||||||
m_terminalPanel->setCustomContextMenuActions({lockLayoutAction});
|
m_terminalPanel->setCustomContextMenuActions({lockLayoutAction});
|
||||||
terminalDock->setWidget(m_terminalPanel);
|
terminalDock->setWidget(m_terminalPanel);
|
||||||
|
|
Loading…
Reference in a new issue