[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/kwin
From: Matt Broadstone <mbroadst () gmail ! com>
Date: 2005-08-17 9:16:08
Message-ID: 1124270168.691970.30713.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 449967 by mbroadst:
rid ourselves of the Q3Buttons
M +5 -0 clients/default/kdedefault.cpp
M +1 -0 clients/default/kdedefault.h
M +6 -0 clients/laptop/laptopclient.cpp
M +1 -0 clients/laptop/laptopclient.h
M +6 -0 clients/modernsystem/modernsys.cpp
M +1 -1 clients/modernsystem/modernsys.h
M +9 -3 clients/plastik/plastikbutton.cpp
M +3 -0 clients/plastik/plastikbutton.h
M +6 -0 clients/quartz/quartz.cpp
M +1 -0 clients/quartz/quartz.h
M +5 -0 clients/redmond/redmond.cpp
M +1 -0 clients/redmond/redmond.h
M +8 -2 clients/web/WebButton.cpp
M +1 -0 clients/web/WebButton.h
M +5 -5 lib/kcommondecoration.cpp
M +2 -2 lib/kcommondecoration.h
--- trunk/KDE/kdebase/kwin/clients/default/kdedefault.cpp #449966:449967
@@ -625,6 +625,11 @@
}
}
+void KDEDefaultButton::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+ drawButton(&p);
+}
void KDEDefaultButton::drawButton(QPainter *p)
{
--- trunk/KDE/kdebase/kwin/clients/default/kdedefault.h #449966:449967
@@ -60,6 +60,7 @@
protected:
void enterEvent(QEvent *);
void leaveEvent(QEvent *);
+ void paintEvent(QPaintEvent *);
void drawButton(QPainter *p);
void drawButtonLabel(QPainter*) {;}
--- trunk/KDE/kdebase/kwin/clients/laptop/laptopclient.cpp #449966:449967
@@ -299,6 +299,12 @@
repaint();
}
+void LaptopButton::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+ drawButton(&p);
+}
+
void LaptopButton::drawButton(QPainter *p)
{
bool smallBtn = width() == btnWidth1;
--- trunk/KDE/kdebase/kwin/clients/laptop/laptopclient.h #449966:449967
@@ -24,6 +24,7 @@
virtual void reset(unsigned long changed);
protected:
+ void paintEvent(QPaintEvent *);
virtual void drawButton(QPainter *p);
QBitmap deco;
};
--- trunk/KDE/kdebase/kwin/clients/modernsystem/modernsys.cpp #449966:449967
@@ -350,6 +350,12 @@
deco.setMask(deco);
}
+void ModernButton::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+ drawButton(&p);
+}
+
void ModernButton::drawButton(QPainter *p)
{
if(decoration()->isActive()){
--- trunk/KDE/kdebase/kwin/clients/modernsystem/modernsys.h #449966:449967
@@ -20,7 +20,7 @@
void setBitmap(const unsigned char *bitmap);
virtual void reset(unsigned long changed);
protected:
-
+ void paintEvent(QPaintEvent *);
virtual void drawButton(QPainter *p);
void drawButtonLabel(QPainter *){;}
QBitmap deco;
--- trunk/KDE/kdebase/kwin/clients/plastik/plastikbutton.cpp #449966:449967
@@ -22,7 +22,7 @@
// #include <kwin/options.h>
-#include <Q3Button>
+#include <QAbstractButton>
#include <qbitmap.h>
#include <qpainter.h>
#include <qpixmap.h>
@@ -146,7 +146,7 @@
void PlastikButton::enterEvent(QEvent *e)
{
- Q3Button::enterEvent(e);
+ QAbstractButton::enterEvent(e);
hover = true;
animate();
@@ -154,12 +154,18 @@
void PlastikButton::leaveEvent(QEvent *e)
{
- Q3Button::leaveEvent(e);
+ QAbstractButton::leaveEvent(e);
hover = false;
animate();
}
+void PlastikButton::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+ drawButton(&p);
+}
+
void PlastikButton::drawButton(QPainter *painter)
{
QRect r(0,0,width(),height());
--- trunk/KDE/kdebase/kwin/clients/plastik/plastikbutton.h #449966:449967
@@ -47,6 +47,9 @@
protected slots:
void animate();
+protected:
+ void paintEvent(QPaintEvent *);
+
private:
void enterEvent(QEvent *e);
void leaveEvent(QEvent *e);
--- trunk/KDE/kdebase/kwin/clients/quartz/quartz.cpp #449966:449967
@@ -444,6 +444,12 @@
}
}
+void QuartzButton::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+ drawButton(&p);
+}
+
void QuartzButton::drawButton(QPainter *p)
{
// Never paint if the pixmaps have not been created
--- trunk/KDE/kdebase/kwin/clients/quartz/quartz.h #449966:449967
@@ -58,6 +58,7 @@
void reset(unsigned long changed);
protected:
+ void paintEvent(QPaintEvent *);
void drawButton(QPainter *p);
QBitmap* deco;
--- trunk/KDE/kdebase/kwin/clients/redmond/redmond.cpp #449966:449967
@@ -300,6 +300,11 @@
repaint(false);
}
+void RedmondButton::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+ drawButton(&p);
+}
void RedmondButton::drawButton(QPainter *p)
{
--- trunk/KDE/kdebase/kwin/clients/redmond/redmond.h #449966:449967
@@ -37,6 +37,7 @@
void reset(unsigned long changed);
protected:
+ void paintEvent(QPaintEvent *);
virtual void drawButton(QPainter *p);
void drawButtonLabel(QPainter *){;}
--- trunk/KDE/kdebase/kwin/clients/web/WebButton.cpp #449966:449967
@@ -130,7 +130,7 @@
{
mouseOver_ = true;
repaint();
- Q3Button::enterEvent(e);
+ QAbstractButton::enterEvent(e);
}
void
@@ -138,9 +138,15 @@
{
mouseOver_ = false;
repaint();
- Q3Button::leaveEvent(e);
+ QAbstractButton::leaveEvent(e);
}
+void WebButton::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+ drawButton(&p);
+}
+
void
WebButton::drawButton(QPainter *p)
{
--- trunk/KDE/kdebase/kwin/clients/web/WebButton.h #449966:449967
@@ -52,6 +52,7 @@
void enterEvent(QEvent *);
void leaveEvent(QEvent *);
+ void paintEvent(QPaintEvent *);
void drawButton(QPainter *p);
private:
--- trunk/KDE/kdebase/kwin/lib/kcommondecoration.cpp #449966:449967
@@ -872,7 +872,7 @@
KCommonDecorationButton::KCommonDecorationButton(ButtonType type, KCommonDecoration \
*parent, const char *name)
- : Q3Button(parent->widget(), name),
+ : QAbstractButton(parent->widget(), name),
m_decoration(parent),
m_type(type),
m_realizeButtons(Qt::LeftButton),
@@ -933,14 +933,14 @@
void KCommonDecorationButton::setToggleButton(bool toggle)
{
- Q3Button::setToggleButton(toggle);
+ QAbstractButton::setToggleButton(toggle);
reset(ToggleChange);
}
void KCommonDecorationButton::setOn(bool on)
{
if (on != isOn() ) {
- Q3Button::setOn(on);
+ QAbstractButton::setOn(on);
reset(StateChange);
}
}
@@ -952,7 +952,7 @@
QMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button()&m_realizeButtons)?Qt::LeftButton : Qt::NoButton, \
e->state());
- Q3Button::mousePressEvent(&me);
+ QAbstractButton::mousePressEvent(&me);
}
void KCommonDecorationButton::mouseReleaseEvent(QMouseEvent* e)
@@ -962,5 +962,5 @@
QMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button()&m_realizeButtons)?Qt::LeftButton : Qt::NoButton, \
e->state());
- Q3Button::mouseReleaseEvent(&me);
+ QAbstractButton::mouseReleaseEvent(&me);
}
--- trunk/KDE/kdebase/kwin/lib/kcommondecoration.h #449966:449967
@@ -25,7 +25,7 @@
#ifndef KCOMMONDECORATION_H
#define KCOMMONDECORATION_H
-#include <Q3Button>
+#include <QAbstractButton>
#include "kdecoration.h"
class KDecorationBridge;
@@ -285,7 +285,7 @@
/**
* Title bar buttons of KCommonDecoration need to inherit this class.
*/
-class KWIN_EXPORT KCommonDecorationButton : public Q3Button
+class KWIN_EXPORT KCommonDecorationButton : public QAbstractButton
{
friend class KCommonDecoration;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic