← Back to branch summary

~ubuntu-branches/ubuntu/wily/kwin/wily-proposed

« back to all changes in this revision

Viewing changes to rules.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-08-10 23:16:37 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20150810231637-5zb2tstjkez93hml
Tags: 4:5.3.95-0ubuntu1
new upstream beta release

Show diffs side-by-side

added added

removed removed

Lines of Context:
rules.cpp
27
27
#include <QTemporaryFile>
28
28
#include <QFile>
29
29
#include <QFileInfo>
30
 
#include <ktoolinvocation.h>
31
30
#include <QDebug>
32
31
 
33
32
#ifndef KCMRULES
891
890
    else
892
891
        unminimize();
893
892
    setShade(shadeMode());
894
 
    setSkipTaskbar(skipTaskbar(), true);
 
893
    setOriginalSkipTaskbar(skipTaskbar());
895
894
    setSkipPager(skipPager());
896
895
    setSkipSwitcher(skipSwitcher());
897
896
    setKeepAbove(keepAbove());
988
987
    return WindowRules(ret);
989
988
}
990
989
 
991
 
void RuleBook::edit(Client* c, bool whole_app)
 
990
void RuleBook::edit(AbstractClient* c, bool whole_app)
992
991
{
993
992
    save();
994
993
    QStringList args;
995
994
    args << QStringLiteral("--wid") << QString::number(c->window());
996
995
    if (whole_app)
997
996
        args << QStringLiteral("--whole-app");
998
 
    KToolInvocation::kdeinitExec(QStringLiteral("kwin_rules_dialog"), args);
 
997
    QProcess *p = new QProcess(this);
 
998
    p->setArguments(args);
 
999
    p->setProcessEnvironment(kwinApp()->processStartupEnvironment());
 
1000
    p->setProgram(QStringLiteral(KWIN_RULES_DIALOG_BIN));
 
1001
    connect(p, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &QProcess::deleteLater);
 
1002
    connect(p, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error), this,
 
1003
        [p] (QProcess::ProcessError e) {
 
1004
            if (e == QProcess::FailedToStart) {
 
1005
                qCDebug(KWIN_CORE) << "Failed to start kwin_rules_dialog";
 
1006
            }
 
1007
        }
 
1008
    );
 
1009
    p->start();
999
1010
}
1000
1011
 
1001
1012
void RuleBook::load()