Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at 2012-07-30 17:13:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old) and /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-kde4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes 2012-05-03 11:00:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes 2012-07-30 17:13:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 25 03:55:36 UTC 2012 - [email protected] + +- Update to version 1.8.13 + * Fix KDE4.9 build - window grouping disabled. + +------------------------------------------------------------------- Old: ---- QtCurve-KDE4-1.8.12.tar.bz2 New: ---- QtCurve-KDE4-1.8.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.q9LI0k/_old 2012-07-30 17:13:36.000000000 +0200 +++ /var/tmp/diff_new_pack.q9LI0k/_new 2012-07-30 17:13:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: qtcurve-kde4 -Version: 1.8.12 +Version: 1.8.13 Release: 0 Summary: QtCurve style for KDE 4 License: GPL-2.0+ ++++++ QtCurve-KDE4-1.8.12.tar.bz2 -> QtCurve-KDE4-1.8.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.12/CMakeLists.txt new/QtCurve-KDE4-1.8.13/CMakeLists.txt --- old/QtCurve-KDE4-1.8.12/CMakeLists.txt 2012-04-24 23:20:01.000000000 +0200 +++ new/QtCurve-KDE4-1.8.13/CMakeLists.txt 2012-07-24 18:06:39.000000000 +0200 @@ -8,7 +8,7 @@ set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "8") -set(CPACK_PACKAGE_VERSION_PATCH "12") +set(CPACK_PACKAGE_VERSION_PATCH "13") set(CPACK_PACKAGE_CONTACT "Craig Drummond <[email protected]>") 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-1.8.12/ChangeLog new/QtCurve-KDE4-1.8.13/ChangeLog --- old/QtCurve-KDE4-1.8.12/ChangeLog 2012-04-24 23:20:01.000000000 +0200 +++ new/QtCurve-KDE4-1.8.13/ChangeLog 2012-07-24 18:06:39.000000000 +0200 @@ -1,3 +1,7 @@ +1.8.13 +------ +1. Fix KDE4.9 build - window grouping disabled. + 1.8.12 ------ 1. Dont setup KDE4 fonts/colours in constructor - seems to mess things up when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.12/kwin/qtcurveclient.cpp new/QtCurve-KDE4-1.8.13/kwin/qtcurveclient.cpp --- old/QtCurve-KDE4-1.8.12/kwin/qtcurveclient.cpp 2012-04-24 23:20:01.000000000 +0200 +++ new/QtCurve-KDE4-1.8.13/kwin/qtcurveclient.cpp 2012-07-24 18:06:39.000000000 +0200 @@ -57,7 +57,7 @@ #include "../style/qtcurve.h" #include <QX11Info> -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) #include <KDE/KIconLoader> #endif @@ -72,7 +72,7 @@ static const int constTitlePad=4; -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) #define TAB_CLOSE_ICON_SIZE tabCloseIconSize(layoutMetric(LM_TitleHeight)) static const int constInvalidTab=-1; @@ -231,7 +231,7 @@ painter->drawLine(start, end); } -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) static void paintTabSeparator(QPainter *painter, const QRect &r) { drawFadedLine(painter, r, Qt::white); @@ -270,14 +270,14 @@ : KCommonDecorationUnstable(bridge, factory) #else : KCommonDecoration(bridge, factory) -#endif +#endif , itsResizeGrip(0L) , itsTitleFont(QFont()) , itsMenuBarSize(-1) , itsToggleMenuBarButton(0L) , itsToggleStatusBarButton(0L) // , itsHover(false) -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) , itsClickInProgress(false) , itsDragInProgress(false) , itsMouseButton(Qt::NoButton) @@ -472,7 +472,7 @@ widget()->setAttribute(Qt::WA_OpaquePaintEvent, true); widget()->setAttribute(Qt::WA_NoSystemBackground); -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) widget()->setAcceptDrops(true); #endif @@ -557,7 +557,7 @@ // In which case we still have a custom background to draw. bool customBgnd=APPEARANCE_FLAT!=bgndAppearance, customShadows= -#if KDE_IS_VERSION(4, 3, 0) +#if KDE_IS_VERSION(4, 3, 0) Handler()->customShadows() #else false @@ -568,7 +568,7 @@ if(!preview && compositing && 100==opacity) opacity=getOpacityProperty(windowId()); - + #if KDE_IS_VERSION(4, 3, 0) if(customShadows) { @@ -582,7 +582,7 @@ painter.save(); painter.setClipRegion(QRegion(r).subtract(getMask(round, r.adjusted(shadowSize, shadowSize, -shadowSize, -shadowSize))), Qt::IntersectClip); } - + if(!isMaximized()) tileSet->render(r.adjusted(5, 5, -5, -5), &painter, TileSet::Ring); else if(isShade()) @@ -610,9 +610,9 @@ wc==QLatin1String("W Mail Thunderbird messageWindow") || wc==QLatin1String("D Calendar Thunderbird EventDialog") || wc==QLatin1String("W Msgcompose Thunderbird Msgcompose") || - wc==QLatin1String("D Msgcompose Thunderbird Msgcompose")) + wc==QLatin1String("D Msgcompose Thunderbird Msgcompose")) itsMenuBarSize=QFontMetrics(QApplication::font()).height()+8; - + else if( #if 0 // Currently LibreOffice does not seem to pain menubar backgrounds for KDE - so disable check here... wc.startsWith(QLatin1String("W VCLSalFrame libreoffice-")) || @@ -666,10 +666,10 @@ // Fill titlebar and border backgrounds... // QPainterPath fillPath(maximized || round<=ROUND_SLIGHT - ? QPainterPath() - : createPath(QRectF(fillRect), + ? QPainterPath() + : createPath(QRectF(fillRect), APPEARANCE_NONE==Handler()->wStyle()->pixelMetric((QStyle::PixelMetric)QtC_TitleBarApp, - &opt, NULL) ? 6.0 : 8.0, + &opt, NULL) ? 6.0 : 8.0, roundBottom ? 6.0 : 1.0)); @@ -717,7 +717,7 @@ // // Titlebar and border backgrounds filled. // - + if(maximized) r.adjust(-3, -border, 3, 0); opt.palette.setColor(QPalette::Button, col); @@ -782,7 +782,7 @@ opt.rect=QRect(r.x(), r.y(), r.width(), titleBarHeight); opt.titleBarState=(active ? QStyle::State_Active : QStyle::State_None)|QtC_StateKWin; - + if(!preview && !isShade() && blend && -1!=itsMenuBarSize) opt.rect.adjust(0, 0, 0, itsMenuBarSize); @@ -809,7 +809,7 @@ else #endif Handler()->wStyle()->drawComplexControl(QStyle::CC_TitleBar, &opt, &painter, widget()); - + if(outerBorder && innerBorder) { QStyleOptionFrame frameOpt; @@ -839,20 +839,20 @@ bool menuIcon=TITLEBAR_ICON_MENU_BUTTON==Handler()->wStyle()->pixelMetric((QStyle::PixelMetric)QtC_TitleBarIcon, 0L, 0L), menuOnlyLeft=menuIcon && onlyMenuIcon(true), menuOnlyRight=menuIcon && !menuOnlyLeft && onlyMenuIcon(false); - + if(!menuOnlyLeft && buttonsLeftWidth()>(titleBarHeight-2*hOffset)) drawSunkenBevel(&painter, QRect(r.left()+hOffset+posAdjust+edgePad+(compositing ? 0 : -1), r.top()+vOffset+edgePad, - buttonsLeftWidth()-hOffset+(compositing ? 0 : 2), + buttonsLeftWidth()-hOffset+(compositing ? 0 : 2), titleBarHeight-2*(vOffset+edgePad)), col, buttonFlags&TITLEBAR_BUTTON_ROUND, round); if(!menuOnlyRight && buttonsRightWidth()>(titleBarHeight-2*hOffset)) drawSunkenBevel(&painter, QRect(r.right()-(buttonsRightWidth()+posAdjust+edgePad), r.top()+vOffset+edgePad, buttonsRightWidth(), titleBarHeight-2*(vOffset+edgePad)), col, buttonFlags&TITLEBAR_BUTTON_ROUND, round); } - + bool showIcon=TITLEBAR_ICON_NEXT_TO_TITLE==Handler()->wStyle()->pixelMetric((QStyle::PixelMetric)QtC_TitleBarIcon, 0L, 0L); int iconSize=showIcon ? Handler()->wStyle()->pixelMetric(QStyle::PM_SmallIconSize) : 0; -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) QList<ClientGroupItem> tabList = clientGroupItems(); const int tabCount = tabList.count(); @@ -922,7 +922,7 @@ rectX2-(titleEdgeRight+rectX+titleEdgeLeft), itsCaptionRect.height()), itsCaption, showIcon ? icon().pixmap(iconSize) : QPixmap(), shadowSize); -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) if(constAddToEmpty==itsTargetTab) { @@ -947,7 +947,7 @@ // if(itsHover) { if( -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) 1==tabCount && #endif active && (itsToggleMenuBarButton||itsToggleStatusBarButton)) @@ -1011,7 +1011,7 @@ color.setAlphaF(0.5); drawFadedLine(&painter, r, color, true, align&(Qt::AlignHCenter|Qt::AlignRight), align&(Qt::AlignHCenter|Qt::AlignLeft)); } - + painter.end(); } @@ -1119,7 +1119,7 @@ painter->setPen(blendColors(WINDOW_SHADOW_COLOR(effect), bgnd, WINDOW_TEXT_SHADOW_ALPHA(effect))); painter->drawText(EFFECT_SHADOW==effect ? textRect.adjusted(1, 1, 1, 1) - : textRect.adjusted(0, 1, 0, 1), + : textRect.adjusted(0, 1, 0, 1), alignment, str); if (!isActive() && DARK_WINDOW_TEXT(color)) @@ -1162,7 +1162,7 @@ ? widget()->rect().adjusted(layoutMetric(LM_OuterPaddingLeft), layoutMetric(LM_OuterPaddingTop), -layoutMetric(LM_OuterPaddingRight), COMPOSITING_ENABLED ? 0 : -layoutMetric(LM_OuterPaddingBottom)) - : + : #endif widget()->rect()); @@ -1321,8 +1321,8 @@ // } // return true; // } - -#if KDE_IS_VERSION(4, 3, 85) + +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) if(Handler()->grouping()) { if(QtCurveButton *btn = dynamic_cast<QtCurveButton *>(o)) @@ -1360,7 +1360,7 @@ return KCommonDecoration::eventFilter(o, e); } -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) bool QtCurveClient::mouseButtonPressEvent(QMouseEvent *e) { itsClickPoint = widget()->mapToParent(e->pos()); @@ -1406,10 +1406,10 @@ { itsClickInProgress = false; itsDragInProgress = true; - + QDrag *drag = new QDrag(widget()); QMimeData *groupData = new QMimeData(); - + groupData->setData(clientGroupItemDragMimeType(), QString().setNum(itemId(item)).toAscii()); drag->setMimeData(groupData); @@ -1581,7 +1581,7 @@ void QtCurveClient::reset(unsigned long changed) { -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) if(changed & SettingCompositing) { updateWindowShape(); @@ -1594,7 +1594,7 @@ for(int i=0; i<constNumButtonStates; ++i) itsButtonBackground[i].pix=QPixmap(); } - + if (changed&SettingBorder) { if (maximizeMode()==MaximizeFull) @@ -1708,7 +1708,7 @@ if(itsWindowClass.isEmpty()) { KWindowInfo info(windowId(), NET::WMWindowType, NET::WM2WindowClass|NET::WM2WindowRole); - + switch(info.windowType(NET::AllTypesMask)) { case NET::Dialog: @@ -1761,7 +1761,7 @@ { sendToggleToApp(false); } - + QtCurveToggleButton * QtCurveClient::createToggleButton(bool menubar) { QtCurveToggleButton *button = new QtCurveToggleButton(menubar, this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.12/kwin/qtcurveclient.h new/QtCurve-KDE4-1.8.13/kwin/qtcurveclient.h --- old/QtCurve-KDE4-1.8.12/kwin/qtcurveclient.h 2012-04-24 23:20:01.000000000 +0200 +++ new/QtCurve-KDE4-1.8.13/kwin/qtcurveclient.h 2012-07-24 18:06:39.000000000 +0200 @@ -53,7 +53,7 @@ public KCommonDecorationUnstable #else public KCommonDecoration -#endif +#endif { Q_OBJECT @@ -95,7 +95,7 @@ private: -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) bool mouseSingleClickEvent(QMouseEvent *e); bool mouseMoveEvent(QMouseEvent *e); bool mouseButtonPressEvent(QMouseEvent *e); @@ -134,7 +134,7 @@ QtCurveToggleButton *itsToggleMenuBarButton, *itsToggleStatusBarButton; // bool itsHover; -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) QList<QtCurveButton *> itsCloseButtons; bool itsClickInProgress, itsDragInProgress; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.12/kwin/qtcurvehandler.cpp new/QtCurve-KDE4-1.8.13/kwin/qtcurvehandler.cpp --- old/QtCurve-KDE4-1.8.12/kwin/qtcurvehandler.cpp 2012-04-24 23:20:01.000000000 +0200 +++ new/QtCurve-KDE4-1.8.13/kwin/qtcurvehandler.cpp 2012-07-24 18:06:39.000000000 +0200 @@ -145,7 +145,7 @@ setStyle(); styleChanged=true; } - + // we assume the active font to be the same as the inactive font since the control // center doesn't offer different settings anyways. itsTitleFont = KDecoration::options()->font(true, false); // not small @@ -254,7 +254,7 @@ case AbilityProvidesShadow: return customShadows(); #endif -#if KDE_IS_VERSION(4, 3, 85) +#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80) case AbilityClientGrouping: return grouping(); #endif @@ -302,7 +302,7 @@ borderHack=false; } else if(compositingToggled && !itsConfig.outerBorder() && - (itsConfig.borderSize()<QtCurveConfig::BORDER_TINY || + (itsConfig.borderSize()<QtCurveConfig::BORDER_TINY || (wStyle()->pixelMetric((QStyle::PixelMetric)QtC_WindowBorder, 0L, 0L)&WINDOW_BORDER_COLOR_TITLEBAR_ONLY))) { QDBusConnection::sessionBus().send(QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig")); @@ -405,7 +405,7 @@ else if(QtCurveConfig::BORDER_TINY==itsConfig.borderSize() && itsConfig.roundBottom() && itsConfig.outerBorder()) return itsBorderSize+1; } - return itsBorderSize; + return itsBorderSize; } void QtCurveHandler::borderSizeChanged() @@ -454,7 +454,7 @@ { itsDBus->emitSbToggle(xid); } - + int QtCurveHandler::borderEdgeSize() const { return itsConfig.edgePad()+ @@ -476,7 +476,7 @@ itsLastStatusXid=0; itsClients.removeAll(c); } - + // make the handler accessible to other classes... static QtCurveHandler *handler = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.12/kwinconfig/qtcurvekwinconfig.cpp new/QtCurve-KDE4-1.8.13/kwinconfig/qtcurvekwinconfig.cpp --- old/QtCurve-KDE4-1.8.12/kwinconfig/qtcurvekwinconfig.cpp 2012-04-24 23:20:01.000000000 +0200 +++ new/QtCurve-KDE4-1.8.13/kwinconfig/qtcurvekwinconfig.cpp 2012-07-24 18:06:39.000000000 +0200 @@ -21,6 +21,7 @@ #include <kconfig.h> #include <klocale.h> #include <kglobal.h> +#include <kdeversion.h> #include <QtDBus/QDBusConnection> #include "config.h" #include "common.h" @@ -68,7 +69,7 @@ KGlobal::locale()->insertCatalog("qtcurve"); KGlobal::locale()->insertCatalog("kwin_clients"); - + if(!QDBusConnection::sessionBus().registerService(constDBusService)) { itsOk=false; @@ -126,7 +127,12 @@ KWinQtCurve::QtCurveShadowConfiguration::MAX_OFFSET); setShadows(); +#if KDE_IS_VERSION(4, 8, 80) + grouping->setVisible(false); + groupingLabel->setVisible(false); +#else connect(grouping, SIGNAL(toggled(bool)), this, SIGNAL(changed())); +#endif connect(activeOpacity, SIGNAL(valueChanged(int)), this, SIGNAL(changed())); connect(inactiveOpacity, SIGNAL(valueChanged(int)), this, SIGNAL(changed())); connect(opaqueBorder, SIGNAL(toggled(bool)), this, SIGNAL(changed())); @@ -173,7 +179,7 @@ return; KConfig *cfg=c ? c : new KConfig("kwinqtcurverc"); - + KWinQtCurve::QtCurveConfig config; config.setBorderSize((KWinQtCurve::QtCurveConfig::Size)borderSize->currentIndex()); @@ -210,7 +216,9 @@ } itsActiveShadows.save(cfg); itsInactiveShadows.save(cfg); +#if !KDE_IS_VERSION(4, 8, 80) config.setGrouping(grouping->isChecked()); +#endif config.setOpacity(activeOpacity->value(), true); config.setOpacity(inactiveOpacity->value(), false); config.setOpaqueBorder(opaqueBorder->isChecked()); @@ -293,7 +301,9 @@ titleBarPad->setValue(cfg.titleBarPad()); edgePad->setValue(cfg.edgePad()); useShadows->setChecked(cfg.customShadows()); +#if !KDE_IS_VERSION(4, 8, 80) grouping->setChecked(cfg.grouping()); +#endif activeOpacity->setValue(cfg.opacity(true)); inactiveOpacity->setValue(cfg.opacity(false)); opaqueBorder->setChecked(cfg.opaqueBorder()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.12/kwinconfig/qtcurvekwinconfigwidget.ui new/QtCurve-KDE4-1.8.13/kwinconfig/qtcurvekwinconfigwidget.ui --- old/QtCurve-KDE4-1.8.12/kwinconfig/qtcurvekwinconfigwidget.ui 2012-04-24 23:20:01.000000000 +0200 +++ new/QtCurve-KDE4-1.8.13/kwinconfig/qtcurvekwinconfigwidget.ui 2012-07-24 18:06:39.000000000 +0200 @@ -105,7 +105,7 @@ </widget> </item> <item row="5" column="0"> - <widget class="QLabel" name="label_2x"> + <widget class="QLabel" name="groupingLabel"> <property name="text"> <string>Window grouping:</string> </property> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
