Mailinglist Archive: yast-commit (1339 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Fri Apr 11 18:43:06 2008
New Revision: 46452

URL: http://svn.opensuse.org/viewcvs/yast?rev=46452&view=rev
Log:
- Changing Accept buttons to OK buttons (FATE #120373).


Modified:
    trunk/update/package/yast2-update.changes
    trunk/update/src/clients/inst_backup.ycp
    trunk/update/src/clients/inst_update.ycp
    trunk/update/src/clients/update.ycp
    trunk/update/src/include/rootpart.ycp
    trunk/update/yast2-update.spec.in

Modified: trunk/update/package/yast2-update.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=46452&r1=46451&r2=46452&view=diff
==============================================================================
--- trunk/update/package/yast2-update.changes (original)
+++ trunk/update/package/yast2-update.changes Fri Apr 11 18:43:06 2008
@@ -2,6 +2,7 @@
 Fri Apr 11 18:05:54 CEST 2008 - locilka@xxxxxxx
 
 - Added missing </p> (bnc #377476).
+- Changing Accept buttons to OK buttons (FATE #120373).
 
 -------------------------------------------------------------------
 Fri Mar 21 10:55:32 CET 2008 - locilka@xxxxxxx

Modified: trunk/update/src/clients/inst_backup.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_backup.ycp?rev=46452&r1=46451&r2=46452&view=diff
==============================================================================
--- trunk/update/src/clients/inst_backup.ycp (original)
+++ trunk/update/src/clients/inst_backup.ycp Fri Apr 11 18:43:06 2008
@@ -93,7 +93,7 @@
 
     // Build and show dialog
 
-    Wizard::OpenAcceptDialog();
+    Wizard::OpenOKDialog();
 
     term contents = `HVSquash(
                              `VBox(
@@ -169,7 +169,7 @@
        boolean tmp = (boolean) UI::QueryWidget (`id(`modified), `Value) ||
            (boolean) UI::QueryWidget (`id(`sysconfig), `Value);
 
-       if (ret == `next)
+       if (ret == `next || ret == `ok)
        {
            if (tmp && !check_backup_path (partition))
                continue;

Modified: trunk/update/src/clients/inst_update.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update.ycp?rev=46452&r1=46451&r2=46452&view=diff
==============================================================================
--- trunk/update/src/clients/inst_update.ycp (original)
+++ trunk/update/src/clients/inst_update.ycp Fri Apr 11 18:43:06 2008
@@ -147,7 +147,7 @@
 ");
 
 
-    Wizard::OpenAcceptDialog ();
+    Wizard::OpenOKDialog ();
 
     Wizard::SetContents (title, contents, helptext, (boolean) WFM::Args(0), 
(boolean) WFM::Args(1));
     Wizard::SetTitleIcon ("yast-software");
@@ -198,7 +198,7 @@
            continue;
        }
 
-       if (ret == `next && Pkg::RestoreState (true))
+       if ((ret == `next || ret == `ok) && Pkg::RestoreState (true))
        {
            boolean something_changed = false;
 
@@ -227,11 +227,11 @@
            }
        }
 
-       if (ret == `back || ret == `next)
+       if (ret == `back || ret == `next || ret == `ok)
            break;
     }
 
-    if (ret == `next)
+    if (ret == `next || ret == `ok)
     {
        Update::did_init1 = false;
 

Modified: trunk/update/src/clients/update.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update.ycp?rev=46452&r1=46451&r2=46452&view=diff
==============================================================================
--- trunk/update/src/clients/update.ycp (original)
+++ trunk/update/src/clients/update.ycp Fri Apr 11 18:43:06 2008
@@ -47,7 +47,7 @@
     ProductControl::custom_control_file =  
"/usr/share/YaST2/control/update.xml";
 
     Wizard::OpenNextBackStepsDialog();
-    Wizard::SetNextButton(`next, Label::AcceptButton());
+    Wizard::SetNextButton(`next, _("&Update"));
     if (!ProductControl::Init())
     {
         y2error("control file %1 not found", 
ProductControl::custom_control_file );

Modified: trunk/update/src/include/rootpart.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/update/src/include/rootpart.ycp?rev=46452&r1=46451&r2=46452&view=diff
==============================================================================
--- trunk/update/src/include/rootpart.ycp (original)
+++ trunk/update/src/include/rootpart.ycp Fri Apr 11 18:43:06 2008
@@ -208,7 +208,7 @@
     {
        Wizard::CreateDialog ();
        Wizard::SetContentsButtons (title, contents, help_text,
-           Label::BackButton (), Label::AcceptButton ());
+           Label::BackButton (), Label::OKButton ());
     }
     else
     {

Modified: trunk/update/yast2-update.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=46452&r1=46451&r2=46452&view=diff
==============================================================================
--- trunk/update/yast2-update.spec.in (original)
+++ trunk/update/yast2-update.spec.in Fri Apr 11 18:43:06 2008
@@ -2,7 +2,8 @@
 
 @HEADER@
 BuildRequires: yast2-storage yast2-packager perl-XML-Writer yast2-devtools 
yast2-testsuite update-desktop-files
-BuildRequires: yast2 >= 2.16.5
+# Wizard::OpenOKDialog
+BuildRequires: yast2 >= 2.16.49
 # package not really needed to be installed but this breaks the building cycle
 
 # Installation::installedVersion && Installation::updateVersion

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