summaryrefslogtreecommitdiffstats
path: root/twin-styles/cde
diff options
context:
space:
mode:
Diffstat (limited to 'twin-styles/cde')
-rw-r--r--twin-styles/cde/cdeclient.cpp98
-rw-r--r--twin-styles/cde/cdeclient.h2
-rw-r--r--twin-styles/cde/config/config.cpp2
3 files changed, 51 insertions, 51 deletions
diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp
index 03eb14fa..34a4baae 100644
--- a/twin-styles/cde/cdeclient.cpp
+++ b/twin-styles/cde/cdeclient.cpp
@@ -19,7 +19,7 @@
#include "cdeclient.h"
#include <tqdatetime.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqbutton.h>
#include <tqcursor.h>
#include <tqlabel.h>
@@ -114,9 +114,9 @@ static inline const KDecorationOptions* options()
return KDecoration::options();
}
-static void fixColorGroup(TQColorGroup & tqcolorGroup)
+static void fixColorGroup(TQColorGroup & colorGroup)
{
- TQColor light = tqcolorGroup.light();
+ TQColor light = colorGroup.light();
int hue, saturation, value;
@@ -125,17 +125,17 @@ static void fixColorGroup(TQColorGroup & tqcolorGroup)
if (value < 128)
{
light.setHsv(hue, saturation, 128);
- tqcolorGroup.setColor(TQColorGroup::Light, light);
+ colorGroup.setColor(TQColorGroup::Light, light);
}
- TQColor dark = tqcolorGroup.dark();
+ TQColor dark = colorGroup.dark();
dark.hsv(&hue, &saturation, &value);
if (value < 84)
{
dark.setHsv(hue, saturation, 84);
- tqcolorGroup.setColor(TQColorGroup::Dark, dark);
+ colorGroup.setColor(TQColorGroup::Dark, dark);
}
}
@@ -381,7 +381,7 @@ void CdeClient::addClientButtons( const TQString& s )
void CdeClient::captionChange()
{
- widget()->tqrepaint(titlebar->tqgeometry(), false);
+ widget()->repaint(titlebar->geometry(), false);
}
void CdeClient::activeChange()
@@ -389,7 +389,7 @@ void CdeClient::activeChange()
for ( int i=0; i < BtnCount; i++ )
if ( button[i] ) button[i]->reset();
- widget()->tqrepaint(false);
+ widget()->repaint(false);
}
void CdeClient::maximizeChange()
@@ -398,7 +398,7 @@ void CdeClient::maximizeChange()
bool m = maximizeMode() == MaximizeFull;
TQToolTip::remove(button[BtnMax]);
TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize"));
- button[BtnMax]->tqrepaint();
+ button[BtnMax]->repaint();
}
}
@@ -412,7 +412,7 @@ void CdeClient::shadeChange()
void CdeClient::showEvent(TQShowEvent *)
{
- widget()->tqrepaint();
+ widget()->repaint();
}
void CdeClient::desktopChange()
@@ -420,7 +420,7 @@ void CdeClient::desktopChange()
// Nothing to do yet
}
-TQSize CdeClient::tqminimumSize() const
+TQSize CdeClient::minimumSize() const
{
return TQSize(2 * (s_buttonSize + s_frameWidth),
2 * s_frameWidth + s_buttonSize);
@@ -489,12 +489,12 @@ void CdeClient::resizeEvent( TQResizeEvent* e)
{
widget()->update( width() - dx + 1, 0, dx, height() );
widget()->update( TQRect( TQPoint(4,4),
- titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) );
- widget()->update(TQRect(titlebar->tqgeometry().topRight(),
- TQPoint(width() - 4, titlebar->tqgeometry().bottom())));
+ titlebar->geometry().bottomLeft() - TQPoint(1,0) ) );
+ widget()->update(TQRect(titlebar->geometry().topRight(),
+ TQPoint(width() - 4, titlebar->geometry().bottom())));
// Titlebar needs no paint event
- TQApplication::postEvent( this, new TQPaintEvent( titlebar->tqgeometry(), false ) );
+ TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) );
}
}
}
@@ -503,16 +503,16 @@ void CdeClient::paintEvent( TQPaintEvent* )
{
TQPainter p(widget());
- TQColorGroup tqcolorGroup;
+ TQColorGroup colorGroup;
if ( coloredFrame )
- tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() );
+ colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() );
else
- tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorFrame, isActive() );
+ colorGroup = options()->colorGroup( KDecoration::ColorFrame, isActive() );
- fixColorGroup( tqcolorGroup );
+ fixColorGroup( colorGroup );
- TQRect trect = titlebar->tqgeometry();
+ TQRect trect = titlebar->geometry();
TQRect mrect = widget()->rect();
if ( s_frameWidth > 0 )
@@ -523,7 +523,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
}
p.setPen( TQt::NoPen );
- p.setBrush( tqcolorGroup.background() );
+ p.setBrush( colorGroup.background() );
if ( s_frameWidth > 1 )
@@ -546,24 +546,24 @@ void CdeClient::paintEvent( TQPaintEvent* )
// draw left and right frames:
qDrawShadePanel( &p, 1, longSide + 1,
s_frameWidth, mrect.height() - 2 * (longSide + 1),
- tqcolorGroup );
+ colorGroup );
qDrawShadePanel( &p, mrect.width() - s_frameWidth - 1, longSide + 1,
s_frameWidth, mrect.height() - 2 * (longSide + 1),
- tqcolorGroup );
+ colorGroup );
}
// draw top and bottom frames:
qDrawShadePanel( &p, longSide + 1, 1,
mrect.width() - 2 * (longSide + 1), s_frameWidth,
- tqcolorGroup );
+ colorGroup );
qDrawShadePanel( &p, longSide + 1, mrect.height() - s_frameWidth - 1,
mrect.width() - 2 * (longSide + 1), s_frameWidth,
- tqcolorGroup );
+ colorGroup );
// draw light corner parts:
- p.setPen( tqcolorGroup.light() );
+ p.setPen( colorGroup.light() );
// tl corner:
p.drawLine( 1, 1, longSide - 1, 1 );
@@ -601,7 +601,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
s_frameWidth + 1, mrect.height() - s_frameWidth - 1 );
// draw dark corner parts:
- p.setPen( tqcolorGroup.dark() );
+ p.setPen( colorGroup.dark() );
// tl corner:
if ( !shaded )
@@ -640,14 +640,14 @@ void CdeClient::paintEvent( TQPaintEvent* )
if ( !coloredFrame )
{
- tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() );
- fixColorGroup( tqcolorGroup );
- p.setBrush( tqcolorGroup.background() );
+ colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() );
+ fixColorGroup( colorGroup );
+ p.setBrush( colorGroup.background() );
}
// draw titlebar:
p.drawRect( trect );
- qDrawShadePanel( &p, trect, tqcolorGroup, titlebarPressed );
+ qDrawShadePanel( &p, trect, colorGroup, titlebarPressed );
// draw caption:
if ( titlebarPressed ) // move the caption right and down if the titlebar is pressed
@@ -672,7 +672,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
// Draw a line behind the wrapped window to prevent having
// unpainted areas when we're shaded.
- p.setPen( tqcolorGroup.dark() );
+ p.setPen( colorGroup.dark() );
p.drawLine(s_frameWidth + 1, mrect.height() - s_frameWidth - 2,
mrect.width() - s_frameWidth - 2, mrect.height() - s_frameWidth - 2);
@@ -712,24 +712,24 @@ KDecoration::Position CdeClient::mousePosition( const TQPoint& p ) const
void CdeClient::mouseDoubleClickEvent( TQMouseEvent * e )
{
- if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
+ if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
titlebarDblClickOperation();
}
void CdeClient::wheelEvent( TQWheelEvent * e )
{
- if (isSetShade() || titleLayout->tqgeometry().contains( e->pos() ) )
+ if (isSetShade() || titleLayout->geometry().contains( e->pos() ) )
titlebarMouseWheelOperation( e->delta());
}
void CdeClient::mousePressEvent( TQMouseEvent * e )
{
- if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
+ if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
{
if ( titlebarButtonMode )
{
titlebarPressed = true;
- widget()->tqrepaint(titlebar->tqgeometry(), false);
+ widget()->repaint(titlebar->geometry(), false);
}
}
}
@@ -745,7 +745,7 @@ void CdeClient::mouseReleaseEvent( TQMouseEvent * e )
if ( e->button() == Qt::LeftButton && titlebarPressed )
{
titlebarPressed = false;
- widget()->tqrepaint(titlebar->tqgeometry(), false);
+ widget()->repaint(titlebar->geometry(), false);
}
}
@@ -797,7 +797,7 @@ CdeButton::CdeButton(CdeClient* parent,
void CdeButton::reset()
{
- tqrepaint( false );
+ repaint( false );
}
void CdeButton::drawButton( TQPainter* p )
@@ -805,36 +805,36 @@ void CdeButton::drawButton( TQPainter* p )
p->setBrush( options()->color( KDecoration::ColorTitleBar, m_parent->isActive() ) );
p->drawRect( 0, 0, s_buttonSize, s_buttonSize );
- TQColorGroup tqcolorGroup =
- options()->tqcolorGroup( KDecoration::ColorTitleBar, m_parent->isActive() );
+ TQColorGroup colorGroup =
+ options()->colorGroup( KDecoration::ColorTitleBar, m_parent->isActive() );
- fixColorGroup(tqcolorGroup);
+ fixColorGroup(colorGroup);
qDrawShadePanel( p, 0, 0, s_buttonSize, s_buttonSize,
- tqcolorGroup, isDown() );
+ colorGroup, isDown() );
switch ( m_btnType )
{
case (BtnMenu):
- qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, tqcolorGroup );
+ qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, colorGroup );
break;
case (BtnHelp):
- p->setPen( tqcolorGroup.light() );
+ p->setPen( colorGroup.light() );
p->drawLineSegments( TQPointArray(16, helpLLines) );
- p->setPen( tqcolorGroup.dark() );
+ p->setPen( colorGroup.dark() );
p->drawLineSegments( TQPointArray(14, helpDLines) );
break;
case (BtnIconify):
- qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, tqcolorGroup );
+ qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, colorGroup );
break;
case (BtnMax):
- qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, tqcolorGroup,
+ qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, colorGroup,
m_parent->maximizeMode() == KDecoration::MaximizeFull );
break;
case (BtnClose):
- p->setPen( tqcolorGroup.dark() );
+ p->setPen( colorGroup.dark() );
p->drawLineSegments( TQPointArray(18, closeDLines) );
- p->setPen( tqcolorGroup.light() );
+ p->setPen( colorGroup.light() );
p->drawLineSegments( TQPointArray(15, closeLLines) );
break;
}
diff --git a/twin-styles/cde/cdeclient.h b/twin-styles/cde/cdeclient.h
index e3a0e9ad..402e0b3d 100644
--- a/twin-styles/cde/cdeclient.h
+++ b/twin-styles/cde/cdeclient.h
@@ -78,7 +78,7 @@ protected:
void activeChange();
void shadeChange();
void iconChange();
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void resize(const TQSize &size);
void borders(int &left, int &right, int &top, int &bottom) const;
void mousePressEvent( TQMouseEvent* );
diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp
index fcd2de42..41631d57 100644
--- a/twin-styles/cde/config/config.cpp
+++ b/twin-styles/cde/config/config.cpp
@@ -30,7 +30,7 @@ CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent )
bgAlign = new TQButtonGroup( 3, Qt::Horizontal, i18n("Text &Alignment"), groupBox );
bgAlign->setExclusive( true );
- TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the tqalignment of the titlebar caption text.") );
+ TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the alignment of the titlebar caption text.") );
new TQRadioButton( i18n("Left"), bgAlign, "AlignLeft" );
TQRadioButton *radio2 = new TQRadioButton( i18n("Centered"), bgAlign, "AlignHCenter" );
radio2->setChecked( true );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 06:03:05 +0000