Attachment #801 for bug #1109

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1109
Collapse All | Expand All

Lines 1-5 Link Here

(-)a/style/qtcurve.cpp (-84 / +88 lines)
1	/*	1	/*
2	TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com	2	QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
3		3
4	----	4	----
5		5
Lines 125-130 Link Here
125	#include <X11/Xatom.h>	125	#include <X11/Xatom.h>
126	#include "qtc_fixx11h.h"	126	#include "qtc_fixx11h.h"
127		127
		128	#ifndef HAVE_REAL_TQT
		129	#define TQTitleBar QTitleBar
		130	#endif
		131
128	static const Atom constNetMoveResize = XInternAtom(qt_xdisplay(), "_NET_WM_MOVERESIZE", False);	132	static const Atom constNetMoveResize = XInternAtom(qt_xdisplay(), "_NET_WM_MOVERESIZE", False);
129	static const TQWidget * getTopLevel(const TQWidget *widget)	133	static const TQWidget * getTopLevel(const TQWidget *widget)
130	{	134	{
Lines 338-353 Link Here
338	}	342	}
339	#endif	343	#endif
340		344
341	class TQtCurveStylePlugin : public TQStylePlugin	345	class QtCurveStylePlugin : public TQStylePlugin
342	{	346	{
343	public:	347	public:
344		348
345	TQtCurveStylePlugin() : TQStylePlugin() { }	349	QtCurveStylePlugin() : TQStylePlugin() { }
346		350
347	TQStringList keys() const	351	TQStringList keys() const
348	{	352	{
349	TQStringList list;	353	TQStringList list;
350	list << "TQtCurve";	354	list << "QtCurve";
351		355
352	#ifdef QTC_STYLE_SUPPORT	356	#ifdef QTC_STYLE_SUPPORT
353	getStyles(kdeHome(useTQt3Settings()), list);	357	getStyles(kdeHome(useTQt3Settings()), list);
Lines 362-377 Link Here
362	TQStyle * create(const TQString &s)	366	TQStyle * create(const TQString &s)
363	{	367	{
364	return "qtcurve"==s.lower()	368	return "qtcurve"==s.lower()
365	? new TQtCurveStyle	369	? new QtCurveStyle
366	#ifdef QTC_STYLE_SUPPORT	370	#ifdef QTC_STYLE_SUPPORT
367	: 0==s.find(THEME_PREFIX)	371	: 0==s.find(THEME_PREFIX)
368	? new TQtCurveStyle(s)	372	? new QtCurveStyle(s)
369	#endif	373	#endif
370	: 0;	374	: 0;
371	}	375	}
372	};	376	};
373		377
374	TQ_EXPORT_PLUGIN(TQtCurveStylePlugin)	378	TQ_EXPORT_PLUGIN(QtCurveStylePlugin)
375		379
376	#define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp \|\| APP_KPRINTER==itsThemedApp \|\| APP_KDIALOG==itsThemedApp)	380	#define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp \|\| APP_KPRINTER==itsThemedApp \|\| APP_KDIALOG==itsThemedApp)
377		381
Lines 803-811 Link Here
803	}	807	}
804		808
805	#ifdef QTC_STYLE_SUPPORT	809	#ifdef QTC_STYLE_SUPPORT
806	TQtCurveStyle::TQtCurveStyle(const TQString &name)	810	QtCurveStyle::QtCurveStyle(const TQString &name)
807	#else	811	#else
808	TQtCurveStyle::TQtCurveStyle()	812	QtCurveStyle::QtCurveStyle()
809	#endif	813	#endif
810	: BASE_STYLE(AllowMenuTransparency, WindowsStyleScrollBar),	814	: BASE_STYLE(AllowMenuTransparency, WindowsStyleScrollBar),
811	itsSliderCols(0L),	815	itsSliderCols(0L),
Lines 1108-1114 Link Here
1108	setSbType();	1112	setSbType();
1109	}	1113	}
1110		1114
1111	TQtCurveStyle::~TQtCurveStyle()	1115	QtCurveStyle::~QtCurveStyle()
1112	{	1116	{
1113	if(itsSidebarButtonsCols!=itsSliderCols &&	1117	if(itsSidebarButtonsCols!=itsSliderCols &&
1114	itsSidebarButtonsCols!=itsDefBtnCols)	1118	itsSidebarButtonsCols!=itsDefBtnCols)
Lines 1151-1162 Link Here
1151	return d;	1155	return d;
1152	}	1156	}
1153		1157
1154	void TQtCurveStyle::polish(TQApplication *app)	1158	void QtCurveStyle::polish(TQApplication *app)
1155	{	1159	{
1156	TQString appName(getFile(app->argv()[0]));	1160	TQString appName(getFile(app->argv()[0]));
1157		1161
1158	if(NULL!=getenv("QTCURVE_DEBUG"))	1162	if(NULL!=getenv("QTCURVE_DEBUG"))
1159	std::cout << "TQtCurve: Application name: \"" << appName.latin1() << "\"\n";	1163	std::cout << "QtCurve: Application name: \"" << appName.latin1() << "\"\n";
1160		1164
1161	if ("kicker"==appName \|\| "appletproxy"==appName)	1165	if ("kicker"==appName \|\| "appletproxy"==appName)
1162	{	1166	{
Lines 1242-1248 Link Here
1242	#endif	1246	#endif
1243	}	1247	}
1244		1248
1245	void TQtCurveStyle::polish(TQPalette &pal)	1249	void QtCurveStyle::polish(TQPalette &pal)
1246	{	1250	{
1247	if(APP_MACTOR==itsThemedApp && itsMactorPal &&	1251	if(APP_MACTOR==itsThemedApp && itsMactorPal &&
1248	pal.active().background()!=itsMactorPal->active().background())	1252	pal.active().background()!=itsMactorPal->active().background())
Lines 1414-1420 Link Here
1414	return c;	1418	return c;
1415	}	1419	}
1416		1420
1417	TQColorGroup TQtCurveStyle::setColorGroup(const TQColorGroup &old, const TQColorGroup &act, bool dis)	1421	TQColorGroup QtCurveStyle::setColorGroup(const TQColorGroup &old, const TQColorGroup &act, bool dis)
1418	{	1422	{
1419	TQColor mid(old.mid());	1423	TQColor mid(old.mid());
1420		1424
Lines 1445-1451 Link Here
1445		1449
1446	static const char * kdeToolbarWidget="kde toolbar widget";	1450	static const char * kdeToolbarWidget="kde toolbar widget";
1447		1451
1448	void TQtCurveStyle::polish(TQWidget *widget)	1452	void QtCurveStyle::polish(TQWidget *widget)
1449	{	1453	{
1450	bool enableFilter(opts.highlightFactor \|\| opts.coloredMouseOver);	1454	bool enableFilter(opts.highlightFactor \|\| opts.coloredMouseOver);
1451		1455
Lines 1823-1829 Link Here
1823	BASE_STYLE::polish(widget);	1827	BASE_STYLE::polish(widget);
1824	}	1828	}
1825		1829
1826	void TQtCurveStyle::unPolish(TQWidget *widget)	1830	void QtCurveStyle::unPolish(TQWidget *widget)
1827	{	1831	{
1828	if(isFormWidget(widget))	1832	if(isFormWidget(widget))
1829	itsKhtmlWidgets.remove(widget);	1833	itsKhtmlWidgets.remove(widget);
Lines 1962-1968 Link Here
1962	SubstructureRedirectMask \| SubstructureNotifyMask, &xev);	1966	SubstructureRedirectMask \| SubstructureNotifyMask, &xev);
1963	}	1967	}
1964		1968
1965	bool TQtCurveStyle::appIsNotEmbedded(TQDialog *dlg)	1969	bool QtCurveStyle::appIsNotEmbedded(TQDialog *dlg)
1966	{	1970	{
1967	Window win;	1971	Window win;
1968		1972
Lines 1974-1980 Link Here
1974	return false;	1978	return false;
1975	}	1979	}
1976		1980
1977	bool TQtCurveStyle::eventFilter(TQObject object, TQEvent event)	1981	bool QtCurveStyle::eventFilter(TQObject object, TQEvent event)
1978	{	1982	{
1979	if(itsHoverWidget && TQT_BASE_OBJECT(object)==TQT_BASE_OBJECT(itsHoverWidget) && (TQEvent::Destroy==event->type() \|\| TQEvent::Hide==event->type()))	1983	if(itsHoverWidget && TQT_BASE_OBJECT(object)==TQT_BASE_OBJECT(itsHoverWidget) && (TQEvent::Destroy==event->type() \|\| TQEvent::Hide==event->type()))
1980	resetHover();	1984	resetHover();
Lines 2430-2436 Link Here
2430	return BASE_STYLE::eventFilter(object, event);	2434	return BASE_STYLE::eventFilter(object, event);
2431	}	2435	}
2432		2436
2433	void TQtCurveStyle::drawLightBevel(const TQColor &bgnd, TQPainter *p, const TQRect &rOrig,	2437	void QtCurveStyle::drawLightBevel(const TQColor &bgnd, TQPainter *p, const TQRect &rOrig,
2434	const TQColorGroup &cg, SFlags flags,	2438	const TQColorGroup &cg, SFlags flags,
2435	int round, const TQColor &fill, const TQColor *custom,	2439	int round, const TQColor &fill, const TQColor *custom,
2436	bool doBorder, bool doCorners, EWidget w) const	2440	bool doBorder, bool doCorners, EWidget w) const
Lines 2651-2657 Link Here
2651	p->restore();	2655	p->restore();
2652	}	2656	}
2653		2657
2654	void TQtCurveStyle::drawGlow(TQPainter p, const TQRect &r, const TQColorGroup &cg, EWidget w, const TQColor cols) const	2658	void QtCurveStyle::drawGlow(TQPainter p, const TQRect &r, const TQColorGroup &cg, EWidget w, const TQColor cols) const
2655	{	2659	{
2656	if(itsMouseOverCols \|\| itsDefBtnCols \|\| cols)	2660	if(itsMouseOverCols \|\| itsDefBtnCols \|\| cols)
2657	{	2661	{
Lines 2686-2692 Link Here
2686	}	2690	}
2687	}	2691	}
2688		2692
2689	void TQtCurveStyle::drawEtch(TQPainter *p, const TQRect &r, const TQColorGroup &cg, bool raised, bool square) const	2693	void QtCurveStyle::drawEtch(TQPainter *p, const TQRect &r, const TQColorGroup &cg, bool raised, bool square) const
2690	{	2694	{
2691	square=square \|\| ROUND_NONE==opts.round;	2695	square=square \|\| ROUND_NONE==opts.round;
2692		2696
Lines 2723-2729 Link Here
2723	}	2727	}
2724	}	2728	}
2725		2729
2726	void TQtCurveStyle::drawBorder(const TQColor &bgnd, TQPainter *p, const TQRect &r, const TQColorGroup &cg,	2730	void QtCurveStyle::drawBorder(const TQColor &bgnd, TQPainter *p, const TQRect &r, const TQColorGroup &cg,
2727	SFlags flags, int round, const TQColor *custom, EWidget w, bool doCorners,	2731	SFlags flags, int round, const TQColor *custom, EWidget w, bool doCorners,
2728	EBorder borderProfile, bool blendBorderColors, int borderVal) const	2732	EBorder borderProfile, bool blendBorderColors, int borderVal) const
2729	{	2733	{
Lines 2973-2979 Link Here
2973	}	2977	}
2974	}	2978	}
2975		2979
2976	void TQtCurveStyle::drawMdiIcon(TQPainter *painter, const TQColor &color, const TQColor &shadow, const TQRect &r, bool sunken, int margin,	2980	void QtCurveStyle::drawMdiIcon(TQPainter *painter, const TQColor &color, const TQColor &shadow, const TQRect &r, bool sunken, int margin,
2977	SubControl button) const	2981	SubControl button) const
2978	{	2982	{
2979	if(!sunken)	2983	if(!sunken)
Lines 2981-2987 Link Here
2981	drawWindowIcon(painter, color, r, sunken, margin, button);	2985	drawWindowIcon(painter, color, r, sunken, margin, button);
2982	}	2986	}
2983		2987
2984	void TQtCurveStyle::drawWindowIcon(TQPainter *painter, const TQColor &color, const TQRect &r, bool sunken, int margin, SubControl button) const	2988	void QtCurveStyle::drawWindowIcon(TQPainter *painter, const TQColor &color, const TQRect &r, bool sunken, int margin, SubControl button) const
2985	{	2989	{
2986	TQRect rect(r);	2990	TQRect rect(r);
2987		2991
Lines 3064-3070 Link Here
3064	}	3068	}
3065	}	3069	}
3066		3070
3067	void TQtCurveStyle::drawEntryField(TQPainter *p, const TQRect &rx, const TQColorGroup &cg,	3071	void QtCurveStyle::drawEntryField(TQPainter *p, const TQRect &rx, const TQColorGroup &cg,
3068	SFlags flags, EntryColor coloration, int round, EWidget w) const	3072	SFlags flags, EntryColor coloration, int round, EWidget w) const
3069	{	3073	{
3070	const TQColor *use(ENTRY_MOUSE_OVER==coloration && itsMouseOverCols	3074	const TQColor *use(ENTRY_MOUSE_OVER==coloration && itsMouseOverCols
Lines 3123-3129 Link Here
3123	}	3127	}
3124	}	3128	}
3125		3129
3126	void TQtCurveStyle::drawArrow(TQPainter *p, const TQRect &r, const TQColorGroup &cg, SFlags flags,	3130	void QtCurveStyle::drawArrow(TQPainter *p, const TQRect &r, const TQColorGroup &cg, SFlags flags,
3127	TQ_PrimitiveElement pe, bool small, bool checkActive) const	3131	TQ_PrimitiveElement pe, bool small, bool checkActive) const
3128	{	3132	{
3129	const TQColor &col(flags&Style_Enabled	3133	const TQColor &col(flags&Style_Enabled
Lines 3135-3141 Link Here
3135	::drawArrow(p, r, p->pen().style()==TQPen::NoPen ? col : TQColor(p->pen().color()), pe, opts, small);	3139	::drawArrow(p, r, p->pen().style()==TQPen::NoPen ? col : TQColor(p->pen().color()), pe, opts, small);
3136	}	3140	}
3137		3141
3138	void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const TQRect &r,	3142	void QtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const TQRect &r,
3139	const TQColorGroup &cg, SFlags flags, const TQStyleOption &data) const	3143	const TQColorGroup &cg, SFlags flags, const TQStyleOption &data) const
3140	{	3144	{
3141	switch(pe)	3145	switch(pe)
Lines 4078-4084 Link Here
4078	widget->parentWidget() && ::tqqt_cast<TQListBox *>(widget->parentWidget()) &&	4082	widget->parentWidget() && ::tqqt_cast<TQListBox *>(widget->parentWidget()) &&
4079	widget->parentWidget()->parentWidget() && ::tqqt_cast<TQComboBox *>(widget->parentWidget()->parentWidget()))	4083	widget->parentWidget()->parentWidget() && ::tqqt_cast<TQComboBox *>(widget->parentWidget()->parentWidget()))
4080	{	4084	{
4081	struct TQtCurveListBoxItem : public TQListBoxItem	4085	struct QtCurveListBoxItem : public TQListBoxItem
4082	{	4086	{
4083	void paintContents(TQPainter *p)	4087	void paintContents(TQPainter *p)
4084	{	4088	{
Lines 4087-4093 Link Here
4087	};	4091	};
4088		4092
4089	TQListBox box=(TQListBox )widget->parentWidget();	4093	TQListBox box=(TQListBox )widget->parentWidget();
4090	TQtCurveListBoxItem item=(TQtCurveListBoxItem )(box->item(box->currentItem()));	4094	QtCurveListBoxItem item=(QtCurveListBoxItem )(box->item(box->currentItem()));
4091		4095
4092	if(item)	4096	if(item)
4093	{	4097	{
Lines 4306-4312 Link Here
4306	return title;	4310	return title;
4307	}	4311	}
4308		4312
4309	void TQtCurveStyle::drawKStylePrimitive(KStylePrimitive kpe, TQPainter p, const TQWidget widget,	4313	void QtCurveStyle::drawKStylePrimitive(KStylePrimitive kpe, TQPainter p, const TQWidget widget,
4310	const TQRect &r, const TQColorGroup &cg, SFlags flags,	4314	const TQRect &r, const TQColorGroup &cg, SFlags flags,
4311	const TQStyleOption &opt) const	4315	const TQStyleOption &opt) const
4312	{	4316	{
Lines 4460-4466 Link Here
4460	}	4464	}
4461	}	4465	}
4462		4466
4463	void TQtCurveStyle::drawControl(ControlElement control, TQPainter p, const TQWidget widget,	4467	void QtCurveStyle::drawControl(ControlElement control, TQPainter p, const TQWidget widget,
4464	const TQRect &r, const TQColorGroup &cg, SFlags flags,	4468	const TQRect &r, const TQColorGroup &cg, SFlags flags,
4465	const TQStyleOption &data) const	4469	const TQStyleOption &data) const
4466	{	4470	{
Lines 5379-5385 Link Here
5379	}	5383	}
5380	}	5384	}
5381		5385
5382	void TQtCurveStyle::drawControlMask(ControlElement control, TQPainter p, const TQWidget widget,	5386	void QtCurveStyle::drawControlMask(ControlElement control, TQPainter p, const TQWidget widget,
5383	const TQRect &r, const TQStyleOption &data) const	5387	const TQRect &r, const TQStyleOption &data) const
5384	{	5388	{
5385	switch(control)	5389	switch(control)
Lines 5405-5411 Link Here
5405	}	5409	}
5406	}	5410	}
5407		5411
5408	void TQtCurveStyle::drawComplexControlMask(ComplexControl control, TQPainter p, const TQWidget widget,	5412	void QtCurveStyle::drawComplexControlMask(ComplexControl control, TQPainter p, const TQWidget widget,
5409	const TQRect &r, const TQStyleOption &data) const	5413	const TQRect &r, const TQStyleOption &data) const
5410	{	5414	{
5411	switch (control)	5415	switch (control)
Lines 5420-5426 Link Here
5420	}	5424	}
5421	}	5425	}
5422		5426
5423	TQRect TQtCurveStyle::subRect(SubRect subrect, const TQWidget *widget)const	5427	TQRect QtCurveStyle::subRect(SubRect subrect, const TQWidget *widget)const
5424	{	5428	{
5425	TQRect rect,	5429	TQRect rect,
5426	wrect(widget->rect());	5430	wrect(widget->rect());
Lines 5477-5483 Link Here
5477	TQWidget *window() const;	5481	TQWidget *window() const;
5478	};	5482	};
5479		5483
5480	void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter p, const TQWidget widget,	5484	void QtCurveStyle::drawComplexControl(ComplexControl control, TQPainter p, const TQWidget widget,
5481	const TQRect &r, const TQColorGroup &cg, SFlags flags,	5485	const TQRect &r, const TQColorGroup &cg, SFlags flags,
5482	SCFlags controls, SCFlags active,	5486	SCFlags controls, SCFlags active,
5483	const TQStyleOption &data) const	5487	const TQStyleOption &data) const
Lines 6266-6272 Link Here
6266	case CC_Slider:	6270	case CC_Slider:
6267	//	6271	//
6268	// Note: Can't use KStyle's drawing routine, as this doesnt work for sliders on gradient	6272	// Note: Can't use KStyle's drawing routine, as this doesnt work for sliders on gradient
6269	// toolbars. It also draws groove, focus, slider - wherease TQtCurve needs groove,	6273	// toolbars. It also draws groove, focus, slider - wherease QtCurve needs groove,
6270	// slider, focus. We also ony double-buffer if not on a toolbar, as we dont know	6274	// slider, focus. We also ony double-buffer if not on a toolbar, as we dont know
6271	// the background, etc, if on a toolbar - and that is handled in eventFilter	6275	// the background, etc, if on a toolbar - and that is handled in eventFilter
6272	{	6276	{
Lines 6442-6448 Link Here
6442	}	6446	}
6443	}	6447	}
6444		6448
6445	TQRect TQtCurveStyle::querySubControlMetrics(TQ_ComplexControl control, const TQWidget *widget,	6449	TQRect QtCurveStyle::querySubControlMetrics(TQ_ComplexControl control, const TQWidget *widget,
6446	SubControl sc, const TQStyleOption &data) const	6450	SubControl sc, const TQStyleOption &data) const
6447	{	6451	{
6448	bool reverse(TQApplication::reverseLayout());	6452	bool reverse(TQApplication::reverseLayout());
Lines 6737-6743 Link Here
6737	return BASE_STYLE::querySubControlMetrics(control, widget, sc, data);	6741	return BASE_STYLE::querySubControlMetrics(control, widget, sc, data);
6738	}	6742	}
6739		6743
6740	int TQtCurveStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const	6744	int QtCurveStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const
6741	{	6745	{
6742	switch(metric)	6746	switch(metric)
6743	{	6747	{
Lines 6827-6833 Link Here
6827	}	6831	}
6828	}	6832	}
6829		6833
6830	int TQtCurveStyle::kPixelMetric(KStylePixelMetric kpm, const TQWidget *widget) const	6834	int QtCurveStyle::kPixelMetric(KStylePixelMetric kpm, const TQWidget *widget) const
6831	{	6835	{
6832	switch(kpm)	6836	switch(kpm)
6833	{	6837	{
Lines 6838-6844 Link Here
6838	}	6842	}
6839	}	6843	}
6840		6844
6841	TQSize TQtCurveStyle::tqsizeFromContents(ContentsType contents, const TQWidget *widget,	6845	TQSize QtCurveStyle::tqsizeFromContents(ContentsType contents, const TQWidget *widget,
6842	const TQSize &contentsSize, const TQStyleOption &data) const	6846	const TQSize &contentsSize, const TQStyleOption &data) const
6843	{	6847	{
6844	switch(contents)	6848	switch(contents)
Lines 6950-6956 Link Here
6950	return BASE_STYLE::tqsizeFromContents(contents, widget, contentsSize, data);	6954	return BASE_STYLE::tqsizeFromContents(contents, widget, contentsSize, data);
6951	}	6955	}
6952		6956
6953	int TQtCurveStyle::styleHint(StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option,	6957	int QtCurveStyle::styleHint(StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option,
6954	TQStyleHintReturn *returnData) const	6958	TQStyleHintReturn *returnData) const
6955	{	6959	{
6956	switch(stylehint)	6960	switch(stylehint)
Lines 6997-7003 Link Here
6997	}	7001	}
6998	}	7002	}
6999		7003
7000	void TQtCurveStyle::drawItem(TQPainter *p, const TQRect &r, int flags, const TQColorGroup &cg, bool enabled,	7004	void QtCurveStyle::drawItem(TQPainter *p, const TQRect &r, int flags, const TQColorGroup &cg, bool enabled,
7001	const TQPixmap pixmap, const TQString &text, int len, const TQColor penColor) const	7005	const TQPixmap pixmap, const TQString &text, int len, const TQColor penColor) const
7002	{	7006	{
7003	TQRect r2(r);	7007	TQRect r2(r);
Lines 7111-7117 Link Here
7111	}	7115	}
7112	}	7116	}
7113		7117
7114	void TQtCurveStyle::drawMenuItem(TQPainter *p, const TQRect &r, int flags, const TQColorGroup &cg,	7118	void QtCurveStyle::drawMenuItem(TQPainter *p, const TQRect &r, int flags, const TQColorGroup &cg,
7115	bool mbi, int round, const TQColor &bgnd, const TQColor *cols) const	7119	bool mbi, int round, const TQColor &bgnd, const TQColor *cols) const
7116	{	7120	{
7117	int fill=opts.useHighlightForMenu && (!mbi \|\| itsHighlightCols==cols) ? ORIGINAL_SHADE : 4,	7121	int fill=opts.useHighlightForMenu && (!mbi \|\| itsHighlightCols==cols) ? ORIGINAL_SHADE : 4,
Lines 7168-7174 Link Here
7168	drawBevelGradient(cols[fill], p, r, true, false, opts.menuitemAppearance, WIDGET_MENU_ITEM);	7172	drawBevelGradient(cols[fill], p, r, true, false, opts.menuitemAppearance, WIDGET_MENU_ITEM);
7169	}	7173	}
7170		7174
7171	void TQtCurveStyle::drawProgress(TQPainter *p, const TQRect &rx, const TQColorGroup &cg, SFlags flags,	7175	void QtCurveStyle::drawProgress(TQPainter *p, const TQRect &rx, const TQColorGroup &cg, SFlags flags,
7172	int round, const TQWidget *widget) const	7176	int round, const TQWidget *widget) const
7173	{	7177	{
7174	if(rx.width()<1)	7178	if(rx.width()<1)
Lines 7262-7268 Link Here
7262	}	7266	}
7263	}	7267	}
7264		7268
7265	void TQtCurveStyle::drawBevelGradient(const TQColor &base, TQPainter *p, const TQRect &origRect, bool horiz, bool sel, EAppearance bevApp, EWidget w) const	7269	void QtCurveStyle::drawBevelGradient(const TQColor &base, TQPainter *p, const TQRect &origRect, bool horiz, bool sel, EAppearance bevApp, EWidget w) const
7266	{	7270	{
7267	if(IS_FLAT(bevApp) && opts.colorSelTab && sel)	7271	if(IS_FLAT(bevApp) && opts.colorSelTab && sel)
7268	bevApp=APPEARANCE_GRADIENT;	7272	bevApp=APPEARANCE_GRADIENT;
Lines 7310-7316 Link Here
7310	}	7314	}
7311	}	7315	}
7312		7316
7313	void TQtCurveStyle::drawBevelGradientReal(const TQColor &base, TQPainter *p, const TQRect &r, bool horiz, bool sel, EAppearance app, EWidget w) const	7317	void QtCurveStyle::drawBevelGradientReal(const TQColor &base, TQPainter *p, const TQRect &r, bool horiz, bool sel, EAppearance app, EWidget w) const
7314	{	7318	{
7315		7319
7316	const Gradient *grad=getGradient(app, &opts);	7320	const Gradient *grad=getGradient(app, &opts);
Lines 7379-7385 Link Here
7379	}	7383	}
7380	}	7384	}
7381		7385
7382	void TQtCurveStyle::drawGradient(const TQColor &top, const TQColor &bot,	7386	void QtCurveStyle::drawGradient(const TQColor &top, const TQColor &bot,
7383	TQPainter *p, TQRect const &r, bool horiz) const	7387	TQPainter *p, TQRect const &r, bool horiz) const
7384	{	7388	{
7385	if(r.width()>0 && r.height()>0)	7389	if(r.width()>0 && r.height()>0)
Lines 7428-7434 Link Here
7428	}	7432	}
7429	}	7433	}
7430		7434
7431	void TQtCurveStyle::drawSbSliderHandle(TQPainter *p, const TQRect &orig, const TQColorGroup &cg,	7435	void QtCurveStyle::drawSbSliderHandle(TQPainter *p, const TQRect &orig, const TQColorGroup &cg,
7432	SFlags flags, bool slider) const	7436	SFlags flags, bool slider) const
7433	{	7437	{
7434	int min(MIN_SLIDER_SIZE(opts.sliderThumbs));	7438	int min(MIN_SLIDER_SIZE(opts.sliderThumbs));
Lines 7483-7489 Link Here
7483	}	7487	}
7484	}	7488	}
7485		7489
7486	void TQtCurveStyle::drawSliderHandle(TQPainter *p, const TQRect &r, const TQColorGroup &cg,	7490	void QtCurveStyle::drawSliderHandle(TQPainter *p, const TQRect &r, const TQColorGroup &cg,
7487	SFlags flags, TQSlider *slider, bool tb) const	7491	SFlags flags, TQSlider *slider, bool tb) const
7488	{	7492	{
7489	bool horiz(SLIDER_TRIANGULAR==opts.sliderStyle ? r.height()>r.width() : r.width()>r.height());	7493	bool horiz(SLIDER_TRIANGULAR==opts.sliderStyle ? r.height()>r.width() : r.width()>r.height());
Lines 7668-7674 Link Here
7668	}	7672	}
7669	}	7673	}
7670		7674
7671	void TQtCurveStyle::drawSliderGroove(TQPainter *p, const TQRect &r, const TQColorGroup &cg,	7675	void QtCurveStyle::drawSliderGroove(TQPainter *p, const TQRect &r, const TQColorGroup &cg,
7672	SFlags flags, const TQWidget *widget) const	7676	SFlags flags, const TQWidget *widget) const
7673	{	7677	{
7674	const TQSlider sliderWidget((const TQSlider )widget);	7678	const TQSlider sliderWidget((const TQSlider )widget);
Lines 7730-7736 Link Here
7730	}	7734	}
7731	}	7735	}
7732		7736
7733	void TQtCurveStyle::drawMenuOrToolBarBackground(TQPainter *p, const TQRect &r, const TQColorGroup &cg,	7737	void QtCurveStyle::drawMenuOrToolBarBackground(TQPainter *p, const TQRect &r, const TQColorGroup &cg,
7734	bool menu, bool horiz) const	7738	bool menu, bool horiz) const
7735	{	7739	{
7736	if(menu && APPEARANCE_STRIPED==opts.bgndAppearance && IS_FLAT(opts.menubarAppearance) && SHADE_NONE==opts.shadeMenubars)	7740	if(menu && APPEARANCE_STRIPED==opts.bgndAppearance && IS_FLAT(opts.menubarAppearance) && SHADE_NONE==opts.shadeMenubars)
Lines 7746-7752 Link Here
7746	drawBevelGradient(color, p, rx, horiz, false, app);	7750	drawBevelGradient(color, p, rx, horiz, false, app);
7747	}	7751	}
7748		7752
7749	void TQtCurveStyle::drawHandleMarkers(TQPainter *p, const TQRect &r, SFlags flags, bool tb,	7753	void QtCurveStyle::drawHandleMarkers(TQPainter *p, const TQRect &r, SFlags flags, bool tb,
7750	ELine handles) const	7754	ELine handles) const
7751	{	7755	{
7752	if(r.width()<2 \|\| r.height()<2)	7756	if(r.width()<2 \|\| r.height()<2)
Lines 7798-7804 Link Here
7798	}	7802	}
7799	}	7803	}
7800		7804
7801	void TQtCurveStyle::drawHighlight(TQPainter *p, const TQRect &r, const TQColorGroup &cg, bool horiz, bool inc) const	7805	void QtCurveStyle::drawHighlight(TQPainter *p, const TQRect &r, const TQColorGroup &cg, bool horiz, bool inc) const
7802	{	7806	{
7803	TQColor col1(midColor(cg.background(), itsMouseOverCols[ORIGINAL_SHADE]));	7807	TQColor col1(midColor(cg.background(), itsMouseOverCols[ORIGINAL_SHADE]));
7804	TQRect r2(r);	7808	TQRect r2(r);
Lines 7810-7816 Link Here
7810	p->drawLine(r2.x(), r2.y(), r2.x()+(horiz ? r2.width()-1 : 0), r2.y()+(horiz ? 0 : r2.height()-1));	7814	p->drawLine(r2.x(), r2.y(), r2.x()+(horiz ? r2.width()-1 : 0), r2.y()+(horiz ? 0 : r2.height()-1));
7811	}	7815	}
7812		7816
7813	void TQtCurveStyle::shadeColors(const TQColor &base, TQColor *vals) const	7817	void QtCurveStyle::shadeColors(const TQColor &base, TQColor *vals) const
7814	{	7818	{
7815	SHADES	7819	SHADES
7816		7820
Lines 7826-7832 Link Here
7826	vals[ORIGINAL_SHADE]=base;	7830	vals[ORIGINAL_SHADE]=base;
7827	}	7831	}
7828		7832
7829	const TQColor * TQtCurveStyle::buttonColors(const TQColorGroup &cg) const	7833	const TQColor * QtCurveStyle::buttonColors(const TQColorGroup &cg) const
7830	{	7834	{
7831	if(cg.button()!=itsButtonCols[ORIGINAL_SHADE])	7835	if(cg.button()!=itsButtonCols[ORIGINAL_SHADE])
7832	{	7836	{
Lines 7837-7850 Link Here
7837	return itsButtonCols;	7841	return itsButtonCols;
7838	}	7842	}
7839		7843
7840	const TQColor * TQtCurveStyle::checkRadioColors(const TQColorGroup &cg, SFlags flags) const	7844	const TQColor * QtCurveStyle::checkRadioColors(const TQColorGroup &cg, SFlags flags) const
7841	{	7845	{
7842	return opts.crColor && flags&Style_Enabled && (flags&Style_On \|\| !(flags&Style_Off))	7846	return opts.crColor && flags&Style_Enabled && (flags&Style_On \|\| !(flags&Style_Off))
7843	? itsCheckRadioSelCols	7847	? itsCheckRadioSelCols
7844	: buttonColors(cg);	7848	: buttonColors(cg);
7845	}	7849	}
7846		7850
7847	const TQColor * TQtCurveStyle::sliderColors(/const TQColorGroup &cg, / SFlags flags) const	7851	const TQColor * QtCurveStyle::sliderColors(/const TQColorGroup &cg, / SFlags flags) const
7848	{	7852	{
7849	return (flags&Style_Enabled)	7853	return (flags&Style_Enabled)
7850	? SHADE_NONE!=opts.shadeSliders &&itsSliderCols && (!opts.colorSliderMouseOver \|\| flags&Style_MouseOver)	7854	? SHADE_NONE!=opts.shadeSliders &&itsSliderCols && (!opts.colorSliderMouseOver \|\| flags&Style_MouseOver)
Lines 7853-7859 Link Here
7853	: itsBackgroundCols;	7857	: itsBackgroundCols;
7854	}	7858	}
7855		7859
7856	const TQColor * TQtCurveStyle::backgroundColors(const TQColor &c) const	7860	const TQColor * QtCurveStyle::backgroundColors(const TQColor &c) const
7857	{	7861	{
7858	if(c!=itsBackgroundCols[ORIGINAL_SHADE])	7862	if(c!=itsBackgroundCols[ORIGINAL_SHADE])
7859	{	7863	{
Lines 7864-7876 Link Here
7864	return itsBackgroundCols;	7868	return itsBackgroundCols;
7865	}	7869	}
7866		7870
7867	const TQColor * TQtCurveStyle::borderColors(SFlags flags, const TQColor *use) const	7871	const TQColor * QtCurveStyle::borderColors(SFlags flags, const TQColor *use) const
7868	{	7872	{
7869	return itsMouseOverCols && opts.coloredMouseOver && flags&Style_MouseOver	7873	return itsMouseOverCols && opts.coloredMouseOver && flags&Style_MouseOver
7870	? itsMouseOverCols : use;	7874	? itsMouseOverCols : use;
7871	}	7875	}
7872		7876
7873	const TQColor * TQtCurveStyle::getSidebarButtons() const	7877	const TQColor * QtCurveStyle::getSidebarButtons() const
7874	{	7878	{
7875	if(!itsSidebarButtonsCols)	7879	if(!itsSidebarButtonsCols)
7876	{	7880	{
Lines 7889-7895 Link Here
7889	return itsSidebarButtonsCols;	7893	return itsSidebarButtonsCols;
7890	}	7894	}
7891		7895
7892	void TQtCurveStyle::setMenuColors(const TQColorGroup &cg)	7896	void QtCurveStyle::setMenuColors(const TQColorGroup &cg)
7893	{	7897	{
7894	switch(opts.shadeMenubars)	7898	switch(opts.shadeMenubars)
7895	{	7899	{
Lines 7916-7922 Link Here
7916	}	7920	}
7917	}	7921	}
7918		7922
7919	const TQColor * TQtCurveStyle::menuColors(const TQColorGroup &cg, bool active) const	7923	const TQColor * QtCurveStyle::menuColors(const TQColorGroup &cg, bool active) const
7920	{	7924	{
7921	return SHADE_WINDOW_BORDER==opts.shadeMenubars	7925	return SHADE_WINDOW_BORDER==opts.shadeMenubars
7922	? getMdiColors(cg, active)	7926	? getMdiColors(cg, active)
Lines 7925-7931 Link Here
7925	: itsMenubarCols;	7929	: itsMenubarCols;
7926	}	7930	}
7927		7931
7928	void TQtCurveStyle::setDecorationColors(bool init)	7932	void QtCurveStyle::setDecorationColors(bool init)
7929	{	7933	{
7930	if(!readKdeGlobals() && !init)	7934	if(!readKdeGlobals() && !init)
7931	return;	7935	return;
Lines 7939-7945 Link Here
7939	shadeColors(kdeSettings.focus, itsFocusCols);	7943	shadeColors(kdeSettings.focus, itsFocusCols);
7940	}	7944	}
7941		7945
7942	const TQColor * TQtCurveStyle::getMdiColors(const TQColorGroup &cg, bool active) const	7946	const TQColor * QtCurveStyle::getMdiColors(const TQColorGroup &cg, bool active) const
7943	{	7947	{
7944	if(!itsActiveMdiColors)	7948	if(!itsActiveMdiColors)
7945	{	7949	{
Lines 8064-8070 Link Here
8064	}	8068	}
8065		8069
8066	#ifdef SET_MDI_WINDOW_BUTTON_POSITIONS	8070	#ifdef SET_MDI_WINDOW_BUTTON_POSITIONS
8067	void TQtCurveStyle::readMdiPositions() const	8071	void QtCurveStyle::readMdiPositions() const
8068	{	8072	{
8069	if(0==itsMdiButtons[0].size() && 0==itsMdiButtons[1].size())	8073	if(0==itsMdiButtons[0].size() && 0==itsMdiButtons[1].size())
8070	{	8074	{
Lines 8137-8143 Link Here
8137	}	8141	}
8138	#endif	8142	#endif
8139		8143
8140	bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)	8144	bool QtCurveStyle::redrawHoverWidget(const TQPoint &pos)
8141	{	8145	{
8142	if(!itsHoverWidget \|\| !itsHoverWidget->isShown() \|\| !itsHoverWidget->isVisible())	8146	if(!itsHoverWidget \|\| !itsHoverWidget->isShown() \|\| !itsHoverWidget->isVisible())
8143	return false;	8147	return false;
Lines 8357-8363 Link Here
8357	return false;	8361	return false;
8358	}	8362	}
8359		8363
8360	const TQColor & TQtCurveStyle::getFill(SFlags flags, const TQColor *use, bool cr, bool darker) const	8364	const TQColor & QtCurveStyle::getFill(SFlags flags, const TQColor *use, bool cr, bool darker) const
8361	{	8365	{
8362	return !(flags&Style_Enabled)	8366	return !(flags&Style_Enabled)
8363	? use[darker ? 2 : ORIGINAL_SHADE]	8367	? use[darker ? 2 : ORIGINAL_SHADE]
Lines 8372-8378 Link Here
8372	: use[darker ? 2 : ORIGINAL_SHADE];	8376	: use[darker ? 2 : ORIGINAL_SHADE];
8373	}	8377	}
8374		8378
8375	const TQColor & TQtCurveStyle::getTabFill(bool current, bool highlight, const TQColor *use) const	8379	const TQColor & QtCurveStyle::getTabFill(bool current, bool highlight, const TQColor *use) const
8376	{	8380	{
8377	return current	8381	return current
8378	? use[ORIGINAL_SHADE]	8382	? use[ORIGINAL_SHADE]
Lines 8381-8387 Link Here
8381	: use[2];	8385	: use[2];
8382	}	8386	}
8383		8387
8384	const TQColor & TQtCurveStyle::menuStripeCol() const	8388	const TQColor & QtCurveStyle::menuStripeCol() const
8385	{	8389	{
8386	switch(opts.menuStripe)	8390	switch(opts.menuStripe)
8387	{	8391	{
Lines 8407-8413 Link Here
8407	}	8411	}
8408	}	8412	}
8409		8413
8410	const TQColor & TQtCurveStyle::checkRadioCol(SFlags flags, const TQColorGroup &cg) const	8414	const TQColor & QtCurveStyle::checkRadioCol(SFlags flags, const TQColorGroup &cg) const
8411	{	8415	{
8412	if(flags&MENU_ITEM)	8416	if(flags&MENU_ITEM)
8413	return flags&Style_Enabled && flags&Style_Active && opts.useHighlightForMenu	8417	return flags&Style_Enabled && flags&Style_Active && opts.useHighlightForMenu
Lines 8421-8427 Link Here
8421	: cg.text();	8425	: cg.text();
8422	}	8426	}
8423		8427
8424	TQColor TQtCurveStyle::shade(const TQColor &a, float k) const	8428	TQColor QtCurveStyle::shade(const TQColor &a, float k) const
8425	{	8429	{
8426	TQColor mod;	8430	TQColor mod;
8427		8431
Lines 8429-8440 Link Here
8429	return mod;	8433	return mod;
8430	}	8434	}
8431		8435
8432	void TQtCurveStyle::shade(const color &ca, color *cb, double k) const	8436	void QtCurveStyle::shade(const color &ca, color *cb, double k) const
8433	{	8437	{
8434	::shade(&opts, ca, cb, k);	8438	::shade(&opts, ca, cb, k);
8435	}	8439	}
8436		8440
8437	TQPixmap * TQtCurveStyle::getPixelPixmap(const TQColor col) const	8441	TQPixmap * QtCurveStyle::getPixelPixmap(const TQColor col) const
8438	{	8442	{
8439	TQRgb rgb(col.rgb());	8443	TQRgb rgb(col.rgb());
8440	TQString key(createKey(rgb));	8444	TQString key(createKey(rgb));
Lines 8456-8462 Link Here
8456	return pix;	8460	return pix;
8457	}	8461	}
8458		8462
8459	TQPixmap * TQtCurveStyle::createStripePixmap(const TQColor &col, bool forWindow) const	8463	TQPixmap * QtCurveStyle::createStripePixmap(const TQColor &col, bool forWindow) const
8460	{	8464	{
8461	TQRgb rgb(col.rgb());	8465	TQRgb rgb(col.rgb());
8462	TQString key(createKey(rgb, forWindow ? 'S' : 's'));	8466	TQString key(createKey(rgb, forWindow ? 'S' : 's'));
Lines 8512-8524 Link Here
8512	adjustPix(img.bits(), 4, img.width(), img.height(), img.bytesPerLine(), col.red(), col.green(), col.blue(), shade);	8516	adjustPix(img.bits(), 4, img.width(), img.height(), img.bytesPerLine(), col.red(), col.green(), col.blue(), shade);
8513	}	8517	}
8514		8518
8515	void TQtCurveStyle::drawDot(TQPainter p, const TQRect &r, const TQColor cols) const	8519	void QtCurveStyle::drawDot(TQPainter p, const TQRect &r, const TQColor cols) const
8516	{	8520	{
8517	TQPixmap *pix=getPixmap(cols[STD_BORDER], PIX_DOT, 0.9);	8521	TQPixmap *pix=getPixmap(cols[STD_BORDER], PIX_DOT, 0.9);
8518	p->drawPixmap(r.x()+((r.width()-pix->width())>>1), r.y()+((r.height()-pix->height())>>1), *pix);	8522	p->drawPixmap(r.x()+((r.width()-pix->width())>>1), r.y()+((r.height()-pix->height())>>1), *pix);
8519	}	8523	}
8520		8524
8521	TQPixmap * TQtCurveStyle::getPixmap(const TQColor col, EPixmap p, double shade) const	8525	TQPixmap * QtCurveStyle::getPixmap(const TQColor col, EPixmap p, double shade) const
8522	{	8526	{
8523	TQRgb rgb(col.rgb());	8527	TQRgb rgb(col.rgb());
8524	TQString key(createKey(rgb, p));	8528	TQString key(createKey(rgb, p));
Lines 8579-8585 Link Here
8579	return pix;	8583	return pix;
8580	}	8584	}
8581		8585
8582	void TQtCurveStyle::setSbType()	8586	void QtCurveStyle::setSbType()
8583	{	8587	{
8584	switch(opts.scrollbarType)	8588	switch(opts.scrollbarType)
8585	{	8589	{
Lines 8599-8605 Link Here
8599	}	8603	}
8600	}	8604	}
8601		8605
8602	void TQtCurveStyle::resetHover()	8606	void QtCurveStyle::resetHover()
8603	{	8607	{
8604	itsIsSpecialHover=false;	8608	itsIsSpecialHover=false;
8605	itsOldPos.setX(-1);	8609	itsOldPos.setX(-1);
Lines 8618-8624 Link Here
8618	}	8622	}
8619	};	8623	};
8620		8624
8621	bool TQtCurveStyle::isWindowDragWidget(TQObject *o, const TQPoint &pos)	8625	bool QtCurveStyle::isWindowDragWidget(TQObject *o, const TQPoint &pos)
8622	{	8626	{
8623	return opts.windowDrag &&	8627	return opts.windowDrag &&
8624	(//qobject_cast<TQDialog*>(o) \|\|	8628	(//qobject_cast<TQDialog*>(o) \|\|
Lines 8636-8642 Link Here
8636	);	8640	);
8637	}	8641	}
8638		8642
8639	void TQtCurveStyle::updateProgressPos()	8643	void QtCurveStyle::updateProgressPos()
8640	{	8644	{
8641	// Taken from lipstik!	8645	// Taken from lipstik!
8642	TQMap<TQWidget*, int>::iterator it(itsProgAnimWidgets.begin()),	8646	TQMap<TQWidget*, int>::iterator it(itsProgAnimWidgets.begin()),
Lines 8663-8674 Link Here
8663	itsAnimationTimer->stop();	8667	itsAnimationTimer->stop();
8664	}	8668	}
8665		8669
8666	void TQtCurveStyle::progressBarDestroyed(TQObject *bar)	8670	void QtCurveStyle::progressBarDestroyed(TQObject *bar)
8667	{	8671	{
8668	itsProgAnimWidgets.remove(TQT_TQWIDGET(bar));	8672	itsProgAnimWidgets.remove(TQT_TQWIDGET(bar));
8669	}	8673	}
8670		8674
8671	void TQtCurveStyle::sliderThumbMoved(int)	8675	void QtCurveStyle::sliderThumbMoved(int)
8672	{	8676	{
8673	TQSlider slider(::tqqt_cast<TQSlider>(sender()));	8677	TQSlider slider(::tqqt_cast<TQSlider>(sender()));
8674		8678
Lines 8676-8687 Link Here
8676	slider->update();	8680	slider->update();
8677	}	8681	}
8678		8682
8679	void TQtCurveStyle::khtmlWidgetDestroyed(TQObject *o)	8683	void QtCurveStyle::khtmlWidgetDestroyed(TQObject *o)
8680	{	8684	{
8681	itsKhtmlWidgets.remove(TQT_TQWIDGET_CONST(o));	8685	itsKhtmlWidgets.remove(TQT_TQWIDGET_CONST(o));
8682	}	8686	}
8683		8687
8684	void TQtCurveStyle::hoverWidgetDestroyed(TQObject *o)	8688	void QtCurveStyle::hoverWidgetDestroyed(TQObject *o)
8685	{	8689	{
8686	if(TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(itsHoverWidget))	8690	if(TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(itsHoverWidget))
8687	resetHover();	8691	resetHover();

Lines 2-8 Link Here

(-)a/common/common.h (-1 / +1 lines)
2	#define __COMMON_H__	2	#define __COMMON_H__
3		3
4	/*	4	/*
5	TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com	5	QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
6		6
7	----	7	----
8		8

Lines 1-5 Link Here

(-)a/common/config_file.c (-2 / +2 lines)
1	/*	1	/*
2	TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com	2	QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
3		3
4	----	4	----
5		5
Lines 618-624 Link Here
618	baseEncoded.prepend("trying to create local folder ");	618	baseEncoded.prepend("trying to create local folder ");
619	perror(baseEncoded.constData());	619	perror(baseEncoded.constData());
620	#else	620	#else
621	perror("trying to create TQtCurve config folder ");	621	perror("trying to create QtCurve config folder ");
622	#endif	622	#endif
623	return false; // Couldn't create it :-(	623	return false; // Couldn't create it :-(
624	}	624	}




#define __QTCURVE_H__

/*
  QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com

  ----


#define BASE_STYLE KStyle
#endif

class QtCurveStyle : public BASE_STYLE
{
    Q_OBJECT
  TQ_OBJECT

    };

#ifdef QTC_STYLE_SUPPORT
    QtCurveStyle(const TQString &name=TQString());
#else
    QtCurveStyle();
#endif

    virtual ~QtCurveStyle();

    void polish(TQApplication *app);
    void polish(TQPalette &pal);

Lines 19-24 Link Here

(-)a/style/CMakeLists.txt (+1 lines)
19	LINK ${QT_LIBRARIES} kdefx	19	LINK ${QT_LIBRARIES} kdefx
20	DESTINATION ${TDE_LIB_DIR}/trinity/plugins/styles	20	DESTINATION ${TDE_LIB_DIR}/trinity/plugins/styles
21	)	21	)
		22	tde_automoc(${qtcurve_SRCS})
22	install(FILES qtcurve.themerc DESTINATION ${TDEPREFIX}/share/apps/kstyle/themes)	23	install(FILES qtcurve.themerc DESTINATION ${TDEPREFIX}/share/apps/kstyle/themes)
23	else (NOT QTC_QT_ONLY)	24	else (NOT QTC_QT_ONLY)
24	set(qtcurve_MOC_CLASSES qtcurve.h qtc_kstyle.h)	25	set(qtcurve_MOC_CLASSES qtcurve.h qtc_kstyle.h)

Return to bug 1109

Lines 2-8 Link Here

(-)a/style/qtcurve.h (-5 / +5 lines)
2	#define __QTCURVE_H__	2	#define __QTCURVE_H__
3		3
4	/*	4	/*
5	TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com	5	QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
6		6
7	----	7	----
8		8
Lines 74-80 Link Here
74	#define BASE_STYLE KStyle	74	#define BASE_STYLE KStyle
75	#endif	75	#endif
76		76
77	class TQtCurveStyle : public BASE_STYLE	77	class QtCurveStyle : public BASE_STYLE
78	{	78	{
79	Q_OBJECT	79	Q_OBJECT
80	TQ_OBJECT	80	TQ_OBJECT
Lines 127-138 Link Here
127	};	127	};
128		128
129	#ifdef QTC_STYLE_SUPPORT	129	#ifdef QTC_STYLE_SUPPORT
130	TQtCurveStyle(const TQString &name=TQString());	130	QtCurveStyle(const TQString &name=TQString());
131	#else	131	#else
132	TQtCurveStyle();	132	QtCurveStyle();
133	#endif	133	#endif
134		134
135	virtual ~TQtCurveStyle();	135	virtual ~QtCurveStyle();
136		136
137	void polish(TQApplication *app);	137	void polish(TQApplication *app);
138	void polish(TQPalette &pal);	138	void polish(TQPalette &pal);