Merge branch 'develop'

source/main.cc

@@ -100,6 +100,9 @@ void pars_flag(int index_start, int argc, char* argv[]){
         else if (str_argv == "--lock-load-global"){
             flag_load_global = true;
         }
+        else if (str_argv == "--lock-sync-hwclock"){
+            flag_sync_hwclock = true;
+        }
         else{
             if (index_start == 1){
                 g_print(gettext("Argument not recognized\n"));

source/ubl-settings-datetime.cc

@@ -15,6 +15,7 @@ bool flag_save = false;
 bool flag_save_local = false;
 bool flag_save_global = false;
 bool flag_load_global = false;
+bool flag_sync_hwclock = false;
 int socket_ext_id_I = 0;
 int socket_trd_id_I = 0;
 string version_application = "1.5";
@@ -182,6 +183,10 @@ void MainWindow::flag_block_gui() {
         lblTime->set_sensitive(false);
         lblData->set_sensitive(false);
     }
+    if (flag_sync_hwclock == true) {
+        lblHW->set_sensitive(false);
+        cbHw->set_sensitive(false);
+    }
     if (flag_timezone == true) {
         cbRegion->set_sensitive(false);
         cbZone->set_sensitive(false);

source/ubl-settings-datetime.h

@@ -34,6 +34,7 @@ extern bool flag_save;
 extern bool flag_save_local;
 extern bool flag_save_global;
 extern bool flag_load_global;
+extern bool flag_sync_hwclock;
 extern int socket_ext_id_I;
 extern int socket_trd_id_I;
 extern string version_application;