Hello community,
here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory
checked in at 2014-11-02 16:46:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old)
and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2014-04-14
12:05:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes
2014-11-02 16:46:07.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Oct 29 23:20:26 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to version 1.4.6
+ * Changed AnimationType::None into AnimationType::NoAnimation
+ due to possible conflict with X11 None.
+ * Disconnect old button if already set (kde#339174)
+ * Fixed decoColor consistently with Qt
+
+-------------------------------------------------------------------
Old:
----
oxygen-gtk2-1.4.5.tar.bz2
New:
----
oxygen-gtk2-1.4.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ oxygen-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.2aAN9S/_old 2014-11-02 16:46:08.000000000 +0100
+++ /var/tmp/diff_new_pack.2aAN9S/_new 2014-11-02 16:46:08.000000000 +0100
@@ -17,7 +17,7 @@
Name: oxygen-gtk2
-Version: 1.4.5
+Version: 1.4.6
Release: 0
Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x
License: LGPL-2.1+
++++++ oxygen-gtk2-1.4.5.tar.bz2 -> oxygen-gtk2-1.4.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.4.5/CMakeLists.txt
new/oxygen-gtk2-1.4.6/CMakeLists.txt
--- old/oxygen-gtk2-1.4.5/CMakeLists.txt 2014-04-10 08:41:36.000000000
+0200
+++ new/oxygen-gtk2-1.4.6/CMakeLists.txt 2014-10-22 09:21:03.000000000
+0200
@@ -13,7 +13,7 @@
set( CPACK_PACKAGE_VENDOR "hugo.pere...@free.fr" )
set( CPACK_PACKAGE_VERSION_MAJOR "1" )
set( CPACK_PACKAGE_VERSION_MINOR "4" )
-set( CPACK_PACKAGE_VERSION_PATCH "5" )
+set( CPACK_PACKAGE_VERSION_PATCH "6" )
set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" )
##################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oxygen-gtk2-1.4.5/src/animations/oxygenanimations.cpp
new/oxygen-gtk2-1.4.6/src/animations/oxygenanimations.cpp
--- old/oxygen-gtk2-1.4.5/src/animations/oxygenanimations.cpp 2014-04-10
08:40:28.000000000 +0200
+++ new/oxygen-gtk2-1.4.6/src/animations/oxygenanimations.cpp 2014-10-22
09:20:32.000000000 +0200
@@ -121,20 +121,20 @@
_treeViewStateEngine->setDuration(
settings.genericAnimationsDuration() );
_menuBarStateEngine->setApplicationName( settings.applicationName() );
- _menuBarStateEngine->setAnimationsEnabled( animationsEnabled &&
(settings.menuBarAnimationType() != None) );
+ _menuBarStateEngine->setAnimationsEnabled( animationsEnabled &&
(settings.menuBarAnimationType() != NoAnimation) );
_menuBarStateEngine->setFollowMouse( settings.menuBarAnimationType()
== FollowMouse );
_menuBarStateEngine->setDuration( settings.menuBarAnimationsDuration()
);
_menuBarStateEngine->setFollowMouseAnimationsDuration(
settings.menuBarFollowMouseAnimationsDuration() );
_menuStateEngine->setApplicationName( settings.applicationName() );
- _menuStateEngine->setEnabled( animationsEnabled &&
(settings.menuAnimationType() != None) );
+ _menuStateEngine->setEnabled( animationsEnabled &&
(settings.menuAnimationType() != NoAnimation) );
_menuStateEngine->setFollowMouse( settings.menuAnimationType() ==
FollowMouse );
_menuStateEngine->setDuration( settings.menuAnimationsDuration() );
_menuStateEngine->setFollowMouseAnimationsDuration(
settings.menuFollowMouseAnimationsDuration() );
// for now, only Fade animations mode is supported for toolbar
animations
_toolBarStateEngine->setApplicationName( settings.applicationName() );
- _toolBarStateEngine->setEnabled( animationsEnabled &&
(settings.toolBarAnimationType() != None) );
+ _toolBarStateEngine->setEnabled( animationsEnabled &&
(settings.toolBarAnimationType() != NoAnimation) );
_toolBarStateEngine->setFollowMouse( settings.toolBarAnimationType()
== FollowMouse );
_toolBarStateEngine->setDuration( settings.genericAnimationsDuration()
);
_toolBarStateEngine->setFollowMouseAnimationsDuration(
settings.toolBarAnimationsDuration() );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oxygen-gtk2-1.4.5/src/animations/oxygencomboboxdata.cpp
new/oxygen-gtk2-1.4.6/src/animations/oxygencomboboxdata.cpp
--- old/oxygen-gtk2-1.4.5/src/animations/oxygencomboboxdata.cpp 2014-04-10
08:40:28.000000000 +0200
+++ new/oxygen-gtk2-1.4.6/src/animations/oxygencomboboxdata.cpp 2014-10-22
09:20:32.000000000 +0200
@@ -84,7 +84,13 @@
void ComboBoxData::setButton( GtkWidget* widget )
{
if( _button._widget == widget ) return;
- assert( !_button._widget );
+
+ if( _button._widget )
+ {
+ std::cerr << "Oxygen::WindowManager::wmButtonPress - warning: a
button was already set for this combobox" << std::endl;
+ _button._toggledId.disconnect();
+ _button._sizeAllocateId.disconnect();
+ }
_button._toggledId.connect( G_OBJECT(widget), "toggled", G_CALLBACK(
childToggledEvent ), this );
_button._sizeAllocateId.connect( G_OBJECT(widget), "size-allocate",
G_CALLBACK( childSizeAllocateEvent ), this );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.4.5/src/oxygenanimationmodes.h
new/oxygen-gtk2-1.4.6/src/oxygenanimationmodes.h
--- old/oxygen-gtk2-1.4.5/src/oxygenanimationmodes.h 2014-02-17
11:11:14.000000000 +0100
+++ new/oxygen-gtk2-1.4.6/src/oxygenanimationmodes.h 2014-07-02
11:07:56.000000000 +0200
@@ -36,7 +36,7 @@
/*! used for menubars, toolbars and menus */
enum AnimationType
{
- None,
+ NoAnimation,
Fade,
FollowMouse
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.4.5/src/oxygencolorutils.cpp
new/oxygen-gtk2-1.4.6/src/oxygencolorutils.cpp
--- old/oxygen-gtk2-1.4.5/src/oxygencolorutils.cpp 2014-02-17
11:11:14.000000000 +0100
+++ new/oxygen-gtk2-1.4.6/src/oxygencolorutils.cpp 2014-10-08
11:11:17.000000000 +0200
@@ -242,7 +242,7 @@
//_________________________________________________________________________
ColorUtils::Rgba ColorUtils::decoColor( const ColorUtils::Rgba&
background, const ColorUtils::Rgba& color )
- { return mix( background, color, 0.4 + 0.8*contrast() ); }
+ { return mix( background, color, 0.8*(1.0 + contrast() ) ); }
//_________________________________________________________________________
ColorUtils::Rgba ColorUtils::alphaColor( const ColorUtils::Rgba& color,
double alpha )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.4.5/src/oxygenqtsettings.cpp
new/oxygen-gtk2-1.4.6/src/oxygenqtsettings.cpp
--- old/oxygen-gtk2-1.4.5/src/oxygenqtsettings.cpp 2014-04-10
08:40:28.000000000 +0200
+++ new/oxygen-gtk2-1.4.6/src/oxygenqtsettings.cpp 2014-10-22
09:20:32.000000000 +0200
@@ -1006,19 +1006,19 @@
// menubar animation type
std::string menuBarAnimationType( _oxygen.getValue( "[Style]",
"MenuBarAnimationType", "MB_FADE") );
- if( menuBarAnimationType == "MB_NONE" ) _menuBarAnimationType = None;
+ if( menuBarAnimationType == "MB_NONE" ) _menuBarAnimationType =
NoAnimation;
else if( menuBarAnimationType == "MB_FADE" ) _menuBarAnimationType =
Fade;
else if( menuBarAnimationType == "MB_FOLLOW_MOUSE" )
_menuBarAnimationType = FollowMouse;
// menubar animation type
std::string menuAnimationType( _oxygen.getValue( "[Style]",
"MenuAnimationType", "ME_FADE") );
- if( menuAnimationType == "ME_NONE" ) _menuAnimationType = None;
+ if( menuAnimationType == "ME_NONE" ) _menuAnimationType = NoAnimation;
else if( menuAnimationType == "ME_FADE" ) _menuAnimationType = Fade;
else if( menuAnimationType == "ME_FOLLOW_MOUSE" ) _menuAnimationType =
FollowMouse;
// toolbar animation type
std::string toolBarAnimationType( _oxygen.getValue( "[Style]",
"ToolBarAnimationType", "TB_FADE") );
- if( toolBarAnimationType == "TB_NONE" ) _toolBarAnimationType = None;
+ if( toolBarAnimationType == "TB_NONE" ) _toolBarAnimationType =
NoAnimation;
else if( toolBarAnimationType == "TB_FADE" ) _toolBarAnimationType =
Fade;
else if( toolBarAnimationType == "TB_FOLLOW_MOUSE" )
_toolBarAnimationType = FollowMouse;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
