Исправлен дизайн, добавлены терминальные команды

pull/30/head
Igor Belitskiy 3 years ago
parent 8917c58931
commit 899f785e92

@ -24,7 +24,7 @@ all: init build
init: init:
@echo "Initialize ..."; \ @echo "Initialize ..."; \
sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ublexec.h; \ sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ublexec.cc; \
echo "-- Build path: ${CMAKE_BUILD_DIR}" echo "-- Build path: ${CMAKE_BUILD_DIR}"
depend: depend:

@ -1,5 +1,6 @@
#include "ublexec.h" #include "ublexec.h"
void pars_flag(int index_start, int argc, char* argv[]);
int main(int argc, char** argv) { int main(int argc, char** argv) {
string str_argv= ""; string str_argv= "";
@ -36,6 +37,7 @@ int main(int argc, char** argv) {
if (argc == 2) { if (argc == 2) {
name_app_cmd = argv[1]; name_app_cmd = argv[1];
} }
pars_flag(1,argc, argv);
int local_argc = 1; int local_argc = 1;
auto app = Gtk::Application::create(local_argc, argv, "org.gtkmm.example.plug"); auto app = Gtk::Application::create(local_argc, argv, "org.gtkmm.example.plug");
auto builder = Gtk::Builder::create_from_file(path_glade); auto builder = Gtk::Builder::create_from_file(path_glade);
@ -47,3 +49,19 @@ 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("ublexec version: ")) + version_application + "\n";
cout << version.c_str();
exit(1);
}
}
}

@ -6,6 +6,7 @@ const string path_glade = "/usr/share/ublexec/ui/ublexec.glade";
const string path_css = "/usr/share/ublexec/css/ublexec.css"; const string path_css = "/usr/share/ublexec/css/ublexec.css";
const string app_name = "ublexec"; const string app_name = "ublexec";
string name_app_cmd = ""; string name_app_cmd = "";
string version_application = "2.23";
const string path_img_head_background = "/usr/share/ublexec/images/logo-background.png"; const string path_img_head_background = "/usr/share/ublexec/images/logo-background.png";
int socket_ext_id_I = 0; int socket_ext_id_I = 0;
int socket_trd_id_I = 0; int socket_trd_id_I = 0;
@ -965,7 +966,8 @@ SettingsPlug::SettingsPlug(::Window p_socketID, Glib::RefPtr<Gtk::Builder> build
show_all_children(); show_all_children();
} }
void help() {
}

@ -28,6 +28,7 @@ extern string name_app_cmd;
extern const string path_img_head_background; extern const string path_img_head_background;
extern int socket_ext_id_I; extern int socket_ext_id_I;
extern int socket_trd_id_I; extern int socket_trd_id_I;
extern string version_application;
void me_thread(string cmd); void me_thread(string cmd);
class CmdArgParser : public Glib::OptionGroup class CmdArgParser : public Glib::OptionGroup
{ {
@ -205,7 +206,6 @@ public:
Gtk::Widget *boxAbout; Gtk::Widget *boxAbout;
public: public:
string termunal_cmd[3] = {"konsole -e ", "xfce4-terminal -x ", "xterm -e "}; string termunal_cmd[3] = {"konsole -e ", "xfce4-terminal -x ", "xterm -e "};
string version_application = "2.23";
string cmd_old = ""; string cmd_old = "";
string user_exec_app = ""; string user_exec_app = "";
string user_cmd = ""; string user_cmd = "";
@ -245,5 +245,6 @@ private:
Gtk::Widget *plugBox; Gtk::Widget *plugBox;
Gtk::Widget *parent; Gtk::Widget *parent;
}; };
void help();

@ -1678,10 +1678,12 @@ with the specified priority</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">9</property>
<property name="adjustment">adjustment1</property> <property name="adjustment">adjustment1</property>
<property name="fill-level">20</property> <property name="fill-level">20</property>
<property name="round-digits">0</property> <property name="round-digits">0</property>
<property name="digits">0</property> <property name="digits">0</property>
<property name="draw-value">False</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

@ -214,3 +214,7 @@ msgstr ""
msgid "ОК" msgid "ОК"
msgstr "" msgstr ""
#: source/main.cc:60 source/main.cc:60
msgid "ublexec version: "
msgstr "https://wiki.ublinux.ru"

@ -218,3 +218,7 @@ msgstr "pkexec"
msgid "ОК" msgid "ОК"
msgstr "ОК" msgstr "ОК"
#: source/main.cc:60 source/main.cc:60
msgid "ublexec version: "
msgstr "ublexec версия: "

Loading…
Cancel
Save