Port to new Style API

I still wonder how it is different from the old approach or where to find the
appropriate docs...

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/3/head
Mavridis Philippe 1 year ago
parent fb37c54a9e
commit 1e1d677040
No known key found for this signature in database
GPG Key ID: 93F66F98F906147D

@ -27,5 +27,9 @@ tde_add_kpart(tdestyle_polyester_config
configdialog.ui configdialog.ui
polyesterconf.cpp polyesterconf.cpp
LINK
tdecore-shared
tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -46,7 +46,7 @@ DEALINGS IN THE SOFTWARE.
extern "C" extern "C"
{ {
KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent) KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
{ {
TDEGlobal::locale()->insertCatalogue("polyester"); TDEGlobal::locale()->insertCatalogue("polyester");
return new PolyesterStyleConfig(parent); return new PolyesterStyleConfig(parent);
@ -352,11 +352,11 @@ TQString PolyesterStyleConfig::buttonType( int listnr )
int PolyesterStyleConfig::buttonItem( TQString kBType ) int PolyesterStyleConfig::buttonItem( TQString kBType )
{ {
if( !strcmp(kBType,"gradients") ) if( kBType == "gradients" )
return 1; return 1;
else if( !strcmp(kBType,"reverseGradients") ) else if( kBType == "reverseGradients")
return 2; return 2;
else if( !strcmp(kBType,"flat") ) else if( kBType == "flat")
return 3; return 3;
else else
return 0; return 0;
@ -379,11 +379,11 @@ TQString PolyesterStyleConfig::scrollBarType( int listnr )
int PolyesterStyleConfig::scrollBarItem( TQString kSType ) int PolyesterStyleConfig::scrollBarItem( TQString kSType )
{ {
if( !strcmp(kSType,"PlatinumStyleScrollBar") ) if( kSType == "PlatinumStyleScrollBar")
return 1; return 1;
else if( !strcmp(kSType,"NextStyleScrollBar") ) else if( kSType == "NextStyleScrollBar")
return 2; return 2;
else if( !strcmp(kSType,"WindowsStyleScrollBar") ) else if( kSType == "WindowsStyleScrollBar")
return 3; return 3;
else else
return 0; return 0;

File diff suppressed because it is too large Load Diff

@ -70,20 +70,24 @@ public:
PolyesterStyle(); PolyesterStyle();
virtual ~PolyesterStyle(); virtual ~PolyesterStyle();
void polish(TQApplication* app ); void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *);
void polish(TQWidget* widget ); void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void unPolish(TQWidget* widget ); void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void drawTDEStylePrimitive(TDEStylePrimitive kpe, void drawTDEStylePrimitive(TDEStylePrimitive kpe,
TQPainter* p, TQPainter* p,
const TQWidget* widget, const TQStyleControlElementData &ceData,
const TQRect &r, ControlElementFlags elementFlags,
const TQColorGroup &cg, const TQRect &r,
SFlags flags = Style_Default, const TQColorGroup &cg,
const TQStyleOption& = TQStyleOption::Default ) const; SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = nullptr) const;
void drawPrimitive(PrimitiveElement pe, void drawPrimitive(PrimitiveElement pe,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
SFlags flags = Style_Default, SFlags flags = Style_Default,
@ -91,51 +95,77 @@ public:
void drawControl(ControlElement element, void drawControl(ControlElement element,
TQPainter *p, TQPainter *p,
const TQWidget *widget, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
SFlags flags = Style_Default, SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = nullptr) const;
void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; void drawControlMask(ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQStyleOption & = TQStyleOption::Default,
const TQWidget *widget = nullptr) const;
void drawComplexControl(ComplexControl control, void drawComplexControl(ComplexControl control,
TQPainter *p, TQPainter *p,
const TQWidget *widget, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
SFlags flags = Style_Default, SFlags flags = Style_Default,
SCFlags controls = SC_All, SCFlags controls = SC_All,
SCFlags active = SC_None, SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = nullptr) const;
int pixelMetric(PixelMetric m, int pixelMetric(PixelMetric m,
const TQWidget *widget = 0 ) const; const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQWidget *widget = nullptr) const;
int kPixelMetric(TDEStylePixelMetric kpm, const TQWidget *widget) const; int kPixelMetric(TDEStylePixelMetric kpm,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQWidget *widget) const;
TQRect subRect(SubRect r, TQRect subRect(SubRect r,
const TQWidget *widget ) const; const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQWidget *widget = nullptr) const;
TQRect querySubControlMetrics(ComplexControl control, TQRect querySubControlMetrics(ComplexControl control,
const TQWidget *widget, const TQStyleControlElementData &ceData,
SubControl subcontrol, ControlElementFlags elementFlags,
const TQStyleOption &opt = TQStyleOption::Default ) const; SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default,
const TQWidget *widget = nullptr) const;
void drawComplexControlMask(TQStyle::ComplexControl c, void drawComplexControlMask(TQStyle::ComplexControl c,
TQPainter *p, TQPainter *p,
const TQWidget *w, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQStyleOption &o=TQStyleOption::Default) const; const TQStyleOption &o=TQStyleOption::Default,
const TQWidget *widget = nullptr) const;
TQSize sizeFromContents(TQStyle::ContentsType t, TQSize sizeFromContents(TQStyle::ContentsType t,
const TQWidget *w, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &s, const TQSize &s,
const TQStyleOption &o) const; const TQStyleOption &o,
const TQWidget *widget = nullptr) const;
int styleHint(StyleHint, const TQWidget * = 0, int styleHint(StyleHint hint,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption & = TQStyleOption::Default, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0 ) const; TQStyleHintReturn * = nullptr,
const TQWidget *widget = nullptr) const;
protected: protected:
enum TabPosition enum TabPosition

Loading…
Cancel
Save