ALT Linux Bugzilla
– Attachment 13453 Details for
Bug 46476
Добавил запуск программ на дискретной видеокарте в alt-app-starter.
New bug
|
Search
|
[?]
|
Help
Register
|
Log In
[x]
|
Forgot Password
Login:
[x]
|
EN
|
RU
[patch]
Патч к alt-app-starter
alt-app-starter.patch (text/plain), 37.07 KB, created by
Егор
on 2023-06-12 08:57:35 MSK
(
hide
)
Description:
Патч к alt-app-starter
Filename:
MIME Type:
Creator:
Егор
Created:
2023-06-12 08:57:35 MSK
Size:
37.07 KB
patch
obsolete
>diff --git a/alt-app-starter/src/mainwindow.cpp b/alt-app-starter/src/mainwindow.cpp >index ad2e38d..695c818 100644 >--- a/alt-app-starter/src/mainwindow.cpp >+++ b/alt-app-starter/src/mainwindow.cpp >@@ -7,6 +7,7 @@ > * exact licensing terms. > */ > >+ > #include "mainwindow.h" > > #include "ui_mainwindow.h" >@@ -32,7 +33,6 @@ > #include <QTextStream> > > #include <boost/scope_exit.hpp> >- > #include <pwd.h> > #include <sys/resource.h> > #include <unistd.h> >@@ -42,17 +42,36 @@ > #include <poll.h> > #include <sys/wait.h> > >+bool getGPU() { >+ >+ std::string output; >+ std::string command = "lspci -mm | awk -F '\"|\" \"|\\\\(' '/\"Display|\"3D|\"VGA/ {a[$0] = $1 \" \" $3 \" \" ($(NF-1) ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $(NF-1))} END {for (i in a) {if (!seen[a[i]]++) {sub(\"^[^ ]+ \", \"\", a[i]); print a[i]}}}'"; >+ >+ FILE* pipe = popen(command.c_str(), "r"); >+ if (!pipe) return false; >+ char buffer[256]; >+ while (fgets(buffer, sizeof(buffer), pipe) != NULL) { >+ output += buffer; >+ } >+ pclose(pipe); >+ >+ bool hasNvidia = output.find("NVIDIA") != std::string::npos; >+ bool hasIntelOrAmd = output.find("Intel") != std::string::npos || output.find("AMD") != std::string::npos; >+ bool hasBothGPU = hasNvidia && hasIntelOrAmd; >+ return hasBothGPU; >+ >+} > MainWindow::MainWindow(QWidget *parent) > : QMainWindow(parent) > , ui(new Ui::MainWindow) > { > ui->setupUi(this); >- > QFont font = ui->label_consoleNotification->font(); > int fontSize = font.pointSize(); > font.setPointSize(fontSize-1); > ui->label_consoleNotification->setFont(font); >- >+ ui->checkBox_RunOnNvidia->setText(tr("Run on an nvidia discrete graphics card")); >+ ui->checkBox_RunOnNvidia->setEnabled(getGPU()); > auto checkBox_runInTerminal_lambda = [this](bool checked) > { > if (checked) >@@ -285,6 +304,11 @@ void MainWindow::runApplication() // Run command with or without user changing > bool useAnotherUser = ui->checkBox_changeUser->isChecked(); > bool runInTerminal = ui->checkBox_runInTerminal->isChecked(); > bool changePriority = ui->checkBox_changePriority->isChecked(); >+ bool checkBox_RunOnNvidia = ui->checkBox_RunOnNvidia->isChecked(); >+ if(checkBox_RunOnNvidia) >+ { >+ fullCommandName = QStringLiteral("nvidia-prime-run ") + fullCommandName; >+ } > > int prio = ui->prioritySpinBox->value(); > >diff --git a/alt-app-starter/src/mainwindow.ui b/alt-app-starter/src/mainwindow.ui >index dbaf874..9c2eeee 100644 >--- a/alt-app-starter/src/mainwindow.ui >+++ b/alt-app-starter/src/mainwindow.ui >@@ -13,7 +13,7 @@ > <x>0</x> > <y>0</y> > <width>731</width> >- <height>489</height> >+ <height>494</height> > </rect> > </property> > <property name="sizePolicy"> >@@ -26,7 +26,8 @@ > <string>Alt-App-Starter - The tool to quickly run programs</string> > </property> > <property name="windowIcon"> >- <iconset theme="system-run"/> >+ <iconset theme="system-run"> >+ <normaloff>.</normaloff>.</iconset> > </property> > <widget class="QWidget" name="centralWidget"> > <property name="sizePolicy"> >@@ -178,6 +179,16 @@ > </property> > </widget> > </item> >+ <item> >+ <widget class="QCheckBox" name="checkBox_RunOnNvidia"> >+ <property name="enabled"> >+ <bool>true</bool> >+ </property> >+ <property name="text"> >+ <string>Run on an nvidia discrete graphics card</string> >+ </property> >+ </widget> >+ </item> > <item> > <spacer name="verticalSpacer_7"> > <property name="orientation"> >diff --git a/alt-app-starter/translations/alt-app-starter.ts b/alt-app-starter/translations/alt-app-starter.ts >index 5efa3ec..5e70994 100644 >--- a/alt-app-starter/translations/alt-app-starter.ts >+++ b/alt-app-starter/translations/alt-app-starter.ts >@@ -5,241 +5,265 @@ > <name>MainWindow</name> > <message> > <location filename="../src/mainwindow.ui" line="26"/> >+ <location filename="../src/ui_mainwindow.h" line="466"/> > <source>Alt-App-Starter - The tool to quickly run programs</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="82"/> >+ <location filename="../src/mainwindow.ui" line="83"/> >+ <location filename="../src/ui_mainwindow.h" line="467"/> > <source>Command: </source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="135"/> >+ <location filename="../src/mainwindow.ui" line="136"/> >+ <location filename="../src/ui_mainwindow.h" line="468"/> > <source>...</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="148"/> >+ <location filename="../src/mainwindow.ui" line="149"/> >+ <location filename="../src/ui_mainwindow.h" line="469"/> > <source>bin</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="157"/> >- <location filename="../src/mainwindow.cpp" line="727"/> >+ <location filename="../src/mainwindow.ui" line="158"/> >+ <location filename="../src/mainwindow.cpp" line="767"/> >+ <location filename="../src/ui_mainwindow.h" line="470"/> > <source>Run in terminal*</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="164"/> >+ <location filename="../src/mainwindow.ui" line="165"/> >+ <location filename="../src/ui_mainwindow.h" line="471"/> > <source>*To run console-only applications like <strong>mc</strong>, <strong>vi</strong> or <strong>bash</strong></source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="177"/> >+ <location filename="../src/mainwindow.ui" line="178"/> >+ <location filename="../src/ui_mainwindow.h" line="472"/> > <source>Don't close terminal after command execution</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="224"/> >+ <location filename="../src/mainwindow.ui" line="235"/> >+ <location filename="../src/ui_mainwindow.h" line="474"/> > <source>Run as another user</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="254"/> >+ <location filename="../src/mainwindow.ui" line="265"/> >+ <location filename="../src/ui_mainwindow.h" line="475"/> > <source>User name:</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="314"/> >+ <location filename="../src/mainwindow.ui" line="325"/> >+ <location filename="../src/ui_mainwindow.h" line="476"/> > <source>Password:</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="369"/> >+ <location filename="../src/mainwindow.ui" line="380"/> >+ <location filename="../src/ui_mainwindow.h" line="477"/> > <source>Run with another priority</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="400"/> >+ <location filename="../src/mainwindow.ui" line="411"/> >+ <location filename="../src/ui_mainwindow.h" line="478"/> > <source>Priority:</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="470"/> >+ <location filename="../src/mainwindow.ui" line="481"/> >+ <location filename="../src/ui_mainwindow.h" line="479"/> > <source>19 (low)</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="477"/> >+ <location filename="../src/mainwindow.ui" line="488"/> >+ <location filename="../src/ui_mainwindow.h" line="480"/> > <source>-20 (high)</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="648"/> >+ <location filename="../src/mainwindow.ui" line="659"/> >+ <location filename="../src/ui_mainwindow.h" line="481"/> > <source>Run</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="651"/> >+ <location filename="../src/mainwindow.ui" line="662"/> >+ <location filename="../src/ui_mainwindow.h" line="483"/> > <source>Return</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="685"/> >+ <location filename="../src/mainwindow.ui" line="696"/> >+ <location filename="../src/ui_mainwindow.h" line="485"/> > <source>Cancel</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="688"/> >+ <location filename="../src/mainwindow.ui" line="699"/> >+ <location filename="../src/ui_mainwindow.h" line="487"/> > <source>Esc</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="264"/> >+ <location filename="../src/mainwindow.cpp" line="299"/> > <source>Open File</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="264"/> >+ <location filename="../src/mainwindow.cpp" line="299"/> > <source>All files (*.*)</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="301"/> >- <location filename="../src/mainwindow.cpp" line="307"/> >+ <location filename="../src/mainwindow.cpp" line="341"/> >+ <location filename="../src/mainwindow.cpp" line="347"/> > <source>Application name error</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="343"/> >+ <location filename="../src/mainwindow.cpp" line="383"/> > <source>Daemon error</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="343"/> >+ <location filename="../src/mainwindow.cpp" line="383"/> > <source>Daemon not safe (not sgid), not using it.</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="350"/> >+ <location filename="../src/mainwindow.cpp" line="390"/> > <source>Daemon start error</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="451"/> >- <location filename="../src/mainwindow.cpp" line="470"/> >- <location filename="../src/mainwindow.cpp" line="480"/> >- <location filename="../src/mainwindow.cpp" line="495"/> >- <location filename="../src/mainwindow.cpp" line="501"/> >- <location filename="../src/mainwindow.cpp" line="540"/> >- <location filename="../src/mainwindow.cpp" line="551"/> >+ <location filename="../src/mainwindow.cpp" line="491"/> >+ <location filename="../src/mainwindow.cpp" line="510"/> >+ <location filename="../src/mainwindow.cpp" line="520"/> >+ <location filename="../src/mainwindow.cpp" line="535"/> >+ <location filename="../src/mainwindow.cpp" line="541"/> >+ <location filename="../src/mainwindow.cpp" line="580"/> >+ <location filename="../src/mainwindow.cpp" line="591"/> > <source>%1 call failed with error code %2: %3</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="540"/> >- <location filename="../src/mainwindow.cpp" line="551"/> >+ <location filename="../src/mainwindow.cpp" line="580"/> >+ <location filename="../src/mainwindow.cpp" line="591"/> > <source>Failed to get launch result of child: %1</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="601"/> >- <location filename="../src/mainwindow.cpp" line="628"/> >+ <location filename="../src/mainwindow.cpp" line="641"/> >+ <location filename="../src/mainwindow.cpp" line="668"/> > <source>Desktop file parsing error</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="602"/> >+ <location filename="../src/mainwindow.cpp" line="642"/> > <source>Desktop icon placeholder "%%i" is used but "Icon" entry is missing</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="629"/> >+ <location filename="../src/mainwindow.cpp" line="669"/> > <source>Unknown placeholder "%1" is encountered</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="723"/> >+ <location filename="../src/mainwindow.cpp" line="763"/> > <source>Run in terminal* (Recommended for %1)</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="327"/> >- <location filename="../src/mainwindow.cpp" line="360"/> >+ <location filename="../src/mainwindow.cpp" line="367"/> >+ <location filename="../src/mainwindow.cpp" line="400"/> > <source>User name error</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="294"/> >- <location filename="../src/mainwindow.cpp" line="423"/> >- <location filename="../src/mainwindow.cpp" line="451"/> >- <location filename="../src/mainwindow.cpp" line="470"/> >- <location filename="../src/mainwindow.cpp" line="480"/> >- <location filename="../src/mainwindow.cpp" line="540"/> >- <location filename="../src/mainwindow.cpp" line="551"/> >- <location filename="../src/mainwindow.cpp" line="566"/> >+ <location filename="../src/mainwindow.cpp" line="334"/> >+ <location filename="../src/mainwindow.cpp" line="463"/> >+ <location filename="../src/mainwindow.cpp" line="491"/> >+ <location filename="../src/mainwindow.cpp" line="510"/> >+ <location filename="../src/mainwindow.cpp" line="520"/> >+ <location filename="../src/mainwindow.cpp" line="580"/> >+ <location filename="../src/mainwindow.cpp" line="591"/> >+ <location filename="../src/mainwindow.cpp" line="606"/> > <source>Application call error</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="350"/> >+ <location filename="../src/mainwindow.cpp" line="390"/> > <source>Could not start daemon, functionality is reduced.</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="360"/> >+ <location filename="../src/mainwindow.cpp" line="400"/> > <source>User %1 does not exist!</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="387"/> >+ <location filename="../src/mainwindow.cpp" line="427"/> > <source>Wrong password or user privileges!</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="423"/> >+ <location filename="../src/mainwindow.cpp" line="463"/> > <source>Application launch failed!</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="383"/> >- <location filename="../src/mainwindow.cpp" line="387"/> >+ <location filename="../src/mainwindow.cpp" line="423"/> >+ <location filename="../src/mainwindow.cpp" line="427"/> > <source>Password error</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="383"/> >+ <location filename="../src/mainwindow.cpp" line="423"/> > <source>Password not entered. > Please enter user password.</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="327"/> >+ <location filename="../src/mainwindow.cpp" line="367"/> > <source>User name not entered. > Please enter user name.</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="307"/> >+ <location filename="../src/mainwindow.cpp" line="347"/> > <source>The entered application name could not be found.</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="294"/> >- <location filename="../src/mainwindow.cpp" line="301"/> >+ <location filename="../src/mainwindow.cpp" line="334"/> >+ <location filename="../src/mainwindow.cpp" line="341"/> > <source>Enter the name of the application! > For example: 'xterm' or 'konsole'.</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="316"/> >+ <location filename="../src/mainwindow.cpp" line="356"/> > <source>Open terminal application error</source> > <translation type="unfinished"></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="316"/> >+ <location filename="../src/mainwindow.cpp" line="356"/> > <source>Terminal emulator not found.</source> > <translation type="unfinished"></translation> > </message> >+ <message> >+ <location filename="../src/mainwindow.ui" line="188"/> >+ <location filename="../src/ui_mainwindow.h" line="473"/> >+ <source>Run on an nvidia discrete graphics card</source> >+ <translation type="unfinished"></translation> >+ </message> > </context> > </TS> >diff --git a/alt-app-starter/translations/alt-app-starter_ru.ts b/alt-app-starter/translations/alt-app-starter_ru.ts >index b941ae9..6c10b76 100644 >--- a/alt-app-starter/translations/alt-app-starter_ru.ts >+++ b/alt-app-starter/translations/alt-app-starter_ru.ts >@@ -5,161 +5,185 @@ > <name>MainWindow</name> > <message> > <location filename="../src/mainwindow.ui" line="26"/> >+ <location filename="../src/ui_mainwindow.h" line="466"/> > <source>Alt-App-Starter - The tool to quickly run programs</source> > <translation>Alt-App-Starter - ÐнÑÑÑÑÐ¼ÐµÐ½Ñ Ð´Ð»Ñ Ð±ÑÑÑÑого запÑÑка пÑогÑамм</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="82"/> >+ <location filename="../src/mainwindow.ui" line="83"/> >+ <location filename="../src/ui_mainwindow.h" line="467"/> > <source>Command: </source> > <translation>Ðоманда: </translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="135"/> >+ <location filename="../src/mainwindow.ui" line="136"/> >+ <location filename="../src/ui_mainwindow.h" line="468"/> > <source>...</source> > <translation></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="148"/> >+ <location filename="../src/mainwindow.ui" line="149"/> >+ <location filename="../src/ui_mainwindow.h" line="469"/> > <source>bin</source> > <translation>bin</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="157"/> >- <location filename="../src/mainwindow.cpp" line="727"/> >+ <location filename="../src/mainwindow.ui" line="158"/> >+ <location filename="../src/mainwindow.cpp" line="767"/> >+ <location filename="../src/ui_mainwindow.h" line="470"/> > <source>Run in terminal*</source> > <translation>ÐÑполниÑÑ Ð² ÑеÑминале*</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="164"/> >+ <location filename="../src/mainwindow.ui" line="165"/> >+ <location filename="../src/ui_mainwindow.h" line="471"/> > <source>*To run console-only applications like <strong>mc</strong>, <strong>vi</strong> or <strong>bash</strong></source> > <translation>*ÐÐ»Ñ Ð·Ð°Ð¿ÑÑка конÑолÑнÑÑ Ð¿Ñиложений, ÑÐ°ÐºÐ¸Ñ ÐºÐ°Ðº <strong>mc</strong>, <strong>vi</strong> или <strong>bash</strong></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="177"/> >+ <location filename="../src/mainwindow.ui" line="178"/> >+ <location filename="../src/ui_mainwindow.h" line="472"/> > <source>Don't close terminal after command execution</source> > <translation>Ðе закÑÑваÑÑ Ð¿Ñиложение ÑеÑминала поÑле вÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="224"/> >+ <location filename="../src/mainwindow.ui" line="188"/> >+ <location filename="../src/ui_mainwindow.h" line="473"/> >+ <source>Run on an nvidia discrete graphics card</source> >+ <translation>ÐапÑÑÑиÑÑ Ð½Ð° диÑкÑеÑной видеокаÑÑе nvidia</translation> >+ </message> >+ <message> >+ <location filename="../src/mainwindow.ui" line="235"/> >+ <location filename="../src/ui_mainwindow.h" line="474"/> > <source>Run as another user</source> > <translation>ÐапÑÑÑиÑÑ Ð¾Ñ Ð¸Ð¼ÐµÐ½Ð¸ дÑÑгого полÑзоваÑелÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="254"/> >+ <location filename="../src/mainwindow.ui" line="265"/> >+ <location filename="../src/ui_mainwindow.h" line="475"/> > <source>User name:</source> > <translation>ÐолÑзоваÑелÑ:</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="314"/> >+ <location filename="../src/mainwindow.ui" line="325"/> >+ <location filename="../src/ui_mainwindow.h" line="476"/> > <source>Password:</source> > <translation>ÐаÑолÑ:</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="369"/> >+ <location filename="../src/mainwindow.ui" line="380"/> >+ <location filename="../src/ui_mainwindow.h" line="477"/> > <source>Run with another priority</source> > <translation>ÐапÑÑÑиÑÑ Ñ Ð´ÑÑгим пÑиоÑиÑеÑом</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="400"/> >+ <location filename="../src/mainwindow.ui" line="411"/> >+ <location filename="../src/ui_mainwindow.h" line="478"/> > <source>Priority:</source> > <translation>ÐÑиоÑиÑеÑ:</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="470"/> >+ <location filename="../src/mainwindow.ui" line="481"/> >+ <location filename="../src/ui_mainwindow.h" line="479"/> > <source>19 (low)</source> > <translation>19 (низкий)</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="477"/> >+ <location filename="../src/mainwindow.ui" line="488"/> >+ <location filename="../src/ui_mainwindow.h" line="480"/> > <source>-20 (high)</source> > <translation>-20 (вÑÑокий)</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="648"/> >+ <location filename="../src/mainwindow.ui" line="659"/> >+ <location filename="../src/ui_mainwindow.h" line="481"/> > <source>Run</source> > <translation>ÐапÑÑÑиÑÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="651"/> >+ <location filename="../src/mainwindow.ui" line="662"/> >+ <location filename="../src/ui_mainwindow.h" line="483"/> > <source>Return</source> > <translation></translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="685"/> >+ <location filename="../src/mainwindow.ui" line="696"/> >+ <location filename="../src/ui_mainwindow.h" line="485"/> > <source>Cancel</source> > <translation>ÐакÑÑÑÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.ui" line="688"/> >+ <location filename="../src/mainwindow.ui" line="699"/> >+ <location filename="../src/ui_mainwindow.h" line="487"/> > <source>Esc</source> > <translation></translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="264"/> >+ <location filename="../src/mainwindow.cpp" line="299"/> > <source>Open File</source> > <translation>ÐÑбÑаÑÑ Ñайл</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="264"/> >+ <location filename="../src/mainwindow.cpp" line="299"/> > <source>All files (*.*)</source> > <translation>ÐÑе ÑÐ°Ð¹Ð»Ñ (*.*)</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="301"/> >- <location filename="../src/mainwindow.cpp" line="307"/> >+ <location filename="../src/mainwindow.cpp" line="341"/> >+ <location filename="../src/mainwindow.cpp" line="347"/> > <source>Application name error</source> > <translation>ÐÑибка в имени пÑиложениÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="343"/> >+ <location filename="../src/mainwindow.cpp" line="383"/> > <source>Daemon error</source> > <translation>ÐÑибка ÑпÑавлÑÑÑей пÑогÑаммÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="343"/> >+ <location filename="../src/mainwindow.cpp" line="383"/> > <source>Daemon not safe (not sgid), not using it.</source> > <translation>ÐебезопаÑÐ½Ð°Ñ ÑпÑавлÑÑÑÐ°Ñ (не sgid) пÑогÑамма, не иÑполÑзÑйÑе еÑ.</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="350"/> >+ <location filename="../src/mainwindow.cpp" line="390"/> > <source>Daemon start error</source> > <translation>ÐÑибка запÑÑка ÑпÑавлÑÑÑей пÑогÑаммÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="451"/> >- <location filename="../src/mainwindow.cpp" line="470"/> >- <location filename="../src/mainwindow.cpp" line="480"/> >- <location filename="../src/mainwindow.cpp" line="495"/> >- <location filename="../src/mainwindow.cpp" line="501"/> >- <location filename="../src/mainwindow.cpp" line="540"/> >- <location filename="../src/mainwindow.cpp" line="551"/> >+ <location filename="../src/mainwindow.cpp" line="491"/> >+ <location filename="../src/mainwindow.cpp" line="510"/> >+ <location filename="../src/mainwindow.cpp" line="520"/> >+ <location filename="../src/mainwindow.cpp" line="535"/> >+ <location filename="../src/mainwindow.cpp" line="541"/> >+ <location filename="../src/mainwindow.cpp" line="580"/> >+ <location filename="../src/mainwindow.cpp" line="591"/> > <source>%1 call failed with error code %2: %3</source> > <translation>ÐÑзов ÑÑнкÑии %1 завеÑÑилÑÑ Ñ Ð¾Ñибкой %2: %3</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="540"/> >- <location filename="../src/mainwindow.cpp" line="551"/> >+ <location filename="../src/mainwindow.cpp" line="580"/> >+ <location filename="../src/mainwindow.cpp" line="591"/> > <source>Failed to get launch result of child: %1</source> > <translation>Ðе ÑдалоÑÑ Ð¿Ð¾Ð»ÑÑиÑÑ ÑезÑлÑÑÐ°Ñ Ð·Ð°Ð¿ÑÑка поÑомка: %1</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="601"/> >- <location filename="../src/mainwindow.cpp" line="628"/> >+ <location filename="../src/mainwindow.cpp" line="641"/> >+ <location filename="../src/mainwindow.cpp" line="668"/> > <source>Desktop file parsing error</source> > <translation>ÐÑибка обÑабоÑки desktop-Ñайла</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="602"/> >+ <location filename="../src/mainwindow.cpp" line="642"/> > <source>Desktop icon placeholder "%%i" is used but "Icon" entry is missing</source> > <translation>ÐÑполÑзÑеÑÑÑ ÑпеÑиалÑнÑй иденÑиÑикаÑÐ¾Ñ Ð¸ÐºÐ¾Ð½ÐºÐ¸ "%%i", но поле "Icon" оÑÑÑÑÑÑвÑеÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="629"/> >+ <location filename="../src/mainwindow.cpp" line="669"/> > <source>Unknown placeholder "%1" is encountered</source> > <translation>ÐбнаÑÑжен неизвеÑÑнÑй ÑпеÑиалÑнÑй иденÑиÑикаÑÐ¾Ñ "%1"</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="723"/> >+ <location filename="../src/mainwindow.cpp" line="763"/> > <source>Run in terminal* (Recommended for %1)</source> > <translation>ÐÑполниÑÑ Ð² ÑеÑминале* (РекомендÑеÑÑÑ Ð´Ð»Ñ %1)</translation> > </message> >@@ -168,8 +192,8 @@ > <translation type="vanished">Ðе ÑдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑÑ ÑпÑавлÑÑÑÑÑ Ð¿ÑогÑаммÑ, Ñнижена ÑÑнкÑионалÑноÑÑÑ.</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="327"/> >- <location filename="../src/mainwindow.cpp" line="360"/> >+ <location filename="../src/mainwindow.cpp" line="367"/> >+ <location filename="../src/mainwindow.cpp" line="400"/> > <source>User name error</source> > <translation>ÐÑибка имени полÑзоваÑелÑ</translation> > </message> >@@ -178,45 +202,45 @@ > <translation type="vanished">ÐолÑзоваÑÐµÐ»Ñ Ð½Ðµ ÑÑÑеÑÑвÑеÑ!</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="294"/> >- <location filename="../src/mainwindow.cpp" line="423"/> >- <location filename="../src/mainwindow.cpp" line="451"/> >- <location filename="../src/mainwindow.cpp" line="470"/> >- <location filename="../src/mainwindow.cpp" line="480"/> >- <location filename="../src/mainwindow.cpp" line="540"/> >- <location filename="../src/mainwindow.cpp" line="551"/> >- <location filename="../src/mainwindow.cpp" line="566"/> >+ <location filename="../src/mainwindow.cpp" line="334"/> >+ <location filename="../src/mainwindow.cpp" line="463"/> >+ <location filename="../src/mainwindow.cpp" line="491"/> >+ <location filename="../src/mainwindow.cpp" line="510"/> >+ <location filename="../src/mainwindow.cpp" line="520"/> >+ <location filename="../src/mainwindow.cpp" line="580"/> >+ <location filename="../src/mainwindow.cpp" line="591"/> >+ <location filename="../src/mainwindow.cpp" line="606"/> > <source>Application call error</source> > <translation>ÐÑибка вÑзова пÑиложениÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="350"/> >+ <location filename="../src/mainwindow.cpp" line="390"/> > <source>Could not start daemon, functionality is reduced.</source> > <translation>Ðе ÑдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑÑ ÑпÑавлÑÑÑÑÑ Ð¿ÑогÑаммÑ, ÑÑнкÑионалÑноÑÑÑ Ñнижена.</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="360"/> >+ <location filename="../src/mainwindow.cpp" line="400"/> > <source>User %1 does not exist!</source> > <translation>ÐолÑзоваÑÐµÐ»Ñ %1 не ÑÑÑеÑÑвÑеÑ!</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="387"/> >+ <location filename="../src/mainwindow.cpp" line="427"/> > <source>Wrong password or user privileges!</source> > <translation>ÐевеÑнÑй паÑÐ¾Ð»Ñ Ð¸Ð»Ð¸ полÑзоваÑелÑÑкие пÑивилегии!</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="423"/> >+ <location filename="../src/mainwindow.cpp" line="463"/> > <source>Application launch failed!</source> > <translation>ÐÑиложение не бÑло запÑÑено!</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="383"/> >- <location filename="../src/mainwindow.cpp" line="387"/> >+ <location filename="../src/mainwindow.cpp" line="423"/> >+ <location filename="../src/mainwindow.cpp" line="427"/> > <source>Password error</source> > <translation>ÐведÑн невеÑнÑй паÑолÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="383"/> >+ <location filename="../src/mainwindow.cpp" line="423"/> > <source>Password not entered. > Please enter user password.</source> > <translation>ÐаÑÐ¾Ð»Ñ Ð½Ðµ введÑн. >@@ -227,7 +251,7 @@ Please enter user password.</source> > <translation type="vanished">ÐевеÑнÑй паÑÐ¾Ð»Ñ Ð¸Ð»Ð¸ полÑзоваÑелÑÑкие пÑивилегии!</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="327"/> >+ <location filename="../src/mainwindow.cpp" line="367"/> > <source>User name not entered. > Please enter user name.</source> > <translation>Ðе введено Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ. >@@ -238,25 +262,25 @@ Please enter user name.</source> > <translation type="vanished">ÐÑибка в названии пÑиложениÑ</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="307"/> >+ <location filename="../src/mainwindow.cpp" line="347"/> > <source>The entered application name could not be found.</source> > <translation>Указанное пÑиложение не найдено.</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="294"/> >- <location filename="../src/mainwindow.cpp" line="301"/> >+ <location filename="../src/mainwindow.cpp" line="334"/> >+ <location filename="../src/mainwindow.cpp" line="341"/> > <source>Enter the name of the application! > For example: 'xterm' or 'konsole'.</source> > <translation>ÐведиÑе название пÑиложениÑ! > ÐапÑимеÑ: 'xterm' или 'konsole'.</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="316"/> >+ <location filename="../src/mainwindow.cpp" line="356"/> > <source>Open terminal application error</source> > <translation>ÐÑибка оÑкÑÑÑÐ¸Ñ ÑеÑминала</translation> > </message> > <message> >- <location filename="../src/mainwindow.cpp" line="316"/> >+ <location filename="../src/mainwindow.cpp" line="356"/> > <source>Terminal emulator not found.</source> > <translation>ÐмÑлÑÑÐ¾Ñ ÑеÑминала не найден.</translation> > </message>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 46476
: 13453