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

Merge pull request 'develop' (#112) from develop into master

Browse Source 
Reviewed-on: #112
pull/114/head
Dmitry Razumov 3 years ago
parent 9b12ade85d 2783059c25
commit 9b75255dd5
7 changed files with 57 additions and 83 deletions
Show Stats Download Patch File Download Diff File

23
README.md
Unescape View File

@ -32,20 +32,21 @@ $ sudo make uninstall
# Usage
```sh
$ ubl-settings-datetime --help
GTK settings datetime for UBLinux
Setting up the date and time for UBLinux
Usage: ubl-settings-datetime [OPTIONS...]
Options:
-h, --help Show this help
-V, --version Show package version
--lock-datetime Locking date and time changes
--lock-timezone Locking time zone change
--lock-ntp-mode Locking the NTP mode selection
--lock-ntp-edit Lock editing NTP servers
--lock-save Locking of local and global configuration saving
--lock-save-local Locking the local configuration save
--lock-save-global Locking the global configuration save
--lock-load-global Lock load global configuration
-h, --help Show this help
-V, --version Show package version
--lock-datetime Lock date and time changes
--lock-timezone Lock time zone changes
--lock-ntp-mode Lock NTP mode selection
--lock-ntp-edit Lock editing NTP servers
--lock-sync-hwclock Lock sync hwclock mode selection
--lock-save Lock saving local and global configuration
--lock-save-local Lock save global configuration
--lock-save-global Lock load global configuration
--lock-load-global Lock load global configuration
$ ubl-settings-datetime --version
ubl-settings-datetime version: x.xx

6
source/main.cc
Unescape View File

@ -8,7 +8,11 @@ int main(int argc, char* argv[]) {
for (int i=1; i<argc; i++){
str_cmd_argv+= to_string(*argv[i]) + " ";
}
if (geteuid() != 0){
string cmd = "";
cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv;
return system(cmd.c_str());
}
setlocale(LC_ALL, "");
bindtextdomain("ubl-settings-datetime", "/usr/share/locale/");
bind_textdomain_codeset("ubl-settings-datetime", "UTF-8");

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

@ -530,61 +530,21 @@ void MainWindow::save_global_local_cfg() {
lblWarning->set_text(nothing_save);
}
else {
string cmd = "";
string cmd_default = "";
string cmd_dhcp = "";
string cmd_set_ntp = "";
string remove = "";
string local = "";
string hw = "";
string remove_ntp = "";
string cmd_zone = "";
if (flag_local == false) {}
if (flag_global == false) {}
if ((this->check_config("region", 0) == false || this->check_config("zone", 0) == false)) {
if (flag_local == false) {
cmd_zone = set_system_ZONE;
this->enter_zone(cmd_zone);
}
}
string cmd = set_all_ZONE;
string cmd_default = set_all_NTPSERVERS_default;
string cmd_dhcp = set_all_NTPSERVERS_dhcp;
string cmd_set_ntp = set_all_NTPSERVERS;
string remove_ntp = remove_all_NTPSERVERS;
string local = set_all_HWCLOCK_SYNC_localtime;
string hw = set_all_HWCLOCK_SYNC_utc;
if ((this->check_config("region", 1) == false || this->check_config("zone", 1) == false)) {
if (flag_global == false) {
cmd_zone = set_global_ZONE;
this->enter_zone(cmd_zone);
}
}
if (this->check_config("dhcp", 0) == false) {
if (flag_local == false) {
cmd_default = set_system_NTPSERVERS_default;
cmd_dhcp = set_system_NTPSERVERS_dhcp;
cmd_set_ntp = set_system_NTPSERVERS;
remove_ntp = remove_system_NTPSERVERS;
this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp);
}
this->enter_zone(cmd);
}
if (this->check_config("dhcp", 1) == false) {
if (flag_global == false) {
cmd_default = set_global_NTPSERVERS_default;
cmd_dhcp = set_global_NTPSERVERS_dhcp;
cmd_set_ntp = set_global_NTPSERVERS;
remove_ntp = remove_global_NTPSERVERS;
this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp);
}
}
if (this->check_config("hw", 0) == false) {
if (flag_local == false) {
local = set_system_HWCLOCK_SYNC_localtime;
hw = set_system_HWCLOCK_SYNC_utc;
this->set_hardware_clock(local, hw);
}
this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp);
}
if (this->check_config("hw", 1) == false) {
if (flag_global == false) {
local = set_global_HWCLOCK_SYNC_localtime;
hw = set_global_HWCLOCK_SYNC_utc;
this->set_hardware_clock(local, hw);
}
this->set_hardware_clock(local, hw);
}
map_config_data_global_old = map_config_data_global;
map_config_data_local_old = map_config_data_local;

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

@ -37,19 +37,28 @@
#define get_global_ZONE "ubconfig --default --source global get clock ZONE"
#define get_global_HWCLOCK_SYNC "ubconfig --source global get clock HWCLOCK_SYNC"
#define set_system_ZONE "ubconfig --target system set clock ZONE="
#define set_global_HWCLOCK_SYNC_utc "ubconfig --target global set clock HWCLOCK_SYNC=utc"
#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global set clock HWCLOCK_SYNC=localtime"
#define set_global_HWCLOCK_SYNC_utc "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=utc"
#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=localtime"
#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system set clock HWCLOCK_SYNC=localtime"
#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system set clock HWCLOCK_SYNC=utc"
#define remove_global_NTPSERVERS "ubconfig --target global remove network NTPSERVERS"
#define remove_global_NTPSERVERS "ubconfig --target global --noexecute remove network NTPSERVERS"
#define set_system_NTPSERVERS_default "ubconfig --target system set network NTPSERVERS=default"
#define set_system_NTPSERVERS_dhcp "ubconfig --target system set network NTPSERVERS=dhcp"
#define set_system_NTPSERVERS "ubconfig --target system set network NTPSERVERS=\""
#define remove_system_NTPSERVERS "ubconfig --target system remove network NTPSERVERS"
#define set_global_ZONE "ubconfig --target global set clock ZONE="
#define set_global_NTPSERVERS_default "ubconfig --target global set network NTPSERVERS=default"
#define set_global_NTPSERVERS_dhcp "ubconfig --target global set network NTPSERVERS=dhcp"
#define set_global_NTPSERVERS "ubconfig --target global set network NTPSERVERS=\""
#define set_global_ZONE "ubconfig --target global --noexecute set clock ZONE="
#define set_all_ZONE "ubconfig set clock ZONE="
#define set_all_NTPSERVERS_default "ubconfig set network NTPSERVERS=default"
#define set_all_NTPSERVERS_dhcp "ubconfig set network NTPSERVERS=dhcp"
#define set_all_NTPSERVERS "ubconfig set network NTPSERVERS=\""
#define remove_all_NTPSERVERS "ubconfig remove network NTPSERVERS"
#define set_all_HWCLOCK_SYNC_localtime "ubconfig set clock HWCLOCK_SYNC=localtime"
#define set_all_HWCLOCK_SYNC_utc "ubconfig set clock HWCLOCK_SYNC=utc"
#define set_global_NTPSERVERS_default "ubconfig --target global --noexecute set network NTPSERVERS=default"
#define set_global_NTPSERVERS_dhcp "ubconfig --target global --noexecute set network NTPSERVERS=dhcp"
#define set_global_NTPSERVERS "ubconfig --target global --noexecute set network NTPSERVERS=\""
#define set_hwclock "hwclock --systohc"
#define icon_checked "com.ublinux.ubl-settings-datetime.checked"
#define icon_warning "com.ublinux.ubl-settings-datetime.warning"
@ -83,7 +92,7 @@
#define nothing_save _("Nothing to save!")
#define read_documentation_web _("Would you like to read documentation in the Web?")
#define redirected_documentation _("You will be redirected to documentation site, where user help pages are ""translated and supported by community.")
#define str_help_h _("GTK settings datetime for UBLinux\n\n""Usage: ubl-settings-datetime [OPTIONS...]\n""Options:\n"" -h, --help Show this help\n"" -V, --version Show package version\n"" --lock-datetime Lock date and time changes\n"" --lock-timezone Lock time zone changes\n"" --lock-ntp-mode Lock NTP mode selection\n"" --lock-ntp-edit Lock editing NTP servers\n"" --lock-sync-hwclock Lock sync hwclock mode selection\n"" --lock-save Lock saving local and global configuration\n"" --lock-save-local Lock save global configuration\n"" --lock-save-global Lock load global configuration\n"" --lock-load-global Lock load global configuration\n")
#define str_help_h _("Setting up the date and time for UBLinux\n\n""Usage: ubl-settings-datetime [OPTIONS...]\n""Options:\n"" -h, --help Show this help\n"" -V, --version Show package version\n"" --lock-datetime Lock date and time changes\n"" --lock-timezone Lock time zone changes\n"" --lock-ntp-mode Lock NTP mode selection\n"" --lock-ntp-edit Lock editing NTP servers\n"" --lock-sync-hwclock Lock sync hwclock mode selection\n"" --lock-save Lock saving local and global configuration\n"" --lock-save-local Lock save global configuration\n"" --lock-save-global Lock load global configuration\n"" --lock-load-global Lock load global configuration\n")
#define str_version _("ubl-settings-datetime version: ")
#define local_read_error _("Local configuration reading error")
#define global_read_error _("Global configuration read error")

6
ubl-settings-datetime.glade
Unescape View File

@ -301,7 +301,7 @@
<object class="GtkMenuItem" id="btnSaveLocalGlob">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save in global and local configuration</property>
<property name="label" translatable="yes">Save configuration</property>
<style>
<class name="menuitemtop"/>
</style>
@ -311,7 +311,7 @@
<object class="GtkMenuItem" id="btnSaveGlob">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save in global configuration</property>
<property name="label" translatable="yes">Save to global configuration</property>
<style>
<class name="menuitemmiddle"/>
</style>
@ -321,7 +321,7 @@
<object class="GtkMenuItem" id="btnSaveLocal">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save in local configuration</property>
<property name="label" translatable="yes">Save to local configuration</property>
<style>
<class name="menuitembottom"/>
</style>

8
ubl-settings-datetime.pot
Unescape View File

@ -755,7 +755,7 @@ msgstr ""
#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85
msgid ""
"GTK settings datetime for UBLinux\n"
"Setting up the date and time for UBLinux\n"
"\n"
"Usage: ubl-settings-datetime [OPTIONS...]\n"
"Options:\n"
@ -1656,15 +1656,15 @@ msgid "Save"
msgstr ""
#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76
msgid "Save in global configuration"
msgid "Save to global configuration"
msgstr ""
#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75
msgid "Save in local configuration"
msgid "Save to local configuration"
msgstr ""
#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74
msgid "Save in global and local configuration"
msgid "Save configuration"
msgstr ""
msgid "Scoresbysund"

10
ubl-settings-datetime_ru.po
Unescape View File

@ -763,7 +763,7 @@ msgstr "ГМТ-3"
#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85
msgid ""
"GTK settings datetime for UBLinux\n"
"Setting up the date and time for UBLinux\n"
"\n"
"Usage: ubl-settings-datetime [OPTIONS...]\n"
"Options:\n"
@ -1682,16 +1682,16 @@ msgid "Save"
msgstr "Сохранить"
#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76
msgid "Save in global configuration"
msgid "Save to global configuration"
msgstr "Сохранить в глобальную конфигурацию"
#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75
msgid "Save in local configuration"
msgid "Save to local configuration"
msgstr "Сохранить в локальную конфигурацию"
#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74
msgid "Save in global and local configuration"
msgstr "Сохранить в глобальную и локальную конфигурацию"
msgid "Save configuration"
msgstr "Сохранить конфигурацию"
msgid "Scoresbysund"
msgstr "Скорсбисунд"

Write Preview
Loading…
Cancel
Save