summaryrefslogtreecommitdiffstats
path: root/tdestyles/asteroid/asteroid.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdestyles/asteroid/asteroid.cpp')
-rw-r--r--tdestyles/asteroid/asteroid.cpp88
1 files changed, 38 insertions, 50 deletions
diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp
index 7119af5a8..8a66cbe80 100644
--- a/tdestyles/asteroid/asteroid.cpp
+++ b/tdestyles/asteroid/asteroid.cpp
@@ -46,8 +46,6 @@
#include "asteroid.h"
-// #define MINIMUM_PUSHBUTTON_WIDTH 75;
-// #define MINIMUM_PUSHBUTTON_HEIGHT 23;
#define MINIMUM_PUSHBUTTON_WIDTH 73;
#define MINIMUM_PUSHBUTTON_HEIGHT 21;
@@ -56,15 +54,6 @@
#define SPINBOX_BUTTON_WIDTH 12
-//#define POPUPMENUITEM_TEXT_ETCH_CONDITIONS ( etchtext && !enabled && !active )
-#define POPUPMENUITEM_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-
-#define PUSHBUTTON_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-#define HEADER_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-#define TABBAR_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-#define CHECKBOX_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-#define RADIOBUTTON_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-
/* Hackery to make metasources work */
#include "asteroid.moc"
@@ -94,7 +83,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin);
AsteroidStyle::AsteroidStyle() : TDEStyle(AllowMenuTransparency)
{
if (tqApp->inherits("TDEApplication")) {
- connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+ connect(tqApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
}
backwards = TQApplication::reverseLayout();
@@ -108,7 +97,7 @@ AsteroidStyle::~AsteroidStyle()
void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
/* Screwing with the palette is fun! and required in order to make it feel
authentic. -clee */
@@ -118,7 +107,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to?
bool isProtectedObject = false;
- TQObject *curparent = TQT_TQOBJECT(w);
+ TQObject *curparent = w;
while (curparent) {
if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem")
|| curparent->inherits("KJanusWidget")
@@ -135,7 +124,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
}
}
- if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQPushButton")) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
}
else {
@@ -159,7 +148,7 @@ AsteroidStyle::applicationPolish(const TQStyleControlElementData&, ControlElemen
TQPalette wp = TQApplication::palette();
wp.setColor(TQColorGroup::Dark, TQColor(128, 128, 128));
wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to?
- TQApplication::setPalette( wp, TRUE );
+ TQApplication::setPalette( wp, true );
}
/*! \reimp
@@ -294,7 +283,7 @@ void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp,
}
}
-int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
+int AsteroidStyle::styleHint( StyleHint stylehint,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption &option,
@@ -324,7 +313,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
}
}
-void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
+void AsteroidStyle::drawPrimitive(PrimitiveElement pe,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -918,7 +907,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
}
}
- if (p->pen() == Qt::NoPen) {
+ if (p->pen() == TQt::NoPen) {
p->setPen(sf & Style_Enabled ? cg.foreground() : cg.light());
}
@@ -980,7 +969,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
}
}
-void AsteroidStyle::drawControl(TQ_ControlElement ce,
+void AsteroidStyle::drawControl(ControlElement ce,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1026,8 +1015,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
const TQTab * t = o.tab();
bool selected = sf & Style_Selected;
- bool lastTab = (ceData.tabBarData.identIndexMap[t->identifier()] == ceData.tabBarData.tabCount-1) ?
- TRUE : FALSE;
+ bool lastTab = (ceData.tabBarData.identIndexMap[t->identifier()] == ceData.tabBarData.tabCount-1);
TQRect r2( r );
if ( ceData.tabBarData.shape == TQTabBar::RoundedAbove ) {
p->setPen( cg.light() );
@@ -1138,7 +1126,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
tr.setWidth(tr.width()+4); // Compensate for text appearing too far to the left
// TQRect tr_offset = TQRect(tr.x()+ETCH_X_OFFSET, tr.y()+ETCH_Y_OFFSET, tr.width(), tr.height());
TQRect tr_offset = TQRect(tr.x()+0, tr.y()+0, tr.width(), tr.height());
- if TABBAR_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
TQPen savePen = p->pen();
p->setPen( cg.light() );
TQColorGroup etchedcg = cg;
@@ -1185,7 +1173,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
//TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
TQRect r_offset = TQRect(r.x()+0, r.y()+0, r.width(), r.height());
- if CHECKBOX_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
TQPen savePen = p->pen();
p->setPen( cg.light() );
TQColorGroup etchedcg = cg;
@@ -1234,7 +1222,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
// TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
TQRect r_offset = TQRect(r.x()+0, r.y()+0, r.width(), r.height());
- if RADIOBUTTON_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
TQPen savePen = p->pen();
p->setPen( cg.light() );
TQColorGroup etchedcg = cg;
@@ -1417,9 +1405,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
}
}
- p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.foreground() );
+ p->setPen( ( etchtext && !enabled )?cg.dark():cg.foreground() );
TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
- if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
TQPen savePen = p->pen();
p->setPen( cg.light() );
p->drawText(r_offset, text_flags, o.menuItem()->text());
@@ -1473,13 +1461,13 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
}
if (!pb->text().isNull()) {
- p->setPen(POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():(enabled ? cg.buttonText() : pb->palette().disabled().buttonText()));
+ p->setPen(( etchtext && !enabled )?cg.dark():(enabled ? cg.buttonText() : pb->palette().disabled().buttonText()));
if (pb->iconSet() && !pb->iconSet()->isNull()) {
TQRect tpr(dx, r.y(), r.width()-dx, r.height());
TQRect tr(p->boundingRect(tpr, text_flags, pb->text()));
TQRect tr_offset = TQRect(tr.x()+ETCH_X_OFFSET, tr.y()+ETCH_Y_OFFSET, tr.width(), tr.height());
- if PUSHBUTTON_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
TQPen savePen = p->pen();
p->setPen( cg.light() );
p->drawText(tr_offset, text_flags, pb->text());
@@ -1488,7 +1476,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
p->drawText(tr, text_flags, pb->text());
} else {
TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
- if PUSHBUTTON_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
TQPen savePen = p->pen();
p->setPen( cg.light() );
p->drawText(r_offset, text_flags, pb->text());
@@ -1515,7 +1503,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
p->drawPixmap(pr.topLeft(), pm);
pr = TQRect(pr.width(), r.top(), r.width() - pr.width(), r.height());
TQRect pr_offset = TQRect(pr.x()+ETCH_X_OFFSET, pr.y()+ETCH_Y_OFFSET, pr.width(), pr.height());
- if HEADER_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
p->setPen( cg.dark()) ;
TQPen savePen = p->pen();
p->setPen( cg.light() );
@@ -1524,9 +1512,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
}
p->drawText(pr, text_flags, ceData.textLabel);
} else {
- p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.buttonText() );
+ p->setPen( ( etchtext && !enabled )?cg.dark():cg.buttonText() );
TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
- if HEADER_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
TQPen savePen = p->pen();
p->setPen( cg.light() );
p->drawText(r_offset, text_flags, ceData.textLabel);
@@ -1611,8 +1599,8 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
if (mi->custom()) {
int m = itemVMargin;
- p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.foreground() );
- if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
+ p->setPen( ( etchtext && !enabled )?cg.dark():cg.foreground() );
+ if ( etchtext && !enabled ) {
TQPen savePen = p->pen();
p->setPen( cg.light() );
TQColorGroup etchedcg = cg;
@@ -1656,7 +1644,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
rr_offset = visualRect(rr_offset, r);
}
- if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
p->setPen(cg.dark());
TQPen savePen = p->pen();
p->setPen( cg.light() );
@@ -1675,7 +1663,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
text_flags |= AlignRight;
}
- if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
+ if ( etchtext && !enabled ) {
p->setPen(cg.dark());
TQPen savePen = p->pen();
p->setPen( cg.light() );
@@ -1686,11 +1674,11 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
} else if (mi->pixmap()) {
TQPixmap *pixmap = mi->pixmap();
if (pixmap->depth() == 1) {
- p->setBackgroundMode(Qt::OpaqueMode);
+ p->setBackgroundMode(TQt::OpaqueMode);
}
p->drawPixmap(xpos, y, *pixmap);
if (pixmap->depth() == 1) {
- p->setBackgroundMode(Qt::TransparentMode);
+ p->setBackgroundMode(TQt::TransparentMode);
}
}
}
@@ -1721,7 +1709,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
}
}
-void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
+void AsteroidStyle::drawControlMask(ControlElement ce,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1768,7 +1756,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
}
}
-void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControl(ComplexControl cc,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1886,15 +1874,15 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
if ( !verticalLine ) {
// make 128*1 and 1*128 bitmaps that can be used for
// drawing the right sort of lines.
- verticalLine = new TQBitmap( 1, 129, TRUE );
- horizontalLine = new TQBitmap( 128, 1, TRUE );
+ verticalLine = new TQBitmap( 1, 129, true );
+ horizontalLine = new TQBitmap( 128, 1, true );
TQPointArray a( 64 );
TQPainter p;
p.begin( verticalLine );
int i;
for( i=0; i<64; i++ )
a.setPoint( i, 0, i*2+1 );
- p.setPen( Qt::color1 );
+ p.setPen( TQt::color1 );
p.drawPoints( a );
p.end();
TQApplication::flushX();
@@ -1902,7 +1890,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
p.begin( horizontalLine );
for( i=0; i<64; i++ )
a.setPoint( i, i*2+1, 0 );
- p.setPen( Qt::color1 );
+ p.setPen( TQt::color1 );
p.drawPoints( a );
p.end();
TQApplication::flushX();
@@ -1996,7 +1984,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
p->drawRect(hr);
bool draw_skinny_frame = false;
-// if (!ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING)) draw_skinny_frame = true;
+// if (!ceData.widgetObjectTypes.contains("TQComboBox")) draw_skinny_frame = true;
if (ceData.comboBoxListBoxFlags & CEF_IsVisible) draw_skinny_frame = true;
if (draw_skinny_frame) {
p->setPen(cg.mid());
@@ -2184,7 +2172,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
}
}
-void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControlMask(ComplexControl cc,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -2300,7 +2288,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData &
}
case PM_DefaultFrameWidth: {
- if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQPopupMenu")) {
return 3;
} else {
return TDEStyle::pixelMetric(pm, ceData, elementFlags, w);
@@ -2384,7 +2372,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat
}
}
-TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
+TQRect AsteroidStyle::querySubControlMetrics(ComplexControl cc,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
@@ -2629,7 +2617,7 @@ bool AsteroidStyle::objectEventHandler( const TQStyleControlElementData &ceData,
/* Win2K has this interesting behaviour where it sets the current
default button to whatever pushbutton the user presses the mouse
on. I _think_ this emulates that properly. -clee */
- if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQPushButton")) {
if (e->type() == TQEvent::MouseButtonPress) {
widgetActionRequest(ceData, elementFlags, source, WAR_SetDefault);
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 11:06:21 +0000