Hello community, here is the log from the commit of package dolphin for openSUSE:Factory checked in at 2020-12-17 16:55:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin (Old) and /work/SRC/openSUSE:Factory/.dolphin.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin" Thu Dec 17 16:55:09 2020 rev:74 rq:855106 version:20.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2020-11-10 13:35:14.428975752 +0100 +++ /work/SRC/openSUSE:Factory/.dolphin.new.5145/dolphin.changes 2020-12-17 16:55:12.353081530 +0100 @@ -1,0 +2,35 @@ +Thu Dec 10 19:14:25 UTC 2020 - Fabian Vogt <[email protected]> + +- Add patch to fix appearance on the first start (kde#429447): + * 0001-Update-cached-viewContainer-geometry-every-time-they.patch + +------------------------------------------------------------------- +Sat Dec 5 23:15:24 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-12-apps-update +- Changes since 20.11.90: + * Fix PlacesItemModelTest, 2nd try + * Re-allow to paste files via context menu (kde#429762) + +------------------------------------------------------------------- +Fri Nov 27 15:15:41 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 20.11.90 + * New feature release +- Too many changes since 20.11.80, only listing bugfixes: + * Allow the openURLJob to run executables (kde#429603) + * Places panel: highlight place only when it is displayed (kde#156678) + * Select last visited folder when going up/back (kde#429097) + * Re-allow icons that are not theme icon (kde#429113) + +------------------------------------------------------------------- +Sat Nov 14 00:00:33 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 20.11.80 + * New feature release +- Too many changes to list here. + +------------------------------------------------------------------- Old: ---- dolphin-20.08.3.tar.xz dolphin-20.08.3.tar.xz.sig New: ---- 0001-Update-cached-viewContainer-geometry-every-time-they.patch dolphin-20.12.0.tar.xz dolphin-20.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin.spec ++++++ --- /var/tmp/diff_new_pack.sdWVnN/_old 2020-12-17 16:55:13.233082474 +0100 +++ /var/tmp/diff_new_pack.sdWVnN/_new 2020-12-17 16:55:13.233082474 +0100 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: dolphin -Version: 20.08.3 +Version: 20.12.0 Release: 0 Summary: KDE File Manager License: GPL-2.0-or-later @@ -30,9 +30,12 @@ Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source3: dolphinsu.desktop Patch0: dolphin-go_up.diff +# PATCH-FIX-UPSTREAM +Patch1: 0001-Update-cached-viewContainer-geometry-every-time-they.patch # PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch +Patch100: 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch BuildRequires: extra-cmake-modules >= 1.6.0 +BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files BuildRequires: cmake(KF5Activities) >= 5.7.0 BuildRequires: cmake(KF5Baloo) @@ -145,11 +148,11 @@ %files %license COPYING* %doc README.md +%doc %lang(en) %{_kf5_htmldir}/en/dolphin/ %dir %{_kf5_appstreamdir} %dir %{_kf5_htmldir} %dir %{_kf5_htmldir}/en %dir %{_kf5_sharedir}/kglobalaccel/ -%doc %lang(en) %{_kf5_htmldir}/en/dolphin/ %{_kf5_applicationsdir}/org.kde.dolphin.desktop %{_kf5_applicationsdir}/org.kde.dolphinsu.desktop %{_kf5_appstreamdir}/org.kde.dolphin.appdata.xml ++++++ 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch ++++++ --- /var/tmp/diff_new_pack.sdWVnN/_old 2020-12-17 16:55:13.261082504 +0100 +++ /var/tmp/diff_new_pack.sdWVnN/_new 2020-12-17 16:55:13.261082504 +0100 @@ -10,13 +10,13 @@ src/main.cpp | 13 ------------- 1 file changed, 13 deletions(-) -Index: dolphin-19.03.60git.20191013T183353~0caab3c0a/src/main.cpp +Index: dolphin-19.03.60git.20201029T150039~bf11c835e/src/main.cpp =================================================================== ---- dolphin-19.03.60git.20191013T183353~0caab3c0a.orig/src/main.cpp 2019-10-13 18:33:53.000000000 +0200 -+++ dolphin-19.03.60git.20191013T183353~0caab3c0a/src/main.cpp 2019-10-14 07:14:20.922172281 +0200 -@@ -39,25 +39,8 @@ - #include <QDBusAbstractInterface> +--- dolphin-19.03.60git.20201029T150039~bf11c835e.orig/src/main.cpp 2020-10-29 22:00:39.000000000 +0100 ++++ dolphin-19.03.60git.20201029T150039~bf11c835e/src/main.cpp 2020-10-31 09:57:30.827192500 +0100 +@@ -28,25 +28,8 @@ #include <QDBusConnectionInterface> + #include <QSessionManager> -#ifndef Q_OS_WIN -#include <unistd.h> ++++++ 0001-Update-cached-viewContainer-geometry-every-time-they.patch ++++++ From 5c5198981e64a7ed5c60e24b43a043bac18d8a93 Mon Sep 17 00:00:00 2001 From: Felix Ernst <[email protected]> Date: Fri, 27 Nov 2020 18:44:48 +0100 Subject: [PATCH] Update cached viewContainer geometry every time they are used --- src/dolphinnavigatorswidgetaction.cpp | 62 ++++++++++++++++----------- src/dolphinnavigatorswidgetaction.h | 18 +++++--- src/dolphintabpage.cpp | 26 ++++------- 3 files changed, 57 insertions(+), 49 deletions(-) diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp index b8c77c69b..e534b9bb4 100644 --- a/src/dolphinnavigatorswidgetaction.cpp +++ b/src/dolphinnavigatorswidgetaction.cpp @@ -53,31 +53,12 @@ void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator() updateText(); } -void DolphinNavigatorsWidgetAction::followViewContainerGeometry( - int globalXOfPrimary, int widthOfPrimary) +void DolphinNavigatorsWidgetAction::followViewContainersGeometry(QWidget *primaryViewContainer, + QWidget *secondaryViewContainer) { - followViewContainersGeometry(globalXOfPrimary, widthOfPrimary, INT_MIN, INT_MIN); -} - -void DolphinNavigatorsWidgetAction::followViewContainersGeometry( - int globalXOfPrimary, int widthOfPrimary, - int globalXOfSecondary, int widthOfSecondary) -{ - if (QApplication::layoutDirection() == Qt::LeftToRight) { - m_globalXOfSplitter = m_splitter->mapToGlobal(QPoint(0,0)).x(); - m_globalXOfPrimary = globalXOfPrimary; - m_globalXOfSecondary = globalXOfSecondary; - } else { - // When the direction is reversed, globalX does not change. - // For the adjustSpacing() code to work we need globalX to measure from right to left - // and to measure up to the rightmost point of a widget instead of the leftmost. - m_globalXOfSplitter = (-1) * (m_splitter->mapToGlobal(QPoint(0,0)).x() + m_splitter->width()); - m_globalXOfPrimary = (-1) * (globalXOfPrimary + widthOfPrimary); - m_globalXOfSecondary = (globalXOfSecondary == INT_MIN) ? INT_MIN : - (-1) * (globalXOfSecondary + widthOfSecondary); - } - m_widthOfPrimary = widthOfPrimary; - m_widthOfSecondary = widthOfSecondary; + Q_CHECK_PTR(primaryViewContainer); + m_primaryViewContainer = primaryViewContainer; + m_secondaryViewContainer = secondaryViewContainer; adjustSpacing(); } @@ -139,6 +120,7 @@ void DolphinNavigatorsWidgetAction::deleteWidget(QWidget *widget) void DolphinNavigatorsWidgetAction::adjustSpacing() { + updateCachedViewGeometry(); Q_ASSERT(m_globalXOfSplitter != INT_MIN); Q_ASSERT(m_globalXOfPrimary != INT_MIN); Q_ASSERT(m_widthOfPrimary != INT_MIN); @@ -262,6 +244,38 @@ QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) co return m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget(); } +void DolphinNavigatorsWidgetAction::updateCachedViewGeometry() +{ + Q_ASSERT(m_primaryViewContainer); + m_widthOfPrimary = m_primaryViewContainer->width(); + if (m_secondaryViewContainer) { + m_widthOfSecondary = m_secondaryViewContainer->width(); + } else { + m_widthOfSecondary = INT_MIN; + } + + const int globalXOfSplitter = m_splitter->mapToGlobal(QPoint(0,0)).x(); + const int globalXOfPrimary = m_primaryViewContainer->mapToGlobal(QPoint(0,0)).x(); + int globalXOfSecondary = INT_MIN; + if (m_secondaryViewContainer) { + globalXOfSecondary = m_secondaryViewContainer->mapToGlobal(QPoint(0,0)).x(); + } + + if (QApplication::layoutDirection() == Qt::LeftToRight) { + m_globalXOfSplitter = globalXOfSplitter; + m_globalXOfPrimary = globalXOfPrimary; + m_globalXOfSecondary = globalXOfSecondary; + } else { + // When the direction is reversed, globalX does not change. + // For the adjustSpacing() code to work we need globalX to measure from right to left + // and to measure up to the rightmost point of a widget instead of the leftmost. + m_globalXOfSplitter = (-1) * (globalXOfSplitter + m_splitter->width()); + m_globalXOfPrimary = (-1) * (globalXOfPrimary + m_widthOfPrimary); + m_globalXOfSecondary = (globalXOfSecondary == INT_MIN) ? INT_MIN : + (-1) * (globalXOfSecondary + m_widthOfSecondary); + } +} + void DolphinNavigatorsWidgetAction::updateText() { const int urlNavigatorsAmount = m_splitter->count() > 1 && m_splitter->widget(1)->isVisible() ? diff --git a/src/dolphinnavigatorswidgetaction.h b/src/dolphinnavigatorswidgetaction.h index bbd8cf127..32d52e5d1 100644 --- a/src/dolphinnavigatorswidgetaction.h +++ b/src/dolphinnavigatorswidgetaction.h @@ -10,6 +10,7 @@ #include "dolphinurlnavigator.h" +#include <QPointer> #include <QSplitter> #include <QTimer> #include <QWidgetAction> @@ -52,17 +53,12 @@ public: */ void createSecondaryUrlNavigator(); - /** - * Notify the primary UrlNavigator of changes in geometry of the ViewContainer it tries to be - * aligned with. Only call this method if there is no secondary UrlNavigator. - */ - void followViewContainerGeometry(int globalXOfPrimary, int widthOfPrimary); /** * Notify this widget of changes in geometry of the ViewContainers it tries to be * aligned with. */ - void followViewContainersGeometry(int globalXOfPrimary, int widthOfPrimary, - int globalXOfSecondary, int widthOfSecondary); + void followViewContainersGeometry(QWidget *primaryViewContainer, + QWidget *secondaryViewContainer = nullptr); bool isInToolbar() const; @@ -141,11 +137,19 @@ private: */ QWidget *spacing(Side side, Position position) const; + void updateCachedViewGeometry(); + /** * Sets this action's text depending on the amount of visible UrlNavigators. */ void updateText(); + /** + * The viewContainers are only remembered for the adjustSpacing calculations. + */ + QPointer<const QWidget> m_primaryViewContainer; + QPointer<const QWidget> m_secondaryViewContainer; + /** * The defaultWidget() of this QWidgetAction. */ diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index 138822cfd..d64c87d75 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -167,7 +167,8 @@ void DolphinTabPage::connectNavigators(DolphinNavigatorsWidgetAction *navigators auto secondaryNavigator = navigatorsWidget->secondaryUrlNavigator(); m_secondaryViewContainer->connectUrlNavigator(secondaryNavigator); } - resizeNavigators(); + m_navigatorsWidget->followViewContainersGeometry(m_primaryViewContainer, + m_secondaryViewContainer); } void DolphinTabPage::disconnectNavigators() @@ -182,7 +183,12 @@ void DolphinTabPage::disconnectNavigators() bool DolphinTabPage::eventFilter(QObject *watched, QEvent *event) { if (event->type() == QEvent::Resize && m_navigatorsWidget) { - resizeNavigators(); + if (!m_splitViewEnabled) { + m_navigatorsWidget->followViewContainersGeometry(m_primaryViewContainer); + } else { + m_navigatorsWidget->followViewContainersGeometry(m_primaryViewContainer, + m_secondaryViewContainer); + } return false; } return QWidget::eventFilter(watched, event); @@ -201,22 +207,6 @@ void DolphinTabPage::insertNavigatorsWidget(DolphinNavigatorsWidgetAction* navig } } - -void DolphinTabPage::resizeNavigators() const -{ - if (!m_splitViewEnabled) { - m_navigatorsWidget->followViewContainerGeometry( - m_primaryViewContainer->mapToGlobal(QPoint(0,0)).x(), - m_primaryViewContainer->width()); - } else { - m_navigatorsWidget->followViewContainersGeometry( - m_primaryViewContainer->mapToGlobal(QPoint(0,0)).x(), - m_primaryViewContainer->width(), - m_secondaryViewContainer->mapToGlobal(QPoint(0,0)).x(), - m_secondaryViewContainer->width()); - } -} - void DolphinTabPage::markUrlsAsSelected(const QList<QUrl>& urls) { m_primaryViewContainer->view()->markUrlsAsSelected(urls); -- 2.25.1 ++++++ dolphin-20.08.3.tar.xz -> dolphin-20.12.0.tar.xz ++++++ ++++ 267755 lines of diff (skipped) ++++++ dolphin-go_up.diff ++++++ --- /var/tmp/diff_new_pack.sdWVnN/_old 2020-12-17 16:55:14.745084096 +0100 +++ /var/tmp/diff_new_pack.sdWVnN/_new 2020-12-17 16:55:14.745084096 +0100 @@ -1,8 +1,8 @@ -Index: dolphin-19.03.60git.20191013T183353~0caab3c0a/src/dolphinui.rc +Index: dolphin-19.03.60git.20201029T150039~bf11c835e/src/dolphinui.rc =================================================================== ---- dolphin-19.03.60git.20191013T183353~0caab3c0a.orig/src/dolphinui.rc 2019-10-13 18:33:53.000000000 +0200 -+++ dolphin-19.03.60git.20191013T183353~0caab3c0a/src/dolphinui.rc 2019-10-14 07:14:11.449801577 +0200 -@@ -99,6 +99,7 @@ +--- dolphin-19.03.60git.20201029T150039~bf11c835e.orig/src/dolphinui.rc 2020-10-29 22:00:39.000000000 +0100 ++++ dolphin-19.03.60git.20201029T150039~bf11c835e/src/dolphinui.rc 2020-10-31 09:57:20.003032608 +0100 +@@ -115,6 +115,7 @@ <text context="@title:menu">Main Toolbar</text> <Action name="go_back" /> <Action name="go_forward" /> _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
