yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the ScreenPreviewWidget useable again

Browse source 
Removes the functionality for Plasma::Wallpapers as that doesn't exist
any more and is not needed by the Screenedges KCM. The KCM still has
way too many functionality, but that can stay for the moment as it's
probably best to reimplement the monitor and the actions in QML.
This commit is contained in:
Martin Gräßlin 2013-09-29 10:20:49 +02:00
parent fc41374111
commit a4a436807f
2 changed files with 5 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
kcmkwin/kwinscreenedges/screenpreviewwidget.cpp
View file

@ -25,9 +25,9 @@
#include <QPainter>
#include <KDebug>
#include <KUrl>
#include "Plasma/FrameSvg"
#include "Plasma/Wallpaper"
#include <Plasma/FrameSvg>
class ScreenPreviewWidgetPrivate
@ -35,7 +35,6 @@ class ScreenPreviewWidgetPrivate
public:
ScreenPreviewWidgetPrivate(ScreenPreviewWidget *screen)
: q(screen),
wallpaper(0),
ratio(1)
{}
@ -49,7 +48,7 @@ public:
void updateScreenGraphics()
{
int bottomElements = screenGraphics->elementSize("base").height() + screenGraphics->marginSize(Plasma::BottomMargin);
int bottomElements = screenGraphics->elementSize("base").height() + screenGraphics->marginSize(Plasma::Types::BottomMargin);
QRect bounds(QPoint(0,0), QSize(q->size().width(), q->height() - bottomElements));
QSize monitorSize(q->size().width(), q->size().width()/ratio);
@ -66,19 +65,9 @@ public:
previewRect = screenGraphics->contentsRect().toRect();
previewRect.moveCenter(bounds.center());
if (wallpaper && !previewRect.isEmpty()) {
wallpaper->setBoundingRect(previewRect);
}
}
void wallpaperDeleted()
{
wallpaper = 0;
}
ScreenPreviewWidget *q;
Plasma::Wallpaper* wallpaper;
Plasma::FrameSvg *screenGraphics;
QPixmap preview;
QRect monitorRect;
@ -104,10 +93,6 @@ void ScreenPreviewWidget::setPreview(const QPixmap &preview)
{
d->preview = preview;
if (d->wallpaper) {
disconnect(d->wallpaper, 0, this, 0);
d->wallpaper = 0;
}
update();
}
@ -116,25 +101,6 @@ const QPixmap ScreenPreviewWidget::preview() const
return d->preview;
}
void ScreenPreviewWidget::setPreview(Plasma::Wallpaper* wallpaper)
{
d->preview = QPixmap();
if (d->wallpaper) {
disconnect(d->wallpaper, 0, this, 0);
}
d->wallpaper = wallpaper;
if (d->wallpaper) {
connect(d->wallpaper, SIGNAL(update(QRectF)), this, SLOT(updateRect(QRectF)));
connect(d->wallpaper, SIGNAL(destroyed(QObject*)), this, SLOT(wallpaperDeleted()));
d->updateScreenGraphics();
}
update(d->previewRect);
}
void ScreenPreviewWidget::setRatio(const qreal ratio)
{
d->ratio = ratio;
@ -170,9 +136,7 @@ void ScreenPreviewWidget::paintEvent(QPaintEvent *event)
d->screenGraphics->paintFrame(&painter, d->monitorRect.topLeft());
painter.save();
if (d->wallpaper) {
d->wallpaper->paint(&painter, event->rect().intersected(d->previewRect));
} else if (!d->preview.isNull()) {
if (!d->preview.isNull()) {
painter.setRenderHint(QPainter::SmoothPixmapTransform);
painter.drawPixmap(d->previewRect, d->preview, d->preview.rect());
}
@ -194,4 +158,4 @@ void ScreenPreviewWidget::dropEvent(QDropEvent *e)
}
}
#include "screenpreviewwidget.moc"
#include "moc_screenpreviewwidget.cpp"

9
kcmkwin/kwinscreenedges/screenpreviewwidget.h
View file

@ -23,15 +23,8 @@
#include <QWidget>
class Wallpaper;
class ScreenPreviewWidgetPrivate;
namespace Plasma
{
class Wallpaper;
}
class ScreenPreviewWidget : public QWidget
{
Q_OBJECT
@ -41,7 +34,6 @@ public:
~ScreenPreviewWidget();
void setPreview(const QPixmap &preview);
void setPreview(Plasma::Wallpaper* wallpaper);
const QPixmap preview() const;
void setRatio(const qreal ratio);
qreal ratio() const;
@ -60,7 +52,6 @@ private:
ScreenPreviewWidgetPrivate *const d;
Q_PRIVATE_SLOT(d, void updateRect(const QRectF& rect))
Q_PRIVATE_SLOT(d, void wallpaperDeleted())
};