Добавлен --help

Makefile

@@ -20,11 +20,7 @@ all: init build
 
 init:
 	@echo "Initialize ..."; \
-	version="$$(cat VERSION.md)"; \
-	version=$${version:8}; \
-	search="s/string version_application.*$&"; \
-	replace="string version_application = \"$${version}\";"; \
-	sed -i -e "$$search/$$replace/gi" source/ubl-settings-bootloader.h; \
+#	sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-bootloader.cc; \
 	echo "-- Build path: ${CMAKE_BUILD_DIR}"
      
 depend:

source/main.cc

@@ -1,22 +1,23 @@
 #include "ubl-settings-bootloader.h"
 
-int main(int argc, char** argv)
-{
+
+void pars_flag(int index_start, int argc, char* argv[]);
+
+int main(int argc, char** argv) {
+    string str_argv= "";
     string str_cmd_argv = "";
     for (int i=1; i<argc; i++){
         str_cmd_argv+= to_string(*argv[i]) + " ";
     }  
-    if (geteuid()!=0){
-        //string cmd = "pkexec " + app_name + " " + str_cmd_argv;
-        //system(cmd.c_str());
-        //return 0;
+    if (argc > 1){
+        str_argv = argv[1];
     }
-    auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug");
-    auto builder = Gtk::Builder::create_from_file(path_glade);
     bindtextdomain("ubl-settings-bootloader", "/usr/share/locale/");
     bind_textdomain_codeset("ubl-settings-bootloader", "UTF-8");
     textdomain("ubl-settings-bootloader");
-    if (argc!=1){
+    if (str_argv.find("--socket-id") != std::string::npos) {
+        auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug");
+        auto builder = Gtk::Builder::create_from_file(path_glade);
         Glib::init();
         setlocale(LC_ALL, "");
         Glib::OptionContext context;
@@ -39,7 +40,11 @@ int main(int argc, char** argv)
         app->run(plug);
         return 0;
     }
-    else {
+    else if (str_argv.find("-") != std::string::npos || argc == 1) {
+        int len_argv = 1;
+        auto app = Gtk::Application::create(len_argv, argv, "org.gtkmm.example.plug");
+        auto builder = Gtk::Builder::create_from_file(path_glade);
+        pars_flag(1, argc, argv);
         MainWindow* wnd = nullptr;
         builder->get_widget_derived("window", wnd);
         auto r = app->run(*wnd);
@@ -48,3 +53,24 @@ int main(int argc, char** argv)
     }
     
 }
+void pars_flag(int index_start, int argc, char* argv[]) {
+    string str_argv = "";
+    for (int i = index_start; i<argc; i++){
+        str_argv = argv[i];
+        if (str_argv == "--help" || str_argv == "-h"){
+            help();
+            exit(1);
+        }
+        else if (str_argv == "--version" || str_argv == "-v"){
+            string version = string(gettext("ubl-settings-bootloader version: ")) + version_application + "\n";
+            cout << version.c_str();
+            exit(1);
+        }
+        else{
+            if (index_start == 1){
+               cout << (gettext("Argument not recognized\n")) << endl;
+            }
+        }
+            
+    }
+}

source/ubl-settings-bootloader.cc

@@ -10,6 +10,7 @@ string path_resources = "/usr/share/ubl-settings-bootloader";
 const string path_img_head_background = "/usr/share/ubl-settings-bootloader/images/logo-background.png";
 int socket_ext_id_I = 0;
 int socket_trd_id_I = 0;
+string version_application = "1.0";
 
 CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help)
 : Glib::OptionGroup{p_name, p_description, p_help} {
@@ -443,9 +444,18 @@ void MainWindow::add_CSS(){
     lblInfoHead_css->add_class("textHead");
 }
 
+void help() {
+    string version = string(gettext("ubl-settings-datetime version: ")) + version_application + "\n";
+    cout << version.c_str();
+    string help;
+    help = "GTK settings bootloader for UBLinux\n\n"
+            "Usage:  ubl-settings-bootloader [OPTIONS...]\n"
+            "Options:\n"
+            "  -h, --help	 Show this help\n"
+            "  -V, --version	         Show package version\n";
+    cout << gettext(help.c_str());
 
-
-
+}
 
 
 

source/ubl-settings-bootloader.h

@@ -22,6 +22,7 @@ extern string path_css;
 extern int socket_ext_id_I;
 extern int socket_trd_id_I;
 extern const string path_img_head_background;
+extern string version_application;
 void me_thread(string cmd);
 class CmdArgParser : public Glib::OptionGroup
 {
@@ -104,7 +105,6 @@ class MainWindow : public Gtk::ApplicationWindow {
         int heigh;
         int screen_width;
         int screen_hight;
-        string version_application = "1.0";
         int index_error = 0;
         string str_cmd_error = "";
         template<typename Type>
@@ -155,4 +155,6 @@ private:
     Gtk::Widget *parent;
 };
 
+void help();
+
 

ubl-settings-bootloader_ru.po

@@ -16,6 +16,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "ubl-settings-bootloader version: "
+msgstr "ubl-settings-bootloader версия: "
+
 msgid "Active"
 msgstr "Активно"
 
@@ -181,3 +184,16 @@ msgstr "Успешно записана локальная конфигурац
 msgid "The program must be run as root"
 msgstr "Программа должна быть запущена с правами \nсуперпользователя!"
 
+msgid ""
+"GTK settings bootloader for UBLinux\n\n"
+"Usage:  ubl-settings-bootloader [OPTIONS...]\n"
+"Options:\n"
+"  -h, --help	 Show this help\n"
+"  -V, --version	         Show package version\n"
+msgstr ""
+"GTK-утилита настройки загрузчика для UBLinux\n"
+"\n"
+"Использование:  ubl-settings-bootloader [Параметры приложения...]\n"
+"Параметры приложения:\n"
+"  -h, --help\t        Показать параметры справки\n"
+"  -V, --version\t        Показать версию пакета\n"