Merge branch 'develop'

source/ubl-settings-datetime.cc

@@ -246,6 +246,7 @@ void MainWindow::info_status_app(string stule) {
     boxInfo->add_class(stule);
 }
 
+
 void MainWindow::get_builder() {
     builder->set_translation_domain(path_app);
     builder->get_widget("boxColor", boxColor);
@@ -381,7 +382,6 @@ void MainWindow::event_zone() {
 
 void MainWindow::synopsis_show() {
     int start_error = error_info;
-    //su -l superadmin -c " DISPLAY=$DISPLAY 
     string cmd = "xdg-open " + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name;
     if (geteuid() == 0) {
         string response_user = this->call("who");
@@ -389,7 +389,6 @@ void MainWindow::synopsis_show() {
         if (index != std::string::npos){
             response_user =  response_user.substr(0, index);
             cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \"";
-            cout << "" << cmd << endl;
         }
     }
     wrapper_system(cmd, "&");
@@ -929,6 +928,8 @@ void MainWindow::event_entry_cbDhcp() {
     else if (activ_index == 2) {
         txtNtpServer->set_text("");
         if (flag_ntp_edit == false) {
+            txtNtpServer->set_sensitive(true);
+            txtNtpServer->grab_focus();
             string cmd = "";
             if (flag_load == false) {
                 cmd = "ubconfig --default --source system get network NTPSERVERS";
@@ -939,12 +940,8 @@ void MainWindow::event_entry_cbDhcp() {
             string response = this->get_ubconfig_value(cmd);
             if (response != "dhcp" && response != "default") {
                 txtNtpServer->set_text(response);
-                txtNtpServer->grab_focus();
-                txtNtpServer->unset_cursor();
-                cout << 222 << endl;
             }
             this->write_config(response, "dhcp");
-            txtNtpServer->set_sensitive(true);
         }
         else {
             this->write_config("", "dhcp");

style.css

@@ -87,3 +87,10 @@ border-radius:2px;
   background-color: transparent;
   opacity:0.99;
 }
+
+.entry {
+
+}
+.entry:focus {
+
+}