[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kexi
From: Jaroslaw Staniek <js () iidea ! pl>
Date: 2006-08-23 23:34:21
Message-ID: 1156376061.179947.12722.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 576383 by staniek:
- StyleProxy ported
- warnings--
M +1 -0 kexiutils/kexiutils_export.h
M +1 -1 kexiutils/styleproxy.cpp
M +60 -70 kexiutils/styleproxy.h
M +1 -1 widget/kexidataawareview.cpp
M +2 -2 widget/tableview/kexitableedit.cpp
M +1 -0 widget/tableview/kexitableview.cpp
--- trunk/koffice/kexi/kexiutils/kexiutils_export.h #576382:576383
@@ -20,6 +20,7 @@
#ifndef _KEXIUTILS_EXPORT_H_
#define _KEXIUTILS_EXPORT_H_
+#include <kdelibs_export.h>
#ifdef MAKE_KEXIUTILS_LIB
# define KEXIUTILS_EXPORT KDE_EXPORT
--- trunk/koffice/kexi/kexiutils/styleproxy.cpp #576382:576383
@@ -34,7 +34,7 @@
void StyleProxy::setParentStyle(QStyle* style)
{
- m_style = QStyleFactory::create(style->name());
+ m_style = QStyleFactory::create(style->objectName());
}
QStyle* StyleProxy::parentStyle() const
--- trunk/koffice/kexi/kexiutils/styleproxy.h #576382:576383
@@ -58,114 +58,104 @@
void setParentStyle(QStyle* style);
virtual void polish( QWidget *w ) { m_style->polish(w); }
- virtual void unPolish( QWidget *w ) { m_style->unPolish(w); }
+ virtual void unpolish( QWidget *w ) { m_style->unpolish(w); }
virtual void polish( QApplication *a ) { m_style->polish(a); }
- virtual void unPolish( QApplication *a ) { m_style->unPolish(a); }
+ virtual void unpolish( QApplication *a ) { m_style->unpolish(a); }
virtual void polish( QPalette &p ) { m_style->polish(p); };
- virtual void polishPopupMenu( QPopupMenu* p ) { m_style->polishPopupMenu(p); }
-
- virtual QRect itemRect( QPainter *p, const QRect &r,
- int flags, bool enabled, const QPixmap *pixmap, const QString &text, int len = -1 ) const
+ virtual QRect itemTextRect(const QFontMetrics &fm, const QRect &r,
+ int flags, bool enabled, const QString &text) const
{
- return m_style->itemRect( p, r, flags, enabled, pixmap, text, len );
+ return m_style->itemTextRect(fm, r, flags, enabled, text);
}
- virtual void drawItem( QPainter *p, const QRect &r,
- int flags, const QColorGroup &g, bool enabled, const QPixmap *pixmap, const QString &text,
- int len = -1, const QColor *penColor = 0 ) const
+ virtual QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const
{
- m_style->drawItem( p, r, flags, g, enabled, pixmap, text, len, penColor );
+ return m_style->itemPixmapRect(r, flags, pixmap);
}
- virtual void drawPrimitive( PrimitiveElement pe,
- QPainter *p, const QRect &r, const QColorGroup &cg, SFlags flags = Style_Default,
- const QStyleOption& option = QStyleOption::Default ) const
+ virtual void drawItemText(QPainter *painter, const QRect &rect,
+ int flags, const QPalette &pal, bool enabled,
+ const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const
{
- m_style->drawPrimitive( pe, p, r, cg, flags, option );
+ m_style->drawItemText(painter, rect, flags, pal, enabled, text, textRole);
}
- virtual void drawControl( ControlElement element,
- QPainter *p, const QWidget *widget, const QRect &r, const QColorGroup &cg,
- SFlags how = Style_Default, const QStyleOption& option = QStyleOption::Default ) const
+ virtual void drawItemPixmap(QPainter *painter, const QRect &rect,
+ int alignment, const QPixmap &pixmap) const
{
- m_style->drawControl( element, p, widget, r, cg, how, option );
+ m_style->drawItemPixmap(painter, rect, alignment, pixmap);
}
- virtual void drawControlMask( ControlElement element,
- QPainter *p, const QWidget *widget, const QRect &r,
- const QStyleOption& option = QStyleOption::Default ) const
+ virtual QPalette standardPalette() const { return m_style->standardPalette(); }
+
+ virtual void drawControl(ControlElement element, const QStyleOption *opt,
+ QPainter *p, const QWidget *w = 0) const
{
- m_style->drawControlMask( element, p, widget, r, option );
+ m_style->drawControl(element, opt, p, w);
}
- virtual QRect subRect( SubRect r, const QWidget *widget ) const
+ virtual QRect subElementRect(SubElement subElement, const QStyleOption *option,
+ const QWidget *widget = 0) const
{
- return m_style->subRect( r, widget );
+ return m_style->subElementRect(subElement, option, widget);
}
-
- virtual void drawComplexControl( ComplexControl control,
- QPainter *p, const QWidget *widget, const QRect &r,
- const QColorGroup &cg, SFlags how = Style_Default,
-#ifdef Q_QDOC
- SCFlags sub = SC_All,
-#else
- SCFlags sub = (uint)SC_All,
-#endif
- SCFlags subActive = SC_None, const QStyleOption& option = QStyleOption::Default ) const
+
+ virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
+ QPainter *p, const QWidget *widget = 0) const
{
- drawComplexControl( control, p, widget, r, cg, how, sub, subActive, option );
+ m_style->drawComplexControl(cc, opt, p, widget);
}
-
- virtual void drawComplexControlMask( ComplexControl control,
- QPainter *p, const QWidget *widget, const QRect &r,
- const QStyleOption& option = QStyleOption::Default ) const
+
+ virtual SubControl hitTestComplexControl(ComplexControl cc,
+ const QStyleOptionComplex *opt, const QPoint &pt, const QWidget *widget = 0) const
{
- m_style->drawComplexControlMask( control, p, widget, r, option );
+ return m_style->hitTestComplexControl(cc, opt, pt, widget);
}
-
- virtual QRect querySubControlMetrics( ComplexControl control,
- const QWidget *widget, SubControl sc,
- const QStyleOption& option = QStyleOption::Default ) const
+
+ virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
+ SubControl sc, const QWidget *widget = 0) const
{
- return m_style->querySubControlMetrics( control, widget, sc, option );
+ return m_style->subControlRect(cc, opt, sc, widget);
}
-
- virtual SubControl querySubControl( ComplexControl control,
- const QWidget *widget, const QPoint &pos,
- const QStyleOption& option = QStyleOption::Default ) const
+
+ virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
+ const QWidget *widget = 0) const
{
- return m_style->querySubControl( control, widget, pos, option );
+ return m_style->pixelMetric(metric, option, widget);
}
-
- virtual int pixelMetric( PixelMetric metric,
- const QWidget *widget = 0 ) const
+
+ virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
+ const QSize &contentsSize, const QWidget *w = 0) const
{
- return m_style->pixelMetric( metric, widget );
+ return m_style->sizeFromContents(ct, opt, contentsSize, w);
}
-
- virtual QSize sizeFromContents( ContentsType contents,
- const QWidget *widget, const QSize &contentsSize,
- const QStyleOption& option = QStyleOption::Default ) const
+
+ virtual int styleHint(StyleHint stylehint, const QStyleOption *opt = 0,
+ const QWidget *widget = 0, QStyleHintReturn* returnData = 0) const
{
- return m_style->sizeFromContents( contents, widget, contentsSize, option );
+ return m_style->styleHint(stylehint, opt, widget, returnData);
}
-
- virtual int styleHint( StyleHint stylehint,
- const QWidget *widget = 0, const QStyleOption& option = QStyleOption::Default,
- QStyleHintReturn* returnData = 0 ) const
+
+ virtual QPixmap standardPixmap(StandardPixmap standardPixmap,
+ const QStyleOption *opt = 0, const QWidget *widget = 0) const
{
- return m_style->styleHint( stylehint, widget, option, returnData );
+ return m_style->standardPixmap(standardPixmap, opt, widget);
}
-
- virtual QPixmap stylePixmap( StylePixmap stylepixmap,
- const QWidget *widget = 0,
- const QStyleOption& option = QStyleOption::Default ) const
+
+ QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
+ const QWidget *widget = 0) const
{
- return m_style->stylePixmap( stylepixmap, widget, option );
+ return m_style->standardIcon(standardIcon, option, widget);
}
+
+ virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
+ const QStyleOption *opt) const
+ {
+ return m_style->generatedIconPixmap(iconMode, pixmap, opt);
+ }
protected:
QStyle *m_style;
--- trunk/koffice/kexi/widget/kexidataawareview.cpp #576382:576383
@@ -111,7 +111,7 @@
void KexiDataAwareView::slotUpdateRowActions(int row)
{
const bool ro = m_dataAwareObject->isReadOnly();
- const bool inserting = m_dataAwareObject->isInsertingEnabled();
+// const bool inserting = m_dataAwareObject->isInsertingEnabled();
const bool deleting = m_dataAwareObject->isDeleteEnabled();
const bool emptyInserting = m_dataAwareObject->isEmptyRowInsertingEnabled();
const bool editing = m_dataAwareObject->rowEditing();
--- trunk/koffice/kexi/widget/tableview/kexitableedit.cpp #576382:576383
@@ -36,14 +36,14 @@
//KexiTableEdit::KexiTableEdit(KexiDB::Field &f, QScrollView* parent, const char* name)
KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, Q3ScrollView* parent, const char* name)
: QWidget(parent->viewport(), name)
-, m_column(&column)
+ ,m_column(&column)
// ,m_field(&f)
// ,m_type(f.type()) //copied because the rest of code uses m_type
,m_scrollView(parent)
+ ,m_usesSelectedTextColor(true)
,m_view(0)
// ,m_hasFocusableWidget(true)
// ,m_acceptEditorAfterDeleteContents(false)
- , m_usesSelectedTextColor(true)
{
setPaletteBackgroundColor( palette().color(QPalette::Active, QColorGroup::Base) );
installEventFilter(this);
--- trunk/koffice/kexi/widget/tableview/kexitableview.cpp #576382:576383
@@ -2590,6 +2590,7 @@
void KexiTableView::vScrollBarValueChanged(int v)
{
+ Q_UNUSED(v);
if (!d->vScrollBarValueChanged_enabled)
return;
// kDebug(44021) << "VCHANGED: " << v << " / " << horizontalScrollBar()->maxValue() << endl;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic