mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-06 05:36:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to removal of KSharedPixmap/KRootPixmap

Browse Source 
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=558225
This commit is contained in:
Tobias Koenig
2006-07-04 22:25:04 +00:00
parent 03e325f043
commit d7ea2cd7be
7 changed files with 13 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
settings/schemaeditor.cpp
View File

@@ -27,6 +27,7 @@
#include <QLineEdit>
#include <QMatrix>
#include <QComboBox>
#include <QDesktopWidget>
//Added by qt3to4:
#include <QPixmap>
#include <QTextStream>
@@ -42,7 +43,6 @@
#include <kinputdialog.h>
#include <QToolButton>
#include <kmessagebox.h>
#include <ksharedpixmap.h>
#include <kimageeffect.h>
#include <QImage>
@@ -76,11 +76,6 @@ SchemaEditor::SchemaEditor(QWidget * parent)
bold.resize(20);
transparent.resize(20);
defaultSchema = "";
spix = new KSharedPixmap;
#ifdef Q_WS_X11
connect(spix, SIGNAL(done(bool)), SLOT(previewLoaded(bool)));
#endif
QDBusInterface kdesktop("org.kde.kdesktop", "/Background", "org.kde.kdesktop.Background");
kdesktop.call( "setExport", 1 );
@@ -148,7 +143,6 @@ void SchemaEditor::setSchema(QString sch)
SchemaEditor::~SchemaEditor()
{
delete spix;
}
@@ -167,10 +161,18 @@ void SchemaEditor::updatePreview()
}
else //try to reload
{
#ifdef Q_WS_X11
if(!spix->loadFromShared(QString("DESKTOP1")))
kDebug(0) << "cannot load" << endl;
#endif
QMatrix mat;
QDesktopWidget desktopWidget;
QPixmap pixmap = QPixmap::grabWidget( desktopWidget.screen( 0 ) );
pix = pixmap.transformed( mat.scale(180.0 / pixmap.width(),
100.0 / pixmap.height()) );
kDebug(0) << "Loaded" << endl;
loaded = true;
if (transparencyCheck->isChecked()) {
updatePreview();
}
}
} else {
QPixmap pm;
@@ -185,26 +187,6 @@ void SchemaEditor::updatePreview()
}
void SchemaEditor::previewLoaded(bool l)
{
if (l) {
QMatrix mat;
pix =
spix->pixmap().transformed(mat.
scale(180.0 / spix->pixmap().width(),
100.0 / spix->pixmap().height()));
kDebug(0) << "Loaded" << endl;
loaded = true;
if (transparencyCheck->isChecked()) {
updatePreview();
}
} else
kDebug(0) << "error loading" << endl;
}
void SchemaEditor::getList()
{
if (! schemaLoaded) {