|
|
|
@ -607,17 +607,11 @@ string MainWindow::start_cmd(string user_cmd) {
|
|
|
|
if (chbTerminal->get_active() == true) {
|
|
|
|
if (chbTerminal->get_active() == true) {
|
|
|
|
string name_terminal = cmbTerminal->get_active_text();
|
|
|
|
string name_terminal = cmbTerminal->get_active_text();
|
|
|
|
if (name_terminal.length() != 0) {
|
|
|
|
if (name_terminal.length() != 0) {
|
|
|
|
if (name_terminal == "xfce4-terminal") {
|
|
|
|
int len_termunal_cmd = sizeof(termunal_cmd)/sizeof(*termunal_cmd);
|
|
|
|
str_cmd_terminal = "xfce4-terminal -x ";
|
|
|
|
for (int index = 0; index<len_termunal_cmd; ++index) {
|
|
|
|
|
|
|
|
if (name_terminal == termunal_bin[index]) {
|
|
|
|
|
|
|
|
str_cmd_terminal = termunal_cmd[index];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (name_terminal == "konsole") {
|
|
|
|
|
|
|
|
str_cmd_terminal = "konsole -e ";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (name_terminal == "xterm") {
|
|
|
|
|
|
|
|
str_cmd_terminal = "xterm -e ";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else{
|
|
|
|
|
|
|
|
str_cmd_terminal = "";
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else{
|
|
|
|
else{
|
|
|
|
@ -773,16 +767,11 @@ void MainWindow::pars_dir_terminal() {
|
|
|
|
string file_name = "";
|
|
|
|
string file_name = "";
|
|
|
|
for (const auto & entry: fs::directory_iterator(path)) {
|
|
|
|
for (const auto & entry: fs::directory_iterator(path)) {
|
|
|
|
file_name = entry.path().filename().string();
|
|
|
|
file_name = entry.path().filename().string();
|
|
|
|
if (file_name == "konsole") {
|
|
|
|
for (const auto &str_teminal: termunal_bin) {
|
|
|
|
cmbTerminal->append("konsole");
|
|
|
|
if (str_teminal == file_name) {
|
|
|
|
cmbTerminal->set_active_text("konsole");
|
|
|
|
cmbTerminal->append(str_teminal);
|
|
|
|
}
|
|
|
|
cmbTerminal->set_active_text(str_teminal);
|
|
|
|
else if (file_name == "xfce4-terminal") {
|
|
|
|
|
|
|
|
cmbTerminal->append("xfce4-terminal");
|
|
|
|
|
|
|
|
cmbTerminal->set_active_text("xfce4-terminal");
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (file_name == "xterm") {
|
|
|
|
|
|
|
|
cmbTerminal->append("xterm");
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|