Hello community,
here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory
checked in at Thu Aug 13 02:09:05 CEST 2009.
--------
--- KDE/qtcurve-kde4/qtcurve-kde4.changes 2009-08-07 00:06:14.000000000 +0200
+++ qtcurve-kde4/qtcurve-kde4.changes 2009-08-12 17:52:13.000000000 +0200
@@ -1,0 +2,18 @@
+Wed Aug 12 17:46:45 CEST 2009 - beineri@opensuse.org
+
+- update to 0.67.5:
+ * If drawing square scrollviews, give these a similar 3d effect
+ to rounded ones.
+ * If using squared scrollviews, also square Kate/Kwrite view.
+ * Disable parentless dialog fix for plasma.
+ * Fix button of non-editable combos when not etching entries.
+ * Fix clipping of plastik style mouse over for max/extra round.
+ * Only do mouse over for entries if combos and spin widgets are unified.
+ * If not etching entries, reduce height of editable combo by 2 pixels.
+ * If not etching/shadowing, when mouse over set to 'glow' use 'thick coloured'
+ * If not etching/shadowing, decrease thinner scrollbar groove.
+ * Remove hard-coding of light border in progressbars - use gradient setting.
+ * Use smaller kwin title bar, if not bordered or round < full.
+ * Fix agua buttons when round < full.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
QtCurve-KDE4-0.67.4.tar.bz2
New:
----
QtCurve-KDE4-0.67.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.oPdYic/_old 2009-08-13 02:08:44.000000000 +0200
+++ /var/tmp/diff_new_pack.oPdYic/_new 2009-08-13 02:08:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-kde4 (Version 0.67.4)
+# spec file for package qtcurve-kde4 (Version 0.67.5)
#
# 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.4
+Version: 0.67.5
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-KDE4-%{version}.tar.bz2
++++++ QtCurve-KDE4-0.67.4.tar.bz2 -> QtCurve-KDE4-0.67.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.4/CMakeLists.txt new/QtCurve-KDE4-0.67.5/CMakeLists.txt
--- old/QtCurve-KDE4-0.67.4/CMakeLists.txt 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/CMakeLists.txt 2009-08-12 08:18:59.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 "4")
+set(CPACK_PACKAGE_VERSION_PATCH "5")
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.4/ChangeLog new/QtCurve-KDE4-0.67.5/ChangeLog
--- old/QtCurve-KDE4-0.67.4/ChangeLog 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/ChangeLog 2009-08-12 08:18:59.000000000 +0200
@@ -1,3 +1,18 @@
+0.67.5
+------
+ 1. If drawing square scrollviews, give these a similar 3d effect to rounded ones.
+ 2. If using squared scrollviews, also square Kate/Kwrite view.
+ 3. Disable parentless dialog fix for plasma.
+ 4. Fix button of non-editable combos when not etching entries.
+ 5. Fix clipping of plastik style mouse over for max/extra round.
+ 6. Only do mouse over for entries if combos and spin widgets are unified.
+ 7. If not etching entries, reduce height of editable combo by 2 pixels.
+ 8. If not etching/shadowing, when mouse over set to 'glow' use 'thick coloured'
+ 9. If not etching/shadowing, decrease thinner scrollbar groove.
+10. Remove hard-coding of light border in progressbars - use gradient setting.
+11. Use smaller kwin title bar, if not bordered or round < full.
+12. Fix agua buttons when round < full.
+
0.67.4
------
1. Dont create a KComponentData if KGlobal::hasMainComponent() is true. Fixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.4/common/common.h new/QtCurve-KDE4-0.67.5/common/common.h
--- old/QtCurve-KDE4-0.67.4/common/common.h 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/common/common.h 2009-08-12 08:18:59.000000000 +0200
@@ -145,7 +145,7 @@
#define QTC_SIMPLE_SHADING (!shading)
-#define QTC_THIN_SBAR_MOD (opts.sliderWidthDEFAULT_SLIDER_WIDTH ? (opts.sliderWidth-9)/2 : 4)
+#define QTC_THIN_SBAR_MOD ((opts.sliderWidthDEFAULT_SLIDER_WIDTH ? (opts.sliderWidth-9)/2 : 4)+(EFFECT_NONE==opts.buttonEffect ? 1 : 0))
#define QTC_SLIDER_SIZE (opts.sliderWidthborder) && WIDGET_MENU_ITEM!=(WIDGET) && !IS_TROUGH(WIDGET) && \
- (WIDGET_DEF_BUTTON!=(WIDGET) || IND_COLORED!=opts.defBtnIndicator)) || \
- (WIDGET_PROGRESSBAR==(WIDGET) && APPEARANCE_FLAT!=(APP) && \
- APPEARANCE_RAISED!=(APP) && APPEARANCE_INVERTED!=(APP) && APPEARANCE_BEVELLED!=(APP)))
+ (!(SUKEN) && (GB_LIGHT==getGradient(APP, &opts)->border) && WIDGET_MENU_ITEM!=(WIDGET) && !IS_TROUGH(WIDGET) && \
+ (WIDGET_DEF_BUTTON!=(WIDGET) || IND_COLORED!=opts.defBtnIndicator))
#define QTC_DRAW_3D_FULL_BORDER(SUNKEN, APP) \
(!(SUNKEN) && GB_3D_FULL==getGradient((APP), &opts)->border)
@@ -301,6 +300,8 @@
#define QTC_DO_EFFECT (QTC_FULLLY_ROUNDED && EFFECT_NONE!=opts.buttonEffect)
#endif
+#define QTC_ENTRY_MO (opts.unifyCombo && opts.unifySpin)
+
#if !defined __cplusplus || (defined QT_VERSION && (QT_VERSION >= 0x040000))
#define QTC_FOCUS_ALPHA 0.08
#define QTC_BORDER_BLEND_ALPHA 0.7
@@ -1359,6 +1360,12 @@
case WIDGET_TROUGH:
case WIDGET_SLIDER_TROUGH:
return opts->grooveAppearance;
+#ifndef __cplusplus
+ case WIDGET_SPIN_UP:
+ case WIDGET_SPIN_DOWN:
+#endif
+ case WIDGET_SPIN:
+ return MODIFY_AGUA(opts->appearance);
default:
break;
}
@@ -1402,7 +1409,7 @@
setupGradient(&stdGradients[APPEARANCE_SPLIT_GRADIENT-APPEARANCE_RAISED], GB_3D,4,0.0,1.06,0.499,1.004,0.5,0.986,1.0,0.92);
setupGradient(&stdGradients[APPEARANCE_BEVELLED-APPEARANCE_RAISED], GB_3D,4,0.0,1.05,0.1,1.02,0.9,0.985,1.0,0.94);
setupGradient(&stdGradients[APPEARANCE_LV_BEVELLED-APPEARANCE_RAISED], GB_3D,3,0.0,1.00,0.85,1.0,1.0,0.90);
- setupGradient(&stdGradients[APPEARANCE_AGUA_MOD-APPEARANCE_RAISED], GB_LIGHT,3,0.0,1.5,0.49,0.85,1.0,1.3);
+ setupGradient(&stdGradients[APPEARANCE_AGUA_MOD-APPEARANCE_RAISED], GB_NONE,3,0.0,1.5,0.49,0.85,1.0,1.3);
setupGradient(&stdGradients[APPEARANCE_LV_AGUA-APPEARANCE_RAISED], GB_NONE,4,0.0,0.98,0.35,0.95,0.4,0.93,1.0,1.15);
init=true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.4/common/config_file.c new/QtCurve-KDE4-0.67.5/common/config_file.c
--- old/QtCurve-KDE4-0.67.4/common/config_file.c 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/common/config_file.c 2009-08-12 08:18:59.000000000 +0200
@@ -1559,9 +1559,6 @@
if(EFFECT_NONE==opts->buttonEffect)
opts->etchEntry=false;
- if(EFFECT_NONE==opts->buttonEffect)
- opts->etchEntry=false;
-
if(opts->squareScrollViews)
opts->highlightScrollViews=false;
@@ -1603,7 +1600,14 @@
#endif
if(APPEARANCE_FLAT==opts->tabAppearance)
opts->tabAppearance=APPEARANCE_RAISED;
+
+ if(EFFECT_NONE==opts->buttonEffect && MO_GLOW==opts->coloredMouseOver)
+ opts->coloredMouseOver=MO_COLORED_THICK;
+
+ if(EFFECT_NONE==opts->buttonEffect)
+ opts->etchEntry=false;
#endif
+
return true;
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.4/kwin/qtcurveclient.cpp new/QtCurve-KDE4-0.67.5/kwin/qtcurveclient.cpp
--- old/QtCurve-KDE4-0.67.4/kwin/qtcurveclient.cpp 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/kwin/qtcurveclient.cpp 2009-08-12 08:18:59.000000000 +0200
@@ -89,12 +89,12 @@
case LM_BorderBottom:
return respectWindowState && maximized ? 0 : Handler()->borderSize();
case LM_TitleEdgeTop:
- return respectWindowState && maximized ? 0 : 3;
+ return respectWindowState && maximized ? 0 : (Handler()->smallBorder() ? 1 : 3);
case LM_TitleEdgeBottom:
- return /*respectWindowState && maximized ? 1 : */ 3;
+ return /*respectWindowState && maximized ? 1 : */ (Handler()->smallBorder() ? 1 : 3);
case LM_TitleEdgeLeft:
case LM_TitleEdgeRight:
- return respectWindowState && maximized ? 0 : 3;
+ return respectWindowState && maximized ? 0 : (Handler()->smallBorder() ? 1 : 3);
case LM_TitleBorderLeft:
case LM_TitleBorderRight:
return 5;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.4/kwin/qtcurvehandler.cpp new/QtCurve-KDE4-0.67.5/kwin/qtcurvehandler.cpp
--- old/QtCurve-KDE4-0.67.4/kwin/qtcurvehandler.cpp 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/kwin/qtcurvehandler.cpp 2009-08-12 08:18:59.000000000 +0200
@@ -43,6 +43,7 @@
#include
#include
#include
+#include "common.h"
static time_t getTimeStamp(const QString &item)
{
@@ -290,6 +291,14 @@
return *bitmap;
}
+bool QtCurveHandler::smallBorder() const
+{
+ QtCurveHandler *that=(QtCurveHandler *)this;
+
+ return noBorder() ||
+ (BorderTiny!=KDecoration::options()->preferredBorderSize(that) && wStyle()->pixelMetric((QStyle::PixelMetric)QtC_Round, NULL, NULL)QtCurveHandler::BorderSize QtCurveHandler::borderSizes() const
{
// the list must be sorted
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.4/kwin/qtcurvehandler.h new/QtCurve-KDE4-0.67.5/kwin/qtcurvehandler.h
--- old/QtCurve-KDE4-0.67.4/kwin/qtcurvehandler.h 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/kwin/qtcurvehandler.h 2009-08-12 08:18:59.000000000 +0200
@@ -89,6 +89,7 @@
bool roundBottom() const { return itsRoundBottom && itsBorderSize>1; }
bool noBorder() const { return itsNoBorder; }
QStyle * wStyle() const { return itsStyle ? itsStyle : QApplication::style(); }
+ bool smallBorder() const;
QListQtCurveHandler::BorderSize borderSizes() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.4/style/qtcurve.cpp new/QtCurve-KDE4-0.67.5/style/qtcurve.cpp
--- old/QtCurve-KDE4-0.67.4/style/qtcurve.cpp 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/style/qtcurve.cpp 2009-08-12 08:18:59.000000000 +0200
@@ -42,7 +42,7 @@
#define QTC_FIX_DISABLED_ICONS
#define QTC_MO_ARROW_X(MO, COL) (state&State_Enabled \
- ? (MO_GLOW==opts.coloredMouseOver && MO \
+ ? (MO_NONE!=opts.coloredMouseOver && MO \
? itsMouseOverCols[QT_STD_BORDER] \
: palette.color(COL)) \
: palette.color(QPalette::Disabled, COL))
@@ -449,6 +449,12 @@
widget->parentWidget()->parentWidget()->inherits("KMReaderWin");
}
+static bool isKateView(const QWidget *widget)
+{
+ return widget && widget->parentWidget() &&
+ ::qobject_cast(widget) && widget->parentWidget()->inherits("KateView");
+}
+
static bool isNoEtchWidget(const QWidget *widget)
{
if(APP_KRUNNER==theThemedApp)
@@ -458,7 +464,7 @@
{
const QWidget *top=widget->window();
- return !top || (!qobject_cast(top) || !qobject_cast(top));
+ return !top || (!qobject_cast(top) && !qobject_cast(top));
}
if(widget && widget->inherits("QWebView"))
@@ -1063,7 +1069,7 @@
theThemedApp=APP_KWIN;
else if("systemsettings"==appName)
theThemedApp=APP_SYSTEMSETTINGS;
- else if("plasma"==appName)
+ else if("plasma"==appName || appName.startsWith("plasma-"))
theThemedApp=APP_PLASMA;
else if("krunner"==appName || "krunner_lock"==appName || "kscreenlocker"==appName)
theThemedApp=APP_KRUNNER;
@@ -1081,6 +1087,10 @@
else if("Designer"==QCoreApplication::applicationName())
theThemedApp=APP_QTDESIGNER;
#endif
+
+ // Plasma does not like the 'Fix parentless dialogs' option...
+ if(APP_PLASMA==theThemedApp && opts.fixParentlessDialogs)
+ opts.fixParentlessDialogs=false;
}
void QtCurveStyle::polish(QPalette &palette)
@@ -2219,14 +2229,11 @@
case PM_ButtonDefaultIndicator:
return 0;
case PM_DefaultFrameWidth:
- if (!opts.popupBorder && widget && widget->inherits("QComboBoxPrivateContainer"))
- return 0;
+ if ((!opts.popupBorder || opts.gtkComboMenus) && widget && widget->inherits("QComboBoxPrivateContainer"))
+ return opts.gtkComboMenus ? 1 : 0;
- if(opts.gtkComboMenus && widget && widget->inherits("QComboBoxPrivateContainer"))
- return 1;
-
- if (!opts.gtkScrollViews && widget && widget->parentWidget() && ::qobject_cast(widget) && widget->parentWidget()->inherits("KateView"))
- return 0;
+ if ((!opts.gtkScrollViews || opts.squareScrollViews) && isKateView(widget))
+ return opts.squareScrollViews ? 1 : 0;
if (opts.squareScrollViews && widget &&
(::qobject_cast(widget) || isKontactPreviewPane(widget)))
@@ -2924,19 +2931,28 @@
{
bool sv(::qobject_cast(widget) ||
(widget && widget->inherits("Q3ScrollView")) ||
- (opts.squareScrollViews && isKontactPreviewPane(widget))),
+ (opts.squareScrollViews && (isKateView(widget) || isKontactPreviewPane(widget)))),
squareSv(sv && (opts.squareScrollViews || (widget && widget->isWindow())));
if(sv && (opts.etchEntry || squareSv))
{
if(squareSv)
{
- const QColor *use(backgroundColors(option));
+ QColor col(backgroundColors(option)[QT_STD_BORDER]);
if(APP_ARORA==theThemedApp)
painter->fillRect(r, palette.brush(QPalette::Base));
- painter->setPen(use[QT_STD_BORDER]);
- drawRect(painter, r);
+ painter->setPen(col);
+
+ // Flat style...
+ //drawRect(painter, r);
+ // 3d style...
+ painter->drawLine(r.x(), r.y(), r.x(), r.y()+r.height()-1);
+ painter->drawLine(r.x(), r.y(), r.x()+r.width()-1, r.y());
+ col.setAlphaF(QT_LOWER_BORDER_ALPHA);
+ painter->setPen(col);
+ painter->drawLine(r.x()+r.width()-1, r.y()+1, r.x()+r.width()-1, r.y()+r.height()-1);
+ painter->drawLine(r.x()+1, r.y()+r.height()-1, r.x()+r.width()-1, r.y()+r.height()-1);
}
else
{
@@ -7045,7 +7061,7 @@
if(opts.thinSbarGroove && slider.isValid())
{
painter->save();
- painter->setClipRegion(QRegion(opt.rect).subtract(slider));
+ painter->setClipRegion(QRegion(opt.rect).subtract(slider.adjusted(1, 1, -1, -1)));
}
drawLightBevel(painter, opts.thinSbarGroove
? horiz
@@ -7263,7 +7279,7 @@
if(opts.unifyCombo)
{
field=r;
- if(QTC_DO_EFFECT)
+ if(doEffect)
field.adjust(1, 1, -1, -1);
}
//field.adjust(-1,-1, 0, 1);
@@ -7531,6 +7547,11 @@
newSize+=QSize(margin+other, margin);
newSize.rheight() += ((1 - newSize.rheight()) & 1);
+
+ if(!opts.etchEntry)
+ if (const QStyleOptionComboBox *combo = qstyleoption_cast(option))
+ if(combo->editable)
+ newSize.rheight()-=2;
break;
}
case CT_MenuItem:
@@ -7712,7 +7733,7 @@
case CC_ComboBox:
if (const QStyleOptionComboBox *comboBox = qstyleoption_cast(option))
{
- bool doEtch(QTC_DO_EFFECT),
+ bool doEtch(opts.etchEntry && QTC_DO_EFFECT),
ed(comboBox->editable);
int x(r.x()),
y(r.y()),
@@ -8584,8 +8605,6 @@
{
case ROUND_SLIGHT:
case ROUND_NONE:
- endSize=WIDGET_SB_SLIDER==w && MO_PLASTIK==opts.coloredMouseOver && option->state&State_MouseOver ? 7 : 4;
- break;
case ROUND_FULL:
endSize=WIDGET_SB_SLIDER==w && MO_PLASTIK==opts.coloredMouseOver && option->state&State_MouseOver ? 7 : 5;
break;
@@ -8701,7 +8720,7 @@
r.adjust(1, 1, -1, -1);
p->setRenderHint(QPainter::Antialiasing, true);
-
+
if(r.width()>0 && r.height()>0)
{
if(WIDGET_PROGRESSBAR==w && STRIPE_NONE!=opts.stripedProgress)
@@ -8717,6 +8736,9 @@
if(!sunken)
if(plastikMouseOver && !sunken)
{
+ p->save();
+ p->setClipPath(buildPath(br.adjusted(0, 0, 0, -1), w, round,
+ getRadius(&opts, br.width()-2, br.height()-2, w, RADIUS_INTERNAL)));
if(WIDGET_SB_SLIDER==w)
{
int len(QTC_SB_SLIDER_MO_LEN(horiz ? r.width() : r.height())+1),
@@ -8770,6 +8792,7 @@
}
}
}
+ p->restore();
}
}
@@ -9083,7 +9106,7 @@
bool enabled(state&State_Enabled),
entry(WIDGET_ENTRY==w || (WIDGET_SCROLLVIEW==w && opts.highlightScrollViews)),
hasFocus(enabled && entry && state&State_HasFocus),
- hasMouseOver(enabled && WIDGET_ENTRY==w && state&State_MouseOver),
+ hasMouseOver(enabled && WIDGET_ENTRY==w && state&State_MouseOver && QTC_ENTRY_MO),
window(WIDGET_MDI_WINDOW==w || WIDGET_MDI_WINDOW_TITLE==w);
const QColor *cols(enabled && hasMouseOver && opts.coloredMouseOver && entry
? itsMouseOverCols
@@ -9177,7 +9200,7 @@
botPath;
QColor col(border);
- col.setAlphaF(0.65);
+ col.setAlphaF(QT_LOWER_BORDER_ALPHA);
buildSplitPath(r, w, round, getRadius(&opts, r.width(), r.height(), w, RADIUS_EXTERNAL), topPath, botPath);
p->setPen(enabled ? border : col);
p->drawPath(topPath);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.4/themes/Agua.qtcurve new/QtCurve-KDE4-0.67.5/themes/Agua.qtcurve
--- old/QtCurve-KDE4-0.67.4/themes/Agua.qtcurve 2009-08-06 22:53:06.000000000 +0200
+++ new/QtCurve-KDE4-0.67.5/themes/Agua.qtcurve 2009-08-12 08:18:59.000000000 +0200
@@ -27,5 +27,4 @@
customShades=0
gtkComboMenus=true
doubleGtkComboArrow=true
-sortedLv=true
-stripedProgress=diagonal
\ No newline at end of file
+stripedProgress=diagonal
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org