From 2efaff2e39f947db51b1638cf83f3fb6a7ecf56d Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Thu, 16 Mar 2023 10:10:26 +0600
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8C=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D1=8B=D1=85?=
 =?UTF-8?q?=20=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20?=
 =?UTF-8?q?=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ublexec.cc | 35 ++++++++++++-----------------------
 source/ublexec.h  |  2 ++
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/source/ublexec.cc b/source/ublexec.cc
index 557053d..ded2387 100644
--- a/source/ublexec.cc
+++ b/source/ublexec.cc
@@ -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);
+            }
+        } 
     }
 }
 
diff --git a/source/ublexec.h b/source/ublexec.h
index 46b96e2..76b8c0f 100755
--- a/source/ublexec.h
+++ b/source/ublexec.h
@@ -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 = "";