From 51d6e391f0b1979ff8dbd9c5fec6af9b6acb8ac5 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 31 Aug 2023 17:38:06 +0600
Subject: [PATCH] Added new entry

---
 .gitignore            |   7 +-
 source/CMakeLists.txt |   2 +-
 source/ublexec.cc     | 105 ++++++-----
 source/ublexec.h      |  17 +-
 ublexec.css           |   4 +
 ublexec.glade         | 415 ++++++++++++++----------------------------
 6 files changed, 211 insertions(+), 339 deletions(-)

diff --git a/.gitignore b/.gitignore
index e2c7ced..07e1ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-ublexec.glade~
-#ublexec.glade#
+*~*
+*#*
 test.cpp
 .vscode
 ublexec
 nohup.out
-ublexec_ru.po~
\ No newline at end of file
+ublexec_ru.po~
+compile/
\ No newline at end of file
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 587687d..e35dd6d 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -71,7 +71,7 @@ add_custom_target(
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection")
+        -fstack-clash-protection -fcf-protection -g")
       
 
 
diff --git a/source/ublexec.cc b/source/ublexec.cc
index ed6f8af..4f341a6 100644
--- a/source/ublexec.cc
+++ b/source/ublexec.cc
@@ -64,7 +64,6 @@ void MainWindow::get_builder() {
     builder->get_widget("rbPkexec", rbPkexec);
     builder->get_widget("rbSu", rbSu);
     builder->get_widget("rbSudo", rbSudo);
-    builder->get_widget("txtCmd", txtCmd);
     builder->get_widget("wndChooseFileWallpaper", wndChooseFileWallpaper);
     builder->get_widget("btnFilemangerExit", btnFilemangerExit);
     builder->get_widget("btnFilemangerOk", btnFilemangerOk);
@@ -78,7 +77,7 @@ void MainWindow::get_builder() {
     builder->get_widget("btnStartMenuExit", btnStartMenuExit);
     builder->get_widget("lblInfoHead", lblInfoHead);
     builder->get_widget("lblinfoCmd", lblinfoCmd);
-    builder->get_widget("lblInfoTime", lblInfoTime);
+    // builder->get_widget("lblInfoTime", lblInfoTime);
     builder->get_widget("labInfoExecutTerm", labInfoExecutTerm);
     builder->get_widget("lblInfoUser", lblInfoUser);
     builder->get_widget("lblInfoUserOther", lblInfoUserOther);
@@ -125,11 +124,17 @@ void MainWindow::get_builder() {
     builder->get_widget("btnCancelHelp", btnCancelHelp);
     builder->get_widget("wndShowWeb", wndShowWeb);
     builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb);
+    builder->get_widget("txtCmd", CommandEntry);
+    builder->get_widget("commandCheck", CommandCheck);
+    builder->get_widget("commandEntry", txtCmd);
 
     #ifdef WEBKIT_FOUND
         builder->get_widget("wndWeb", wndWeb);
     #endif
 }
+void set_sensitive_from_check(Gtk::CheckButton *check, Gtk::Widget *widget){
+    widget->set_sensitive(check->get_active());
+}
 
 void MainWindow::set_icon_array() {
     array_icon[0] = this->iconGraphics;
@@ -177,53 +182,52 @@ void MainWindow::localization() {
     string str_authors = string(copyright) + to_string(year); 
     aboutWindows->set_copyright(str_authors);
     aboutWindows->set_website(website);
-    btnhelp->set_label(str_help);
-    btnAbout->set_label(str_about_1);
-    aboutWindows->set_comments(define_name_app);
-    aboutWindows->set_website_label(home_page );
-    aboutWindows->set_version(_(version_application.c_str()));
-    aboutWindows->set_title(space_name_app );
-    lblHeaderAboutTopic->set_label(space_name_app );
-    lblHeaderName->set_text(define_name_app);
-    this->set_title(define_name_app);
-    btnStart->set_label(str_run);
-    wndChooseFileWallpaper->set_title(str_please_select_file);
-    dialogStartMenu->set_title(str_selecting_programs);
-    lblInfoHead->set_text(define_name_app);
-    lblinfoCmd->set_text(str_localization_cmd_line);
-    lblInfoTime->set_text(str_localization_team);
-    labInfoExecutTerm->set_text(str_run_terminal);
-    lblInfoUser->set_text(str_localization_user);
-    lblInfoUserOther->set_text(str_run_of_user);
-    lblInfoUserName->set_text(str_localization_username);
-    lblInfoNooPriority->set_text(str_localization_priority);
-    lblInfoExec->set_text(str_change_priority);
-    lblInfoPriority->set_text(string(str_localization_priority) + ":");
-    lblMessageError->set_text(str_select_app_program);
-    messageError->set_title(str_localization_attention);
-    lblGraphics->set_text(str_localization_graphics);
-    lblTools->set_text(str_localization_tools);
-    lblInternet->set_text(str_localization_internet);
-    lblMultimedia->set_text(str_localization_multimedia);
-    lblSettings->set_text(str_localization_settings);
-    lblEducation->set_text(str_localization_education);
-    lblOffice->set_text(str_localization_office);
-    lblOther->set_text(str_localization_other);
-    lblDevelopment->set_text(str_localization_development);
-    lblSystem->set_text(str_localization_system);
-    btnListApp->set_tooltip_text(str_application_overview);
-    btnFilemaneg->set_tooltip_text(str_file_overview);
-    btnMessageErrorOk->set_label(str_close);
-    lblhelpHeader->set_text(read_documentation_web);
-    lblhelpText->set_text(redirected_documentation);
-    btnReadHelp->set_label(read_online);
-    btnCancelHelp->set_label(cancel);
-    chkAlwaysOpenHelp->set_label(always_redirect);
-    lblwebHeaderName->set_label(name_app_1);
-    lblHeadeWndWeb->set_label(define_name_app);
-    lblwebHeaderName->set_label(define_name_app);
-    btnFilemaneg->set_tooltip_text(str_tooltip_filemanager);
-    btnListApp->set_tooltip_text(str_tooltip_list_app);
+    // btnhelp->set_label(str_help);
+    // btnAbout->set_label(str_about_1);
+    // aboutWindows->set_comments(define_name_app);
+    // aboutWindows->set_website_label(home_page );
+    // aboutWindows->set_version(_(version_application.c_str()));
+    // aboutWindows->set_title(space_name_app );
+    // lblHeaderAboutTopic->set_label(space_name_app );
+    // lblHeaderName->set_text(define_name_app);
+    // this->set_title(define_name_app);
+    // btnStart->set_label(str_run);
+    // wndChooseFileWallpaper->set_title(str_please_select_file);
+    // dialogStartMenu->set_title(str_selecting_programs);
+    // lblInfoHead->set_text(define_name_app);
+    // lblinfoCmd->set_text(str_localization_cmd_line);
+    // labInfoExecutTerm->set_text(str_run_terminal);
+    // lblInfoUser->set_text(str_localization_user);
+    // lblInfoUserOther->set_text(str_run_of_user);
+    // lblInfoUserName->set_text(str_localization_username);
+    // lblInfoNooPriority->set_text(str_localization_priority);
+    // lblInfoExec->set_text(str_change_priority);
+    // lblInfoPriority->set_text(string(str_localization_priority) + ":");
+    // lblMessageError->set_text(str_select_app_program);
+    // messageError->set_title(str_localization_attention);
+    // lblGraphics->set_text(str_localization_graphics);
+    // lblTools->set_text(str_localization_tools);
+    // lblInternet->set_text(str_localization_internet);
+    // lblMultimedia->set_text(str_localization_multimedia);
+    // lblSettings->set_text(str_localization_settings);
+    // lblEducation->set_text(str_localization_education);
+    // lblOffice->set_text(str_localization_office);
+    // lblOther->set_text(str_localization_other);
+    // lblDevelopment->set_text(str_localization_development);
+    // lblSystem->set_text(str_localization_system);
+    // btnListApp->set_tooltip_text(str_application_overview);
+    // btnFilemaneg->set_tooltip_text(str_file_overview);
+    // btnMessageErrorOk->set_label(str_close);
+    // lblhelpHeader->set_text(read_documentation_web);
+    // lblhelpText->set_text(redirected_documentation);
+    // btnReadHelp->set_label(read_online);
+    // btnCancelHelp->set_label(cancel);
+    // chkAlwaysOpenHelp->set_label(always_redirect);
+    // lblwebHeaderName->set_label(name_app_1);
+    // lblHeadeWndWeb->set_label(define_name_app);
+    // lblwebHeaderName->set_label(define_name_app);
+    // btnFilemaneg->set_tooltip_text(str_tooltip_filemanager);
+    // btnListApp->set_tooltip_text(str_tooltip_list_app);
 }
 
 void MainWindow::event() {
@@ -461,9 +465,11 @@ void MainWindow::tempate_icon_select(Gtk::IconView *icon, Glib::RefPtr<Gtk::List
         Gtk::TreeModel::Row row = *iter;
         auto app_name_exec = row[m_Columns.app_name_exec];
         const Glib::ustring description = row[m_Columns.m_col_description];
+        // auto name = row[m_Columns.m_col_filename];
         path_file = "";
         name_app = "";
         user_cmd = "";
+        CommandEntry->set_text(app_name_exec);
         txtCmd->set_text(app_name_exec);
         name_app = txtCmd->get_text();
         size_t len_name_app = name_app.length();
@@ -471,6 +477,7 @@ void MainWindow::tempate_icon_select(Gtk::IconView *icon, Glib::RefPtr<Gtk::List
         for (auto &del_sim: array_del) {
             str_remove(name_app, del_sim);
             if (name_app.length() != len_name_app) {
+                CommandEntry->set_text(name_app);
                 txtCmd->set_text(name_app);
                 break;
             }
diff --git a/source/ublexec.h b/source/ublexec.h
index e34f468..bc5119e 100644
--- a/source/ublexec.h
+++ b/source/ublexec.h
@@ -31,22 +31,13 @@
 #define define_name_app _("Run as...") 
 #define name_app_1 _("ublexec")
 #define website _("https://wiki.ublinux.com")
-#define home_page _("Project Home Page")
+#define home_page _("Project hompage")
 #define space_name_app _(" Run as...")
 #define str_about_1 _("About") 
-#define str_about _("About ubl-settings-datetime")
 #define str_help _("Help")
-#define str_save _("Save")
-#define str_load _("Load")
-#define save_all _("Save to global and local configuration")
-#define save_local _("Save local configuration")
-#define save_global _("Save global configuration")
-#define load_global _("Load global configuration")
-#define load_local _("Load local configuration")
 #define read_online _("Read online")
 #define cancel _("Cancel")
 #define always_redirect _("Always redirect")
-#define nothing_save _("Nothing to save!")
 #define read_documentation_web _("Would you like to read documentation in the Web?")
 #define redirected_documentation _("You will be redirected to documentation website where documentation is\ntranslated and supported by community.")
 #define str_help_h _("GTK \"Run applications as another user with the specified priority\" for ""UBLinux\n""\n""Usage:  ublexec [OPTIONS...]\n""Options:\n""  -h, --help\t Show this help\n""  -V, --version\t Show package version\n""  -x APP_NAME    Running the program\n""  -e FILE_NAME   Running the file\n")
@@ -79,7 +70,7 @@
 #define str_please_select_file  _("Please select File")
 #define str_localization_cmd_line _("Command Line")
 #define str_localization_user _("User")
-#define str_localization_team _("Team:")
+#define str_localization_team _("Command:")
 #define str_run _("Run")
 
 #define const_link_doc "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ublexec"
@@ -291,6 +282,8 @@ public:
         Gtk::Button *btnReadHelp;
         Gtk::Button *btnCancelHelp;
         Gtk::Window *wndShowWeb;
+        Gtk::Entry *CommandEntry;
+        Gtk::CheckButton *CommandCheck;
         
         #ifdef WEBKIT_FOUND
           Gtk::Window *wndWeb;
@@ -343,4 +336,4 @@ private:
 void help();
 void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data);
 
-
+void set_sensitive_from_check(Gtk::CheckButton *check, Gtk::Widget *widget);
diff --git a/ublexec.css b/ublexec.css
index 1e33f1c..3d86970 100644
--- a/ublexec.css
+++ b/ublexec.css
@@ -2,6 +2,10 @@
   text-shadow: 2px 2px @theme_bg_color;
   color: @theme_text_color;
 }
+.thin {
+	margin:0px;
+	padding:0px;
+}
 .bannerbackground {
   background-color: #404040;
 }
diff --git a/ublexec.glade b/ublexec.glade
index b31d342..6cc511f 100644
--- a/ublexec.glade
+++ b/ublexec.glade
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.38.2 -->
-<interface>
+<interface domain="ublexec">
   <requires lib="gtk+" version="3.24"/>
+  <!-- interface-css-provider-path ublexec.css -->
   <object class="GtkIconView">
     <property name="visible">True</property>
     <property name="can-focus">True</property>
@@ -19,9 +20,9 @@
     <property name="program-name">ublexec</property>
     <property name="version">1.0</property>
     <property name="copyright" translatable="yes">Copyright © 2022 - 2023, UBSoft LLC</property>
-    <property name="comments" translatable="yes">ublexec</property>
+    <property name="comments" translatable="yes">Run as...</property>
     <property name="website">https://ublinux.ru/</property>
-    <property name="website-label" translatable="yes">Project Home Page</property>
+    <property name="website-label" translatable="yes">Project hompage</property>
     <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
 Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property>
     <property name="authors">UBGroup</property>
@@ -46,9 +47,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
     </child>
     <child type="titlebar">
@@ -65,7 +63,7 @@
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">ublexec</property>
+            <property name="label" translatable="yes">Run as...</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -1114,6 +1112,8 @@
     </child>
   </object>
   <object class="GtkWindow" id="window">
+    <property name="width-request">800</property>
+    <property name="height-request">600</property>
     <property name="can-focus">False</property>
     <property name="icon-name">com.ublinux.ublexec</property>
     <child>
@@ -1147,12 +1147,17 @@
           <object class="GtkBox" id="plugBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
@@ -1163,12 +1168,6 @@
                       <object class="GtkFrame" id="frame1">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="margin-top">6</property>
-                        <property name="margin-bottom">6</property>
                         <property name="hexpand">True</property>
                         <property name="label-xalign">0.019999999552965164</property>
                         <property name="shadow-type">in</property>
@@ -1176,47 +1175,22 @@
                           <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
                             <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="hexpand">True</property>
                             <property name="orientation">vertical</property>
+                            <property name="spacing">5</property>
                             <child>
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
                                 <property name="hexpand">True</property>
-                                <child>
-                                  <object class="GtkLabel" id="lblInfoTime">
-                                    <property name="width-request">0</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <property name="label" translatable="yes" context="Time" comments="Time">Team:</property>
-                                    <property name="wrap">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
+                                <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkEntry" id="txtCmd">
-                                    <property name="width-request">440</property>
                                     <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
+                                    <property name="can-focus">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -1226,17 +1200,12 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="btnFilemaneg">
-                                    <property name="width-request">51</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">File view</property>
                                     <property name="halign">end</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
                                     <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
                                     <child>
                                       <object class="GtkImage">
                                         <property name="visible">True</property>
@@ -1250,8 +1219,14 @@
                                         <property name="margin-top">3</property>
                                         <property name="margin-bottom">3</property>
                                         <property name="stock">gtk-directory</property>
+                                        <style>
+                                          <class name="thin"/>
+                                        </style>
                                       </object>
                                     </child>
+                                    <style>
+                                      <class name="thin"/>
+                                    </style>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1261,17 +1236,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="btnListApp">
-                                    <property name="width-request">51</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes">Program view</property>
                                     <property name="halign">end</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
                                     <child>
                                       <object class="GtkImage">
                                         <property name="visible">True</property>
@@ -1285,6 +1254,9 @@
                                         <property name="icon-name">view-list-details</property>
                                       </object>
                                     </child>
+                                    <style>
+                                      <class name="thin"/>
+                                    </style>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1303,25 +1275,8 @@
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">6</property>
                                 <property name="hexpand">True</property>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="width-request">44</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-left">15</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">15</property>
-                                    <property name="margin-end">5</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
+                                <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkCheckButton" id="chbTerminal">
                                     <property name="visible">True</property>
@@ -1329,11 +1284,6 @@
                                     <property name="receives-default">False</property>
                                     <property name="halign">start</property>
                                     <property name="valign">center</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-bottom">6</property>
                                     <property name="draw-indicator">True</property>
                                     <child>
                                       <object class="GtkLabel" id="labInfoExecutTerm">
@@ -1353,30 +1303,13 @@
                                   <object class="GtkComboBoxText" id="cmbTerminal">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="halign">start</property>
-                                    <property name="margin-left">2</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-bottom">6</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                     <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="width-request">116</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1391,7 +1324,7 @@
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes" context="ublexec" comments="ublexec">Command Line</property>
+                            <property name="label" translatable="yes" context="ublexec" comments="ublexec">File or app opening</property>
                           </object>
                         </child>
                       </object>
@@ -1405,24 +1338,19 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-bottom">5</property>
                     <property name="hexpand">True</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkFrame" id="frame2">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
                         <property name="hexpand">True</property>
                         <property name="label-xalign">0.019999999552965164</property>
                         <property name="shadow-type">in</property>
@@ -1430,15 +1358,18 @@
                           <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
                             <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="hexpand">True</property>
                             <property name="orientation">vertical</property>
+                            <property name="spacing">5</property>
                             <child>
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
                                 <property name="hexpand">True</property>
+                                <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkCheckButton" id="chbAnotherUser">
                                     <property name="visible">True</property>
@@ -1446,12 +1377,6 @@
                                     <property name="receives-default">False</property>
                                     <property name="halign">start</property>
                                     <property name="valign">center</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
                                     <property name="draw-indicator">True</property>
                                     <child>
                                       <object class="GtkLabel" id="lblInfoUserOther">
@@ -1474,8 +1399,6 @@
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">False</property>
                                     <property name="margin-left">6</property>
-                                    <property name="margin-right">6</property>
-                                    <property name="margin-end">6</property>
                                     <property name="draw-indicator">True</property>
                                     <property name="group">rbSu</property>
                                   </object>
@@ -1491,10 +1414,6 @@
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">False</property>
-                                    <property name="margin-left">3</property>
-                                    <property name="margin-right">31</property>
-                                    <property name="margin-start">3</property>
-                                    <property name="margin-end">31</property>
                                     <property name="draw-indicator">True</property>
                                     <property name="group">rbPkexec</property>
                                   </object>
@@ -1510,10 +1429,6 @@
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">False</property>
-                                    <property name="margin-left">6</property>
-                                    <property name="margin-right">6</property>
-                                    <property name="margin-start">6</property>
-                                    <property name="margin-end">6</property>
                                     <property name="draw-indicator">True</property>
                                     <property name="group">rbSu</property>
                                   </object>
@@ -1523,23 +1438,6 @@
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="width-request">95</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="margin-left">15</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">15</property>
-                                    <property name="margin-end">5</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">4</property>
-                                  </packing>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1552,17 +1450,11 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
                                 <property name="hexpand">True</property>
+                                <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkLabel" id="lblInfoUserName">
-                                    <property name="width-request">123</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
                                     <property name="label" translatable="yes" context="Time" comments="Time">User Name:</property>
                                     <property name="wrap">True</property>
                                     <property name="xalign">0</property>
@@ -1575,35 +1467,15 @@
                                 </child>
                                 <child>
                                   <object class="GtkComboBoxText" id="cmbUser">
-                                    <property name="width-request">374</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="width-request">0</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-end">100</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1632,24 +1504,19 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-bottom">5</property>
                     <property name="hexpand">True</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkFrame" id="frame3">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
                         <property name="hexpand">True</property>
                         <property name="label-xalign">0.019999999552965164</property>
                         <property name="shadow-type">in</property>
@@ -1657,10 +1524,12 @@
                           <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
                             <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="hexpand">True</property>
                             <property name="orientation">vertical</property>
+                            <property name="spacing">5</property>
                             <child>
                               <object class="GtkCheckButton" id="cbxExecuteEpriority">
                                 <property name="visible">True</property>
@@ -1668,12 +1537,6 @@
                                 <property name="receives-default">False</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="margin-left">5</property>
-                                <property name="margin-right">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">6</property>
                                 <property name="draw-indicator">True</property>
                                 <child>
                                   <object class="GtkLabel" id="lblInfoExec">
@@ -1694,16 +1557,13 @@
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
                                 <property name="hexpand">True</property>
+                                <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkLabel" id="lblInfoPriority">
                                     <property name="width-request">5</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">13</property>
+                                    <property name="valign">center</property>
                                     <property name="label" translatable="yes" context="Time" comments="Time">Priority:</property>
                                     <property name="wrap">True</property>
                                     <property name="xalign">0</property>
@@ -1716,13 +1576,9 @@
                                 </child>
                                 <child>
                                   <object class="GtkScale" id="scalePriority">
-                                    <property name="width-request">-1</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
+                                    <property name="margin-bottom">15</property>
                                     <property name="adjustment">adjustment1</property>
                                     <property name="fill-level">20</property>
                                     <property name="round-digits">0</property>
@@ -1738,11 +1594,7 @@
                                   <object class="GtkSpinButton" id="spinPriority">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">15</property>
+                                    <property name="valign">center</property>
                                     <property name="numeric">True</property>
                                   </object>
                                   <packing>
@@ -1762,37 +1614,15 @@
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="margin-top">9</property>
+                                <property name="margin-start">120</property>
+                                <property name="margin-end">120</property>
                                 <property name="hexpand">False</property>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="width-request">62</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-left">15</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">15</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
+                                <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkLabel" id="lblTimeEpriorityLow">
-                                    <property name="width-request">145</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-bottom">6</property>
                                     <property name="label" translatable="yes" context="Time" comments="Time">19 (Low)</property>
-                                    <property name="wrap">True</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
@@ -1807,13 +1637,7 @@
                                     <property name="can-focus">False</property>
                                     <property name="halign">end</property>
                                     <property name="valign">center</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-bottom">6</property>
                                     <property name="label" translatable="yes" context="Time" comments="Time">-20 (High)</property>
-                                    <property name="wrap">True</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
@@ -1822,23 +1646,6 @@
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="width-request">107</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="margin-left">15</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">15</property>
-                                    <property name="margin-end">5</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">4</property>
-                                  </packing>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1867,6 +1674,80 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame4">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-left">5</property>
+                        <property name="margin-right">5</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-bottom">5</property>
+                        <property name="hexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkCheckButton" id="commandCheck">
+                                <property name="label" translatable="yes">Edit</property>
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">False</property>
+                                <property name="draw-indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="commandEntry">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="lblinfoCmd1">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes" context="ublexec" comments="ublexec">Command Line</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
@@ -1876,18 +1757,13 @@
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">True</property>
-                    <property name="margin-left">5</property>
-                    <property name="margin-right">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-top">6</property>
-                    <property name="margin-bottom">6</property>
                     <property name="image">image1</property>
                     <property name="always-show-image">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="pack-type">end</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
@@ -1917,7 +1793,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="halign">center</property>
-            <property name="label" translatable="yes">Ublexec</property>
+            <property name="label" translatable="yes">Run as...</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -1945,11 +1821,7 @@
                 <property name="popup">menu1</property>
                 <property name="direction">none</property>
                 <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">open-menu-symbolic</property>
-                  </object>
+                  <placeholder/>
                 </child>
               </object>
               <packing>
@@ -1967,9 +1839,14 @@
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="spinPriority"/>
+      <widget name="lblInfoPriority"/>
+    </widgets>
+  </object>
   <object class="GtkWindow" id="messageError">
     <property name="can-focus">False</property>
-    <property name="valign">start</property>
     <property name="resizable">False</property>
     <child>
       <object class="GtkBox">
@@ -1980,17 +1857,16 @@
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
+            <property name="spacing">5</property>
             <child>
               <object class="GtkImage">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="halign">center</property>
-                <property name="margin-left">20</property>
-                <property name="margin-right">20</property>
-                <property name="margin-start">20</property>
-                <property name="margin-end">20</property>
-                <property name="margin-top">20</property>
-                <property name="margin-bottom">20</property>
                 <property name="icon-name">dialog-warning-symbolic</property>
                 <property name="icon_size">6</property>
               </object>
@@ -2002,14 +1878,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="lblMessageError">
+                <property name="width-request">200</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-left">10</property>
-                <property name="margin-right">25</property>
-                <property name="margin-start">10</property>
-                <property name="margin-end">25</property>
-                <property name="margin-top">20</property>
-                <property name="margin-bottom">20</property>
                 <property name="label">Select an executable file or program</property>
                 <property name="wrap">True</property>
                 <property name="xalign">0</property>
@@ -2122,16 +1993,12 @@
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
     </child>
   </object>
   <object class="GtkApplicationWindow" id="wndShowWeb">
+    <property name="width-request">450</property>
     <property name="can-focus">False</property>
-    <property name="halign">start</property>
-    <property name="valign">start</property>
     <property name="resizable">False</property>
     <property name="default-width">450</property>
     <property name="default-height">250</property>
@@ -2311,7 +2178,7 @@
           <object class="GtkLabel" id="lblwebHeaderName">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">ublexec</property>
+            <property name="label" translatable="yes">Run as...</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -2347,7 +2214,7 @@
           <object class="GtkLabel" id="lblHeadeWndWeb">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">ublexec</property>
+            <property name="label" translatable="yes">Run as...</property>
           </object>
         </child>
         <child>