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

Merge pull request 'master' (#111) from Igor1/ubl-settings-datetime:master into develop

Browse Source 
Reviewed-on: #111
pull/112/head
Dmitry Razumov 3 years ago
parent fe1aee048b 3d18f5d3bd
commit 2783059c25
6 changed files with 36 additions and 63 deletions
Show Stats Download Patch File Download Diff File

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");

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

@ -530,62 +530,22 @@ 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);
}
}
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);
}
}
map_config_data_global_old = map_config_data_global;
map_config_data_local_old = map_config_data_local;
info_warning_error(4);

23
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"

2
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 to global and local configuration</property>
<property name="label" translatable="yes">Save configuration</property>
<style>
<class name="menuitemtop"/>
</style>

2
ubl-settings-datetime.pot
Unescape View File

@ -1664,7 +1664,7 @@ msgid "Save to local configuration"
msgstr ""
#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74
msgid "Save to global and local configuration"
msgid "Save configuration"
msgstr ""
msgid "Scoresbysund"

4
ubl-settings-datetime_ru.po
Unescape View File

@ -1690,8 +1690,8 @@ msgid "Save to local configuration"
msgstr "Сохранить в локальную конфигурацию"
#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74
msgid "Save to global and local configuration"
msgstr "Сохранить в глобальную и локальную конфигурацию"
msgid "Save configuration"
msgstr "Сохранить конфигурацию"
msgid "Scoresbysund"
msgstr "Скорсбисунд"

Write Preview
Loading…
Cancel
Save