Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2014-04-13 13:13:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2014-04-03 16:38:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2014-04-13 13:13:29.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Apr 10 09:41:15 UTC 2014 - [email protected] + +- Ensure that the title stays on top during the installation + (bnc#868859). +- Really disable Abort for firstboot (gh#yast/yast-country#36). +- 3.1.8 + +------------------------------------------------------------------- +Wed Apr 9 12:09:55 UTC 2014 - [email protected] + +- moved "UTC" check-box back to main time zone dialog (bnc#872767) +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-country-3.1.6.tar.bz2 New: ---- yast2-country-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.MLvgKs/_old 2014-04-13 13:13:31.000000000 +0200 +++ /var/tmp/diff_new_pack.MLvgKs/_new 2014-04-13 13:13:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.6 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.1.6.tar.bz2 -> yast2-country-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.6/package/yast2-country.changes new/yast2-country-3.1.8/package/yast2-country.changes --- old/yast2-country-3.1.6/package/yast2-country.changes 2014-04-01 10:04:48.000000000 +0200 +++ new/yast2-country-3.1.8/package/yast2-country.changes 2014-04-10 12:35:41.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Apr 10 09:41:15 UTC 2014 - [email protected] + +- Ensure that the title stays on top during the installation + (bnc#868859). +- Really disable Abort for firstboot (gh#yast/yast-country#36). +- 3.1.8 + +------------------------------------------------------------------- +Wed Apr 9 12:09:55 UTC 2014 - [email protected] + +- moved "UTC" check-box back to main time zone dialog (bnc#872767) +- 3.1.7 + +------------------------------------------------------------------- Tue Apr 1 09:39:40 CEST 2014 - [email protected] - do not package keyboard.desktop file for s390 (bnc#870953) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.6/package/yast2-country.spec new/yast2-country-3.1.8/package/yast2-country.spec --- old/yast2-country-3.1.6/package/yast2-country.spec 2014-04-01 10:04:48.000000000 +0200 +++ new/yast2-country-3.1.8/package/yast2-country.spec 2014-04-10 12:35:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.6 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.6/timezone/src/clients/inst_timezone.rb new/yast2-country-3.1.8/timezone/src/clients/inst_timezone.rb --- old/yast2-country-3.1.6/timezone/src/clients/inst_timezone.rb 2014-04-01 10:04:48.000000000 +0200 +++ new/yast2-country-3.1.8/timezone/src/clients/inst_timezone.rb 2014-04-10 12:35:41.000000000 +0200 @@ -26,19 +26,14 @@ def main Yast.import "UI" Yast.import "GetInstArgs" - Yast.import "Mode" + Yast.import "Stage" Yast.import "Storage" Yast.import "Wizard" Yast.include self, "timezone/dialogs.rb" @args = GetInstArgs.argmap - - if Ops.get_string(@args, "first_run", "yes") != "no" - Ops.set(@args, "first_run", "yes") - end - - Wizard.HideAbortButton if Mode.mode == "firstboot" + @args["first_run"] = "yes" unless @args["first_run"] == "no" if Stage.initial && Ops.greater_than( @@ -49,7 +44,21 @@ Builtins.y2milestone("windows partition found: assuming local time") end + full_size_timezone_dialog + end + + # While the rest of the installation dialogs have enough room + # to have the title on the left (bnc#868859), this one needs the space + # for the world map. + # So use a plain Wizard Dialog without the :titleOnLeft option + def full_size_timezone_dialog + Wizard.OpenNextBackDialog + + Wizard.HideAbortButton if Stage.firstboot + TimezoneDialog(@args) + ensure + Wizard.CloseDialog end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.6/timezone/src/include/timezone/dialogs.rb new/yast2-country-3.1.8/timezone/src/include/timezone/dialogs.rb --- old/yast2-country-3.1.6/timezone/src/include/timezone/dialogs.rb 2014-04-01 10:04:48.000000000 +0200 +++ new/yast2-country-3.1.8/timezone/src/include/timezone/dialogs.rb 2014-04-10 12:35:41.000000000 +0200 @@ -99,6 +99,50 @@ nil end + def utc_helptext + # help for time calculation basis: + # hardware clock references local time or UTC? + utc_help = _( + "<p>\n" + + "Specify whether your machine is set to local time or UTC in <b>Hardware Clock Set To</b>.\n" + + "Most PCs that also have other operating systems installed (such as Microsoft\n" + + "Windows) use local time.\n" + + "Machines that have only Linux installed are usually\n" + + "set to Universal Time Coordinated (UTC).\n" + + "If the hardware clock is set to UTC, your system can switch from standard time\n" + + "to daylight saving time and back automatically.\n" + + "</p>\n" + ) + + # help text: extra note about localtime + utc_help = utc_help + _( + "<p>\n" + + "Note: The internal system clock as used by the Linux kernel must\n" + + "always be in UTC, because this is the reference for the correct localtime\n" + + "in user space. If you are choosing localtime for CMOS clock,\n" + + "check the user manual for background information about side effects.\n" + + "</p>" + ) + utc_help + end + + def confirm_local_time + # warning popup, in case local time is selected (bnc#732769) + Popup.ContinueCancel(_( + "\n" + + "You selected local time, but only Linux seems to be installed on your system.\n" + + "In such case, it is strongly recommended to use UTC, and to click Cancel.\n" + + "\n" + + "If you want to keep local time, you must adjust the CMOS clock twice the year\n" + + "because of Day Light Saving switches. If you miss to adjust the clock, backups may fail,\n" + + "your mail system may drop mail messages, etc.\n" + + "\n" + + "If you use UTC, Linux will adjust the time automatically.\n" + + "\n" + + "Do you want to continue with your selection (local time)?" + ) + ) + end # handles the complication that the package yast2-ntp-client may not be present def ntp_call(acall, args) @@ -136,7 +180,6 @@ def SetTimeDialog ntp_help_text = Convert.to_string(ntp_call("ui_help_text", {})) - utc_only = Timezone.utc_only textmode = Language.GetTextMode # help text for set time dialog @@ -149,32 +192,6 @@ ntp_help_text ) - if !utc_only - # help for time calculation basis: - # hardware clock references local time or UTC? - htext = htext + _( - "<p>\n" + - "Specify whether your machine is set to local time or UTC in <b>Hardware Clock Set To</b>.\n" + - "Most PCs that also have other operating systems installed (such as Microsoft\n" + - "Windows) use local time.\n" + - "Machines that have only Linux installed are usually\n" + - "set to Universal Time Coordinated (UTC).\n" + - "If the hardware clock is set to UTC, your system can switch from standard time\n" + - "to daylight saving time and back automatically.\n" + - "</p>\n" - ) - - # help text: extra note about localtim - htext = htext + _( - "<p>\n" + - "Note: The internal system clock as used by the Linux kernel must\n" + - "always be in UTC, because this is the reference for the correct localtime\n" + - "in user space. If you are choosing localtime for CMOS clock,\n" + - "check the user manual for background information about side effects.\n" + - "</p>" - ) - end - dt_widgets = false hour = "" @@ -282,16 +299,6 @@ dt_widgets = true end - hwclock_term = VBox( - CheckBox( - Id(:hwclock), - Opt(:hstretch, :notify), - # check box label - _("&Hardware Clock Set to UTC"), - @hwclock_s == :hwclock_utc - ), - textmode ? Label("") : Empty() - ) cont = VBox( HBox( @@ -341,12 +348,7 @@ ), HWeight(1, VBox()) ), - VSpacing(2), - HBox( - HWeight(1, VBox()), - HWeight(6, utc_only ? Empty() : hwclock_term), - HWeight(1, VBox()) - ) + VSpacing(2) ) Wizard.OpenAcceptDialog @@ -413,38 +415,6 @@ end end - if ret == :accept - # Get current settings. - # UTC vs. localtime, only if needed - # - @hwclock_s = :hwclock_utc - if !utc_only - @hwclock_s = UI.QueryWidget(Id(:hwclock), :Value) ? :hwclock_utc : :hwclock_localtime - - if !Timezone.windows_partition && @hwclock_s == :hwclock_localtime - # warning popup, in case local time is selected (bnc#732769) - if !Popup.ContinueCancel( - _( - "\n" + - "You selected local time, but only Linux seems to be installed on your system.\n" + - "In such case, it is strongly recommended to use UTC, and to click Cancel.\n" + - "\n" + - "If you want to keep local time, you must adjust the CMOS clock twice the year\n" + - "because of Day Light Saving switches. If you miss to adjust the clock, backups may fail,\n" + - "your mail system may drop mail messages, etc.\n" + - "\n" + - "If you use UTC, Linux will adjust the time automatically.\n" + - "\n" + - "Do you want to continue with your selection (local time)?" - ) - ) - ret = :not_next - next - end - end - end - end - if ret == :accept && ntp_rb # before the sync, save the time zone (bnc#467318) Timezone.Set( @@ -647,16 +617,32 @@ # Read system date and time. date = Timezone.GetDateTime(true, false) + @hwclock_s = hwclock == "-u" ? :hwclock_utc : :hwclock_localtime + hwclock_s_old = @hwclock_s + @hwclock_s_initial = @hwclock_s + timezoneterm = HBox() + hwclock_term = VBox( + CheckBox( + Id(:hwclock), + Opt(:notify), + # check box label + _("&Hardware Clock Set to UTC"), + @hwclock_s == :hwclock_utc + ), + textmode ? Label("") : Empty() + ) + if UI.HasSpecialWidget(:TimezoneSelector) == true timezone_selector = true worldmap = Ops.add(Directory.themedir, "/current/worldmap/worldmap.jpg") timezoneterm = VBox( TimezoneSelector(Id(:timezonemap), Opt(:notify), worldmap, zones), HBox( + HWeight(1, HStretch()), HWeight( - 1, + 2, ComboBox( Id(:region), Opt(:notify), @@ -667,7 +653,7 @@ ), HSpacing(), HWeight( - 1, + 2, ReplacePoint( Id(:tzsel), # title for combo box 'timezone' @@ -675,15 +661,21 @@ ) ), HSpacing(), - HWeight(1, VBox( - Left(Label(_("Date and Time"))), - Left(Label(Id(:date), date))) - ), + HWeight(1, HStretch()) + ), + HBox( + HWeight(1, HStretch()), + HWeight(2, Left( + utc_only ? Label(" ") : hwclock_term + )), HSpacing(), - VBox( - Label(" "), - settime - ) + HWeight(2, HBox( + Label(_("Date and Time:")), + Label(Id(:date), date), + HStretch() + )), + HSpacing(), + HWeight(1, Right(settime)) ) ) else @@ -711,8 +703,8 @@ ), HSpacing(), VBox( - Label(" "), - settime + Right(utc_only ? Label(" ") : hwclock_term), + Right(settime) ), HSpacing() ) @@ -827,6 +819,9 @@ "</p>\n" ) + if !utc_only + help_text = help_text + utc_helptext + end if !Arch.s390 && !Mode.config @@ -856,10 +851,6 @@ Wizard.SetDesktopTitleAndIcon("timezone") end - @hwclock_s = hwclock == "-u" ? :hwclock_utc : :hwclock_localtime - hwclock_s_old = @hwclock_s - @hwclock_s_initial = @hwclock_s - show_selected_region.call(sel, timezone) if timezone_selector UI.ChangeWidget( @@ -880,6 +871,24 @@ ret = :next if ret == :ok break if !Mode.config && ret == :abort && Popup.ConfirmAbort(:painless) + + if ret == :next + # Get current settings. + # UTC vs. localtime, only if needed + # + @hwclock_s = :hwclock_utc + if !utc_only + @hwclock_s = UI.QueryWidget(Id(:hwclock), :Value) ? :hwclock_utc : :hwclock_localtime + + if !Timezone.windows_partition && @hwclock_s == :hwclock_localtime + if ! confirm_local_time + ret = :not_next + next + end + end + end + end + if ret == :region num = selected_region.call next if num == sel -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
