Author: tgoettlicher Date: Wed Mar 21 14:31:14 2012 New Revision: 67679 URL: http://svn.opensuse.org/viewcvs/yast?rev=67679&view=rev Log: Added shortcut to conflict dialog (2.21.21) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgConflictList.cc trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=67679&r1=67678&r2=67679&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Wed Mar 21 14:31:14 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "19") +SET(VERSION_PATCH "21") 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=67679&r1=67678&r2=67679&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Wed Mar 21 14:31:14 2012 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Mar 21 14:30:14 CET 2012 - tgoettlicher@suse.de + +- Added shortcut to conflict dialog +- Version: 2.21.21 + +------------------------------------------------------------------- +Fri Mar 16 11:02:43 CET 2012 - tgoettlicher@suse.de + +- Fixed bnc#722325: untranslated rpm groups +- Version: 2.21.20 + +------------------------------------------------------------------- Tue Mar 6 14:36:45 CET 2012 - tgoettlicher@suse.de - Fixed bnc#691572: Formatting Package Descriptions Modified: trunk/qt-pkg/src/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgConflictList.cc?rev=67679&r1=67678&r2=67679&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgConflictList.cc (original) +++ trunk/qt-pkg/src/YQPkgConflictList.cc Wed Mar 21 14:31:14 2012 @@ -305,9 +305,14 @@ zypp::ProblemSolutionList solutions = problem()->solutions(); zypp::ProblemSolutionList::iterator it = solutions.begin(); + int n=0; + while ( it != solutions.end() ) { - QRadioButton * solutionButton = new QRadioButton( fromUTF8( ( *it )->description() ), this ); + ++n; + QString shortcut = "" + QString( (n<10)?"&":"" ) + QString::number(n) + ": "; + + QRadioButton * solutionButton = new QRadioButton( shortcut + fromUTF8( ( *it )->description() ), this ); vbox->addWidget( solutionButton ); _solutions[ solutionButton ] = *it; Modified: trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc?rev=67679&r1=67678&r2=67679&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc Wed Mar 21 14:31:14 2012 @@ -80,8 +80,6 @@ { _rpmGroupsTree = new YRpmGroupsTree(); Q_CHECK_PTR( _rpmGroupsTree ); - _rpmGroupsTree->setTextdomain("qt-pkg"); - fillRpmGroupsTree(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org