Hello community, here is the log from the commit of package kdebase4-runtime checked in at Tue Jun 3 16:22:38 CEST 2008. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2008-05-23 18:58:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2008-06-02 12:43:16.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 2 12:42:42 CEST 2008 - dmueller@suse.de + +- oxygen style fixes: + * render focus on radio buttons + * don't apply a grey gradient to a blank screensaver (bnc#392792) + +------------------------------------------------------------------- oxygen-icon-theme.changes: same change New: ---- r814374.diff r814438.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.o28472/_old 2008-06-03 16:14:51.000000000 +0200 +++ /var/tmp/diff_new_pack.o28472/_new 2008-06-03 16:14:51.000000000 +0200 @@ -23,7 +23,7 @@ Summary: The KDE Runtime Components Url: http://www.kde.org/ Version: 4.0.4 -Release: 14 +Release: 18 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Patch0: 4_0_BRANCH.diff @@ -33,6 +33,8 @@ Patch4: kde4-wrapper.diff Patch5: kdesu-remember-keep-password.diff Patch6: menus.diff +Patch7: r814374.diff +Patch8: r814438.diff #Source1: _upstream #Source2: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,6 +64,8 @@ %patch4 %patch5 %patch6 +%patch7 +%patch8 %build %cmake_kde4 -d build @@ -304,6 +308,10 @@ /usr/share/kde4/man %changelog +* Mon Jun 02 2008 dmueller@suse.de +- oxygen style fixes: + * render focus on radio buttons + * don't apply a grey gradient to a blank screensaver (bnc#392792) * Fri May 23 2008 stbinner@suse.de - fix entries under "Applications" without kdebase3 (bnc#381855) * Tue May 20 2008 llunak@suse.cz ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.o28472/_old 2008-06-03 16:14:51.000000000 +0200 +++ /var/tmp/diff_new_pack.o28472/_new 2008-06-03 16:14:51.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Oxygen Icon Theme Url: http://www.kde.org Version: 4.0.4 -Release: 12 +Release: 16 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable Source0: kdebase-runtime-%version.tar.bz2 @@ -115,6 +115,10 @@ /usr/share/icons/oxygen %changelog +* Mon Jun 02 2008 dmueller@suse.de +- oxygen style fixes: + * render focus on radio buttons + * don't apply a grey gradient to a blank screensaver (bnc#392792) * Fri May 23 2008 stbinner@suse.de - fix entries under "Applications" without kdebase3 (bnc#381855) * Tue May 20 2008 llunak@suse.cz ++++++ r814374.diff ++++++ ------------------------------------------------------------------------ r814374 | mueller | 2008-05-30 09:17:08 +0200 (Fr, 30 Mai 2008) | 4 lines merge -r806399 by ossi: paint focus on radio buttons ------------------------------------------------------------------------ Index: kstyles/oxygen/oxygen.h =================================================================== --- kstyles/oxygen/oxygen.h (Revision 814373) +++ kstyles/oxygen/oxygen.h (Revision 814374) @@ -142,8 +142,8 @@ protected: bool enabled, bool hasFocus, bool mouseOver, int checkPrimitive, bool sunken=false) const; void renderRadioButton(QPainter *p, const QRect &r, const QPalette &pal, - bool enabled, bool mouseOver, int radioPrimitive, - bool drawButton=true) const; + bool enabled, bool hasFocus, bool mouseOver, + int radioPrimitive, bool drawButton=true) const; void renderDot(QPainter *p, const QPointF &point, const QColor &baseColor) const; Index: kstyles/oxygen/oxygen.cpp =================================================================== --- kstyles/oxygen/oxygen.cpp (Revision 814373) +++ kstyles/oxygen/oxygen.cpp (Revision 814374) @@ -687,13 +687,13 @@ void OxygenStyle::drawKStylePrimitive(Wi case MenuItem::RadioOn: { - renderRadioButton(p, r, pal, enabled, mouseOver, RadioButton::RadioOn, true); + renderRadioButton(p, r, pal, enabled, false, mouseOver, RadioButton::RadioOn, true); return; } case MenuItem::RadioOff: { - renderRadioButton(p, r, pal, enabled, mouseOver, RadioButton::RadioOff, true); + renderRadioButton(p, r, pal, enabled, false, mouseOver, RadioButton::RadioOff, true); return; } @@ -827,7 +827,9 @@ void OxygenStyle::drawKStylePrimitive(Wi case RadioButton::RadioOn: case RadioButton::RadioOff: { - renderRadioButton(p, r, pal, enabled, mouseOver, primitive); + bool hasFocus = flags & State_HasFocus; + + renderRadioButton(p, r, pal, enabled, hasFocus, mouseOver, primitive); return; } } @@ -2110,17 +2112,17 @@ void OxygenStyle::renderCheckBox(QPainte } void OxygenStyle::renderRadioButton(QPainter *p, const QRect &r, const QPalette &pal, - bool enabled, bool mouseOver, int prim, + bool enabled, bool hasFocus, bool mouseOver, int prim, bool drawButton) const { QRect r2(r.x() + (r.width()-21)/2, r.y() + (r.height()-21)/2, 21, 21); int x = r2.x(); int y = r2.y(); - // TODO focus? - if(mouseOver) + if(mouseOver || hasFocus) { - QPixmap slabPixmap = _helper.roundSlabFocused(pal.color(QPalette::Button),_viewHoverBrush.brush(QPalette::Active).color(), 0.0); + QPixmap slabPixmap = _helper.roundSlabFocused(pal.color(QPalette::Button), + (mouseOver ? _viewHoverBrush : _viewFocusBrush).brush(QPalette::Active).color(), 0.0); if(drawButton) p->drawPixmap(x, y, slabPixmap); } ++++++ r814438.diff ++++++ ------------------------------------------------------------------------ r814438 | mueller | 2008-05-30 12:23:35 +0200 (Fr, 30 Mai 2008) | 1 line backport 814437 ------------------------------------------------------------------------ Index: kstyles/oxygen/oxygen.cpp =================================================================== --- kstyles/oxygen/oxygen.cpp (Revision 814437) +++ kstyles/oxygen/oxygen.cpp (Revision 814438) @@ -1852,6 +1852,11 @@ void OxygenStyle::polish(QWidget* widget switch (widget->windowFlags() & Qt::WindowType_Mask) { case Qt::Window: + // don't install a gradient on a (possibly blank) screen saver + if (widget->inherits("KScreenSaver")) + break; + + // fall through case Qt::Dialog: widget->installEventFilter(this); break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org