Hello community, here is the log from the commit of package simple-ccsm-kde for openSUSE:Factory checked in at Wed Jun 10 18:34:21 CEST 2009. -------- --- KDE/simple-ccsm-kde/simple-ccsm-kde.changes 2008-12-01 17:06:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/simple-ccsm-kde/simple-ccsm-kde.changes 2009-06-10 15:12:39.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 10 14:49:00 CEST 2009 - llunak@suse.cz + +- update to 1.1 (utf8 fixes, bugreports to compiz bugzilla) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- simple-ccsm-kde-1.0.tar.bz2 New: ---- simple-ccsm-kde-1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simple-ccsm-kde.spec ++++++ --- /var/tmp/diff_new_pack.p23912/_old 2009-06-10 18:34:08.000000000 +0200 +++ /var/tmp/diff_new_pack.p23912/_new 2009-06-10 18:34:08.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package simple-ccsm-kde (Version 1.0) +# spec file for package simple-ccsm-kde (Version 1.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,8 +26,8 @@ Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Simple Settings Manager for Compiz -Version: 1.0 -Release: 9 +Version: 1.1 +Release: 1 Source: simple-ccsm-kde-%{version}.tar.bz2 Requires: %{name}-lang = 11.1 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -67,6 +67,8 @@ /usr/share/applications/kde4/simple-ccsm-kde.desktop %changelog +* Wed Jun 10 2009 llunak@suse.cz +- update to 1.1 (utf8 fixes, bugreports to compiz bugzilla) * Mon Dec 01 2008 ro@suse.de - added ExclusiveArch * Sat Nov 29 2008 stbinner@suse.de ++++++ simple-ccsm-kde-1.0.tar.bz2 -> simple-ccsm-kde-1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/simple-ccsm-kde-1.0/dialog.cpp new/simple-ccsm-kde-1.1/dialog.cpp --- old/simple-ccsm-kde-1.0/dialog.cpp 2008-10-22 13:18:28.000000000 +0200 +++ new/simple-ccsm-kde-1.1/dialog.cpp 2009-06-10 14:22:10.000000000 +0200 @@ -343,10 +343,10 @@ ui.screen_zoom_groupbox->setVisible( zoom ); if( zoom ) { - ui.screen_zoom_checkbox->setText( zoom->shortDesc ); - ui.screen_zoom_checkbox->setToolTip( zoom->longDesc ); - ui.screen_zoom_groupbox->setTitle( zoom->shortDesc ); - ui.screen_zoom_groupbox->setToolTip( zoom->longDesc ); + ui.screen_zoom_checkbox->setText( QString::fromUtf8 ( zoom->shortDesc )); + ui.screen_zoom_checkbox->setToolTip( QString::fromUtf8 (zoom->longDesc )); + ui.screen_zoom_groupbox->setTitle( QString::fromUtf8 (zoom->shortDesc )); + ui.screen_zoom_groupbox->setToolTip( QString::fromUtf8 (zoom->longDesc )); setupKeyButton( zoom, "zoom_in_button", ui.screen_zoom_in_label, ui.screen_zoom_in_button ); setupKeyButton( zoom, "zoom_out_button", ui.screen_zoom_out_label, ui.screen_zoom_out_button ); } @@ -355,10 +355,10 @@ ui.area_zoom_groupbox->setVisible( area ); if( area ) { - ui.area_zoom_checkbox->setText( area->shortDesc ); - ui.area_zoom_checkbox->setToolTip( area->longDesc ); - ui.area_zoom_groupbox->setTitle( area->shortDesc ); - ui.area_zoom_groupbox->setToolTip( area->longDesc ); + ui.area_zoom_checkbox->setText( QString::fromUtf8 (area->shortDesc )); + ui.area_zoom_checkbox->setToolTip( QString::fromUtf8 (area->longDesc )); + ui.area_zoom_groupbox->setTitle( QString::fromUtf8 (area->shortDesc )); + ui.area_zoom_groupbox->setToolTip( QString::fromUtf8 (area->longDesc )); setupKeyButton( area, "zoom_in_button", ui.area_zoom_in_label, ui.area_zoom_in_button ); setupKeyButton( area, "zoom_out_button", ui.area_zoom_out_label, ui.area_zoom_out_button ); } @@ -406,7 +406,8 @@ else { CCSSetting* s = setting( plugin, option ); - ui.edges_monitor->addEdgeItem( edge, QString( plugin->shortDesc ) + ":" + s->shortDesc ); + QString edgeName = QString::fromUtf8( plugin->shortDesc ) + ":" + QString::fromUtf8 (s->shortDesc ); + ui.edges_monitor->addEdgeItem( edge, edgeName ); unsigned int data; ccsGetEdge( s, &data ); if( data & ( 1 << edge )) // TODO is there a libcompizconfig function for this? @@ -449,9 +450,9 @@ return; } CCSSetting* s = setting( p, option ); - label->setText( s->shortDesc ); - label->setToolTip( s->longDesc ); - combo->setToolTip( s->longDesc ); + label->setText( QString::fromUtf8( s->shortDesc )); + label->setToolTip( QString::fromUtf8( s->longDesc )); + combo->setToolTip( QString::fromUtf8( s->longDesc )); // kdDebug() << "TYPE:" << s->info.forList.listType; if(( s->type == TypeList && s->info.forList.listType == TypeInt ) || s->type == TypeInt ) @@ -509,9 +510,9 @@ { CCSPlugin* p = plugin( "animation" ); CCSSetting* s = setting( p, option ); - label->setText( s->shortDesc ); - label->setToolTip( s->longDesc ); - combo->setToolTip( s->longDesc ); + label->setText( QString::fromUtf8( s->shortDesc ) ); + label->setToolTip( QString::fromUtf8 ( s->longDesc ) ); + combo->setToolTip( QString::fromUtf8 ( s->longDesc ) ); assert( s->type == TypeList && s->info.forList.listType == TypeString ); QString active = listStringOption( s ); // kdDebug() << "ACT:" << active; @@ -575,9 +576,9 @@ return; } CCSSetting* s = setting( p, option ); - label->setText( s->shortDesc ); - label->setToolTip( s->longDesc ); - spinbox->setToolTip( s->longDesc ); + label->setText( QString::fromUtf8( s->shortDesc )); + label->setToolTip( QString::fromUtf8( s->longDesc )); + spinbox->setToolTip( QString::fromUtf8( s->longDesc )); if( s->type == TypeFloat ) { spinbox->setRange( s->info.forFloat.min, s->info.forFloat.max ); @@ -620,8 +621,8 @@ return; } CCSSetting* s = setting( plugin, option ); - checkbox->setText( group ? s->group : s->shortDesc ); - checkbox->setToolTip( s->longDesc ); + checkbox->setText( QString::fromUtf8( group ? s->group : s->shortDesc )); + checkbox->setToolTip( QString::fromUtf8( s->longDesc )); Bool val; ccsGetBool( s, &val ); checkbox->setChecked( val ); @@ -643,8 +644,8 @@ checkbox->hide(); return; } - checkbox->setText( p->shortDesc ); - checkbox->setToolTip( p->longDesc ); + checkbox->setText( QString::fromUtf8( p->shortDesc )); + checkbox->setToolTip( QString::fromUtf8( p->longDesc )); checkbox->setChecked( ccsPluginIsActive( context, const_cast< char* >( pl ))); } @@ -656,9 +657,9 @@ void Dialog::setupKeyButton( CCSPlugin* plugin, const char* option, QLabel* label, QPushButton* button ) { CCSSetting* s = setting( plugin, option ); - label->setText( s->shortDesc ); - label->setToolTip( s->longDesc ); - button->setToolTip( s->longDesc ); + label->setText( QString::fromUtf8( s->shortDesc )); + label->setToolTip( QString::fromUtf8( s->longDesc )); + button->setToolTip( QString::fromUtf8( s->longDesc )); CCSSettingButtonValue val; ccsGetButton( s, &val ); KAcceleratorManager::setNoAccel( button ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/simple-ccsm-kde-1.0/main.cpp new/simple-ccsm-kde-1.1/main.cpp --- old/simple-ccsm-kde-1.0/main.cpp 2008-09-12 10:57:44.000000000 +0200 +++ new/simple-ccsm-kde-1.1/main.cpp 2009-06-10 14:47:42.000000000 +0200 @@ -27,8 +27,9 @@ int main( int argc, char* argv[] ) { - KAboutData about( "simple-ccsm-kde", NULL, ki18n( "Simple CCSM" ), "1.0", + KAboutData about( "simple-ccsm-kde", NULL, ki18n( "Simple CCSM" ), "1.1", ki18n( "Simple configuration tool for Compiz" ), KAboutData::License_GPL ); + about.setBugAddress( "http://bugs.opencompositing.org" ); KCmdLineArgs::init( argc, argv, &about ); KCmdLineOptions opts; opts.add("parent <n>", ki18n("The window handle for a parent window for the dialog.")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org