From 9bd9a0764b412f474f3c69b64e8aa69bd5a06d0c Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 17 May 2023 17:42:24 +0600 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20plug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/main.cc | 57 +++++++++++++++---------------------------------- ublexec.desktop | 2 -- 2 files changed, 17 insertions(+), 42 deletions(-) diff --git a/source/main.cc b/source/main.cc index ab09c8b..9bcb77d 100644 --- a/source/main.cc +++ b/source/main.cc @@ -13,48 +13,25 @@ int main(int argc, char** argv) { if (argc > 1){ str_argv = argv[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; - CmdArgParser parser{ - "Socket ID", - "Command line argument for socket ID communication.", - "No help available, sorry" - }; - - context.set_main_group(parser); - context.parse(argc, argv); - ::Window socketID = parser.GetSocketID(); - SettingsPlug plug{socketID, builder}; - plug.show(); - app->run(plug); - return 0; - } - else { - if (argc == 3) { - name_app_cmd = argv[2]; - string str_flag = argv[1]; - if (str_flag == "-x") { - flag_prog_file = 1; - } - else if (str_flag == "-e") { - flag_prog_file = 2; - } + if (argc == 3) { + name_app_cmd = argv[2]; + string str_flag = argv[1]; + if (str_flag == "-x") { + flag_prog_file = 1; + } + else if (str_flag == "-e") { + flag_prog_file = 2; } - pars_flag(1,argc, argv); - int local_argc = 1; - auto app = Gtk::Application::create(local_argc, argv, "org.gtkmm.example.plug"); - auto builder = Gtk::Builder::create_from_file(path_glade); - MainWindow* wnd = nullptr; - builder->get_widget_derived("window", wnd); - auto r = app->run(*wnd); - delete wnd; - return r; } - + pars_flag(1,argc, argv); + int local_argc = 1; + auto app = Gtk::Application::create(local_argc, argv, "org.gtkmm.example.plug"); + auto builder = Gtk::Builder::create_from_file(path_glade); + MainWindow* wnd = nullptr; + builder->get_widget_derived("window", wnd); + auto r = app->run(*wnd); + delete wnd; + return r; } void pars_flag(int index_start, int argc, char* argv[]) { diff --git a/ublexec.desktop b/ublexec.desktop index 846ac40..e0f7abd 100644 --- a/ublexec.desktop +++ b/ublexec.desktop @@ -10,6 +10,4 @@ Type=Application Exec=ublexec Icon=com.ublinux.ublexec Terminal=false -X-XfcePluggable=true -X-UBLPluggable=true Categories=XFCE;GTK;Utility;X-GNOME-Utilities;System; \ No newline at end of file