Author: jsuchome
Date: Thu Apr 8 13:58:48 2010
New Revision: 61612
URL: http://svn.opensuse.org/viewcvs/yast?rev=61612&view=rev
Log:
- enable switching off NTP (bnc#589296)
- 2.19.12
Modified:
trunk/country/VERSION
trunk/country/package/yast2-country.changes
trunk/country/timezone/src/Timezone.ycp
trunk/country/timezone/src/dialogs.ycp
Modified: trunk/country/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=61612&r1=61611&r2=61612&view=diff
==============================================================================
--- trunk/country/VERSION (original)
+++ trunk/country/VERSION Thu Apr 8 13:58:48 2010
@@ -1 +1 @@
-2.19.11
+2.19.12
Modified: trunk/country/package/yast2-country.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=61612&r1=61611&r2=61612&view=diff
==============================================================================
--- trunk/country/package/yast2-country.changes (original)
+++ trunk/country/package/yast2-country.changes Thu Apr 8 13:58:48 2010
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Apr 6 13:57:12 CEST 2010 - jsuchome@suse.cz
+
+- enable switching off NTP (bnc#589296)
+- 2.19.12
+
+-------------------------------------------------------------------
Fri Apr 2 08:38:51 CEST 2010 - jsuchome@suse.cz
- CONSOLE_SCREENMAP="8859-13" for Lithuanian (bnc#566283)
Modified: trunk/country/timezone/src/Timezone.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.ycp?rev=61612&r1=61611&r2=61612&view=diff
==============================================================================
--- trunk/country/timezone/src/Timezone.ycp (original)
+++ trunk/country/timezone/src/Timezone.ycp Thu Apr 8 13:58:48 2010
@@ -390,6 +390,8 @@
cmd = "/sbin/hwclock --hctosys " + hwclock;
y2milestone( "SetTime cmd %1", cmd );
SCR::Execute(.target.bash, cmd );
+ // actually, it was probably not called, but do not let it change the time again after manual change
+ systz_called = true;
}
};
Modified: trunk/country/timezone/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=61612&r1=61611&r2=61612&view=diff
==============================================================================
--- trunk/country/timezone/src/dialogs.ycp (original)
+++ trunk/country/timezone/src/dialogs.ycp Thu Apr 8 13:58:48 2010
@@ -36,6 +36,9 @@
// if system clock is configured to sync with NTP
boolean ntp_used = false;
+ // ntp server configured to sync with
+ string ntp_server = "";
+
// if packages for NTP configuration are installed
boolean ntp_installed = false;
@@ -151,6 +154,28 @@
}
}
+ void enable_disable_time_widgets (boolean enable) {
+
+ UI::ChangeWidget (`id (`change_now), `Enabled, enable);
+
+ enable = enable && (boolean) UI::QueryWidget (`id (`change_now), `Value);
+
+ if (dt_widgets)
+ {
+ UI::ChangeWidget (`id (`date), `Enabled, enable);
+ UI::ChangeWidget (`id (`time), `Enabled, enable);
+ }
+ else
+ {
+ UI::ChangeWidget (`id(`hour), `Enabled, enable);
+ UI::ChangeWidget (`id(`minute), `Enabled, enable);
+ UI::ChangeWidget (`id(`second), `Enabled, enable);
+ UI::ChangeWidget (`id(`day), `Enabled, enable);
+ UI::ChangeWidget (`id(`month), `Enabled, enable);
+ UI::ChangeWidget (`id(`year), `Enabled, enable);
+ }
+ }
+
term dateterm = `VBox (
`HBox (
`HSpacing(1),
@@ -210,7 +235,12 @@
`VBox (
`Left (timeterm),
`VSpacing(),
- `Left (dateterm)
+ `Left (dateterm),
+ `VSpacing (),
+ `HBox (`HSpacing (0.5), `Left (
+ // check box label
+ `CheckBox (`id (`change_now), `opt (`notify), _("Change the Time Now"), true))
+ )
)
),
`VSpacing (1),
@@ -246,11 +276,11 @@
});
}
-
any ret = nil;
repeat
{
ntp_call ("ui_enable_disable_widgets", $["enabled": ntp_rb]);
+ enable_disable_time_widgets (!ntp_rb);
ret = UI::UserInput();
y2debug ("UserInput ret:%1", ret );
@@ -291,16 +321,18 @@
// before the sync, save the time zone (bnc#467318)
Timezone::Set (Timezone::timezone, Stage::initial () && !Mode::live_installation ());
// true: go on, exit; false: loop on
- boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[]);
+ boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[ "ntpdate_only" : true]);
if (!ntp_handled)
ret = `retry; // loop on
else
{
+ // `ntp_address is constructed by ntp-client_proposal.ycp... :-(
+ ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
// after sync, show real time in the widget
Timezone::diff = 0;
}
}
- if (ret == `accept && !ntp_rb)
+ if (ret == `accept && !ntp_rb && UI::QueryWidget (`id (`change_now), `Value) == true)
{
if (dt_widgets)
{
@@ -355,9 +387,13 @@
if (ret == `accept)
{
// new system time from ntpdate must be saved to hw clock
- Timezone::SystemTime2HWClock ();
+ if (ntp_rb)
+ {
+ Timezone::SystemTime2HWClock ();
+ }
// remember ui
ntp_call ("SetUseNTP", $["ntp_used" : ntp_rb]);
+ ntp_used = ntp_rb;
}
Wizard::CloseDialog ();
@@ -447,9 +483,9 @@
ntp_used = true;
// configure NTP client
srandom ();
- string server = sformat ("%1.opensuse.pool.ntp.org", random (4));
+ ntp_server = sformat ("%1.opensuse.pool.ntp.org", random (4));
map