commit oxygen-gtk3 for openSUSE:Factory

Hello community, here is the log from the commit of package oxygen-gtk3 for openSUSE:Factory checked in at 2012-10-05 18:38:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk3 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk3", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk3/oxygen-gtk3.changes 2012-07-24 17:20:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk3.new/oxygen-gtk3.changes 2012-10-06 18:40:04.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Oct 5 08:20:46 UTC 2012 - mlin@suse.com + +- Update to version 1.1.1 + * Thread-proof timers used for transitions and animations (kde#306671) + * Safer code for Groupbox appearance (kde#305833) + * Proper rendering of flat GtkEntries + * More testing options for the demo application + +------------------------------------------------------------------- Old: ---- oxygen-gtk3-1.1.0.tar.bz2 New: ---- oxygen-gtk3-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk3.spec ++++++ --- /var/tmp/diff_new_pack.SjTImT/_old 2012-10-06 18:40:04.000000000 +0200 +++ /var/tmp/diff_new_pack.SjTImT/_new 2012-10-06 18:40:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: oxygen-gtk3 -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 3.x License: LGPL-2.1+ ++++++ oxygen-gtk3-1.1.0.tar.bz2 -> oxygen-gtk3-1.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.0/CMakeLists.txt new/oxygen-gtk3-1.1.1/CMakeLists.txt --- old/oxygen-gtk3-1.1.0/CMakeLists.txt 2012-07-16 19:17:32.000000000 +0200 +++ new/oxygen-gtk3-1.1.1/CMakeLists.txt 2012-10-04 10:12:10.000000000 +0200 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "hugo@oxygen-icons.org" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "1" ) -set( CPACK_PACKAGE_VERSION_PATCH "0" ) +set( CPACK_PACKAGE_VERSION_PATCH "1" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.0/demo/oxygeninputdemowidget.cpp new/oxygen-gtk3-1.1.1/demo/oxygeninputdemowidget.cpp --- old/oxygen-gtk3-1.1.0/demo/oxygeninputdemowidget.cpp 2012-07-16 19:17:32.000000000 +0200 +++ new/oxygen-gtk3-1.1.1/demo/oxygeninputdemowidget.cpp 2012-10-04 10:12:10.000000000 +0200 @@ -68,6 +68,8 @@ gtk_entry_set_text( GTK_ENTRY( lineEditor ), "Example text" ); gtk_widget_show( lineEditor ); + _entries.push_back( lineEditor ); + // invisible line editor gtk_grid_attach( GTK_GRID( grid ), label = gtk_label_new( "Password editor: " ), 0, 1, 1, 1 ); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); @@ -78,6 +80,8 @@ gtk_entry_set_visibility( GTK_ENTRY( lineEditor ), false ); gtk_widget_show( lineEditor ); + _entries.push_back( lineEditor ); + // combobox gtk_grid_attach( GTK_GRID( grid ), label = gtk_label_new( "Editable combobox: " ), 0, 2, 1, 1 ); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); @@ -116,6 +120,17 @@ gtk_grid_attach( GTK_GRID( grid ), spinButton = gtk_spin_button_new_with_range( 0, 100, 1 ), 1, 3, 1, 1 ); gtk_widget_show( spinButton ); + _entries.push_back( spinButton ); + + // flat widget button + GtkWidget* checkbutton; + gtk_grid_attach( GTK_GRID( grid ), checkbutton = gtk_check_button_new_with_label( "Use flat widgets" ), 0, 4, 2, 1 ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( checkbutton ), false ); + gtk_widget_show( checkbutton ); + + _flatModeChangedId.connect( G_OBJECT( checkbutton ), "toggled", G_CALLBACK( flatModeChanged ), this ); + + // separator GtkWidget* separator( gtk_separator_new( GTK_ORIENTATION_HORIZONTAL ) ); gtk_box_pack_start( GTK_BOX( mainWidget ), separator, false, true, 0 ); @@ -165,7 +180,6 @@ gtk_box_pack_start( GTK_BOX( mainWidget ), scrolledWindow, true, true, 0 ); gtk_widget_show( scrolledWindow ); - GtkWidget* checkbutton; gtk_box_pack_start( GTK_BOX( mainWidget ), checkbutton = gtk_check_button_new_with_label( "Wrap words" ), false, true, 0 ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( checkbutton ), true ); gtk_widget_show( checkbutton ); @@ -179,9 +193,17 @@ {} //____________________________________________________ - void InputDemoWidget::wrapModeChanged( GtkToggleButton* button, gpointer data ) + void InputDemoWidget::flatModeChanged( GtkToggleButton* button, gpointer data ) { + WidgetList entries( static_cast( data )->_entries ); + bool state( gtk_toggle_button_get_active( button ) ); + for( WidgetList::const_iterator iter = entries.begin(); iter != entries.end(); iter++ ) + { gtk_entry_set_has_frame( GTK_ENTRY( *iter ), !state ); } + } + //____________________________________________________ + void InputDemoWidget::wrapModeChanged( GtkToggleButton* button, gpointer data ) + { GtkTextView* textView( GTK_TEXT_VIEW( static_cast( data )->_textView ) ); bool state( gtk_toggle_button_get_active( button ) ); gtk_text_view_set_wrap_mode( textView, (state ? GTK_WRAP_WORD:GTK_WRAP_NONE) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.0/demo/oxygeninputdemowidget.h new/oxygen-gtk3-1.1.1/demo/oxygeninputdemowidget.h --- old/oxygen-gtk3-1.1.0/demo/oxygeninputdemowidget.h 2012-07-16 19:17:32.000000000 +0200 +++ new/oxygen-gtk3-1.1.1/demo/oxygeninputdemowidget.h 2012-10-04 10:12:10.000000000 +0200 @@ -28,6 +28,7 @@ #include "oxygensignal.h" #include +#include <vector> namespace Oxygen { @@ -46,13 +47,23 @@ protected: //! wrap mode changed + static void flatModeChanged( GtkToggleButton*, gpointer ); + + //! wrap mode changed static void wrapModeChanged( GtkToggleButton*, gpointer ); private: + //! list of gtk entries + typedef std::vector WidgetList; + WidgetList _entries; + //! text editor GtkWidget* _textView; + //! flat mode changed + Signal _flatModeChangedId; + //! toggle wrap mode Signal _wrapModeChangedId; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.0/demo/oxygentimer.cpp new/oxygen-gtk3-1.1.1/demo/oxygentimer.cpp --- old/oxygen-gtk3-1.1.0/demo/oxygentimer.cpp 2012-07-16 19:17:32.000000000 +0200 +++ new/oxygen-gtk3-1.1.1/demo/oxygentimer.cpp 2012-10-04 10:12:10.000000000 +0200 @@ -20,6 +20,7 @@ #include "oxygentimer.h" +#include #include <iostream> namespace Oxygen @@ -34,7 +35,7 @@ _func = func; _data = data; - _timerId = g_timeout_add( delay, (GSourceFunc)timeOut, this ); + _timerId = gdk_threads_add_timeout( delay, (GSourceFunc)timeOut, this ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.0/src/animations/oxygengroupboxlabeldata.h new/oxygen-gtk3-1.1.1/src/animations/oxygengroupboxlabeldata.h --- old/oxygen-gtk3-1.1.0/src/animations/oxygengroupboxlabeldata.h 2012-07-16 19:17:32.000000000 +0200 +++ new/oxygen-gtk3-1.1.1/src/animations/oxygengroupboxlabeldata.h 2012-10-04 10:12:10.000000000 +0200 @@ -57,8 +57,9 @@ if( allocation.height > 1 ) { - gtk_widget_set_size_request( widget, allocation.width, allocation.height+14 ); + // Save resized state before actually resizing to prevent infinite recursion (bug 305833) _resized = true; + gtk_widget_set_size_request( widget, allocation.width, allocation.height+14 ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.0/src/animations/oxygentimelineserver.cpp new/oxygen-gtk3-1.1.1/src/animations/oxygentimelineserver.cpp --- old/oxygen-gtk3-1.1.0/src/animations/oxygentimelineserver.cpp 2012-07-16 19:17:32.000000000 +0200 +++ new/oxygen-gtk3-1.1.1/src/animations/oxygentimelineserver.cpp 2012-10-04 10:12:10.000000000 +0200 @@ -22,6 +22,7 @@ #include "oxygentimeline.h" #include "../config.h" +#include #include <iostream> namespace Oxygen @@ -69,7 +70,7 @@ { if( !_timerId ) - { _timerId = g_timeout_add( updateInterval, (GSourceFunc)update, this ); } + { _timerId = gdk_threads_add_timeout( updateInterval, (GSourceFunc)update, this ); } return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.0/src/animations/oxygentimer.cpp new/oxygen-gtk3-1.1.1/src/animations/oxygentimer.cpp --- old/oxygen-gtk3-1.1.0/src/animations/oxygentimer.cpp 2012-07-16 19:17:32.000000000 +0200 +++ new/oxygen-gtk3-1.1.1/src/animations/oxygentimer.cpp 2012-10-04 10:12:10.000000000 +0200 @@ -21,6 +21,7 @@ #include "oxygentimer.h" #include "../config.h" +#include #include <iostream> namespace Oxygen @@ -35,7 +36,7 @@ _func = func; _data = data; - _timerId = g_timeout_add( delay, (GSourceFunc)timeOut, this ); + _timerId = gdk_threads_add_timeout( delay, (GSourceFunc)timeOut, this ); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org