Differential D27654 Diff 76607 src/core/desktopexecparser.cpp

Changeset View

Standalone View

View Options

src/core/desktopexecparser.cpp

Show First 20 Lines • Show All 424 Lines • ▼ Show 20 Line(s)298{
425 425​
426 if (d->service.terminal()) { 426​ if (d->service.terminal()) {
427 KConfigGroup cg(KSharedConfig::openConfig(), "General"); 427​ KConfigGroup cg(KSharedConfig::openConfig(), "General");
428 QString terminal = cg.readPathEntry("TerminalApplication", QStringLiteral("konsole")); 428​ QString terminal = cg.readPathEntry("TerminalApplication", QStringLiteral("konsole"));
429 if (terminal == QLatin1String("konsole")) { 429​ if (terminal == QLatin1String("konsole")) {
430 if (!d->service.workingDirectory().isEmpty()) { 430​ if (!d->service.workingDirectory().isEmpty()) {
431 terminal += QLatin1String(" --workdir ") + KShell::quoteArg(d->service.workingDirectory()); 431​ terminal += QLatin1String(" --workdir ") + KShell::quoteArg(d->service.workingDirectory());
432 } 432​ }
433 terminal += QLatin1String(" -qwindowtitle '%c' %i"); 433​ terminal += QLatin1String(" -qwindowtitle '%c'");
434​ if(!d->service.icon().isEmpty()) {
435​ terminal += QLatin1String(" -qwindowicon ") + KShell::quoteArg(d->service.icon().replace(QLatin1Char('%'), QLatin1String("%%")));
436​ }
434 } 437​ }
435 terminal += QLatin1Char(' ') + d->service.terminalOptions(); 438​ terminal += QLatin1Char(' ') + d->service.terminalOptions();
436 if (!mx1.expandMacrosShellQuote(terminal)) { 439​ if (!mx1.expandMacrosShellQuote(terminal)) {
437 qCWarning(KIO_CORE) << "KRun: syntax error in command" << terminal << ", service" << d->service.name(); 440​ qCWarning(KIO_CORE) << "KRun: syntax error in command" << terminal << ", service" << d->service.name();
438 return QStringList(); 441​ return QStringList();
439 } 442​ }
440 mx2.expandMacrosShellQuote(terminal); 443​ mx2.expandMacrosShellQuote(terminal);
441 result = KShell::splitArgs(terminal); // assuming that the term spec never needs a shell! 444​ result = KShell::splitArgs(terminal); // assuming that the term spec never needs a shell!
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines