Перечень возможных терминалов вынесены в массив

pull/17/head
Igor Belitskiy 3 years ago
parent 26365211f4
commit 2efaff2e39

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

@ -200,6 +200,8 @@ public:
Glib::RefPtr<Gtk::ListStore> list_System;
Gtk::Widget *boxAbout;
public:
string termunal_bin[3] = {"konsole","xfce4-terminal","xterm"};
string termunal_cmd[3] = {"konsole -e ","xfce4-terminal -x ","xterm -e "};
string version_application = "1.0";
string cmd_old = "";
string user_exec_app = "";

Loading…
Cancel
Save