Author: tgoettlicher Date: Tue Dec 1 10:36:01 2009 New Revision: 59869 URL: http://svn.opensuse.org/viewcvs/yast?rev=59869&view=rev Log: - fixed bnc #554473: UTF-8 Problem - fixed bnc #558881: Broken accented chars in YaST Qt packager versions tab Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgVersionsView.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=59869&r1=59868&r2=59869&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Tue Dec 1 10:36:01 2009 @@ -2,6 +2,8 @@ Tue Dec 1 10:13:02 CET 2009 - tgoettlicher@suse.de - fixed bnc #549868: Mnemonic clash in Software Management +- fixed bnc #554473: UTF-8 Problem +- fixed bnc #558881: Broken accented chars in YaST Qt packager versions tab ------------------------------------------------------------------- Thu Nov 19 14:15:03 CET 2009 - tgoettlicher@suse.de Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?rev=59869&r1=59868&r2=59869&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Tue Dec 1 10:36:01 2009 @@ -1393,7 +1393,10 @@ // repository if there is a job for it if ( zypp::getZYpp()->resolver()->upgradingRepo(repo) ) { - _repoUpgradingLabel->setText(_repoUpgradingLabel->text() + _("<p><small>Cancel switching</a> system packages to versions in repository %2</small></p>").arg(repo.alias().c_str()).arg(repo.name().c_str())); + _repoUpgradingLabel->setText(_repoUpgradingLabel->text() + _("<p><small>Cancel switching</a> system packages to versions in repository %2</small></p>") + .arg(fromUTF8(repo.alias().c_str())) + .arg(fromUTF8(repo.name().c_str())) + ); } } @@ -1409,7 +1412,10 @@ ! repo.isSystemRepo() && _repoFilterView->selectedRepo() == repo ) { - _repoUpgradeLabel->setText(_repoUpgradeLabel->text() + _("<p>Switch system packages</a> to the versions in this repository (%2)</p>").arg(repo.alias().c_str()).arg(repo.name().c_str())); + _repoUpgradeLabel->setText(_repoUpgradeLabel->text() + _("<p>Switch system packages</a> to the versions in this repository (%2)</p>") + .arg(fromUTF8(repo.alias().c_str())) + .arg(fromUTF8(repo.name().c_str())) + ); } } _repoUpgradeLabel->setVisible(!_repoUpgradeLabel->text().isEmpty() && Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?rev=59869&r1=59868&r2=59869&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Tue Dec 1 10:36:01 2009 @@ -146,7 +146,7 @@ font.setPixelSize( (int) ( fm.height() * 1.1 ) ); pkgNameLabel->setFont( font ); - pkgNameLabel->setText( selectable->theObj()->name().c_str() ); + pkgNameLabel->setText( fromUTF8(selectable->theObj()->name().c_str()) ); // New scope { @@ -193,9 +193,9 @@ while ( it != selectable->installedEnd() ) { QString text = _( "%1-%2 from vendor %3 (installed)" ) - .arg( (*it)->edition().asString().c_str() ) - .arg( (*it)->arch().asString().c_str() ) - .arg( (*it)->vendor().c_str() ) ; + .arg( fromUTF8( (*it)->edition().asString().c_str() ) ) + .arg( fromUTF8( (*it)->arch().asString().c_str() ) ) + .arg( fromUTF8( (*it)->vendor().c_str() ) ) ; QWidget * installedVersion = new QWidget( this ); QHBoxLayout * instLayout = new QHBoxLayout( installedVersion ); @@ -347,11 +347,11 @@ // ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ // %1 %2 %3 %4 %5 setText( _( "%1-%2 from %3 with priority %4 and vendor %5" ) - .arg( zyppObj->edition().asString().c_str() ) - .arg( zyppObj->arch().asString().c_str() ) - .arg( zyppObj->repository().info().name().c_str() ) + .arg( fromUTF8( zyppObj->edition().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->arch().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->repository().info().name().c_str() ) ) .arg( zyppObj->repository().info().priority() ) - .arg( zyppObj->vendor().c_str() ) ); + .arg( fromUTF8( zyppObj->vendor().c_str() ) ) ); } @@ -383,11 +383,11 @@ , _zyppObj( zyppObj ) { setText (_( "%1-%2 from %3 with priority %4 and vendor %5" ) - .arg( zyppObj->edition().asString().c_str() ) - .arg( zyppObj->arch().asString().c_str() ) - .arg( zyppObj->repository().info().name().c_str() ) + .arg( fromUTF8( zyppObj->edition().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->arch().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->repository().info().name().c_str() ) ) .arg( zyppObj->repository().info().priority() ) - .arg( zyppObj->vendor().c_str() )); + .arg( fromUTF8( zyppObj->vendor().c_str() ) )); connect( this, SIGNAL (toggled(bool)), this, SLOT( slotIconClicked())); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org