Mailinglist Archive: yast-commit (819 mails)

< Previous Next >
[yast-commit] r55104 - in /trunk/registration: package/yast2-registration.changes src/clients/online_update_configuration.ycp
  • From: jdsn@xxxxxxxxxxxxxxxx
  • Date: Tue, 27 Jan 2009 18:15:12 -0000
  • Message-id: <E1LRsSu-0004JW-Nz@xxxxxxxxxxxxxxxx>
Author: jdsn
Date: Tue Jan 27 19:15:12 2009
New Revision: 55104

URL: http://svn.opensuse.org/viewcvs/yast?rev=55104&view=rev
Log:
use OKDialog for online_update_configuration (bnc#440568)

Modified:
trunk/registration/package/yast2-registration.changes
trunk/registration/src/clients/online_update_configuration.ycp

Modified: trunk/registration/package/yast2-registration.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=55104&r1=55103&r2=55104&view=diff
==============================================================================
--- trunk/registration/package/yast2-registration.changes (original)
+++ trunk/registration/package/yast2-registration.changes Tue Jan 27 19:15:12
2009
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Jan 27 17:35:44 CET 2009 - jdsn@xxxxxxx
+
+- use OKDialog for online_update_configuration (bnc#440568)
+
+-------------------------------------------------------------------
Mon Jan 26 17:48:44 CET 2009 - jdsn@xxxxxxx

- keep target initialized on exit (bnc#468449)

Modified: trunk/registration/src/clients/online_update_configuration.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/online_update_configuration.ycp?rev=55104&r1=55103&r2=55104&view=diff
==============================================================================
--- trunk/registration/src/clients/online_update_configuration.ycp (original)
+++ trunk/registration/src/clients/online_update_configuration.ycp Tue Jan 27
19:15:12 2009
@@ -54,22 +54,21 @@
string targetRootDir = Mode::normal() ? "/":Installation::destdir;
Pkg::TargetInit(targetRootDir, false); // (bnc#449844)

- // check if we are in installation workflow or running independently
- if (Mode::normal()) Wizard::CreateDialog();
+ // check if we are in installation workflow or running independently -
use OKDialog (bnc#440568)
+ if (Mode::normal()) Wizard::OpenOKDialog();

// we always need the next button and never the back button
Wizard::SetContents (moduleTitle, contents, help, false, true);
Wizard::SetTitleIcon ("yast-online_update");
- Wizard::SetNextButton(`next, Label::FinishButton() );

/* -------------------------------- PROGRAM LOGIC START
----------------------------------------------------------- */

OnlineUpdateConfiguration::Read();

- if (false) // for testing only
- {
- OnlineUpdateConfiguration::currentUpdateRepo = "";
- }
+// if (false) // for testing only
+// {
+// OnlineUpdateConfiguration::currentUpdateRepo = "";
+// }

string replaceUpdateRepoString =
OnlineUpdateConfiguration::currentUpdateRepo;

@@ -104,7 +103,7 @@
{
ret = Wizard::UserInput();

- if (ret == `next)
+ if ( ret == `next || ret == `ok )
{
OnlineUpdateConfiguration::updateInterval = (symbol)
UI::QueryWidget(`id(`updateInterval), `Value );
OnlineUpdateConfiguration::skipInteractivePatches = (boolean)
UI::QueryWidget(`id(`skipInteractivePatches), `Value );
@@ -112,7 +111,7 @@

y2milestone("Writing online update configuration settings.");
OnlineUpdateConfiguration::Write();
- //break;
+ ret = `next;
}

if ( ret == `restoreDefault )
@@ -187,8 +186,19 @@
UI::RecalcLayout();
}

+ if ( ret == `back || ret == `abort || ret == `cancel )
+ {
+ if ( Popup::ReallyAbort(true) )
+ {
+ break;
+ }
+ else
+ {
+ ret = `continue;
+ }
+ }

- } until (ret == `next || ret == `abort || ret == `cacel || ret == `back);
+ } until (ret == `ok || ret == `next || ret == `abort || ret == `cancel ||
ret == `back);

Pkg::SourceFinishAll();


--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages