diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 9ad55c1..264f9a4 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -12,6 +12,7 @@ bool flag_timezone = false; bool flag_ntp = false; bool flag_update = false; int socket_ext_id_I=0; +int socket_trd_id_I=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} { @@ -26,8 +27,14 @@ CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_descr socketExtId.set_flags(Glib::OptionEntry::FLAG_IN_MAIN); socketExtId.set_description("Settings manager secondary socket"); + Glib::OptionEntry socketTrdId; + socketTrdId.set_long_name("socket-trd-id"); + socketTrdId.set_flags(Glib::OptionEntry::FLAG_IN_MAIN); + socketTrdId.set_description("Settings manager secondary socket"); + add_entry(socketIDArg, m_socketID); add_entry(socketExtId, socket_ext_id_I); + add_entry(socketTrdId, socket_trd_id_I); } ::Window CmdArgParser::GetSocketID() const{ return m_socketID; @@ -49,13 +56,15 @@ void MainWindow::settings(){ Gtk::Widget *plugBox; Gtk::Window *window; Gtk::Widget *boxButton; + Gtk::Widget *btnSave; builder->get_widget("standartHead",standartHead); builder->get_widget("plugBox",plugBox); builder->get_widget("window",window); builder->get_widget("boxButton",boxButton); + builder->get_widget("btnSave",btnSave); - ubl_get_standard_ui(standartHead,plugBox,boxButton,window,"ubl-settings-datetime.svg",_("Settings the date and time"),_("ubl-settings-datetime"),0,socket_ext_id_I); + ubl_make_plugs(boxButton,btnSave, socket_ext_id_I, socket_trd_id_I); year=0, month=0, day=0; this->get_builder(); this->lacalization(); @@ -226,11 +235,13 @@ void MainWindow::get_builder(){ builder->get_widget("btnSaveLocal",btnSaveLocal); builder->get_widget("btnSaveGlobl",btnSaveGlobl); builder->get_widget("lblSave",lblSave); - builder->get_widget("btnSave",btnSave); + builder->get_widget("btnDownload",btnDownload); builder->get_widget("lblDownload",lblDownload); builder->get_widget("btnDownloadGlobal", btnDownloadGlobal); builder->get_widget("btnDownloadlocal", btnDownloadlocal); + builder->get_widget("btnSettings", btnSettings); + builder->get_widget("aboutWindows", aboutWindows); //builder->get_widget("cbxSynchronizeNtp",cbxSynchronizeNtp); @@ -263,8 +274,14 @@ void MainWindow::event(){ btnSaveLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::save_local_cfg)); btnSaveGlobl->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::save_global_cfg)); btnDownloadlocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg)); + btnSettings->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::about_Dialog_show)); +} + +void MainWindow::about_Dialog_show(){ + aboutWindows->show(); } + void MainWindow::download_globl_cfg(){ this->entry_dhcp_mess(); string cmd = "/usr/bin/ubconfig --default --source global get clock ZONE"; @@ -675,8 +692,7 @@ void MainWindow::get_config(){ this->read_file(); this->update_hour_minute(); this->update_calendar(); - - + this->entry_dhcp_mess(); } array MainWindow::split_region_zone(string read_reg_zon_cfg){ diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index e2b6b1c..f6af689 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -30,6 +30,7 @@ extern bool flag_timezone; extern bool flag_ntp; extern bool flag_update; extern int socket_ext_id_I; +extern int socket_trd_id_I; class CmdArgParser : public Glib::OptionGroup { public: @@ -84,13 +85,16 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Label *lblNtpClose; Gtk::Entry *txtNtpServer; Gtk::Entry *txtDate; - Gtk::Widget *btnSave; Gtk::Widget *btnDownload; Gtk::MenuItem *btnSaveLocal; Gtk::MenuItem *btnSaveGlobl; Gtk::MenuItem *btnDownloadGlobal; Gtk::MenuItem *btnDownloadlocal; + Gtk::AboutDialog *aboutWindows; + //Gtk::MenuButton *btnSave; + //Gtk::MenuButton *btnDownload; + Gtk::Button *btnSettings; std::map > time_reg_map; std::map > time_reg_map_local; unsigned int year=0; @@ -119,6 +123,7 @@ class MainWindow : public Gtk::ApplicationWindow { virtual ~MainWindow() = default; void fill_in_reg_zone(string &cmd); void download_globl_cfg(); + void about_Dialog_show(); void save_local_cfg(); void save_global_cfg(); void save_Dhcp(); diff --git a/ubl-settings-datetime.desktop b/ubl-settings-datetime.desktop index 521b6fe..9c4cd2e 100644 --- a/ubl-settings-datetime.desktop +++ b/ubl-settings-datetime.desktop @@ -7,7 +7,7 @@ GenericName[ru]=Настройка даты и времени Comment=Date time settings Comment[ru]=Приложение для настройки даты и времени Type=Application -Exec=pkexec ubl-settings-datetime --lock-datetime +Exec=pkexec ubl-settings-datetime Icon=ubl-settings-datetime Terminal=false X-XfcePluggable=true diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index dbad9a0..d25ecc8 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -2,6 +2,43 @@ + + False + О Программе + center + dialog + ubl-settings-datetime + 1.4 + Copyright © 2021 - the ublinux team + Настройка даты времени + https://ublinux.ru/ + www.ublinux.ru + UBGroup + UBGroup + ubl-settings-datetime + gpl-2-0 + + + False + vertical + 2 + + + False + end + + + False + False + 0 + + + + + + + + True False @@ -26,18 +63,18 @@ True False - + True False - Download Global + Download Local True - + True False - Download Local + Download Global True @@ -732,16 +769,34 @@ Format: DD.MM.YYYY - + True - False + True + False + True + menu1 - + True - True - False - True - menu1 + False + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + go-bottom + + + False + True + 0 + + True @@ -754,44 +809,103 @@ Format: DD.MM.YYYY 6 Save + + False + True + 1 + + + + + + + 1 + + + + + True + False + + + True + True + False + True + menu2 + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + media-floppy + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + Download + + + False + True + 1 + + + False True - 1 + 0 - + True True - False True - menu2 - + True False - 5 - 5 - 5 - 5 - 6 - 6 - Download + 25 + emblem-system False True - 2 + 1 - 1 + end + 2