Hello community,
here is the log from the commit of package oxygen5 for openSUSE:Factory checked in at 2016-01-20 09:52:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/oxygen5 (Old)
and /work/SRC/openSUSE:Factory/.oxygen5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/oxygen5/oxygen5.changes 2016-01-03 13:26:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.oxygen5.new/oxygen5.changes 2016-01-20 09:52:04.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Jan 6 14:12:15 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.5.3:
+ * Bugfix release
+ * For more details please see:
+ https://www.kde.org/announcements/plasma-5.5.3.php
+
+-------------------------------------------------------------------
Old:
----
oxygen-5.5.2.tar.xz
New:
----
oxygen-5.5.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ oxygen5.spec ++++++
--- /var/tmp/diff_new_pack.ZI7Agz/_old 2016-01-20 09:52:11.000000000 +0100
+++ /var/tmp/diff_new_pack.ZI7Agz/_new 2016-01-20 09:52:11.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package oxygen5
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define kwin_deco 1
Name: oxygen5
-Version: 5.5.2
+Version: 5.5.3
Release: 0
Summary: Oxygen style, KWin decoration, cursors and sounds
License: GPL-2.0+
++++++ oxygen-5.5.2.tar.xz -> oxygen-5.5.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/CMakeLists.txt new/oxygen-5.5.3/CMakeLists.txt
--- old/oxygen-5.5.2/CMakeLists.txt 2015-12-22 11:41:01.000000000 +0100
+++ new/oxygen-5.5.3/CMakeLists.txt 2016-01-06 13:12:06.000000000 +0100
@@ -1,5 +1,5 @@
project(oxygen)
-set(PROJECT_VERSION "5.5.2")
+set(PROJECT_VERSION "5.5.3")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/cursors/Oxygen_Black/index.theme new/oxygen-5.5.3/cursors/Oxygen_Black/index.theme
--- old/oxygen-5.5.2/cursors/Oxygen_Black/index.theme 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/cursors/Oxygen_Black/index.theme 2016-01-06 13:11:11.000000000 +0100
@@ -49,7 +49,7 @@
Comment[hu]=Oxygen egértéma. Lélegezzen fel asztala!
Comment[it]=Tema del mouse Oxygen. Ossigena il tuo desktop!
Comment[ko]=Oxygen 마우스 테마입니다. 데스크톱에 산소를 불어넣으십시오!
-Comment[lt]=Oxygen pelės tema. Papuošk savo darbastalį su Oxygen!
+Comment[lt]=Oxygen pelės tema. Papuošk savo darbalaukį su Oxygen!
Comment[nl]=Muisthema van Oxygen. Geef uw bureaublad zuurstof!
Comment[nn]=Oxygen peikartema. Oxygeniser skrivebordet!
Comment[pl]=Tlen - zestaw wskaźników myszy. Dotleń swój pulpit!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/cursors/Oxygen_Blue/index.theme new/oxygen-5.5.3/cursors/Oxygen_Blue/index.theme
--- old/oxygen-5.5.2/cursors/Oxygen_Blue/index.theme 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/cursors/Oxygen_Blue/index.theme 2016-01-06 13:11:11.000000000 +0100
@@ -49,7 +49,7 @@
Comment[hu]=Oxygen egértéma. Lélegezzen fel asztala!
Comment[it]=Tema del mouse Oxygen. Ossigena il tuo desktop!
Comment[ko]=Oxygen 마우스 테마입니다. 데스크톱에 산소를 불어넣으십시오!
-Comment[lt]=Oxygen pelės tema. Papuošk savo darbastalį su Oxygen!
+Comment[lt]=Oxygen pelės tema. Papuošk savo darbalaukį su Oxygen!
Comment[nl]=Muisthema van Oxygen. Geef uw bureaublad zuurstof!
Comment[nn]=Oxygen peikartema. Oxygeniser skrivebordet!
Comment[pl]=Tlen - zestaw wskaźników myszy. Dotleń swój pulpit!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/cursors/Oxygen_White/index.theme new/oxygen-5.5.3/cursors/Oxygen_White/index.theme
--- old/oxygen-5.5.2/cursors/Oxygen_White/index.theme 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/cursors/Oxygen_White/index.theme 2016-01-06 13:11:11.000000000 +0100
@@ -49,7 +49,7 @@
Comment[hu]=Oxygen egértéma. Lélegezzen fel asztala!
Comment[it]=Tema del mouse Oxygen. Ossigena il tuo desktop!
Comment[ko]=Oxygen 마우스 테마입니다. 데스크톱에 산소를 불어넣으십시오!
-Comment[lt]=Oxygen pelės tema. Papuošk savo darbastalį su Oxygen!
+Comment[lt]=Oxygen pelės tema. Papuošk savo darbalaukį su Oxygen!
Comment[nl]=Muisthema van Oxygen. Geef uw bureaublad zuurstof!
Comment[nn]=Oxygen peikartema. Oxygeniser skrivebordet!
Comment[pl]=Tlen - zestaw wskaźników myszy. Dotleń swój pulpit!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/cursors/Oxygen_Yellow/index.theme new/oxygen-5.5.3/cursors/Oxygen_Yellow/index.theme
--- old/oxygen-5.5.2/cursors/Oxygen_Yellow/index.theme 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/cursors/Oxygen_Yellow/index.theme 2016-01-06 13:11:11.000000000 +0100
@@ -49,7 +49,7 @@
Comment[hu]=Oxygen egértéma. Lélegezzen fel asztala!
Comment[it]=Tema del mouse Oxygen. Ossigena il tuo desktop!
Comment[ko]=Oxygen 마우스 테마입니다. 데스크톱에 산소를 불어넣으십시오!
-Comment[lt]=Oxygen pelės tema. Papuošk savo darbastalį su Oxygen!
+Comment[lt]=Oxygen pelės tema. Papuošk savo darbalaukį su Oxygen!
Comment[nl]=Muisthema van Oxygen. Geef uw bureaublad zuurstof!
Comment[nn]=Oxygen peikartema. Oxygeniser skrivebordet!
Comment[pl]=Tlen - zestaw wskaźników myszy. Dotleń swój pulpit!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/cursors/Oxygen_Zion/index.theme new/oxygen-5.5.3/cursors/Oxygen_Zion/index.theme
--- old/oxygen-5.5.2/cursors/Oxygen_Zion/index.theme 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/cursors/Oxygen_Zion/index.theme 2016-01-06 13:11:11.000000000 +0100
@@ -46,7 +46,7 @@
Comment[hu]=Oxygen egértéma. Lélegezzen fel asztala!
Comment[it]=Tema del mouse Oxygen. Ossigena il tuo desktop!
Comment[ko]=Oxygen 마우스 테마입니다. 데스크톱에 산소를 불어넣으십시오!
-Comment[lt]=Oxygen pelės tema. Papuošk savo darbastalį su Oxygen!
+Comment[lt]=Oxygen pelės tema. Papuošk savo darbalaukį su Oxygen!
Comment[nl]=Muisthema van Oxygen. Geef uw bureaublad zuurstof!
Comment[nn]=Oxygen peikartema. Oxygeniser skrivebordet!
Comment[pl]=Tlen - zestaw wskaźników myszy. Dotleń swój pulpit!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/kdecoration/config/oxygenconfigwidget.cpp new/oxygen-5.5.3/kdecoration/config/oxygenconfigwidget.cpp
--- old/oxygen-5.5.2/kdecoration/config/oxygenconfigwidget.cpp 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/kdecoration/config/oxygenconfigwidget.cpp 2016-01-06 13:11:11.000000000 +0100
@@ -87,8 +87,8 @@
m_ui.animationConfigWidget->load();
// load shadows
- m_ui.activeShadowConfiguration->readConfig( m_configuration.data() );
- m_ui.inactiveShadowConfiguration->readConfig( m_configuration.data() );
+ m_ui.activeShadowConfiguration->load();
+ m_ui.inactiveShadowConfiguration->load();
// load exceptions
ExceptionList exceptions;
@@ -120,12 +120,9 @@
// save configuration
m_internalSettings->save();
- // save standard configuration
- ExceptionList::writeConfig( m_internalSettings.data(), m_configuration.data() );
-
// save shadows
- m_ui.activeShadowConfiguration->writeConfig( m_configuration.data() );
- m_ui.inactiveShadowConfiguration->writeConfig( m_configuration.data() );
+ m_ui.activeShadowConfiguration->save();
+ m_ui.inactiveShadowConfiguration->save();
// get list of exceptions and write
InternalSettingsList exceptions( m_ui.exceptions->exceptions() );
@@ -165,8 +162,8 @@
m_ui.drawSizeGrip->setChecked( m_internalSettings->drawSizeGrip() );
// load shadows
- m_ui.activeShadowConfiguration->readDefaults( m_configuration.data() );
- m_ui.inactiveShadowConfiguration->readDefaults( m_configuration.data() );
+ m_ui.activeShadowConfiguration->setDefaults();
+ m_ui.inactiveShadowConfiguration->setDefaults();
// load animations
m_ui.animationConfigWidget->setInternalSettings( m_internalSettings );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/kdecoration/oxygendecoration.cpp new/oxygen-5.5.3/kdecoration/oxygendecoration.cpp
--- old/oxygen-5.5.2/kdecoration/oxygendecoration.cpp 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/kdecoration/oxygendecoration.cpp 2016-01-06 13:11:11.000000000 +0100
@@ -43,6 +43,7 @@
#include <QPainter>
#include <QTextStream>
+#include <QTimer>
#if OXYGEN_HAVE_X11
#include <QX11Info>
@@ -148,6 +149,11 @@
connect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &Decoration::recalculateBorders);
connect(s.data(), &KDecoration2::DecorationSettings::spacingChanged, this, &Decoration::recalculateBorders);
+ // buttons
+ connect(s.data(), &KDecoration2::DecorationSettings::spacingChanged, this, &Decoration::updateButtonsGeometryDelayed);
+ connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &Decoration::updateButtonsGeometryDelayed);
+ connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &Decoration::updateButtonsGeometryDelayed);
+
// full reconfiguration
connect(s.data(), &KDecoration2::DecorationSettings::reconfigured, this, &Decoration::reconfigure);
connect(s.data(), &KDecoration2::DecorationSettings::reconfigured, SettingsProvider::self(), &SettingsProvider::reconfigure, Qt::UniqueConnection );
@@ -335,6 +341,10 @@
}
//________________________________________________________________
+ void Decoration::updateButtonsGeometryDelayed()
+ { QTimer::singleShot( 0, this, &Decoration::updateButtonsGeometry ); }
+
+ //________________________________________________________________
void Decoration::updateButtonsGeometry()
{
auto s = settings();
@@ -397,6 +407,7 @@
}
+ update();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/kdecoration/oxygendecoration.h new/oxygen-5.5.3/kdecoration/oxygendecoration.h
--- old/oxygen-5.5.2/kdecoration/oxygendecoration.h 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/kdecoration/oxygendecoration.h 2016-01-06 13:11:11.000000000 +0100
@@ -101,6 +101,7 @@
void reconfigure();
void recalculateBorders();
void updateButtonsGeometry();
+ void updateButtonsGeometryDelayed();
void updateTitleBar();
void updateAnimationState();
void updateSizeGripVisibility();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/kdecoration/oxygenexceptionlist.cpp new/oxygen-5.5.3/kdecoration/oxygenexceptionlist.cpp
--- old/oxygen-5.5.2/kdecoration/oxygenexceptionlist.cpp 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/kdecoration/oxygenexceptionlist.cpp 2016-01-06 13:11:11.000000000 +0100
@@ -48,7 +48,7 @@
// create new configuration
InternalSettingsPtr configuration( new InternalSettings() );
- readConfig( configuration.data(), config.data() );
+ configuration.data()->load();
// apply changes from exception
configuration->setEnabled( exception.enabled() );
@@ -96,11 +96,19 @@
void ExceptionList::writeConfig( KCoreConfigSkeleton* skeleton, KConfig* config, const QString& groupName )
{
+ // list of items to be written
+ QStringList keys = { "Enabled", "ExceptionPattern", "ExceptionType", "HideTitleBar", "Mask", "BorderSize"};
+
// write all items
- foreach( KConfigSkeletonItem* item, skeleton->items() )
+ foreach( auto key, keys )
{
+ KConfigSkeletonItem* item( skeleton->findItem( key ) );
+ if( !item ) continue;
+
if( !groupName.isEmpty() ) item->setGroup( groupName );
- item->writeConfig( config );
+ KConfigGroup configGroup( config, item->group() );
+ configGroup.writeEntry( item->key(), item->property() );
+
}
}
@@ -116,4 +124,5 @@
}
}
+
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/kdecoration/oxygenexceptionlist.h new/oxygen-5.5.3/kdecoration/oxygenexceptionlist.h
--- old/oxygen-5.5.2/kdecoration/oxygenexceptionlist.h 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/kdecoration/oxygenexceptionlist.h 2016-01-06 13:11:11.000000000 +0100
@@ -56,17 +56,17 @@
//! write to kconfig
void writeConfig( KSharedConfig::Ptr );
- //! read configuration
- static void readConfig( KCoreConfigSkeleton*, KConfig*, const QString& = QString() );
-
- //! write configuration
- static void writeConfig( KCoreConfigSkeleton*, KConfig*, const QString& = QString() );
-
protected:
//! generate exception group name for given exception index
static QString exceptionGroupName( int index );
+ //! read configuration
+ static void readConfig( KCoreConfigSkeleton*, KConfig*, const QString& );
+
+ //! write configuration
+ static void writeConfig( KCoreConfigSkeleton*, KConfig*, const QString& );
+
private:
//! exceptions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/kstyle/oxygen.themerc new/oxygen-5.5.3/kstyle/oxygen.themerc
--- old/oxygen-5.5.2/kstyle/oxygen.themerc 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/kstyle/oxygen.themerc 2016-01-06 13:11:11.000000000 +0100
@@ -129,7 +129,7 @@
Comment[kn]=ಮುಂದಿನ ಪೀಳಿಗೆಯ ಗಣಕತೆರೆ ವೈಖರಿ
Comment[ko]=다음 세대 데스크톱을 위한 스타일
Comment[ku]=Curekirina nifşê pêş ê sermaseyê
-Comment[lt]=Kitos kartos darbastalio stiliaus kūrimas
+Comment[lt]=Kitos kartos darbalaukio stiliaus kūrimas
Comment[lv]=Nākamās paaudzes darbvirsmas stils
Comment[mai]=अगिला पीढ़ीक डेस्कटापक शैली
Comment[mk]=Стил за следната генерација десктопи
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/liboxygen/CMakeLists.txt new/oxygen-5.5.3/liboxygen/CMakeLists.txt
--- old/oxygen-5.5.2/liboxygen/CMakeLists.txt 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/liboxygen/CMakeLists.txt 2016-01-06 13:11:11.000000000 +0100
@@ -9,8 +9,7 @@
oxygenhelper.cpp
oxygenitemmodel.cpp
oxygenshadowcache.cpp
- oxygentileset.cpp
- oxygenutil.cpp)
+ oxygentileset.cpp)
if(OXYGEN_USE_KDE4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/liboxygen/oxygenshadowconfigwidget.cpp new/oxygen-5.5.3/liboxygen/oxygenshadowconfigwidget.cpp
--- old/oxygen-5.5.2/liboxygen/oxygenshadowconfigwidget.cpp 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/liboxygen/oxygenshadowconfigwidget.cpp 2016-01-06 13:11:11.000000000 +0100
@@ -28,7 +28,7 @@
#include "oxygeninactiveshadowconfiguration.h"
#include "ui_oxygenshadowconfigurationui.h"
-#include "oxygenutil.h"
+#include "config-liboxygen.h"
#include <KLocalizedString>
#include <QLabel>
@@ -63,7 +63,7 @@
{ delete ui; }
//_________________________________________________________
- void ShadowConfigWidget::writeConfig( KConfig* config ) const
+ void ShadowConfigWidget::save( void ) const
{
if( _group == QPalette::Active )
@@ -76,7 +76,11 @@
ActiveShadowConfiguration::setUseOuterColor( ui->useOuterColor->isChecked() );
ActiveShadowConfiguration::setEnabled( isChecked() );
- Util::writeConfig( ActiveShadowConfiguration::self(), config );
+ #if OXYGEN_USE_KDE4
+ ActiveShadowConfiguration::self()->writeConfig();
+ #else
+ ActiveShadowConfiguration::self()->save();
+ #endif
} else if( _group == QPalette::Inactive ) {
@@ -87,7 +91,11 @@
InactiveShadowConfiguration::setUseOuterColor( ui->useOuterColor->isChecked() );
InactiveShadowConfiguration::setEnabled( isChecked() );
- Util::writeConfig( InactiveShadowConfiguration::self(), config );
+ #if OXYGEN_USE_KDE4
+ InactiveShadowConfiguration::self()->writeConfig();
+ #else
+ InactiveShadowConfiguration::self()->save();
+ #endif
}
@@ -122,13 +130,21 @@
}
//_________________________________________________________
- void ShadowConfigWidget::readConfig( KConfig* config, bool defaults )
+ void ShadowConfigWidget::load( bool defaults )
{
if( _group == QPalette::Active )
{
if( defaults ) ActiveShadowConfiguration::self()->setDefaults();
- else Util::readConfig( ActiveShadowConfiguration::self(), config );
+ else {
+
+ #if OXYGEN_USE_KDE4
+ ActiveShadowConfiguration::self()->readConfig();
+ #else
+ ActiveShadowConfiguration::self()->load();
+ #endif
+
+ }
ui->shadowSize->setValue( ActiveShadowConfiguration::shadowSize() );
ui->verticalOffset->setValue( 10*ActiveShadowConfiguration::verticalOffset() );
@@ -141,7 +157,15 @@
} else if( _group == QPalette::Inactive ) {
if( defaults ) InactiveShadowConfiguration::self()->setDefaults();
- else Util::readConfig( InactiveShadowConfiguration::self(), config );
+ else {
+
+ #if OXYGEN_USE_KDE4
+ InactiveShadowConfiguration::self()->readConfig();
+ #else
+ InactiveShadowConfiguration::self()->load();
+ #endif
+
+ }
ui->shadowSize->setValue( InactiveShadowConfiguration::shadowSize() );
ui->verticalOffset->setValue( 10*InactiveShadowConfiguration::verticalOffset() );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/liboxygen/oxygenshadowconfigwidget.h new/oxygen-5.5.3/liboxygen/oxygenshadowconfigwidget.h
--- old/oxygen-5.5.2/liboxygen/oxygenshadowconfigwidget.h 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/liboxygen/oxygenshadowconfigwidget.h 2016-01-06 13:11:11.000000000 +0100
@@ -56,15 +56,15 @@
{ _group = group; }
//! read defaults
- void readDefaults( KConfig* config )
- { readConfig( config, true ); }
+ void setDefaults( void )
+ { load(true ); }
//! read config
- void readConfig( KConfig* config )
- { readConfig( config, false ); }
+ void load( void )
+ { load( false ); }
//! write config
- void writeConfig( KConfig* ) const;
+ void save( void ) const;
//! true if modified
bool isChanged( void ) const
@@ -83,7 +83,7 @@
protected:
//! read config
- void readConfig( KConfig*, bool );
+ void load( bool );
//! set changed state
virtual void setChanged( bool value )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.5.2/liboxygen/oxygenutil.cpp new/oxygen-5.5.3/liboxygen/oxygenutil.cpp
--- old/oxygen-5.5.2/liboxygen/oxygenutil.cpp 2015-12-22 11:40:05.000000000 +0100
+++ new/oxygen-5.5.3/liboxygen/oxygenutil.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-/*
- * Copyright 2012 Hugo Pereira Da Costa