Hello community,
here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory
checked in at Wed Aug 26 15:36:33 CEST 2009.
--------
--- KDE/qtcurve-kde4/qtcurve-kde4.changes 2009-08-12 17:52:13.000000000 +0200
+++ qtcurve-kde4/qtcurve-kde4.changes 2009-08-26 09:56:10.000000000 +0200
@@ -1,0 +2,16 @@
+Wed Aug 26 07:51:02 UTC 2009 - beineri@opensuse.org
+
+- update to 0.67.6:
+ * Fix corners of round frames where frame background is different
+ to window background.
+ * Only use icon metrics for auto-deault buttons that are either
+ within a QDialogButtonBox, or are on a KFileWidget.
+ * Give toolbar items a 1 pixel spacing - so that there is at
+ least a gap between konqueror's location and search edit fields.
+ * Fix saving of menubar item 'colour on mouse over' setting.
+ * Fix bleed of Agua shine in scrollbar buttons.
+ * Offset sunken slider thumbs to improve appearance.
+ * When shading tab background - dont shade tabs of document mode
+ tab widgets.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
QtCurve-KDE4-0.67.5.tar.bz2
New:
----
QtCurve-KDE4-0.67.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.TTBhG7/_old 2009-08-26 15:35:56.000000000 +0200
+++ /var/tmp/diff_new_pack.TTBhG7/_new 2009-08-26 15:35:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-kde4 (Version 0.67.5)
+# spec file for package qtcurve-kde4 (Version 0.67.6)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: QtCurve style for KDE 4
-Version: 0.67.5
+Version: 0.67.6
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-KDE4-%{version}.tar.bz2
++++++ QtCurve-KDE4-0.67.5.tar.bz2 -> QtCurve-KDE4-0.67.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.5/CMakeLists.txt new/QtCurve-KDE4-0.67.6/CMakeLists.txt
--- old/QtCurve-KDE4-0.67.5/CMakeLists.txt 2009-08-12 08:18:59.000000000 +0200
+++ new/QtCurve-KDE4-0.67.6/CMakeLists.txt 2009-08-25 23:31:33.000000000 +0200
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "67")
-set(CPACK_PACKAGE_VERSION_PATCH "5")
+set(CPACK_PACKAGE_VERSION_PATCH "6")
set(CPACK_PACKAGE_CONTACT "Craig Drummond ")
set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.5/ChangeLog new/QtCurve-KDE4-0.67.6/ChangeLog
--- old/QtCurve-KDE4-0.67.5/ChangeLog 2009-08-12 08:18:59.000000000 +0200
+++ new/QtCurve-KDE4-0.67.6/ChangeLog 2009-08-25 23:31:33.000000000 +0200
@@ -1,3 +1,16 @@
+0.67.6
+------
+1. Fix corners of round frames where frame background is different to window
+ background.
+2. Only use icon metrics for auto-deault buttons that are either within a
+ QDialogButtonBox, or are on a KFileWidget.
+3. Give toolbar items a 1 pixel spacing - so that there is at least a gap between
+ konqueror's location and search edit fields.
+4. Fix saving of menubar item 'colour on mouse over' setting.
+5. Fix bleed of Agua shine in scrollbar buttons.
+6. Offset sunken slider thumbs to improve appearance.
+7. When shading tab background - dont shade tabs of document mode tab widgets.
+
0.67.5
------
1. If drawing square scrollviews, give these a similar 3d effect to rounded ones.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.5/common/config_file.c new/QtCurve-KDE4-0.67.6/common/config_file.c
--- old/QtCurve-KDE4-0.67.5/common/config_file.c 2009-08-12 08:18:59.000000000 +0200
+++ new/QtCurve-KDE4-0.67.6/common/config_file.c 2009-08-25 23:31:33.000000000 +0200
@@ -2313,6 +2313,7 @@
CFG_WRITE_ENTRY(framelessGroupBoxes)
CFG_WRITE_ENTRY(groupBoxLine)
CFG_WRITE_ENTRY(fadeLines)
+ CFG_WRITE_ENTRY(colorMenubarMouseOver)
CFG_WRITE_ENTRY(crHighlight)
CFG_WRITE_ENTRY(crButton)
CFG_WRITE_ENTRY(fillProgress)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.5/style/qtcurve.cpp new/QtCurve-KDE4-0.67.6/style/qtcurve.cpp
--- old/QtCurve-KDE4-0.67.5/style/qtcurve.cpp 2009-08-12 08:18:59.000000000 +0200
+++ new/QtCurve-KDE4-0.67.6/style/qtcurve.cpp 2009-08-25 23:31:33.000000000 +0200
@@ -70,6 +70,7 @@
#include
#include
#include
+#include
#if !defined QTC_DISABLE_KDEFILEDIALOG_CALLS && !KDE_IS_VERSION(4, 1, 0)
static int theInstanceCount=0;
@@ -1257,8 +1258,14 @@
// Enable hover effects in all itemviews
if (QAbstractItemView *itemView = qobject_cast(widget))
{
- itemView->viewport()->setAttribute(Qt::WA_Hover);
- if(opts.forceAlternateLvCols && !widget->inherits("KFilePlacesView"))
+ QWidget *viewport=itemView->viewport();
+ viewport->setAttribute(Qt::WA_Hover);
+
+ if(opts.forceAlternateLvCols &&
+ viewport->autoFillBackground() && // Dolphins Folders panel
+ 255==viewport->palette().color(itemView->viewport()->backgroundRole()).alpha() && // KFilePlacesView
+ (qobject_cast(widget) ||
+ (qobject_cast(widget) && QListView::IconMode!=((QListView *)widget)->viewMode())))
itemView->setAlternatingRowColors(true);
}
@@ -2184,6 +2191,10 @@
: PM_DefaultChildMargin, option, widget);
case PM_MenuBarItemSpacing:
return 0;
+ case PM_ToolBarItemMargin:
+ return 0;
+ case PM_ToolBarItemSpacing:
+ return 1;
case PM_FocusFrameVMargin:
case PM_FocusFrameHMargin:
return 2;
@@ -3016,6 +3027,15 @@
painter->setRenderHint(QPainter::Antialiasing, false);
}
+ if(opts.round && IS_FLAT(opts.bgndAppearance) &&
+ widget && widget->parentWidget()/* &&
+ widget->palette().background().color()!=widget->parentWidget()->palette().background().color()*/)
+ {
+ painter->setPen(widget->parentWidget()->palette().background().color());
+ painter->drawRect(r);
+ painter->drawRect(r.adjusted(1, 1, -1, -1));
+ }
+
drawBorder(painter, r, &opt,
opts.round &&
( (APP_KMIX==theThemedApp && widget && widget->parentWidget() && qobject_cast(widget) &&
@@ -4895,7 +4915,10 @@
int xm(windowsItemFrame + checkcol + windowsItemHMargin -2),
xpos(menuItem->rect.x() + xm);
- QRect textRect(xpos, y + windowsItemVMargin, w - xm - windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin),
+ QRect textRect(xpos, y + windowsItemVMargin,
+ opts.menuIcons ? (w - xm - windowsRightBorder - tab + 1)
+ : (w - ((xm*2) + tab)),
+ h - 2 * windowsItemVMargin),
vTextRect = visualRect(option->direction, menuItem->rect, textRect);
QString s(menuItem->text);
@@ -5321,14 +5344,14 @@
case CE_TabBarTabShape:
if (const QStyleOptionTab *tab = qstyleoption_cast(option))
{
- bool onlyBase(widget && widget->parentWidget()
+ bool onlyTab(widget && widget->parentWidget()
? qobject_cast(widget->parentWidget()) ? false : true
: false),
selected(state&State_Selected),
horiz(QTabBar::RoundedNorth==tab->shape || QTabBar::RoundedSouth==tab->shape);
#ifdef QTC_STYLE_QTABBAR
- if(onlyBase)
+ if(onlyTab)
{
if(selected || state&State_MouseOver)
{
@@ -5358,15 +5381,15 @@
#endif
QRect r2(r);
bool rtlHorTabs(Qt::RightToLeft==tab->direction && horiz),
- onlyTab(QStyleOptionTab::OnlyOneTab==tab->position),
+ oneTab(QStyleOptionTab::OnlyOneTab==tab->position),
leftCornerWidget(tab->cornerWidgets&QStyleOptionTab::LeftCornerWidget),
rightCornerWidget(tab->cornerWidgets&QStyleOptionTab::RightCornerWidget),
firstTab((tab->position == (Qt::LeftToRight==tab->direction || !horiz ?
- QStyleOptionTab::Beginning : QStyleOptionTab::End)) || onlyTab),
+ QStyleOptionTab::Beginning : QStyleOptionTab::End)) || oneTab),
lastTab((tab->position == (Qt::LeftToRight==tab->direction || !horiz ?
- QStyleOptionTab::End : QStyleOptionTab::Beginning)) || onlyTab);
+ QStyleOptionTab::End : QStyleOptionTab::Beginning)) || oneTab);
int tabBarAlignment(styleHint(SH_TabBar_Alignment, tab, widget)),
- tabOverlap(onlyTab ? 0 : pixelMetric(PM_TabBarTabOverlap, option, widget)),
+ tabOverlap(oneTab ? 0 : pixelMetric(PM_TabBarTabOverlap, option, widget)),
moOffset(ROUNDED_NONE==opts.round || TAB_MO_TOP!=opts.tabMouseOver ? 1 : opts.round),
highlightOffset(opts.highlightTab && opts.round>ROUND_SLIGHT ? 2 : 1),
highlightBorder(opts.round>ROUND_FULL ? 4 : 3),
@@ -5382,9 +5405,9 @@
false
#endif
),
- docFixLeft(!leftCornerWidget && leftAligned && firstTab && (docMode || onlyBase)),
- fixLeft(!onlyBase && !leftCornerWidget && leftAligned && firstTab && !docMode),
- fixRight(!onlyBase && !rightCornerWidget && rightAligned && lastTab && !docMode),
+ docFixLeft(!leftCornerWidget && leftAligned && firstTab && (docMode || onlyTab)),
+ fixLeft(!onlyTab && !leftCornerWidget && leftAligned && firstTab && !docMode),
+ fixRight(!onlyTab && !rightCornerWidget && rightAligned && lastTab && !docMode),
mouseOver(state&State_Enabled && state&State_MouseOver),
glowMo(!selected && mouseOver && opts.coloredMouseOver && TAB_MO_GLOW==opts.tabMouseOver);
const QColor *use(backgroundColors(option));
@@ -5402,7 +5425,7 @@
case QTabBar::RoundedNorth:
case QTabBar::TriangularNorth:
{
- int round=selected || onlyTab || TAB_MO_GLOW==opts.tabMouseOver || opts.roundAllTabs
+ int round=selected || oneTab || TAB_MO_GLOW==opts.tabMouseOver || opts.roundAllTabs
? ROUNDED_TOP
: firstTab
? ROUNDED_TOPLEFT
@@ -5415,7 +5438,7 @@
if(!firstTab)
r.adjust(-tabOverlap, 0, 0, 0);
painter->setClipPath(buildPath(r.adjusted(0, 0, 0, 4), WIDGET_TAB_TOP, round, radius));
- fillTab(painter, r.adjusted(1+sizeAdjust, 1, -(1+sizeAdjust), 0), option, fill, true, WIDGET_TAB_TOP);
+ fillTab(painter, r.adjusted(1+sizeAdjust, 1, -(1+sizeAdjust), 0), option, fill, true, WIDGET_TAB_TOP, (docMode || onlyTab));
painter->setClipping(false);
// This clipping helps with plasma's tabs and nvidia
if(selected)
@@ -5484,7 +5507,7 @@
case QTabBar::RoundedSouth:
case QTabBar::TriangularSouth:
{
- int round=selected || onlyTab || TAB_MO_GLOW==opts.tabMouseOver || opts.roundAllTabs
+ int round=selected || oneTab || TAB_MO_GLOW==opts.tabMouseOver || opts.roundAllTabs
? ROUNDED_BOTTOM
: firstTab
? ROUNDED_BOTTOMLEFT
@@ -5497,7 +5520,7 @@
r.adjust(-tabOverlap, 0, 0, 0);
painter->setClipPath(buildPath(r.adjusted(0, -4, 0, 0), WIDGET_TAB_BOT, round, radius));
- fillTab(painter, r.adjusted(1+sizeAdjust, 0, -(1+sizeAdjust), -1), option, fill, true, WIDGET_TAB_BOT);
+ fillTab(painter, r.adjusted(1+sizeAdjust, 0, -(1+sizeAdjust), -1), option, fill, true, WIDGET_TAB_BOT, (docMode || onlyTab));
painter->setClipping(false);
drawBorder(painter, r.adjusted(sizeAdjust, -4, -sizeAdjust, 0), option, round, glowMo ? itsMouseOverCols : 0L, WIDGET_TAB_BOT, borderProfile, false);
if(glowMo)
@@ -5557,7 +5580,7 @@
case QTabBar::RoundedWest:
case QTabBar::TriangularWest:
{
- int round=selected || onlyTab || TAB_MO_GLOW==opts.tabMouseOver || opts.roundAllTabs
+ int round=selected || oneTab || TAB_MO_GLOW==opts.tabMouseOver || opts.roundAllTabs
? ROUNDED_LEFT
: firstTab
? ROUNDED_TOPLEFT
@@ -5570,7 +5593,7 @@
if(!firstTab)
r.adjust(0, -tabOverlap, 0, 0);
painter->setClipPath(buildPath(r.adjusted(0, 0, 4, 0), WIDGET_TAB_TOP, round, radius));
- fillTab(painter, r.adjusted(1, sizeAdjust, 0, -(1+sizeAdjust)), option, fill, false, WIDGET_TAB_TOP);
+ fillTab(painter, r.adjusted(1, sizeAdjust, 0, -(1+sizeAdjust)), option, fill, false, WIDGET_TAB_TOP, (docMode || onlyTab));
painter->setClipping(false);
drawBorder(painter, r.adjusted(0, sizeAdjust, 4, -sizeAdjust), option, round, glowMo ? itsMouseOverCols : 0L, WIDGET_TAB_TOP, borderProfile, false);
if(glowMo)
@@ -5623,7 +5646,7 @@
case QTabBar::RoundedEast:
case QTabBar::TriangularEast:
{
- int round=selected || onlyTab || TAB_MO_GLOW==opts.tabMouseOver || opts.roundAllTabs
+ int round=selected || oneTab || TAB_MO_GLOW==opts.tabMouseOver || opts.roundAllTabs
? ROUNDED_RIGHT
: firstTab
? ROUNDED_TOPRIGHT
@@ -5636,7 +5659,7 @@
if(!firstTab)
r.adjust(0, -tabOverlap, 0, 0);
painter->setClipPath(buildPath(r.adjusted(-4, 0, 0, 0), WIDGET_TAB_BOT, round, radius));
- fillTab(painter, r.adjusted(0, sizeAdjust, -1, -(1+sizeAdjust)), option, fill, false, WIDGET_TAB_BOT);
+ fillTab(painter, r.adjusted(0, sizeAdjust, -1, -(1+sizeAdjust)), option, fill, false, WIDGET_TAB_BOT, (docMode || onlyTab));
painter->setClipping(false);
drawBorder(painter, r.adjusted(-4, sizeAdjust, 0, -sizeAdjust), option, round, glowMo ? itsMouseOverCols : 0L, WIDGET_TAB_BOT, borderProfile, false);
if(glowMo)
@@ -7424,7 +7447,15 @@
if (const QStyleOptionButton *btn = qstyleoption_cast(option))
{
- if(btn->features&QStyleOptionButton::AutoDefaultButton)
+ if(btn->features&QStyleOptionButton::AutoDefaultButton &&
+ widget && widget->parentWidget() &&
+ (::qobject_cast(widget->parentWidget()) ||
+#ifdef QTC_QT_ONLY
+ widget->parentWidget()->inherits("KFileWidget")
+#else
+ ::qobject_cast(widget->parentWidget())
+#endif
+ ))
{
int iconHeight=btn->icon.isNull() ? btn->iconSize.height() : 16;
if(size.height()0 ? 0.3 : 0.1) : 0.2);
g.setColorAt(1.0, white);
+ if(WIDGET_SB_BUTTON==w)
+ {
+ p->save();
+ p->setClipRect(r);
+ }
p->fillPath(buildPath(gr, w, round, rad), QBrush(g));
+ if(WIDGET_SB_BUTTON==w)
+ p->restore();
}
}
@@ -9592,31 +9630,37 @@
? ROUNDED_ALL : ROUNDED_NONE,
getFill(&opt, use, false, SHADE_DARKEN==opts.shadeSliders), use, true, WIDGET_SB_SLIDER);
- const QColor *markers(/*opts.coloredMouseOver && opt.state&State_MouseOver
- ? itsMouseOverCols
- : */use);
-
- if(opt.state&State_Horizontal)
- r.setX(r.x()+1);
- else
- r.setY(r.y()+1);
-
if(LINE_NONE!=opts.sliderThumbs && (slider || ((opt.state&State_Horizontal && r.width()>=min)|| r.height()>=min)))
+ {
+ const QColor *markers(/*opts.coloredMouseOver && opt.state&State_MouseOver
+ ? itsMouseOverCols
+ : */use);
+ bool horiz(opt.state&State_Horizontal);
+
+ if(LINE_SUNKEN==opts.sliderThumbs)
+ if(horiz)
+ r.adjust(0, -1, 0, 0);
+ else
+ r.adjust(-1, 0, 0, 0);
+ else
+ r.adjust(horiz ? 1 : 0, horiz ? 0 : 1, 0, 0);
+
switch(opts.sliderThumbs)
{
// case LINE_1DOT:
// p->drawPixmap(r.x()+((r.width()-5)/2), r.y()+((r.height()-5)/2), *getPixmap(markers[QT_STD_BORDER], PIX_DOT, 1.0));
// break;
case LINE_FLAT:
- drawLines(p, r, !(opt.state&State_Horizontal), 3, 5, markers, 0, 5, opts.sliderThumbs);
+ drawLines(p, r, !horiz, 3, 5, markers, 0, 5, opts.sliderThumbs);
break;
case LINE_SUNKEN:
- drawLines(p, r, !(opt.state&State_Horizontal), 4, 3, markers, 0, 3, opts.sliderThumbs);
+ drawLines(p, r, !horiz, 4, 3, markers, 0, 3, opts.sliderThumbs);
break;
case LINE_DOTS:
default:
- drawDots(p, r, !(opt.state&State_Horizontal), slider ? 3 : 5, slider ? 5 : 2, markers, 0, 5);
+ drawDots(p, r, !horiz, slider ? 3 : 5, slider ? 5 : 2, markers, 0, 5);
}
+ }
}
void QtCurveStyle::drawSliderHandle(QPainter *p, const QRect &r, const QStyleOptionSlider *option) const
@@ -9960,12 +10004,13 @@
}
}
-void QtCurveStyle::fillTab(QPainter *p, const QRect &r, const QStyleOption *option, const QColor &fill, bool horiz, EWidget tab) const
+void QtCurveStyle::fillTab(QPainter *p, const QRect &r, const QStyleOption *option, const QColor &fill, bool horiz,
+ EWidget tab, bool tabOnly) const
{
bool invertedSel=option->state&State_Selected && APPEARANCE_INVERTED==opts.appearance;
QColor col(invertedSel ? option->palette.background().color() : fill);
- if(opts.tabBgnd)
+ if(opts.tabBgnd && !tabOnly)
col=shade(col, QTC_TO_FACTOR(opts.tabBgnd));
if(invertedSel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.5/style/qtcurve.h new/QtCurve-KDE4-0.67.6/style/qtcurve.h
--- old/QtCurve-KDE4-0.67.5/style/qtcurve.h 2009-08-12 08:18:59.000000000 +0200
+++ new/QtCurve-KDE4-0.67.6/style/qtcurve.h 2009-08-25 23:31:33.000000000 +0200
@@ -159,7 +159,7 @@
void drawSliderGroove(QPainter *p, const QRect &groove, const QRect &handle, const QStyleOptionSlider *slider, const QWidget *widget) const;
void drawMenuOrToolBarBackground(QPainter *p, const QRect &r, const QStyleOption *option, bool menu=true, bool horiz=true) const;
void drawHandleMarkers(QPainter *p, const QRect &r, const QStyleOption *option, bool tb, ELine handles) const;
- void fillTab(QPainter *p, const QRect &r, const QStyleOption *option, const QColor &fill, bool horiz, EWidget tab) const;
+ void fillTab(QPainter *p, const QRect &r, const QStyleOption *option, const QColor &fill, bool horiz, EWidget tab, bool tabOnly) const;
void colorTab(QPainter *p, const QRect &r, bool horiz, EWidget tab, int round) const;
void shadeColors(const QColor &base, QColor *vals) const;
const QColor * buttonColors(const QStyleOption *option) const;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org