[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/runtime/kstyles/light
From: Stefan Monov <logixoul () gmail ! com>
Date: 2008-06-21 11:29:29
Message-ID: 1214047769.901243.32734.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 822759 by logixoul:
some porting... still doesn't compile
M +1 -15 CMakeLists.txt
M +13 -19 lightstyle-v2.cpp
M +13 -23 lightstyle-v2.h
M +24 -24 lightstyle-v3.cpp
M +13 -19 lightstyle-v3.h
--- trunk/KDE/kdebase/runtime/kstyles/light/CMakeLists.txt #822758:822759
@@ -1,27 +1,13 @@
project(kstyle-light)
-add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_PLUGIN -DQT3_SUPPORT )
-
-########### next target ###############
-
set(light_PART_SRCS
light.cpp
lightstyle-v2.cpp
lightstyle-v3.cpp
)
-
kde4_add_plugin(light ${light_PART_SRCS})
-
target_link_libraries(light ${KDE4_KDECORE_LIBS} )
-
install(TARGETS light DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles )
-
-
-########### install files ###############
-
-
-
-
-
--- trunk/KDE/kdebase/runtime/kstyles/light/lightstyle-v2.cpp #822758:822759
@@ -25,7 +25,7 @@
#include "QtGui/QMenuBar"
#include "QtGui/QApplication"
#include "QtGui/QPainter"
-#include "QtGui/QColorGroup"
+#include "QtGui/QPalette"
#include "QtGui/QPushButton"
#include "QtGui/qdrawutil.h"
#include "QtGui/QProgressBar"
@@ -88,7 +88,7 @@
KStyle::polishPopupMenu(menu);
}
-static void drawLightBevel(QPainter *p, const QRect &r, const QColorGroup &cg,
+static void drawLightBevel(QPainter *p, const QRect &r, const QPalette &cg,
QStyle::State flags, const QBrush *fill = 0)
{
QRect br = r;
@@ -130,12 +130,11 @@
}
void LightStyleV2::drawPrimitive( PrimitiveElement pe,
+ const QStyleOption *option,
QPainter *p,
- const QRect &r,
- const QColorGroup &cg,
- SFlags flags,
- const QStyleOption &data ) const
+ const QWidget *widget ) const
{
+ QRect r = option->rect();
switch (pe) {
case PE_HeaderSection:
{
@@ -613,13 +612,11 @@
}
void LightStyleV2::drawControl( ControlElement control,
+ const QStyleOption *option,
QPainter *p,
- const QWidget *widget,
- const QRect &r,
- const QColorGroup &cg,
- SFlags flags,
- const QStyleOption &data ) const
+ const QWidget *widget ) const
{
+ QRect r = option->rect();
switch (control) {
case CE_TabBarTab:
{
@@ -987,11 +984,11 @@
}
}
-QRect LightStyleV2::subRect(SubRect subrect, const QWidget *widget) const
+QRect LightStyleV2::subElementRect(SubElement subelement, const QWidget *widget) \
const {
QRect rect, wrect(widget->rect());
- switch (subrect) {
+ switch (subelement) {
case SR_PushButtonFocusRect:
{
const QPushButton *button = (const QPushButton *) widget;
@@ -1009,7 +1006,7 @@
}
default:
- rect = QCommonStyle::subRect(subrect, widget);
+ rect = QCommonStyle::subElementRect(subelement, widget);
}
return rect;
@@ -1018,9 +1015,6 @@
void LightStyleV2::drawComplexControl( ComplexControl control,
QPainter* p,
const QWidget* widget,
- const QRect& r,
- const QColorGroup& cg,
- SFlags flags,
SCFlags controls,
SCFlags active,
const QStyleOption &data ) const
@@ -1618,10 +1612,10 @@
return ret;
}
-QPixmap LightStyleV2::stylePixmap( StylePixmap stylepixmap,
+QPixmap LightStyleV2::standardPixmap( StylePixmap standardpixmap,
const QWidget *widget,
const QStyleOption &data ) const
{
- return singleton->basestyle->stylePixmap( stylepixmap, widget, data );
+ return singleton->basestyle->standardPixmap( stylepixmap, widget, data );
}
#include "lightstyle-v2.moc"
--- trunk/KDE/kdebase/runtime/kstyles/light/lightstyle-v2.h #822758:822759
@@ -25,8 +25,9 @@
#include <kstyle.h>
+#include <Q3PopupMenu>
+#include <QtGui/QStyleOption>
-
#ifdef QT_PLUGIN
# define Q_EXPORT_STYLE_LIGHT_V2
#else
@@ -44,41 +45,30 @@
void polishPopupMenu( Q3PopupMenu * );
- void drawPrimitive(PrimitiveElement, QPainter *, const QRect &, const \
QColorGroup &,
- SFlags = Style_Default,
- const QStyleOption & = QStyleOption::Default ) const;
+ void drawPrimitive(PrimitiveElement, const QStyleOption *, QPainter *, const \
QWidget * widget = 0 ) const;
- void drawControl(ControlElement, QPainter *, const QWidget *, const QRect &,
- const QColorGroup &, SFlags = Style_Default,
- const QStyleOption & = QStyleOption::Default ) const;
+ void drawControl(ControlElement, const QStyleOption *, QPainter *, const QWidget \
* widget = 0 ) const;
void drawControlMask(ControlElement, QPainter *, const QWidget *, const QRect &,
- const QStyleOption & = QStyleOption::Default) const;
+ const QStyleOption & = QStyleOption::SO_Default) const;
- QRect subRect(SubRect, const QWidget *) const;
+ QRect subElementRect(SubElement, const QStyleOption * option, const QWidget *) \
const;
- void drawComplexControl(ComplexControl, QPainter *, const QWidget *, const QRect \
&,
- const QColorGroup &, SFlags = Style_Default,
- SCFlags = SC_All, SCFlags = SC_None,
- const QStyleOption & = QStyleOption::Default ) const;
+ void drawComplexControl(ComplexControl, QPainter *, const QWidget *,
+ SCFlags = SC_All, SCFlags = SC_None ) const;
- QRect querySubControlMetrics(ComplexControl, const QWidget *, SubControl,
- const QStyleOption & = QStyleOption::Default ) const;
+ QRect querySubControlMetrics(ComplexControl, const QWidget *, SubControl ) \
const;
- SubControl querySubControl(ComplexControl, const QWidget *, const QPoint &,
- const QStyleOption &data = QStyleOption::Default ) const;
+ SubControl querySubControl(ComplexControl, const QWidget *, const QPoint & ) \
const;
int pixelMetric(PixelMetric, const QWidget * = 0 ) const;
- QSize sizeFromContents(ContentsType, const QWidget *, const QSize &,
- const QStyleOption & = QStyleOption::Default ) const;
+ QSize sizeFromContents(ContentsType, const QWidget *, const QSize & ) const;
int styleHint(StyleHint, const QWidget * = 0,
- const QStyleOption & = QStyleOption::Default,
QStyleHintReturn * = 0 ) const;
- QPixmap stylePixmap( StylePixmap stylepixmap,
- const QWidget* widget = 0,
- const QStyleOption& = QStyleOption::Default ) const;
+ QPixmap standardPixmap( StandardPixmap standardpixmap,
+ const QWidget* widget = 0 ) const;
};
--- trunk/KDE/kdebase/runtime/kstyles/light/lightstyle-v3.cpp #822758:822759
@@ -22,23 +22,23 @@
#include "lightstyle-v3.h"
-#include "QtGui/QMenuBar"
-#include "QtGui/QApplication"
-#include "QtGui/QCheckBox"
-#include "QtGui/QPainter"
-#include "QtGui/QColorGroup"
-#include "QtGui/QPushButton"
-#include "QtGui/qdrawutil.h"
-#include "QtGui/QProgressBar"
-#include "QtGui/QScrollBar"
-#include "QtGui/QTabBar"
-#include "QtCore/QPointer"
-#include "QtGui/QLayout"
-#include "QtGui/QLineEdit"
-#include "QtGui/QImage"
-#include "QtGui/QComboBox"
-#include "QtGui/QSlider"
-#include "QtGui/QStyleFactory"
+#include <QtGui/QMenuBar>
+#include <QtGui/QApplication>
+#include <QtGui/QCheckBox>
+#include <QtGui/QPainter>
+#include <QtGui/QColorGroup>
+#include <QtGui/QPushButton>
+#include <QtGui/qdrawutil.h>
+#include <QtGui/QProgressBar>
+#include <QtGui/QScrollBar>
+#include <QtGui/QTabBar>
+#include <QtCore/QPointer>
+#include <QtGui/QLayout>
+#include <QtGui/QLineEdit>
+#include <QtGui/QImage>
+#include <QtGui/QComboBox>
+#include <QtGui/QSlider>
+#include <QtGui/QStyleFactory>
#include <Qt3Support/Q3PointArray>
@@ -1105,14 +1105,14 @@
}
}
-QRect LightStyleV3::subRect(SubRect subrect, const QWidget *widget) const
+QRect LightStyleV3::subElementRect(SubElement subelement, const QWidget *widget) \
const {
QRect rect;
- switch (subrect) {
+ switch (subelement) {
case SR_PushButtonFocusRect:
{
- rect = QCommonStyle::subRect( SR_PushButtonContents, widget );
+ rect = QCommonStyle::subElementRect( SR_PushButtonContents, widget );
int bm = pixelMetric( PM_ButtonMargin, widget ), hbm = bm / 2;
rect.adjust( hbm, hbm, -hbm, -hbm );
break;
@@ -1120,7 +1120,7 @@
case SR_ComboBoxFocusRect:
{
- rect = QCommonStyle::subRect( SR_ComboBoxFocusRect, widget );
+ rect = QCommonStyle::subElementRect( SR_ComboBoxFocusRect, widget );
rect.adjust( -1, -1, 1, 1 );
break;
}
@@ -1143,7 +1143,7 @@
default:
- rect = QCommonStyle::subRect(subrect, widget);
+ rect = QCommonStyle::subElementRect(subelement, widget);
break;
}
@@ -1853,10 +1853,10 @@
return ret;
}
-QPixmap LightStyleV3::stylePixmap( StylePixmap stylepixmap,
+QPixmap LightStyleV3::standardPixmap( StandardPixmap standardpixmap,
const QWidget *widget,
const QStyleOption &data ) const
{
- return basestyle->stylePixmap( stylepixmap, widget, data );
+ return basestyle->standardPixmap( standardpixmap, widget, data );
}
#include "lightstyle-v3.moc"
--- trunk/KDE/kdebase/runtime/kstyles/light/lightstyle-v3.h #822758:822759
@@ -28,7 +28,8 @@
#include <qcommonstyle.h>
#endif // QT_H
-#include "kstyle.h"
+#include <kstyle.h>
+#include <QtGui/QStyleOption>
#ifdef QT_PLUGIN
# define Q_EXPORT_STYLE_LIGHT_V3
@@ -48,41 +49,34 @@
void polishPopupMenu( Q3PopupMenu * );
- void drawPrimitive(PrimitiveElement, QPainter *, const QRect &, const \
QColorGroup &,
- SFlags = Style_Default,
- const QStyleOption & = QStyleOption::Default ) const;
+ void drawPrimitive(PrimitiveElement, QPainter *, const QRect & ) const;
- void drawControl(ControlElement, QPainter *, const QWidget *, const QRect &,
- const QColorGroup &, SFlags = Style_Default,
- const QStyleOption & = QStyleOption::Default ) const;
- void drawControlMask(ControlElement, QPainter *, const QWidget *, const QRect &,
- const QStyleOption & = QStyleOption::Default) const;
+ void drawControl(ControlElement, QPainter *, const QWidget * ) const;
+ void drawControlMask(ControlElement, QPainter *, const QWidget * ) const;
- QRect subRect(SubRect, const QWidget *) const;
+ QRect subElementRect(SubElement, const QWidget *) const;
void drawComplexControl(ComplexControl, QPainter *, const QWidget *, const QRect \
&,
- const QColorGroup &, SFlags = Style_Default,
- SCFlags = SC_All, SCFlags = SC_None,
- const QStyleOption & = QStyleOption::Default ) const;
+ SCFlags = SC_All, SCFlags = SC_None ) const;
QRect querySubControlMetrics(ComplexControl, const QWidget *, SubControl,
- const QStyleOption & = QStyleOption::Default ) const;
+ const QStyleOption & = QStyleOption::SO_Default ) const;
SubControl querySubControl(ComplexControl, const QWidget *, const QPoint &,
- const QStyleOption &data = QStyleOption::Default ) const;
+ const QStyleOption &data = QStyleOption::SO_Default ) const;
int pixelMetric(PixelMetric, const QWidget * = 0 ) const;
QSize sizeFromContents(ContentsType, const QWidget *, const QSize &,
- const QStyleOption & = QStyleOption::Default ) const;
+ const QStyleOption & = QStyleOption::SO_Default ) const;
int styleHint(StyleHint, const QWidget * = 0,
- const QStyleOption & = QStyleOption::Default,
+ const QStyleOption & = QStyleOption::SO_Default,
QStyleHintReturn * = 0 ) const;
- QPixmap stylePixmap( StylePixmap stylepixmap,
+ QPixmap standardPixmap( StandardPixmap standardpixmap,
const QWidget* widget = 0,
- const QStyleOption& = QStyleOption::Default ) const;
+ const QStyleOption& = QStyleOption::SO_Default ) const;
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic