From: <os...@us...> - 2011-12-01 21:53:03
|
Revision: 7321 http://oorexx.svn.sourceforge.net/oorexx/?rev=7321&view=rev Author: osims Date: 2011-12-01 21:52:57 +0000 (Thu, 01 Dec 2011) Log Message: ----------- Minor update to cancel msgbox in ProductView for both Ex5 and Ex6 - change from "OK/Cancel" to "Yes/No". Modified Paths: -------------- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise05/ProductView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductView.rex Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise05/ProductView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise05/ProductView.rex 2011-12-01 04:35:21 UTC (rev 7320) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise05/ProductView.rex 2011-12-01 21:52:57 UTC (rev 7321) @@ -35,7 +35,7 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 04b: ProductView.rex - The ProductView component v00-07 29Nov11 + Exercise 04b: ProductView.rex - The ProductView component v00-08 01Dec11 Contains: classes "ProductView" and "AboutDialog". Pre-requisites: ProductView.dll, ProductView.h. @@ -65,6 +65,7 @@ pressing Esc) can issue a "changes made but not committed - are you sure" message. v00-07 29Nov11: Added a comment to the cancel method. No change in function. + v00-08 01Dec11: Changed OK/Cancel to Yes/No on "cancel while in update" dialog. ------------------------------------------------------------------------------*/ @@ -270,12 +271,14 @@ /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD cancel - -- If in the process of updating a product, then ask whether any changes - -- should be thrown away, else close by calling the superclass. + -- If in the process of updating, then ask whether any changes should be + -- thrown away and dialog closed. If yes then close by calling the superclass, + -- else nop. If not in update, then close immediately say "ProductView-cancel-01." if self~dialogState = "inUpdate" then do - ans = MessageDialog(.HRS~closeInUpdate, self~dlgHandle, .HRS~updateIP, "OKCANCEL", "WARNING", "DEFBUTTON2") - if ans = 1 then return self~cancel:super + ans = MessageDialog(.HRS~closeInUpdate, self~dlgHandle, .HRS~updateIP, "YESNO", "WARNING", "DEFBUTTON2") + if ans = .PlainBaseDialog~IDYES then return self~cancel:super + else nop end else return self~cancel:super Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductView.rex 2011-12-01 04:35:21 UTC (rev 7320) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductView.rex 2011-12-01 21:52:57 UTC (rev 7321) @@ -35,7 +35,7 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 06: ProductView.rex - The ProductView component v02-02 29Nov11 + Exercise 06: ProductView.rex - The ProductView component v02-03 01Dec11 Contains: classes "ProductView" and "AboutDialog". Pre-requisites: ProductView.dll, ProductView.h, Pproduct.ico, ProductIcon.bmp, @@ -55,6 +55,7 @@ v02-01 19Sep11: Changed to provide for standalone invocation. v02-02 29Nov11: Brought up to date with Ex05 version (added state attribute plus better "cancel" method). + v02-03 01Dec11: Changed OK/Cancel to Yes/No on "cancel while in update" dialog. ------------------------------------------------------------------------------*/ @@ -65,7 +66,7 @@ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - ProductView v02-00 09Sep11 + ProductView v02-03 01Dec11 ----------- The "view" part of the Product component. Now designed to operate from its own folder. Should be invoked from immediately outside the Product folder. @@ -267,15 +268,15 @@ ::METHOD ok unguarded return - /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "Cancel" - This is a no-op method that over-rides the default Windows action - of 'cancel window' for an Escape key. --*/ + /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD cancel - -- If in the process of updating a product, then ask whether any changes - -- should be thrown away, else close by calling the superclass. + -- If in the process of updating, then ask whether any changes should be + -- thrown away and dialog closed. If yes then close by calling the superclass, + -- else nop. If not in update, then close immediately if self~dialogState = "inUpdate" then do - ans = MessageDialog(.HRS~closeInUpdate, self~dlgHandle, .HRS~updateIP, "OKCANCEL", "WARNING", "DEFBUTTON2") - if ans = 1 then return self~cancel:super + ans = MessageDialog(.HRS~closeInUpdate, self~dlgHandle, .HRS~updateIP, "YESNO", "WARNING", "DEFBUTTON2") + if ans = .PlainBaseDialog~IDYES then return self~cancel:super + else nop end else return self~cancel:super This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |