From 0c1b2e3d35b0feefdb30c15fa3c1b6ad06ed4ec5 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Fri, 1 Sep 2023 16:45:34 +0600
Subject: [PATCH] Fixes

---
 source/ubl-strings.h | 29 ++-------------
 source/ublexec.c     | 40 ++++++++++----------
 ublexec.glade        | 88 ++++++++++++++++----------------------------
 3 files changed, 55 insertions(+), 102 deletions(-)

diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 2f9831d..e169970 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -1,39 +1,18 @@
 #define VERSION_LABEL yon_char_unite(_("Version:")," ",version_application,"\n",NULL)
-#define HELP_LABEL yon_char_unite(_("ublexec version:")," ", version_application,"\n",_("TEMPLATE Manager"),"\n",_("Usage:"), " ublexec ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configuration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n",NULL)
+#define HELP_LABEL yon_char_unite(_("ublexec version:")," ", version_application,"\n",_("Run as..."),"\n",_("Usage:"), " ublexec ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configuration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n",NULL)
 
-#define TITLE_LABEL _("TEMPLATE Manager")
-#define TITLE_INFO_LABEL _("System TEMPLATE settings management")
+#define TITLE_LABEL _("Run as...")
+#define TITLE_INFO_LABEL _("Run the application as a user with a changed priority")
 
 #define SUCCESS_LABEL _("Operation succeeded")
-#define ROOT_WARNING_LABEL _("Warning! Application was launched without root - root-dependent actions are locked")
 
 #define ABOUT_LABEL _("About")
 #define DOCUMENTATION_LABEL _("Documentation")
 
-#define SAVE_LOCAL_LABEL _("Save to local configuration")
-#define SAVE_GLOBAL_LABEL _("Save to global configuration")
-#define SAVE_CONFIGURATION_LABEL _("Save configuration")
-#define SAVE_LABEL _("Save")
-
-#define LOAD_LOCAL_LABEL _("Load local configuration")
-#define LOAD_GLOBAL_LABEL _("Load global configuration")
-#define LOAD_LABEL _("Load")
-
 #define CANCEL_LABEL _("Cancel")
 
 #define HELP_TITLE_LABEL _("Would you like to read documentation in the Web?")
 #define HELP_INFO_LABEL _("You will be redirected to documentation website where documentation is\ntranslated and supported by community.")
 #define HELP_ALWAYS_OPEN_LABEL _("Always redirect to online documentation")
 #define OPEN_HELP_LABEL _("Open documentation")
-#define PROJECT_HOME_LABEL _("Project Home Page")
-#define NOTHING_CHOSEN_LABEL _("Nothing were chosen")
-
-
-#define GLOBAL_LOAD_SUCCESS_LABEL _("Global configuration loading succseeded.")
-#define LOCAL_LOAD_SUCCESS_LABEL _("Local configuration loading succseeded.")
-#define LOAD_FAILED_LABEL _("Config loading failed")
-
-#define GLOBAL_LOCAL_SAVE_SUCCESS_LABEL _("Local and global configuration saving succseeded.")
-#define GLOBAL_SAVE_SUCCESS_LABEL _("Global configuration saving succseeded.")
-#define LOCAL_SAVE_SUCCESS_LABEL _("Local configuration saving succseeded.")
-#define SAVE_FAILED_LABEL
\ No newline at end of file
+#define PROJECT_HOME_LABEL _("Project homepage")
\ No newline at end of file
diff --git a/source/ublexec.c b/source/ublexec.c
index 5e50471..1c539d9 100644
--- a/source/ublexec.c
+++ b/source/ublexec.c
@@ -132,30 +132,30 @@ main_window *setup_window(){
     /* Widgets getting | Получение виджетов */
     main_window *widgets = malloc(sizeof(main_window));
     GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
-    widgets->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
-    widgets->HatLabel = yon_gtk_builder_get_widget(builder,"headerTopic");
+    widgets->Window = yon_gtk_builder_get_widget(builder,"window");
     widgets->PlugBox = yon_gtk_builder_get_widget(builder,"plugBox");
+    widgets->TargetNameEntry = yon_gtk_builder_get_widget(builder,"targetNameEntry");
+    widgets->chooseFileButton = yon_gtk_builder_get_widget(builder,"chooseFileButton");
+    widgets->chooseDesktopButton = yon_gtk_builder_get_widget(builder,"chooseDesktopButton");
 
-    widgets->HeadOverlay = yon_gtk_builder_get_widget(builder,"HeadOverlay");
-    widgets->HeadImage = yon_gtk_builder_get_widget(builder,"HeadBackgroundImage");
-    widgets->HeadBox = yon_gtk_builder_get_widget(builder,"HeaderBox");
-    widgets->HeadTitleLabel = yon_gtk_builder_get_widget(builder,"HeaderTitleLabel");
-    widgets->HeadInfoLabel = yon_gtk_builder_get_widget(builder,"HeaderInfoLabel");
-    
-    widgets->StatusBox = yon_gtk_builder_get_widget(builder,"mainStatusBox");
-    widgets->StatusIcon = yon_gtk_builder_get_widget(builder,"mainStatusIcon");
-    widgets->StatusLabel = yon_gtk_builder_get_widget(builder,"mainStatusLabel");
+    widgets->runWithTerminalCheck = yon_gtk_builder_get_widget(builder,"runWithTerminalCheck");
+    widgets->runWithTerminalCombo = yon_gtk_builder_get_widget(builder,"runWithTerminalCombo");
+
+    widgets->runWithUserCheck = yon_gtk_builder_get_widget(builder,"runWithUserCheck");
+    widgets->runWithUserPkexecCheck = yon_gtk_builder_get_widget(builder,"runWithUserPkexecCheck");
+    widgets->runWithUserSuCheck = yon_gtk_builder_get_widget(builder,"runWithUserSuCheck");
+    widgets->runWithUserSudoCheck = yon_gtk_builder_get_widget(builder,"runWithUserSudoCheck");
+    widgets->runWithUserCombo = yon_gtk_builder_get_widget(builder,"runWithUserCombo");
+
+    widgets->priorityCheck = yon_gtk_builder_get_widget(builder,"priorityCheck");
+    widgets->priorityScale = yon_gtk_builder_get_widget(builder,"priorityScale");
+    widgets->prioritySpin = yon_gtk_builder_get_widget(builder,"prioritySpin");
+    widgets->highestPriorityLabel = yon_gtk_builder_get_widget(builder,"highestPriorityLabel");
 
-    widgets->SaveLabel = yon_gtk_builder_get_widget(builder,"headerSaveConfigLabel");
-    widgets->SaveMenuItem = yon_gtk_builder_get_widget(builder,"SaveGlobalLocalConfigurationMenuItem");
-    widgets->SaveGlobalMenuItem = yon_gtk_builder_get_widget(builder,"SaveGlobalConfigurationMenuItem");
-    widgets->SaveLocalMenuItem = yon_gtk_builder_get_widget(builder,"SaveLocalConfigurationMenuItem");
-    widgets->RightBox = yon_gtk_builder_get_widget(builder,"HeaderRightBox");
+    widgets->commandCheck = yon_gtk_builder_get_widget(builder,"commandCheck");
+    widgets->commandEntry = yon_gtk_builder_get_widget(builder,"commandEntry");
 
-    widgets->LoadLabel = yon_gtk_builder_get_widget(builder,"headerLoadConfigLabel");
-    widgets->LoadGlobalMenuItem = yon_gtk_builder_get_widget(builder,"LoadGlobalConfigurationMenuItem");
-    widgets->LoadLocalMenuItem = yon_gtk_builder_get_widget(builder,"LoadLocalConfigurationMenuItem");
-    widgets->LeftBox = yon_gtk_builder_get_widget(builder,"HeaderLeftBox");
+    widgets->runButton = yon_gtk_builder_get_widget(builder,"runButton");
 
     widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL);
     widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL);
diff --git a/ublexec.glade b/ublexec.glade
index 6799fb2..36e5a0e 100644
--- a/ublexec.glade
+++ b/ublexec.glade
@@ -1059,13 +1059,7 @@
   <object class="GtkImage" id="image1">
     <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="stock">gtk-media-play</property>
+    <property name="icon-name">media-playback-start-symbolic</property>
   </object>
   <object class="GtkListStore" id="list_Other">
     <columns>
@@ -1083,33 +1077,13 @@
       <column type="gfloat"/>
     </columns>
   </object>
-  <object class="GtkMenu" id="menu1">
+  <object class="GtkMenu" id="menu2">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="take-focus">False</property>
     <property name="reserve-toggle-size">False</property>
     <property name="rect-anchor-dy">4</property>
     <property name="menu-type-hint">dropdown-menu</property>
-    <child>
-      <object class="GtkMenuItem" id="btnhelp">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Help</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="btnAbout">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">About</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
   </object>
   <object class="GtkWindow" id="window">
     <property name="width-request">800</property>
@@ -1188,7 +1162,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkEntry" id="txtCmd">
+                                  <object class="GtkEntry" id="targetNameEntry">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                   </object>
@@ -1199,7 +1173,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkButton" id="btnFilemaneg">
+                                  <object class="GtkButton" id="chooseFileButton">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">True</property>
@@ -1235,7 +1209,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkButton" id="btnListApp">
+                                  <object class="GtkButton" id="chooseDesktopButton">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">True</property>
@@ -1278,7 +1252,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkCheckButton" id="chbTerminal">
+                                  <object class="GtkCheckButton" id="runWithTerminalCheck">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">False</property>
@@ -1286,7 +1260,7 @@
                                     <property name="valign">center</property>
                                     <property name="draw-indicator">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="labInfoExecutTerm">
+                                      <object class="GtkLabel">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
                                         <property name="label" translatable="yes">Run in the terminal emulator</property>
