Author: jsmeix Date: Fri Nov 21 12:38:13 2008 New Revision: 53508 URL: http://svn.opensuse.org/viewcvs/yast?rev=53508&view=rev Log: - V 2.17.3 - Removed the "Cancel" button from the Overview dialog because there is nothing to "Cancel" here. Do no longer restore the outdated default button names when a dialog is closed to avoid too many visible changes of button names. (See Novell/Suse Bugzilla bnc#440560). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/dialogs.ycp Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=53508&r1=53507&r2=53508&view=diff ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Fri Nov 21 12:38:13 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=53508&r1=53507&r2=53508&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Fri Nov 21 12:38:13 2008 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Nov 21 11:46:49 CET 2008 - jsmeix@suse.de + +- V 2.17.3 +- Removed the "Cancel" button from the Overview dialog + because there is nothing to "Cancel" here. + Do no longer restore the outdated default button names + when a dialog is closed to avoid too many visible + changes of button names. + (See Novell/Suse Bugzilla bnc#440560). + +------------------------------------------------------------------- Tue Nov 4 09:17:52 CET 2008 - jsmeix@suse.de - V 2.17.2 Modified: trunk/scanner/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/dialogs.ycp?rev=53508&r1=53507&r2=53508&view=diff ============================================================================== --- trunk/scanner/src/dialogs.ycp (original) +++ trunk/scanner/src/dialogs.ycp Fri Nov 21 12:38:13 2008 @@ -136,13 +136,33 @@ // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... // the "finish" button in an Overview dialog must now be named "OK": Wizard::SetNextButton( `next, Label::OKButton() ); - // Do not have a "Back" button in the Overview dialog - // because in the Overview dialog there is nothing where to go back, - // see http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... + // In the Overview dialog it does not make sense to have a button with "back" functionality + // which is named "Cancel" according to the new YaST style guide at + // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... + // because there is nothing to "cancel" in the Overview dialog because it + // only shows information about the current state of the configuration + // but the Overview dialog itself does not do any change of the configuration. + // The Overview dialog has actually the same meaning for the user + // as a plain notification popup which has only a "OK" button. + // If the user does not agree to what is shown in the Overview dialog + // he must launch a configuration sub-dialog to change the configuration. + // If the user accepted in such a configuration sub-dialog what he changed + // via the "OK" button there, the change is applied and the Overview dialog + // shows the new current state of the configuration, see + // http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implementa...: + // so that it is not possible to "cancel" the change in the Overview dialog. + // Any change of the configuration is done in sub-dialogs which are called + // from the Overview dialog (even the "Confirm Deletion" popup is such a sub-dialog) + // and in all those sub-dialogs there is a button with "cancel" functionality. Wizard::HideBackButton(); // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd... - // the "abort" button in an Overview dialog must now be named "cancel": - Wizard::SetAbortButton( `abort, Label::CancelButton() ); + // there is no longer a "abort" functionality which exits the whole module. + // Instead this button is now named "Cancel" and its functionality is + // to go back to the Overview dialog (i.e. what the "back" button would do) + // because it reads "Cancel - Closes the window and returns to the overview." + // In this case this does not make sense because this is already the "overview". + // Therefore the button with the "abort" functionality is not shown at all: + Wizard::HideAbortButton(); any ret = nil; while(true) { // UI::UserInput returns the label of the button which was cklicked: @@ -365,8 +385,6 @@ _("Deactivate %1?"), backend_name ) ) ) { continue; } - Wizard::DisableBackButton(); - Wizard::DisableAbortButton(); Wizard::DisableNextButton(); if( ! Scanner::DeactivateBackend( backend_name, -1, true ) ) { Popup::Error( // Message of a Popup::Error @@ -375,8 +393,6 @@ // was called and this function would have shown more specific messages. sformat( _("Failed to deactivate %1."), backend_name ) ); } - Wizard::EnableBackButton(); - Wizard::EnableAbortButton(); Wizard::EnableNextButton(); // Exit this dialog and run it again via the sequencer in wizards.ycp // to get it updated after the delete via calling OverviewContents(): @@ -530,12 +546,6 @@ continue; } y2milestone( "OverviewDialog returns: %1", ret ); - // Re-set the default ID and label for the button with the "next" functionality for further wizard dialogs: - Wizard::SetNextButton( `next, Label::NextButton() ); - // Restore the above hidden button with "back" functionality for other wizard dialogs: - Wizard::RestoreBackButton(); - // Re-set the default ID and label for the button with the "abort" functionality for further wizard dialogs: - Wizard::SetAbortButton( `abort, Label::AbortButton() ); return ret; } @@ -762,10 +772,6 @@ y2milestone( "Ignoring unexpected returncode in SelectModelDialog: %1", ret ); continue; } - // Re-set the default ID and label for the button with the "abort" functionality for further wizard dialogs: - Wizard::SetAbortButton( `abort, Label::AbortButton() ); - // Re-enable the above disabled button with the "back" functionality for further wizard dialogs: - Wizard::EnableBackButton(); return ret; } @@ -805,7 +811,6 @@ // so that I do not show any "abort"/"cancel" button here at all: Wizard::HideAbortButton(); Wizard::DisableBackButton(); - Wizard::DisableAbortButton(); Wizard::DisableNextButton(); if( ! Scanner::ActivateBackend( "", Scanner::selected_model_database_index, true ) ) { Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the driver (backend) name. @@ -814,14 +819,12 @@ _("Failed to activate %1."), backend_name ) ); } Wizard::EnableBackButton(); - Wizard::EnableAbortButton(); Wizard::EnableNextButton(); any ret = nil; while(true) { ret = UI::UserInput(); if( ret == `back ) { Wizard::DisableBackButton(); - Wizard::DisableAbortButton(); Wizard::DisableNextButton(); if( ! Scanner::DeactivateBackend( "", Scanner::selected_model_database_index, false ) ) { Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the driver (backend) name. @@ -830,7 +833,6 @@ _("Failed to deactivate %1."), backend_name ) ); } Wizard::EnableBackButton(); - Wizard::EnableAbortButton(); Wizard::EnableNextButton(); break; } @@ -840,8 +842,6 @@ y2milestone( "Ignoring unexpected returncode in ConfigureBackendDialog: %1", ret ); continue; } - // Restore the above hidden button with "abort" functionality for other wizard dialogs: - Wizard::RestoreAbortButton(); return ret; } @@ -1136,16 +1136,13 @@ } } Wizard::DisableBackButton(); - Wizard::DisableAbortButton(); Wizard::DisableNextButton(); if( ! Scanner::SetupNetworkScanningConfig() ) { Wizard::EnableBackButton(); - Wizard::EnableAbortButton(); Wizard::EnableNextButton(); continue; } Wizard::EnableBackButton(); - Wizard::EnableAbortButton(); Wizard::EnableNextButton(); break; } @@ -1155,8 +1152,6 @@ y2milestone( "Ignoring unexpected returncode in ConfigureBackendDialog: %1", ret ); continue; } - // Restore the above hidden button with "abort" functionality for other wizard dialogs: - Wizard::RestoreAbortButton(); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org