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

Move findImage method from EffectView to EffectModel

Browse source
This commit is contained in:
Antonis Tsiapaliokas 2013-08-07 20:25:04 +03:00 committed by Martin Gräßlin
parent 2f30411106
commit f44691b61c
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcmkwin/kwincompositing/model.cpp
View file

@ -134,6 +134,12 @@ QString EffectModel::serviceName(const QString &effectName) {
return "kwin4_effect_" + effectName.toLower().replace(" ", "");
}
QString EffectModel::findImage(const QString &imagePath, int size) {
const QString relativePath("icons/oxygen/" + QString::number(size) + 'x' + QString::number(size) + '/' + imagePath);
const QString fullImagePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, relativePath, QStandardPaths::LocateFile);
return fullImagePath;
}
EffectView::EffectView(QWindow *parent)
: QQuickView(parent)
{
@ -171,11 +177,5 @@ void EffectView::syncConfig() {
kwinConfig.sync();
}
QString EffectView::findImage(const QString &imagePath, int size) {
const QString relativePath("icons/oxygen/" + QString::number(size) + 'x' + QString::number(size) + '/' + imagePath);
const QString fullImagePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, relativePath, QStandardPaths::LocateFile);
return fullImagePath;
}
}//end namespace Compositing
}//end namespace KWin

4
kcmkwin/kwincompositing/model.h
View file

@ -64,10 +64,11 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
QString serviceName(const QString &effectName);
Q_INVOKABLE QString findImage(const QString &imagePath, int size = 128);
private:
void loadEffects();
QList<EffectData> m_effectsList;
};
class EffectView : public QQuickView {
@ -81,7 +82,6 @@ public:
Q_INVOKABLE void effectStatus(const QString &effectName, bool status);
Q_INVOKABLE void syncConfig();
Q_INVOKABLE QString findImage(const QString &imagePath, int size = 128);
private:
QHash<QString, bool> m_effectStatus;

4
kcmkwin/kwincompositing/qml/Effect.qml
View file

@ -90,7 +90,7 @@ Component {
id: configureButton
anchors.left: effectItem.right
visible: effectConfig.effectUiConfigExists(model.ServiceNameRole)
iconSource: engineObject.findImage("actions/configure.png")
iconSource: effectModel.findImage("actions/configure.png")
width: 50
height: 25
enabled: myCheckBox.checked
@ -104,7 +104,7 @@ Component {
anchors.left: configureButton.right
width: 50
height: 25
iconSource: engineObject.findImage("status/dialog-information.png");
iconSource: effectModel.findImage("status/dialog-information.png");
onClicked: {
animationAbout.running = true;