diff options
| author | Danny Baumann <dannybaumann@web.de> | 2009-01-08 14:20:01 +0100 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2009-01-14 16:46:39 +0100 |
| commit | ed79849955ca43dda6e142f7abccd3bf5dbd4fc8 (patch) | |
| tree | a02dfece795778642ede5494deb82fc2c7138a97 | |
| parent | c46bccb6392fec054e33084413d09e63a041eee3 (diff) | |
Plasma::PanelSvg was renamed to Plasma::FrameSvg in KDE 4.2.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | kde/window-decorator-kde4/switcher.cpp | 20 | ||||
| -rw-r--r-- | kde/window-decorator-kde4/switcher.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 45320991..7a11f4cf 100644 --- a/configure.ac +++ b/configure.ac @@ -487,7 +487,7 @@ if test "x$use_kde4" = "xyes"; then kde4libs=`kde4-config --install lib --expandvars 2>/dev/null` kde4incs=`kde4-config --install include --expandvars 2>/dev/null` - kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h" + kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h" dnl Check for KWin headers AC_MSG_CHECKING([for KWin headers]) diff --git a/kde/window-decorator-kde4/switcher.cpp b/kde/window-decorator-kde4/switcher.cpp index 2978e69f..83e5c409 100644 --- a/kde/window-decorator-kde4/switcher.cpp +++ b/kde/window-decorator-kde4/switcher.cpp @@ -30,7 +30,7 @@ #include <fixx11h.h> -#include <KDE/Plasma/PanelSvg> +#include <KDE/Plasma/FrameSvg> #include <KDE/Plasma/Theme> #include <kwindowsystem.h> @@ -46,9 +46,9 @@ mId (id) QColor color; color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor); - mBackground = new Plasma::PanelSvg(); + mBackground = new Plasma::FrameSvg(); mBackground->setImagePath ("dialogs/background"); - mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders); + mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders); mBorder.left = mBackground->marginSize(Plasma::LeftMargin); mBorder.right = mBackground->marginSize(Plasma::RightMargin); @@ -131,9 +131,8 @@ KWD::Switcher::redrawPixmap () p.setCompositionMode (QPainter::CompositionMode_Source); p.setRenderHint (QPainter::SmoothPixmapTransform); - mBackground->resizePanel (QSizeF (contentWidth, contentHeight)); - mBackground->paintPanel (&p, QRect (0, 0, contentWidth, - contentHeight)); + mBackground->resizeFrame (QSizeF (contentWidth, contentHeight)); + mBackground->paintFrame (&p, QRect (0, 0, contentWidth, contentHeight)); mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top, mGeometry.width (), @@ -167,10 +166,11 @@ KWD::Switcher::update () p.setCompositionMode (QPainter::CompositionMode_Source); - - mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top + - mGeometry.height () + 5, mGeometry.width (), - fm.height ())); + mBackground->paintFrame (&p, QRect (mBorder.left, + mBorder.top + + mGeometry.height () + 5, + mGeometry.width (), + fm.height ())); p.setFont (font); p.setPen (Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor)); diff --git a/kde/window-decorator-kde4/switcher.h b/kde/window-decorator-kde4/switcher.h index 2451c7a9..bc969d77 100644 --- a/kde/window-decorator-kde4/switcher.h +++ b/kde/window-decorator-kde4/switcher.h @@ -30,7 +30,7 @@ namespace Plasma { -class PanelSvg; +class FrameSvg; } class QSpacerItem; @@ -70,7 +70,7 @@ class Switcher QRect mGeometry; - Plasma::PanelSvg *mBackground; + Plasma::FrameSvg *mBackground; QPixmap mPixmap; QPixmap mBackgroundPixmap; |