@@ -1300,7 +1274,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkComboBoxText" id="cmbTerminal">
+                                  <object class="GtkComboBoxText" id="runWithTerminalCombo">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                   </object>
@@ -1320,11 +1294,11 @@
                           </object>
                         </child>
                         <child type="label">
-                          <object class="GtkLabel" id="lblinfoCmd">
+                          <object class="GtkLabel">
                             <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">File or app opening</property>
+                            <property name="label" translatable="yes" context="ublexec" comments="ublexec">File or app for running</property>
                           </object>
                         </child>
                       </object>
@@ -1371,7 +1345,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkCheckButton" id="chbAnotherUser">
+                                  <object class="GtkCheckButton" id="runWithUserCheck">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">False</property>
@@ -1393,14 +1367,14 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="rbPkexec">
+                                  <object class="GtkRadioButton" id="runWithUserPkexecCheck">
                                     <property name="label" translatable="yes">pkexec</property>
                                     <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="draw-indicator">True</property>
-                                    <property name="group">rbSu</property>
+                                    <property name="group">runWithUserSuCheck</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1409,13 +1383,13 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="rbSu">
+                                  <object class="GtkRadioButton" id="runWithUserSuCheck">
                                     <property name="label" translatable="yes">su</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">False</property>
                                     <property name="draw-indicator">True</property>
-                                    <property name="group">rbPkexec</property>
+                                    <property name="group">runWithUserPkexecCheck</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1424,13 +1398,13 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="rbSudo">
+                                  <object class="GtkRadioButton" id="runWithUserSudoCheck">
                                     <property name="label" translatable="yes">sudo</property>
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">False</property>
                                     <property name="draw-indicator">True</property>
-                                    <property name="group">rbSu</property>
+                                    <property name="group">runWithUserSuCheck</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1452,7 +1426,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkLabel" id="lblInfoUserName">
+                                  <object class="GtkLabel">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                     <property name="label" translatable="yes" context="Time" comments="Time">User Name:</property>
@@ -1466,7 +1440,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkComboBoxText" id="cmbUser">
+                                  <object class="GtkComboBoxText" id="runWithUserCombo">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                   </object>
@@ -1486,7 +1460,7 @@
                           </object>
                         </child>
                         <child type="label">
-                          <object class="GtkLabel" id="lblInfoUser">
+                          <object class="GtkLabel">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
@@ -1531,7 +1505,7 @@
                             <property name="orientation">vertical</property>
                             <property name="spacing">5</property>
                             <child>
-                              <object class="GtkCheckButton" id="cbxExecuteEpriority">
+                              <object class="GtkCheckButton" id="priorityCheck">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <property name="receives-default">False</property>
@@ -1539,7 +1513,7 @@
                                 <property name="valign">center</property>
                                 <property name="draw-indicator">True</property>
                                 <child>
-                                  <object class="GtkLabel" id="lblInfoExec">
+                                  <object class="GtkLabel">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                     <property name="label" translatable="yes">Change startup priority</property>
@@ -1575,7 +1549,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkScale" id="scalePriority">
+                                  <object class="GtkScale" id="priorityScale">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="margin-bottom">15</property>
@@ -1591,7 +1565,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="spinPriority">
+                                  <object class="GtkSpinButton" id="prioritySpin">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <property name="valign">center</property>
@@ -1619,7 +1593,7 @@
                                 <property name="hexpand">False</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkLabel" id="lblTimeEpriorityLow">
+                                  <object class="GtkLabel">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                     <property name="label" translatable="yes" context="Time" comments="Time">19 (Low)</property>
@@ -1632,7 +1606,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="lblTime4EpriorityHigh">
+                                  <object class="GtkLabel" id="highestPriorityLabel">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                     <property name="halign">end</property>
@@ -1656,7 +1630,7 @@
                           </object>
                         </child>
                         <child type="label">
-                          <object class="GtkLabel" id="lblInfoNooPriority">
+                          <object class="GtkLabel">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
@@ -1738,7 +1712,7 @@
                       </object>
                     </child>
                     <child type="label">
-                      <object class="GtkLabel" id="lblinfoCmd1">
+                      <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
@@ -1753,7 +1727,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="btnStart">
+                  <object class="GtkButton" id="runButton">
                     <property name="label" translatable="yes">Run</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
@@ -1819,7 +1793,7 @@
                 <property name="focus-on-click">False</property>
                 <property name="receives-default">True</property>
                 <property name="draw-indicator">True</property>
-                <property name="popup">menu1</property>
+                <property name="popup">menu2</property>
                 <property name="direction">none</property>
                 <child>
                   <placeholder/>
@@ -1842,7 +1816,7 @@
   </object>
   <object class="GtkSizeGroup">
     <widgets>
-      <widget name="spinPriority"/>
+      <widget name="prioritySpin"/>
       <widget name="lblInfoPriority"/>
     </widgets>
   </object>