Author: coolo Date: Wed May 21 08:44:02 2008 New Revision: 47730 URL: http://svn.opensuse.org/viewcvs/yast?rev=47730&view=rev Log: fixing conflict dialog themeing (bnc#381371#2) Modified: trunk/qt-pkg/src/YQPkgConflictList.cc trunk/theme/openSUSE/wizard/installation.qss trunk/theme/package/yast2-theme.changes Modified: trunk/qt-pkg/src/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgConflictList.cc?rev=47730&r1=47729&r2=47730&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgConflictList.cc (original) +++ trunk/qt-pkg/src/YQPkgConflictList.cc Wed May 21 08:44:02 2008 @@ -226,6 +226,7 @@ QLabel *label = new QLabel( fromUTF8 ( _problem->details() ), this ); _layout->addWidget( label ); + setProperty( "class", "conflict" ); addSolutions(); setMinimumSize( _layout->minimumSize() ); setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); @@ -245,10 +246,12 @@ QString text = fromUTF8( problem()->description() ); QLabel *heading = new QLabel( text, this ); + heading->setProperty( "class", "conflict-heading" ); heading->setStyleSheet( "font-size: +2; color: red; font: bold;" ); hbox->addWidget( heading ); hbox->addStretch( 1 ); + frame->setProperty( "class", "conflict-frame" ); frame->setStyleSheet( "background-color: lightgray;" ); _layout->addWidget(frame); } Modified: trunk/theme/openSUSE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/installation.qss?rev=47730&r1=47729&r2=47730&view=diff ============================================================================== --- trunk/theme/openSUSE/wizard/installation.qss (original) +++ trunk/theme/openSUSE/wizard/installation.qss Wed May 21 08:44:02 2008 @@ -116,6 +116,8 @@ .Contents YQMultiLineEdit QTextEdit { color: black; } .Contents QMessageBox { background-color: #555; } +.conflict QWidget { color: black; } + YQMultiProgressMeter { background-color: transparent; border: 1px solid gray; Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.changes?rev=47730&r1=47729&r2=47730&view=diff ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Wed May 21 08:44:02 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 21 07:29:48 CEST 2008 - coolo@suse.de + +- Several color fixes in the stylesheet (bnc#375177) +- V 2.16.29 + +------------------------------------------------------------------- Fri May 16 16:29:48 CEST 2008 - sh@suse.de - Fixed bnc #374704: Missing icons in wizard -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org