diff options
Diffstat (limited to 'twin-styles/smooth-blend/client/smoothblend.cc')
| -rw-r--r-- | twin-styles/smooth-blend/client/smoothblend.cc | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc index e012fbc2..f2a23b03 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cc +++ b/twin-styles/smooth-blend/client/smoothblend.cc @@ -19,7 +19,7 @@ #include <tqbitmap.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqtooltip.h> #include <tqtimer.h> @@ -51,7 +51,7 @@ bool smoothblendFactory::menuClose = false; static const int TOPMARGIN = 4; // do not change static const int DECOHEIGHT = 4; // do not change static const int SIDETITLEMARGIN = 2; -// Default button tqlayout +// Default button layout const char default_left[] = "M"; const char default_right[] = "HIAX"; @@ -94,7 +94,7 @@ KDecoration* smoothblendFactory::createDecoration(KDecorationBridge* b) { // reset() // ------- // Reset the handler. Returns true if decorations need to be remade, false if -// only a tqrepaint is necessary +// only a repaint is necessary bool smoothblendFactory::reset(unsigned long changed) { // read in the configuration @@ -184,11 +184,11 @@ smoothblendButton::~smoothblendButton() { } ////////////////////////////////////////////////////////////////////////////// -// tqsizeHint() +// sizeHint() // ---------- // Return size hint -TQSize smoothblendButton::tqsizeHint() const { +TQSize smoothblendButton::sizeHint() const { return TQSize(::factory->buttonSize(), ::factory->buttonSize()); } @@ -232,7 +232,7 @@ void smoothblendButton::animate() { animTmr->start(TIMERINTERVAL, true); // single-shot } } - tqrepaint(false); + repaint(false); } ////////////////////////////////////////////////////////////////////////////// // enterEvent() @@ -407,7 +407,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) { TQColor redColor(red); bool active = client_->isActive(); TQPixmap backgroundTile = client_->getTitleBarTile(active); - group = KDecoration::options()->tqcolorGroup(KDecoration::ColorTitleBar, active); + group = KDecoration::options()->colorGroup(KDecoration::ColorTitleBar, active); //draw the titlebar behind the buttons and app icons if ((client_->maximizeMode()==client_->MaximizeFull) && !KDecoration::options()->moveResizeMaximizedWindows()) @@ -434,7 +434,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) { //that may produce pixilation of the image painter->drawImage( dx, dy, menuButtonImage.smoothScale(newWidth, newHeight) ); } else { - //highlight on a mouse over tqrepaint + //highlight on a mouse over repaint double factor = animProgress * 0.13; if(!isDown()) @@ -508,8 +508,8 @@ void smoothblendClient::create_pixmaps() { TQColorGroup group,widgetGroup; int FRAMESIZE = ::factory->frameSize(); // Get the color groups we need for the gradients - group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); - widgetGroup = widget()->tqcolorGroup(); + group = options()->colorGroup(KDecoration::ColorTitleBar, true); + widgetGroup = widget()->colorGroup(); // active top title bar tile tempPixmap.resize(1, TOPMARGIN); @@ -525,7 +525,7 @@ void smoothblendClient::create_pixmaps() { painter.end(); // inactive top title bar tile - group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); + group = options()->colorGroup(KDecoration::ColorTitleBar, false); tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap, group.background(), widgetGroup.background(), @@ -539,7 +539,7 @@ void smoothblendClient::create_pixmaps() { // active title bar tile tempPixmap.resize(1, s_titleHeight+FRAMESIZE); - group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); + group = options()->colorGroup(KDecoration::ColorTitleBar, true); tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap, group.background(), widgetGroup.background(), @@ -552,7 +552,7 @@ void smoothblendClient::create_pixmaps() { painter.end(); // inactive title bar tile - group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); + group = options()->colorGroup(KDecoration::ColorTitleBar, false); tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap, group.background(), widgetGroup.background(), @@ -600,7 +600,7 @@ void smoothblendClient::init() { } void smoothblendClient::_resetLayout() { - // basic tqlayout: + // basic layout: // _______________________________________________________________ // | topSpacer | // |_______________________________________________________________| @@ -697,9 +697,9 @@ void smoothblendClient::_resetLayout() ////////////////////////////////////////////////////////////////////////////// // addButtons() // ------------ -// Add buttons to title tqlayout +// Add buttons to title layout -void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int button_size) { +void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int button_size) { TQString tip; if (s.length() > 0) { for (unsigned n=0; n < s.length(); n++) { @@ -710,8 +710,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "splat.png", i18n("Menu"),ButtonMenu,button_size); connect(button[ButtonMenu], TQT_SIGNAL(pressed()), this, TQT_SLOT(menuButtonPressed())); connect(button[ButtonMenu], TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased())); - tqlayout->addWidget(button[ButtonMenu]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonMenu]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -726,8 +726,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "circle.png", tip, ButtonSticky, button_size, true); connect(button[ButtonSticky], TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops())); - tqlayout->addWidget(button[ButtonSticky]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonSticky]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -737,8 +737,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "help.png", i18n("Help"), ButtonHelp, button_size); connect(button[ButtonHelp], TQT_SIGNAL(clicked()), this, TQT_SLOT(showContextHelp())); - tqlayout->addWidget(button[ButtonHelp]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonHelp]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -748,8 +748,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "minimize.png", i18n("Minimize"), ButtonMin, button_size); connect(button[ButtonMin], TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize())); - tqlayout->addWidget(button[ButtonMin]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonMin]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -764,8 +764,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "maximize.png", tip, ButtonMax, button_size, true); connect(button[ButtonMax], TQT_SIGNAL(clicked()), this, TQT_SLOT(maxButtonPressed())); - tqlayout->addWidget(button[ButtonMax]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonMax]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -775,8 +775,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "close.png", i18n("Close"), ButtonClose, button_size); connect(button[ButtonClose], TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow())); - tqlayout->addWidget(button[ButtonClose]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonClose]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -787,8 +787,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int i18n("Keep Above Others"), ButtonAbove, button_size, true); connect(button[ButtonAbove], TQT_SIGNAL(clicked()), this, TQT_SLOT(aboveButtonPressed())); - tqlayout->addWidget(button[ButtonAbove]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonAbove]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -799,8 +799,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int i18n("Keep Below Others"), ButtonBelow, button_size, true); connect(button[ButtonBelow], TQT_SIGNAL(clicked()), this, TQT_SLOT(belowButtonPressed())); - tqlayout->addWidget(button[ButtonBelow]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonBelow]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -815,13 +815,13 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "shade.png", tip, ButtonShade, button_size, true); connect(button[ButtonShade], TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeButtonPressed())); - tqlayout->addWidget(button[ButtonShade]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonShade]); + if (n < s.length()-1) layout->addSpacing(1); } break; case '_': // Spacer item - tqlayout->addSpacing(::factory->frameSize()); + layout->addSpacing(::factory->frameSize()); } } } @@ -836,7 +836,7 @@ void smoothblendClient::activeChange() { for (int n=0; n<ButtonTypeCount; n++) if (button[n]) button[n]->reset(); - widget()->tqrepaint(false); + widget()->repaint(false); } ////////////////////////////////////////////////////////////////////////////// @@ -845,7 +845,7 @@ void smoothblendClient::activeChange() { // The title has changed void smoothblendClient::captionChange() { - widget()->tqrepaint(titlebar_->tqgeometry(), false); + widget()->repaint(titlebar_->geometry(), false); } ////////////////////////////////////////////////////////////////////////////// @@ -858,7 +858,7 @@ void smoothblendClient::desktopChange() { if (button[ButtonSticky]) { TQToolTip::remove(button[ButtonSticky]); TQToolTip::add(button[ButtonSticky], d ? i18n("Un-Sticky") : i18n("Sticky")); - button[ButtonSticky]->tqrepaint(false); + button[ButtonSticky]->repaint(false); } } @@ -869,7 +869,7 @@ void smoothblendClient::desktopChange() { void smoothblendClient::iconChange() { if (button[ButtonMenu]) { - button[ButtonMenu]->tqrepaint(false); + button[ButtonMenu]->repaint(false); } } @@ -883,7 +883,7 @@ void smoothblendClient::maximizeChange() { if (button[ButtonMax]) { TQToolTip::remove(button[ButtonMax]); TQToolTip::add(button[ButtonMax], m ? i18n("Restore") : i18n("Maximize")); - button[ButtonMax]->tqrepaint(false); + button[ButtonMax]->repaint(false); } } @@ -897,7 +897,7 @@ void smoothblendClient::shadeChange() { if (button[ButtonShade]) { TQToolTip::remove(button[ButtonShade]); TQToolTip::add(button[ButtonShade], s ? i18n("Unshade") : i18n("Shade")); - button[ButtonShade]->tqrepaint(false); + button[ButtonShade]->repaint(false); } } @@ -909,7 +909,7 @@ void smoothblendClient::shadeChange() { void smoothblendClient::keepAboveChange(bool a) { if (button[ButtonAbove]) { button[ButtonAbove]->setOn(a); - button[ButtonAbove]->tqrepaint(false); + button[ButtonAbove]->repaint(false); } } @@ -921,7 +921,7 @@ void smoothblendClient::keepAboveChange(bool a) { void smoothblendClient::keepBelowChange(bool b) { if (button[ButtonBelow]) { button[ButtonBelow]->setOn(b); - button[ButtonBelow]->tqrepaint(false); + button[ButtonBelow]->repaint(false); } } @@ -937,7 +937,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co left = right = bottom = 0; top = ::factory->buttonSize(); - // update tqlayout etc. + // update layout etc. topSpacer_->changeSize(1, 0, TQSizePolicy::Expanding, TQSizePolicy::Fixed); decoSpacer_->changeSize(1, 0, TQSizePolicy::Expanding, TQSizePolicy::Fixed); leftSpacer_->changeSize(left, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding); @@ -949,7 +949,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co left = right = bottom = ::factory->frameSize(); top = ::factory->titleSize() + (FRAMESIZE*2); - // update tqlayout etc. + // update layout etc. topSpacer_->changeSize(1, FRAMESIZE, TQSizePolicy::Expanding, TQSizePolicy::Fixed); decoSpacer_->changeSize(1, FRAMESIZE, TQSizePolicy::Expanding, TQSizePolicy::Fixed); leftSpacer_->changeSize(left, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding); @@ -958,7 +958,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co rightTitleSpacer_->changeSize(right,s_titleHeight,TQSizePolicy::Fixed, TQSizePolicy::Fixed); bottomSpacer_->changeSize(1, bottom, TQSizePolicy::Expanding, TQSizePolicy::Fixed); } - widget()->tqlayout()->activate(); + widget()->layout()->activate(); } ////////////////////////////////////////////////////////////////////////////// @@ -971,12 +971,12 @@ void smoothblendClient::resize(const TQSize &size) { } ////////////////////////////////////////////////////////////////////////////// -// tqminimumSize() +// minimumSize() // ------------- // Return the minimum allowable size for this window -TQSize smoothblendClient::tqminimumSize() const { - return widget()->tqminimumSize(); +TQSize smoothblendClient::minimumSize() const { + return widget()->minimumSize(); } ////////////////////////////////////////////////////////////////////////////// @@ -1077,7 +1077,7 @@ bool smoothblendClient::eventFilter(TQObject *obj, TQEvent *e) { // Doubleclick on title void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) { - if (titlebar_->tqgeometry().contains(e->pos())) + if (titlebar_->geometry().contains(e->pos())) titlebarDblClickOperation(); } @@ -1088,7 +1088,7 @@ void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) { void smoothblendClient::wheelEvent(TQWheelEvent *e) { - if (titleLayout_->tqgeometry().contains(e->pos()) ) + if (titleLayout_->geometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } @@ -1117,18 +1117,18 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { TQPainter painter(widget()); bool active = isActive(); //get group information first - group = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()); - widgetGroup = widget()->tqcolorGroup(); - - TQRect topRect( topSpacer_->tqgeometry() ); - TQRect titleRect( titleLayout_->tqgeometry() ); - TQRect textRect( titlebar_->tqgeometry() ); - TQRect Rltitle( leftTitleSpacer_->tqgeometry() ); - TQRect Rrtitle( rightTitleSpacer_->tqgeometry() ); - TQRect Rdeco( decoSpacer_->tqgeometry() ); - TQRect Rleft( leftSpacer_->tqgeometry() ); - TQRect Rright( rightSpacer_->tqgeometry() ); - TQRect Rbottom( bottomSpacer_->tqgeometry() ); + group = options()->colorGroup(KDecoration::ColorTitleBar, isActive()); + widgetGroup = widget()->colorGroup(); + + TQRect topRect( topSpacer_->geometry() ); + TQRect titleRect( titleLayout_->geometry() ); + TQRect textRect( titlebar_->geometry() ); + TQRect Rltitle( leftTitleSpacer_->geometry() ); + TQRect Rrtitle( rightTitleSpacer_->geometry() ); + TQRect Rdeco( decoSpacer_->geometry() ); + TQRect Rleft( leftSpacer_->geometry() ); + TQRect Rright( rightSpacer_->geometry() ); + TQRect Rbottom( bottomSpacer_->geometry() ); TQRect tempRect; @@ -1183,7 +1183,7 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { Rltitle.width(), Rltitle.height()+Rdeco.height(), active ? *aTitleBarTile:*iTitleBarTile); - // left mid tqlayout + // left mid layout painter.fillRect(Rleft,widgetGroup.background()); // right of buttons and title @@ -1192,7 +1192,7 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { Rrtitle.width(), Rrtitle.height()+Rdeco.height(), active ? *aTitleBarTile:*iTitleBarTile); - // right mid tqlayout + // right mid layout painter.fillRect(Rright,widgetGroup.background()); // bottom @@ -1280,7 +1280,7 @@ void smoothblendClient::updateMask() { void smoothblendClient::resizeEvent(TQResizeEvent *) { if (widget()->isShown()) { TQRegion region = widget()->rect(); - region = region.subtract(titlebar_->tqgeometry()); + region = region.subtract(titlebar_->geometry()); widget()->erase(region); updateMask(); } @@ -1293,7 +1293,7 @@ void smoothblendClient::resizeEvent(TQResizeEvent *) { void smoothblendClient::showEvent(TQShowEvent *) { updateMask(); - widget()->tqrepaint(); + widget()->repaint(); } ////////////////////////////////////////////////////////////////////////////// |