[yast-commit] r66955 - in /trunk/country: VERSION package/yast2-country.changes timezone/src/dialogs.ycp
Author: jsuchome Date: Fri Nov 25 14:54:20 2011 New Revision: 66955 URL: http://svn.opensuse.org/viewcvs/yast?rev=66955&view=rev Log: (patch from visnov) - correctly set the window title during installation (bnc#730650) - 2.22.1 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=66955&r1=66954&r2=66955&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Fri Nov 25 14:54:20 2011 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=66955&r1=66954&r2=66955&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Nov 25 14:54:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 25 14:52:31 CET 2011 - jsuchome@suse.cz + +- correctly set the window title during installation (bnc#730650) +- 2.22.1 + +------------------------------------------------------------------- Mon Nov 21 16:02:30 CET 2011 - jsuchome@suse.cz - do not set keyboard layout on module start, when not in Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=66955&r1=66954&r2=66955&view=diff ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Fri Nov 25 14:54:20 2011 @@ -259,7 +259,9 @@ Wizard::OpenAcceptDialog (); // TODO replace help text after ntp_installed, is. Wizard::SetContents (_("Change Date and Time"), cont, htext, true, true); - Wizard::SetDesktopTitleAndIcon("timezone"); + + if( Mode::normal() ) + Wizard::SetDesktopTitleAndIcon("timezone"); show_current_time (); @@ -726,11 +728,14 @@ Wizard::SetContents (_("Clock and Time Zone"), contents, help_text, args["enable_back"]:true, args["enable_next"]:true); - Wizard::SetDesktopTitleAndIcon ("timezone"); if ( Stage::initial () || Stage::firstboot ()) { Wizard::SetTitleIcon ("yast-timezone"); } + else + { + Wizard::SetDesktopTitleAndIcon ("timezone"); + } symbol hwclock_s = (hwclock=="-u") ? `hwclock_utc : `hwclock_localtime; symbol hwclock_s_old = hwclock_s; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsuchome@svn2.opensuse.org