Applications
/
ubl-settings-datetime
8
0
Fork 3
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Добавлены новые парметры блокировки

Browse Source
pull/55/head
Igor Belitskiy 3 years ago
parent 84275f37f2
commit bb45aa7aae
5 changed files with 1505 additions and 121 deletions
Show Stats Download Patch File Download Diff File

1398
#ubl-settings-datetime.glade#~
View File

File diff suppressed because it is too large Load Diff

81
source/main.cc
Unescape View File

@ -1,4 +1,7 @@
#include "ubl-settings-datetime.h"
void pars_flag(int index_start, int argc, char* argv[]);
int main(int argc, char* argv[]) {
string str_argv="";
string str_cmd_argv = "";
@ -14,24 +17,9 @@ int main(int argc, char* argv[]) {
str_argv = argv[1];
}
if ((str_argv.find("-s")!=std::string::npos) || (str_argv.find("--socket-id")!=std::string::npos)){
for (int i=3; i<argc; i++){
str_argv = argv[i];
if (str_argv=="--lock-datetime"){
flag_datetime=true;
}
else if (str_argv=="--lock-timezone"){
flag_timezone=true;
}
else if (str_argv=="--lock-ntp"){
flag_ntp=true;
}
else if (str_argv=="--lock-update"){
flag_update=true;
}
if (str_argv.find("--socket-id")!=std::string::npos){
}
pars_flag(3, argc, argv);
auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug");
auto builder = Gtk::Builder::create_from_file(path_glade + "ubl-settings-datetime.glade");
Glib::init();
@ -60,37 +48,56 @@ int main(int argc, char* argv[]) {
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 + "ubl-settings-datetime.glade");
for (int i=1; i<argc; i++){
pars_flag(1, argc, argv);
MainWindow* wnd = nullptr;
builder->get_widget_derived("window", wnd);
auto r = app->run(*wnd);
delete wnd;
return r;
}
else{
cout << gettext("Argument not recognized");
return 0;
}
}
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();
return 1;
exit (1);
}
else if (str_argv=="--lock-datetime"){
flag_datetime=true;
else if (str_argv == "--lock-datetime"){
flag_datetime = true;
}
else if (str_argv=="--lock-timezone"){
flag_timezone=true;
else if (str_argv == "--lock-timezone"){
flag_timezone = true;
}
else if (str_argv=="--lock-ntp"){
flag_ntp=true;
else if (str_argv == "--lock-ntp-mode"){
flag_ntp_mode = true;
}
else if (str_argv=="--lock-update"){
flag_update=true;
else if (str_argv == "--lock-ntp-edit"){
flag_ntp_edit = true;
}
else{
g_print(gettext("Argument not recognized\n"));
else if (str_argv == "--lock-save"){
flag_save = true;
}
else if (str_argv == "--lock-save-local"){
flag_save_local = true;
}
MainWindow* wnd = nullptr;
builder->get_widget_derived("window", wnd);
auto r = app->run(*wnd);
delete wnd;
return r;
else if (str_argv == "--lock-save-global"){
flag_save_global = true;
}
else if (str_argv == "--lock-load-global"){
flag_load_global = true;
}
else{
cout << gettext("Argument not recognized");
return 0;
if (index_start == 1){
g_print(gettext("Argument not recognized\n"));
}
}
}
}

112
source/ubl-settings-datetime.cc
Unescape View File

@ -9,8 +9,12 @@ string path_locale = "/usr/share/locale/";
string path_css = "/usr/share/ubl-settings-datetime/css/style.css";
bool flag_datetime = false;
bool flag_timezone = false;
bool flag_ntp = false;
bool flag_update = false;
bool flag_ntp_mode = false;
bool flag_ntp_edit = false;
bool flag_save = false;
bool flag_save_local = false;
bool flag_save_global = false;
bool flag_load_global = false;
int socket_ext_id_I=0;
int socket_trd_id_I=0;
@ -18,7 +22,6 @@ CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_descr
: Glib::OptionGroup{p_name, p_description, p_help} {
Glib::OptionEntry socketIDArg;
socketIDArg.set_long_name("socket-id");
socketIDArg.set_short_name('s');
socketIDArg.set_flags(Glib::OptionEntry::FLAG_IN_MAIN);
socketIDArg.set_description("Settings manager socket");
@ -79,12 +82,6 @@ void MainWindow::settings(){
this->event();
this->parse_text_date();
this->download_local_cfg();
//orevrlayInfo->add_overlay(*boxInfoError);
//imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
//GdkPixbuf* pixbuf_image = gdk_pixbuf_new_from_file_at_size("/usr/share/ubl-settings-datetime/images/close.svg", 12,12,NULL);
//GtkWidget* imageInfo = GTK_WIDGET(imageCloseInfo->gobj());
//gtk_image_set_from_pixbuf(GTK_IMAGE(imageInfo), pixbuf_image);
}
else{
btnDownload->set_sensitive(false);
@ -109,11 +106,7 @@ void MainWindow::settings(){
btnBoxAboutDialog->set_visible(false);
this->event();
imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
}
//popCalendar->show_all();
}
@ -159,14 +152,10 @@ void MainWindow::lacalization(){
mess_sudo->set_title(_("Warning!"));
mess_dchp->set_title(_("Warning!"));
lblTimeBios->set_text(_("Synchronize hardware time"));
//_lblSynchronizebChk->set_text(_("Synchronize via NTP"));
}
void MainWindow::flag_block_gui(){
if (flag_datetime==true){
//numTimeHrs->set_sensitive(false);
//numTimeMin->set_sensitive(false);
//txtDate->set_sensitive(false);
btnUpdateDateTime->set_sensitive(false);
numTimeHrs->set_sensitive(false);
numTimeMin->set_sensitive(false);
@ -180,17 +169,28 @@ void MainWindow::flag_block_gui(){
if (flag_timezone==true){
cbRegion->set_sensitive(false);
cbZone->set_sensitive(false);
//btnChooseDate->set_sensitive(false);
cbDhcp->set_sensitive(false);
}
if (flag_ntp==true){
if (flag_ntp_mode==true){
cbDhcp->set_sensitive(false);
txtNtpServer->set_sensitive(false);
flag_ntp_edit = true;
}
if (flag_update==true){
if (flag_ntp_edit==true){
txtNtpServer->set_sensitive(false);
cbDhcp->set_sensitive(false);
}
if (flag_load_global==true){
btnDonwlolGlob->set_sensitive(false);
}
if (flag_save==true){
btnSave->set_sensitive(false);
}
if (flag_save_local==true){
btnSaveLocal->set_sensitive(false);
}
if (flag_save_global==true){
btnSaveGlob->set_sensitive(false);
}
}
void MainWindow::add_CSS(){
@ -201,11 +201,8 @@ void MainWindow::add_CSS(){
styleContext->add_provider_for_screen(screen, cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);//add provider for screen in all application
Glib::RefPtr<Gtk::StyleContext> context = boxColor->get_style_context();
Glib::RefPtr<Gtk::StyleContext> context_lbl_head = lblHead->get_style_context();
context->add_class("cssboxColor1");
context_lbl_head->add_class("textHead");
}
@ -240,7 +237,6 @@ void MainWindow::get_builder(){
builder->get_widget("lblTimeZone",lblTimeZone);
builder->get_widget("lblReg",lblReg);
builder->get_widget("lblZone",lblZone);
//builder->get_widget("lblSynchronizebChk",_lblSynchronizebChk);
builder->get_widget("lblSynchronizebChkGLob",lblSynchronizebChkGLob);
builder->get_widget("lblSynchronizeBtn",lblSynchronizeBtn);
builder->get_widget("lblTimeBios",lblTimeBios);
@ -249,7 +245,6 @@ void MainWindow::get_builder(){
builder->get_widget("lblMessageSudo",lblMessageSudo);
builder->get_widget("btnMessCloseSudo",btnMessCloseSudo);
builder->get_widget("lblSave",lblSave);
builder->get_widget("lblDownload",lblDownload);
builder->get_widget("aboutWindows", aboutWindows);
builder->get_widget("btnBoxAboutDialog", btnBoxAboutDialog);
@ -356,20 +351,29 @@ void MainWindow::save_global_cfg(){
info_warning_error(3);
}
void MainWindow::save_global_local_cfg(){
string cmd = "ubconfig --target system set clock ZONE=";
this->enter_zone(cmd);
string cmd = "";
string cmd_default = "";
string cmd_dhcp = "";
string cmd_set_ntp = "";
string remove = "";
if (flag_save_global==false){
cmd = "/usr/bin/ubconfig --target global set clock ZONE=";
this->enter_zone(cmd);
string cmd_default = "/usr/bin/ubconfig --target global set network NTPSERVERS=default";
string cmd_dhcp = "/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp";
string cmd_set_ntp = "/usr/bin/ubconfig --target global set network NTPSERVERS=\"";
string remove = "/usr/bin/ubconfig --target global remove network NTPSERVERS";
cmd_default = "/usr/bin/ubconfig --target global set network NTPSERVERS=default";
cmd_dhcp = "/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp";
cmd_set_ntp = "/usr/bin/ubconfig --target global set network NTPSERVERS=\"";
remove = "/usr/bin/ubconfig --target global remove network NTPSERVERS";
this->save_Dhcp(cmd_default, cmd_dhcp, remove, cmd_set_ntp);
}
if (flag_save_local==false){
cmd = "ubconfig --target system set clock ZONE=";
this->enter_zone(cmd);
cmd_default = "/usr/bin/ubconfig --target system set network NTPSERVERS=default";
cmd_dhcp = "/usr/bin/ubconfig --target system set network NTPSERVERS=dhcp";
cmd_set_ntp = "/usr/bin/ubconfig --target system set network NTPSERVERS=\"";
remove = "/usr/bin/ubconfig --target system remove network NTPSERVERS";
this->save_Dhcp(cmd_default, cmd_dhcp, remove, cmd_set_ntp);
}
info_warning_error(4);
}
@ -417,28 +421,6 @@ void MainWindow::info_warning_error(int mess){
}
void MainWindow::stop_ntp(){
int start_error = error_info;
string cmd = "SEL_SERVICE=\"systemd-timesyncd\"; systemctl --quiet is-active ${SEL_SERVICE}.service &>/dev/null && systemctl stop ${SEL_SERVICE}.service; ";
wrapper_system(cmd);
cmd ="SEL_SERVICE=\"ntpd\"; systemctl --quiet is-active ${SEL_SERVICE}.service &>/dev/null && systemctl stop ${SEL_SERVICE}.service || pkill -9 ${SEL_SERVICE}; ";
wrapper_system(cmd);
cmd ="SEL_SERVICE=\"ntpdate\"; systemctl --quiet is-active ${SEL_SERVICE}.service &>/dev/null && systemctl stop ${SEL_SERVICE}.service || pkill -9 ${SEL_SERVICE}; ";
wrapper_system(cmd);
cmd = "SEL_SERVICE=\"chronyd\"; systemctl --quiet is-active ${SEL_SERVICE}.service &>/dev/null && systemctl stop ${SEL_SERVICE}.service || pkill -9 ${SEL_SERVICE}; ";
wrapper_system(cmd);
cmd ="SEL_SERVICE=\"openntpd\"; systemctl --quiet is-active ${SEL_SERVICE}.service &>/dev/null && systemctl stop ${SEL_SERVICE}.service || pkill -9 ntpd; ";
wrapper_system(cmd);
cmd ="SEL_SERVICE=\"ptp4l\"; systemctl --quiet is-active ${SEL_SERVICE}.service &>/dev/null && systemctl stop ${SEL_SERVICE}.service || pkill -9 ${SEL_SERVICE}; ";
wrapper_system(cmd);
cmd ="SEL_SERVICE=\"phc2sys\"; systemctl --quiet is-active ${SEL_SERVICE}.service &>/dev/null && systemctl stop ${SEL_SERVICE}.service || pkill -9 ${SEL_SERVICE} ";
wrapper_system(cmd);
if (start_error!=error_info){
error_info=start_error;
}
cout << error_info << endl;
}
void MainWindow::wrapper_system(string cmd){
int response_cmd = system(cmd.c_str());
if (response_cmd!=0){
@ -620,13 +602,14 @@ void MainWindow::event_entry_cbDhcp(){
txtNtpServer->set_text("");
}
else if (activ_index==2){
if (flag_ntp_edit==false){
txtNtpServer->set_sensitive(true);
}
}
else if (activ_index==3){
txtNtpServer->set_text("");
txtNtpServer->set_sensitive(false);
btnUpdateDateTime->set_sensitive(true);
this->stop_ntp();
}
}
@ -655,7 +638,6 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove
}
void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhcp){
//string cmd = "/usr/bin/ubconfig get network NTPSERVERS";
string cmd = cmd_get_dhcp;
struct Result<string> obj_result = this->wrapper_call(cmd);
if (obj_result.error==0){
@ -671,7 +653,6 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc
else if (str_dhcp=="default"){
btnUpdateDateTime->set_sensitive(false);
cbDhcp->set_active(0);
//string cmd = "/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT";
cmd = cmd_default_get_dhcp;
struct Result<string> obj_result = this->wrapper_call(cmd);
txtNtpServer->set_sensitive(false);
@ -682,10 +663,6 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc
if (obj_result.error==2){
warning_info-=1;
}
//string error = "";
//error = string(_("ERROR")) + "\n" + obj_result.response;
//lblMessage->set_text(error);
//mess_dchp->show();
}
}
else{
@ -701,10 +678,12 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc
else{
cbDhcp->set_active(2);
txtNtpServer->set_text(str_dhcp);
if (flag_ntp_edit==false){
txtNtpServer->set_sensitive(true);
}
}
}
}
else{
cbDhcp->set_active(3);
txtNtpServer->set_text("");
@ -921,7 +900,6 @@ string MainWindow::call(string cmd){
exit(1);
}
while (fgets(path, PATH_MAX, fp) != NULL){
//printf("%s", path);
break;
}
status = pclose(fp);
@ -933,7 +911,6 @@ string MainWindow::call(string cmd){
}
void MainWindow::append_zone(){
//int length_zone = time_reg_map.at(str_region).size();
cbZone->remove_all();
int index = cbRegion->get_active_row_number();
string str_region = array_region[index];
@ -1052,26 +1029,25 @@ void MainWindow::read_file(){
string path_reg_zone = "";
namespace fs = std::filesystem;
for (const auto & entry : fs::directory_iterator("/usr/share/zoneinfo/")){
std::ifstream in(entry.path()); // окрываем файл для чтения
std::ifstream in(entry.path());
if (in.is_open()){
string key_reg = entry.path().filename().string();
string path_dir = "/usr/share/zoneinfo/"+key_reg;
if (fs::is_directory(path_dir)){
if (key_reg!="Pacific"){
if (key_reg!="posix"){
//if (key_reg!="Etc"){
if (key_reg!="right"){
vector<string> zone;
vector<string> zone_local;
for (const auto & entry_zone : fs::directory_iterator(path_dir)){
std::ifstream in1(entry_zone.path()); // окрываем файл для чтения
std::ifstream in1(entry_zone.path());
if (in1.is_open()){
string key_zone = entry_zone.path().filename().string();
if (fs::is_directory(path_dir+"/"+key_zone)){
string reg_reg_zone = path_dir+"/"+key_zone;
for (const auto & entry_reg_reg_zone : fs::directory_iterator(reg_reg_zone)){
std::ifstream in2(entry_zone.path()); // окрываем файл для чтения
std::ifstream in2(entry_zone.path());
if (in2.is_open()){
string reg_reg_zone = entry_reg_reg_zone.path().filename().string();
zone.push_back(reg_reg_zone);

9
source/ubl-settings-datetime.h
Unescape View File

@ -27,8 +27,12 @@ extern string path_locale;
extern string path_css;
extern bool flag_datetime;
extern bool flag_timezone;
extern bool flag_ntp;
extern bool flag_update;
extern bool flag_ntp_mode;
extern bool flag_ntp_edit;
extern bool flag_save;
extern bool flag_save_local;
extern bool flag_save_global;
extern bool flag_load_global;
extern int socket_ext_id_I;
extern int socket_trd_id_I;
class CmdArgParser : public Glib::OptionGroup
@ -163,7 +167,6 @@ class MainWindow : public Gtk::ApplicationWindow {
int check_root();
void gui_exit();
bool gui_exit_2(GdkEventAny* event);
void stop_ntp();
void wind_close_ntp();
void wrapper_system(string cmd);
void info_status_app(string stule);

0
ubl-settings-datetime.glade
Unescape View File

Write Preview
Loading…
Cancel
Save