From 108e10ca15be6662fa02f56665cc78808ab243e7 Mon Sep 17 00:00:00 2001 From: Nathaniel Graham Date: Tue, 30 Jan 2018 17:05:57 -0700 Subject: [PATCH 1/3] Let the terminal panel dock to any part of the window Summary: BUG: 362593 Just what it says: Let the terminal panel sit on the left or right side of the window. Test Plan: Tested in KDE Neon: - Opened terminal panel, unlocked widgets, and tried to drag it to the right or left side of the window: I can - Put terminal panel on right side, quit Dolphin and opened Dolphin again: terminal panel appears on the right as expected - Put terminal panel on right side, closed terminal panel, quit Dolphin, opened Dolphin, and opened the terminal panel again: terminal panel appears on the right as expected - Removed dolphinrc file and opened terminal panel: appears on the bottom {F5682428} Reviewers: #dolphin Subscribers: elvisangelaccio, anthonyfieroni, cfeck Differential Revision: https://phabricator.kde.org/D10189 --- src/dolphinmainwindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index c35de766cc..070d56aeb2 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1278,7 +1278,6 @@ void DolphinMainWindow::setupDockWidgets() DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal")); terminalDock->setLocked(lock); terminalDock->setObjectName(QStringLiteral("terminalDock")); - terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); m_terminalPanel = new TerminalPanel(terminalDock); m_terminalPanel->setCustomContextMenuActions({lockLayoutAction}); terminalDock->setWidget(m_terminalPanel); From ee5736bc06358def78736331600744179ae9e72d Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 3 Feb 2018 00:38:57 +0100 Subject: [PATCH 2/3] GIT_SILENT Upgrade KDE Applications version to 17.12.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d45626ee69..e60df7f097 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) From a618383df3840d85dcd7e4ff62dc2ed02f55b0b7 Mon Sep 17 00:00:00 2001 From: Robert Hoffmann Date: Tue, 13 Feb 2018 23:12:44 +0100 Subject: [PATCH 3/3] Fix resetting "View Modes" preferences to defaults Summary: Removed call to settings.readConfig() in ViewSettingsTab::loadSettings(), because it overwrites default settings with user settings even if called from ViewSettingsTab::restoreDefaultSettings(). Test Plan: Settings -> Configure Dolphin -> View Modes: Choose "Custom Font", "Choose...": other font settings than preselected; alter "Icon Size" slider positions; click OK; OK; note modified text font next to icons, icon sizes Settings -> Configure Dolphin -> View Modes: Click "Defaults" check "Font" is reset to "System Font"; check "Icon Size" slider positions are reset to default positions; click OK check text font next to icons, icon sizes are reset to defaults Subscribers: ltoscano, ngraham, elvisangelaccio, michaelh, #dolphin Tags: #dolphin Differential Revision: https://phabricator.kde.org/D10190 --- src/settings/viewmodes/viewsettingstab.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index a673769ade..ae751f9aaf 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -232,8 +232,7 @@ void ViewSettingsTab::loadSettings() break; } - ViewModeSettings settings(viewMode()); - settings.readConfig(); + const ViewModeSettings settings(viewMode()); const QSize iconSize(settings.iconSize(), settings.iconSize()); m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));