From b5040fe4250af95dada1a345d96fc09b30dc98ea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Jun 2020 07:42:21 +0200 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- effects/sessionquit/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/sessionquit/package/metadata.desktop b/effects/sessionquit/package/metadata.desktop index e35edceb9f..bd4f622be7 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -3,6 +3,7 @@ Name=Session Quit Name[ca]=Sortida de la sessió Name[cs]=Sezení bylo ukončeno Name[da]=Afslutning af session +Name[de]=Sitzung beenden Name[en_GB]=Session Quit Name[es]=Cierre de sesión Name[et]=Seansist väljumine From a8979aa4e46cc60c63542c12a73e8c6f1fa74041 Mon Sep 17 00:00:00 2001 From: Benjamin Port Date: Mon, 22 Jun 2020 09:20:13 +0200 Subject: [PATCH 2/2] KCM Compositing: Fix save state use settings objects to track state instead of a class member that will need to be synchronized. BUG: 423223 --- kcmkwin/kwincompositing/main.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp index 31c611fa9f..7021eb97af 100644 --- a/kcmkwin/kwincompositing/main.cpp +++ b/kcmkwin/kwincompositing/main.cpp @@ -70,11 +70,6 @@ private: OrgKdeKwinCompositingInterface *m_compositingInterface; KWinCompositingSetting *m_settings; - - // unmanaged states - int m_backend; - bool m_glCore; - double m_animationDurationFactor; }; static const QVector s_animationMultipliers = {8, 4, 2, 1, 0.5, 0.25, 0.125, 0}; @@ -215,10 +210,10 @@ void KWinCompositingKCM::updateUnmanagedItemStatus() const bool inPlasma = isRunningPlasma(); - bool changed = glCore != m_glCore; - changed |= backend != m_backend; + bool changed = glCore != m_settings->glCore(); + changed |= backend != m_settings->backend(); if (!inPlasma) { - changed |= (animationDuration != m_animationDurationFactor); + changed |= (animationDuration != m_settings->animationDurationFactor()); } unmanagedWidgetChangeState(changed); @@ -244,10 +239,9 @@ void KWinCompositingKCM::load() m_settings->findItem("Backend")->readConfig(m_settings->config()); m_settings->findItem("glCore")->readConfig(m_settings->config()); - m_backend = m_settings->backend(); - m_glCore = m_settings->glCore(); - if (m_backend == KWinCompositingSetting::EnumBackend::OpenGL) { - if (m_glCore) { + + if (m_settings->backend() == KWinCompositingSetting::EnumBackend::OpenGL) { + if (m_settings->glCore()) { m_form.backend->setCurrentIndex(CompositingTypeIndex::OPENGL31_INDEX); } else { m_form.backend->setCurrentIndex(CompositingTypeIndex::OPENGL20_INDEX);