From: <os...@us...> - 2012-02-11 23:06:53
|
Revision: 7519 http://oorexx.svn.sourceforge.net/oorexx/?rev=7519&view=rev Author: osims Date: 2012-02-11 23:06:45 +0000 (Sat, 11 Feb 2012) Log Message: ----------- Make changes so that there is one .Application~setDefaults for the application as a whole (in the startup files), and a .Application~addToConstDir() in each dialog. Also update names of the "Human-Readable Strings" classes. Modified Paths: -------------- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/CustomerListView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/CustomerView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/StartupCustomer.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/StartupCustomerList.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderFormView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderListView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderView.rc main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrder.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrderForm.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrderList.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/OrderMgr/OrderMgrBaseView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductListView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductView.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/StartupProduct.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/StartupProductList.rex main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Startup.rex Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/CustomerListView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/CustomerListView.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/CustomerListView.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -35,7 +35,7 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 06: The Customer ListView v01-03 28Jan12 + Exercise 06: The Customer ListView v01-04 12Feb12 Contains: classes "CustomerListView" and "HRSclv". @@ -53,9 +53,9 @@ msg box. v01-03 28Jan12: Changed class name HRS to HRSclv to allow for multiple HRS classes in same file at some future time. + v01-04 11Feb12: CustomerListView - Changed .application() - Outstanding Problems: None reported. *******************************************************************************/ @@ -65,14 +65,17 @@ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - CustomerListView v00-03 28Jan12 - ------------- + CustomerListView v00-04 11Feb12 + ---------------- The view of a list of products. Changes: v00-01: First version v00-02: Corrected for standalone invocation. v00-03 28Jan12: Changed name of HRS class to HRSplv. + v00-04 11Feb12: moved .application~setDefaults() to app startup file. + changed to .application~addToConstDir() here. + [interface (idl format)] <<optional>> = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ @@ -84,7 +87,7 @@ ::METHOD newInstance CLASS PUBLIC use arg rootDlg - .Application~useGlobalConstDir("O","Customer\CustomerListView.h") + .Application~addToConstDir("Customer\CustomerListView.h") --say ".CustomerListView-newInstance-01: root =" rootDlg dlg = self~new("Customer\CustomerListView.rc", "IDD_CUSTLIST_DIALOG") --say ".CustomerListView-newInstance-02." Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/CustomerView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/CustomerView.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/CustomerView.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -35,7 +35,7 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 06: The CustomerView component v02-03 28Jan12 + Exercise 06: The CustomerView component v02-04 11Feb12 Contains: class "CustomerView"; routine "startCustomerView". Pre-requisites: CustomerView.rc, CustomerView.h. @@ -51,6 +51,8 @@ v02-02 21Jan12: Added HRS class. v02-03 28Jan12: Changed class HRS to HRScv to allow for possible future packaging of all classes in a single "application" file. + v02-04 11Feb12: Changed CustomerView + ------------------------------------------------------------------------------*/ ::requires "ooDialog.cls" @@ -59,7 +61,7 @@ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - CustomerView v02-03 28Jan12 + CustomerView v02-04 11Feb12 ------------- The "view" (or "gui") part of the Customer component - part of the sample Order Management application. @@ -77,7 +79,10 @@ v02-02 04Oct11: Added msgbox for unimplemented menu item. v02-03 28Jan12: Changed class name HRS to HRSclv to allow for multiple HRS classes in same file at some future time. + v02-04 11Feb12: moved .application~setDefaults() to app startup file. + changed to .application~addToConstDir() here. + [interface (idl format)] = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ @@ -88,14 +93,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD newInstance CLASS PUBLIC UNGUARDED - expose hasParent --Rel2StartupDir. + expose hasParent -- ADDED FOR EXERCISE06. Statements in the old "StartCustomerView" Routine -- have been moved here. The ~activate statement has also changed. use arg rootDlg, customerNo --say ".CustomerView-newInstance-01: Start." - .Application~setDefaults("O", "Customer\CustomerView.h", .false) --Rel2StartupDir. + .Application~addToConstDir("Customer\CustomerView.h") -- Create an instance of CustomerView and show it: - dlg = .CustomerView~new("Customer\CustomerView.rc", "IDD_CUST_DIALOG") --Rel2StartupDir. + dlg = .CustomerView~new("Customer\CustomerView.rc", "IDD_CUST_DIALOG") --say ".CustomerView-newInstance-02: root =" rootDlg dlg~activate(rootDlg, customerNo) Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/StartupCustomer.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/StartupCustomer.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/StartupCustomer.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,17 +36,20 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise06: Stand-alone startup for CustomerView - startupCustomer.rex v01-00 12Sep11 + startupCustomer.rex v01-01 11Feb12 Contains: Startup code. Pre-requisites: Must be run from the parent folder of the Customer folder. Changes: v01-00 12Sep11: First Version + v01-01 11Feb12: Add .application~setDefaults to this file. Outstanding Problems: None reported. *******************************************************************************/ +.Application~setDefaults("O", , .false) + .local~my.idCustomerData = .CustomerData~new -- create Customer Data instance .local~my.idCustomerModel = .CustomerModel~new -- create Customer Model instance .local~my.idCustomerData~activate Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/StartupCustomerList.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/StartupCustomerList.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer/StartupCustomerList.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,17 +36,21 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise06: Stand-alone startup for CustomerList - startupCustomerList.rex v01-00 12Sep11 + startupCustomerList.rex v01-01 11Feb12 Contains: Startup code. Pre-requisites: Must be run from the parent folder of the Customer folder. Changes: v01-00 12Sep11: First Version + v01-01 11Feb12: Add .application~setDefaults to this file. + Outstanding Problems: None reported. *******************************************************************************/ +.Application~setDefaults("O", , .false) + .CustomerListView~newInstance("SA") ::requires "Customer\CustomerListView.rex" Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderFormView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderFormView.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderFormView.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -35,10 +35,10 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 06: The OrderFormView class v00-04 12Oct11 + Exercise 06: The OrderFormView class v00-05 11Feb12 OrderFormView.rex - Contains: class "OrderFormView", class "HRS". + Contains: class "OrderFormView", class "HRSofv". Pre-requisite files: OrderFormView.rc, OrderFormView.h. Changes: @@ -50,16 +50,25 @@ v00-04 12Oct11: Changed DoThis menu item and added two more - now have Cancel/Place/Save Order. Also added "not implemented" message for each menu item. + v00-05 11Feb12: OrderFormView - Changed .application() & HRS class + ------------------------------------------------------------------------------*/ ::requires "ooDialog.cls" /*============================================================================== - OrderFormView v00-02 28Sep11 + OrderFormView v00-03 11Feb12 ------------- The "view" (or "gui") Data Entry part of the Sales Order component. + Changes: + v00-01: First Version + v00-02: Second version + v00-03: 11Feb12: Moved .application~setDefaults() to app startup file. + changed to .application~addToConstDir() here. + Changed name fo HRS class to HRSofv. + interface iOrderFormView { void new(); void activate(); @@ -70,7 +79,7 @@ ::METHOD newInstance CLASS PUBLIC use arg rootDlg, orderNo - .Application~useGlobalConstDir("O","Order\OrderFormView.h") + .Application~addToConstDir("Order\OrderFormView.h") dlg = self~new("Order\OrderFormView.rc", "IDD_ORDFORM_DIALOG") --say ".OrderFormView-newInstance: rootDlg =" rootDlg dlg~activate(rootDlg, orderNo) @@ -134,11 +143,11 @@ /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD placeOrder UNGUARDED - self~noMenuFunction(.HRS~ofPlaceOrder) + self~noMenuFunction(.HRSofv~PlaceOrder) /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD saveOrder UNGUARDED - self~noMenuFunction(.HRS~ofSaveOrder) + self~noMenuFunction(.HRSofv~SaveOrder) /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD CancelOrder UNGUARDED @@ -146,18 +155,18 @@ /*- - Help - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD about UNGUARDED - self~noMenuFunction(.HRS~ofHelpAbout) + self~noMenuFunction(.HRSofv~HelpAbout) /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD noMenuFunction UNGUARDED use arg title - ret = MessageDialog(.HRS~ofNoMenu, self~hwnd, title, 'WARNING') + ret = MessageDialog(.HRSofv~NoMenu, self~hwnd, title, 'WARNING') /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -- "Cancel" - This method over-rides the default Windows action of -- 'cancel window' for an Escape key. ::METHOD cancel - response = askDialog(.HRS~ofQExit, "N") + response = askDialog(.HRSofv~QExit, "N") if response = 1 then forward class (super) return @@ -167,26 +176,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD placeOrderBtn UNGUARDED - ret = MessageDialog(.HRS~ofNoBtn, self~hwnd, "Place Order Button", 'WARNING') + ret = MessageDialog(.HRSofv~NoBtn, self~hwnd, "Place Order Button", 'WARNING') /*============================================================================*/ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - Human-Readable Strings (HRS) v00-02 12Oct11 + Human-Readable Strings (HRSofv) v00-03 11Feb12 -------- - The HRS class provides constant character strings for user-visible messages. + The HRSofv class provides constant character strings for user-visible messages. = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -::CLASS HRS PRIVATE -- Human-Readable Strings - ::CONSTANT ofQExit "Are you sure you want to cancel this Order and throw away all changes?" - ::CONSTANT ofNoMenu "This menu item is not yet implemented." - ::CONSTANT ofNoBtn "This button is not yet implemented." - ::CONSTANT ofPlaceOrder "Place Order" - ::CONSTANT ofSaveOrder "Save Order" - ::CONSTANT ofCancelOrder "Cancel Order" - ::CONSTANT ofHelpAbout "Help - About" +::CLASS HRSofv PRIVATE -- Human-Readable Strings + ::CONSTANT QExit "Are you sure you want to cancel this Order and throw away all changes?" + ::CONSTANT NoMenu "This menu item is not yet implemented." + ::CONSTANT NoBtn "This button is not yet implemented." + ::CONSTANT PlaceOrder "Place Order" + ::CONSTANT SaveOrder "Save Order" + ::CONSTANT CancelOrder "Cancel Order" + ::CONSTANT HelpAbout "Help - About" /*============================================================================*/ Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderListView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderListView.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderListView.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -35,7 +35,7 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 06: The Order ListView v01-02 28Jan12 + Exercise 06: The Order ListView v01-03 11Feb12 Contains: class "OrderListView", "HRSolv" @@ -51,6 +51,7 @@ Added an HRS class for text strings. v01-02 28Jan12: Changed class name HRS to HRSolv to allow for multiple HRS classes in same file at some future time. + v01-03 11Feb12: OrderListView - Changed .application() Outstanding Problems: None reported. *******************************************************************************/ @@ -61,13 +62,15 @@ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - OrderListView v00-03 28Jan12 + OrderListView v00-04 11Feb12 ------------- The view of a list of products. Changes: v00-01: First version v00-02: Corrected for standalone invocation. v00-03 28Jan12: Changed name of HRS class to HRSplv. + v00-04 11Feb12: Moved .application~setDefaults() to app startup file. + changed to .application~addToConstDir() here. [interface (idl format)] <<optional>> = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ @@ -80,7 +83,7 @@ ::METHOD newInstance CLASS PUBLIC use arg rootDlg - .Application~useGlobalConstDir("O","Order\OrderListView.h") + .Application~addToConstDir("Order\OrderListView.h") say ".OrderListView-newInstance-01: root =" "'"||rootDlg||"'" dlg = self~new("Order\OrderListView.rc", "IDD_ORDLIST_LISTVIEW") say ".OrderListView-newInstance-02." Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderView.rc =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderView.rc 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderView.rc 2012-02-11 23:06:45 UTC (rev 7519) @@ -47,7 +47,7 @@ { POPUP "Actions" { - MENUITEM "DoThis", IDM_ORDER_DOTHIS + MENUITEM "An Action", IDM_ORDER_DOTHIS } POPUP "Help" { Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderView.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/OrderView.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -35,7 +35,7 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 06: The OrderView class v00-03 28Sep11 + Exercise 06: The OrderView class v00-04 11Feb12 OrderFormView.rex Contains: class "OrderView". @@ -51,6 +51,7 @@ v00-01 25Aug11. v00-02 19Sep11: Corrected standalone invocation. v00-03 28Sep11: Minor mod to comment. + v00-04 11Feb12: OrderFormView - Changed .application() ------------------------------------------------------------------------------*/ @@ -59,11 +60,14 @@ /*============================================================================== - OrderFormView v00-02 19Sep11 + OrderFormView v00-04 11Feb12 ------------- The "view" (or "gui") part of the Order component - part of the sample Order Management application. + v00-04 11Feb12: Moved .application~setDefaults() to app startup file. + changed to .application~addToConstDir() here. + interface iOrderView { void new(); void activate(); @@ -76,7 +80,7 @@ expose rootDlg use arg rootDlg, orderNo say ".OrderView-newInstance: rootDlg =" rootDlg - .Application~useGlobalConstDir("O","Order\OrderView.h") + .Application~addToConstDir("Order\OrderView.h") dlg = self~new("Order\OrderView.rc", "IDD_ORDER_DIALOG") dlg~activate(rootDlg, orderNo) @@ -127,3 +131,47 @@ menuBar~attachTo(self) return + + /*---------------------------------------------------------------------------- + Event-Handler Methods - Menu Events + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + + /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + ::METHOD anAction UNGUARDED + self~noMenuFunction(.HRSov~anAction) + + /*- - Help - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + ::METHOD about UNGUARDED + self~noMenuFunction(.HRSov~HelpAbout) + + /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + ::METHOD noMenuFunction UNGUARDED + use arg title + ret = MessageDialog(.HRSov~NoMenu, self~hwnd, title, 'WARNING') + + /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + -- "Cancel" - This method over-rides the default Windows action of + -- 'cancel window' for an Escape key. + ::METHOD cancel + response = askDialog(.HRSov~QExit, "N") + if response = 1 then forward class (super) + return + +/*============================================================================*/ + + +/*////////////////////////////////////////////////////////////////////////////// + ============================================================================== + Human-Readable Strings (HRSov) v00-01 11Feb12 + -------- + The HRSofv class provides constant character strings for user-visible messages. + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ + +::CLASS HRSov PRIVATE -- Human-Readable Strings + ::CONSTANT anAction "An Action" + ::CONSTANT NoMenu "This menu item is not implemented." + ::CONSTANT QExit "Are you sure you want to cancel this Order View?" + ::CONSTANT HelpAbout "About Sales Order" + +/*============================================================================*/ + Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrder.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrder.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrder.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,19 +36,20 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise06: Stand-alone startup for OrderForm - startupOrderForm.rex v01-00 12Sep11 + startupOrder.rex v01-01 11Feb12 Contains: Startup code. Pre-requisites: Must be run from the parent folder of the Order folder. Changes: - v01-00 12Sep11: First Version + v01-00 28Sep11: First Version + v01-01 11Feb12: Add .application~setDefaults to this file. Outstanding Problems: None reported. *******************************************************************************/ +.Application~setDefaults("O", , .false) +.OrderView~newInstance("SA") -.OrderFormView~newInstance("SA") - -::REQUIRES "Order\OrderFormView.rex" +::REQUIRES "Order\OrderView.rex" Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrderForm.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrderForm.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrderForm.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,19 +36,20 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise06: Stand-alone startup for OrderForm - startupOrderForm.rex v01-00 28Sep11 + startupOrderForm.rex v01-01 11Feb12 Contains: Startup code. Pre-requisites: Must be run from the parent folder of the Order folder. Changes: v01-00 28Sep11: First Version + v01-01 11Feb12: Add .application~setDefaults to this file. Outstanding Problems: None reported. *******************************************************************************/ +.Application~setDefaults("O", , .false) - .OrderFormView~newInstance("SA") ::REQUIRES "Order\OrderFormView.rex" Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrderList.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrderList.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Order/StartupOrderList.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,19 +36,21 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise06: Stand-alone startup for OrderForm - startupOrderForm.rex v01-00 12Sep11 + startupOrderForm.rex v01-01 11Feb12 Contains: Startup code. Pre-requisites: Must be run from the parent folder of the Order folder. Changes: v01-00 12Sep11: First Version + v01-01 11Feb12: Add .application~setDefaults to this file. + Outstanding Problems: None reported. *******************************************************************************/ +.Application~setDefaults("O", , .false) - .OrderListView~newInstance("SA") ::REQUIRES "Order\OrderListView.rex" Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/OrderMgr/OrderMgrBaseView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/OrderMgr/OrderMgrBaseView.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/OrderMgr/OrderMgrBaseView.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,7 +36,7 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise 06: The OrderManagementBaseView class - OrderMgrBaseView.rex v00-06 05Feb12 + OrderMgrBaseView.rex v00-07 11Feb12 Contains: classes "OrderMgrBaseBase", HRSombv (private). @@ -52,11 +52,9 @@ v00-05 28Jan12: Changed class name HRS to HRSombv to allow for multiple HRS classes in same file at some future time. v00-06 15Feb12: Changes to comments only. + v00-07 11Feb12: Add .application~setDefaults to this file. - To Do: - Fix close by system (top right icon on window) - should bring up - "are you sure" msg. - - Fix no-warning close when hit enter. - - Add Find Customer, Find Product (buttons or menu items?) + To Do: - Add Find Customer, Find Product (buttons or menu items?) - Tidy up comments in code. Possible future additions: @@ -70,13 +68,19 @@ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - OrderMgrBaseView v00-06 05Feb12 + OrderMgrBaseView v00-06 11Feb12 ----------------- The base "view" (or "gui") part of the OrderMgr component (part of the sample Order Management application). This class provides for (a) handling of a re-sizeable dilaog, and also for providing the icons for the main control in the dialog which is a ListView control. + Changes: + v00-06 11Feb12: Moved .application~setDefaults() to app startup file. + changed to .application~addToConstDir() here. + + + interface iOrderMgrBaseView { void newInstance(); } @@ -94,7 +98,7 @@ --say ".OrderMgrBaseView-newInstance-01: Start." -- Enable use of symbolic IDs in menu creation, and turn off AutoDetection -- (the third parameter: - .Application~setDefaults("O", "OrderMgr\OrderMgrBaseView.h", .false) + .Application~addToConstDir("OrderMgr\OrderMgrBaseView.h") -- Create an instance of OrderMgrBaseView and show it: dlg = self~new Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductListView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductListView.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductListView.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -61,13 +61,14 @@ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - ProductListView v00-03 28Jan12 + ProductListView v00-04 11Feb12 ------------- The view of a list of products. Changes: v00-01: First version v00-02: Corrected for standalone invocation. v00-03 28Jan12: Changed name of HRS class to HRSplv. + v00-04 11Feb12: Add .application~addToConstDir to this file. [interface (idl format)] <<optional>> = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ @@ -80,7 +81,7 @@ ::METHOD newInstance CLASS PUBLIC use arg rootDlg - .Application~useGlobalConstDir("O","Product\ProductListView.h") + .Application~addToConstDir("Product\ProductListView.h") --say ".ProductListView-newInstance-01: rootDlg =" rootDlg dlg = self~new("Product\ProductListView.rc", "IDD_PRODLIST_DIALOG") --say ".ProductListView-newInstance-02." Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductView.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductView.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/ProductView.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -35,7 +35,7 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 06: ProductView.rex - The ProductView component v02-03 01Dec11 + Exercise 06: ProductView.rex - The ProductView component v02-04 11Feb12 Contains: classes "ProductView", "AboutDialog", and "HRSpv". Pre-requisites: ProductView.dll, ProductView.h, Pproduct.ico, ProductIcon.bmp, @@ -56,6 +56,8 @@ 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. + v02-04 11Feb12: ProductView - Changed .application() + HRS class name changed to HRSpv ------------------------------------------------------------------------------*/ @@ -66,11 +68,16 @@ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - ProductView v02-03 01Dec11 + ProductView v02-04 11Feb12 ----------- The "view" part of the Product component. Now designed to operate from its own folder. Should be invoked from immediately outside the Product folder. [interface (idl format)] + + Changes: + v02-04 11Feb12: Moved .application~setDefaults() to app startup file. + Changed to .application~addToConstDir() here. + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ ::CLASS ProductView SUBCLASS ResDialog PUBLIC @@ -86,7 +93,7 @@ say ".ProductView-newInstance-01: rootDlg =" rootDlg -- Enable use of symbolic IDs in menu creation, and turn off AutoDetection -- (the third parameter: - .Application~setDefaults("O", "Product\ProductView.h", .false) + .Application~addToConstDir("Product\ProductView.h") -- Create an instance of ProductView and show it: dlg = .ProductView~new("Product\res\ProductView.dll", IDD_PRODUCT_VIEW) -- Exercise06 - but move to res folder later. dlg~activate(rootDlg, productNo) -- CHANGED FOR EXERCISE06. @@ -210,9 +217,9 @@ -- If changed, go on to validate data. result = self~checkForChanges(newProdData) if result = .false then do - msg = .HRS~nilSaved + msg = .HRSpv~nilSaved hwnd = self~dlgHandle - answer = MessageDialog(msg,hwnd,.HRS~updateProd,"OK","WARNING","DEFBUTTON2 APPLMODAL") + answer = MessageDialog(msg,hwnd,.HRSpv~updateProd,"OK","WARNING","DEFBUTTON2 APPLMODAL") return end @@ -221,15 +228,15 @@ -- Better would be a set of error numbers. -- If no problems, then show msgbox and go on to disable controls. if result = "" then do - msg = .HRS~saved + msg = .HRSpv~saved hwnd = self~dlgHandle - answer = MessageDialog(msg,hwnd,.HRS~updateProd,"OK","INFORMATION","DEFBUTTON1 APPLMODAL") + answer = MessageDialog(msg,hwnd,.HRSpv~updateProd,"OK","INFORMATION","DEFBUTTON1 APPLMODAL") end -- If problems, then show msgbox and leave user to try again or refresh or exit. else do - msg = result||.EndOfLine||.HRS~notSaved + msg = result||.EndOfLine||.HRSpv~notSaved hwnd = self~dlgHandle - answer = MessageDialog(msg,hwnd,.HRS~updateProd,"OK","ERROR","DEFBUTTON1 APPLMODAL") + answer = MessageDialog(msg,hwnd,.HRSpv~updateProd,"OK","ERROR","DEFBUTTON1 APPLMODAL") return end @@ -274,7 +281,7 @@ -- 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, "YESNO", "WARNING", "DEFBUTTON2") + ans = MessageDialog(.HRSpv~closeInUpdate, self~dlgHandle, .HRSpv~updateIP, "YESNO", "WARNING", "DEFBUTTON2") if ans = .PlainBaseDialog~IDYES then return self~cancel:super else nop end @@ -369,27 +376,27 @@ price = prodData~price; newPrice = newProdData~price oldUom = prodData~uom; newUom = newProdData~uom -- 'oldUom - avoids name conflict with 'uom' in newProddata~uom. if ((price/oldUom)*1.5 < newPrice/newUom) | (newPrice/newUom < (price/oldUom)/2) then do - msg = msg||.HRS~badRatio||" " + msg = msg||.HRSpv~badRatio||" " end -- Check Size vs UOM: if prodData~size = "L" & newProdData~size = "S" - -- Large to Small & prodData~uom/2 < newProdData~uom then do - msg = msg||.HRS~uomTooBig||" " + msg = msg||.HRSpv~uomTooBig||" " end if prodData~size = "S" & newProdData~size = "L" - -- Small to Large & prodData~uom*2 > newProdData~uom then do - msg = msg||.HRS~uomTooSmall||" " + msg = msg||.HRSpv~uomTooSmall||" " end -- Check Product Description length: if newProdData.description~length > 80 then do - msg = msg||.HRS~descrTooBig||" " + msg = msg||.HRSpv~descrTooBig||" " end -- Check Product Name length: if newProdData~name~length > 30 then do - msg = msg||.HRS~prodNameTooBig + msg = msg||.HRSpv~prodNameTooBig end return msg @@ -452,7 +459,7 @@ /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::method showMsgBox say "AboutDialog-showMsgBox-01." - ans = MessageDialog(.HRS~AboutDblClick) + ans = MessageDialog(.HRSpv~AboutDblClick) /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ @@ -468,12 +475,15 @@ /*////////////////////////////////////////////////////////////////////////////// ============================================================================== - Human-Readable Strings (HRS) v00-02 08Aug11 - -------- - The HRS class provides constant character strings for user-visible messages. + Human-Readable Strings (HRSpv) v00-03 11Feb12 + ------------------------------ + The HRSpv class provides constant character strings for user-visible messages. + + Changes: + v00-03 11Feb12: Changed class name NRS to HRSpv = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -::CLASS HRS PRIVATE -- Human-Readable Strings +::CLASS HRSpv PRIVATE -- Human-Readable Strings ::CONSTANT AboutDblClick "You double-clicked!" ::CONSTANT badRatio "The new price/UOM ratio cannot be changed more than 50% up or down." ::CONSTANT closeInUpdate "Any changes made will be lost. Exit anyway?" @@ -487,3 +497,5 @@ ::CONSTANT updateIP "Update in process" ::CONSTANT updateProd "Update Product" +/*============================================================================*/ + Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/StartupProduct.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/StartupProduct.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/StartupProduct.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,17 +36,20 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise06: Stand-alone startup for Product - startupProduct.rex v01-00 12Sep11 + startupProduct.rex v01-01 11Feb12 Contains: Startup code. Pre-requisites: Must be run from the parent folder of the Product folder. Changes: v01-00 12Sep11: First Version + v01-01 11Feb12: Add .application~setDefaults to this file. Outstanding Problems: None reported. *******************************************************************************/ +.Application~setDefaults("O", , .false) + .local~my.idProductData = .ProductData~newInstance -- create a ProductData instance .local~my.idProductModel = .ProductModel~newInstance -- create a ProductModel instance .local~my.idProductData~activate Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/StartupProductList.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/StartupProductList.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Product/StartupProductList.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,17 +36,20 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise06: Stand-alone startup for ProductList - startupProductList.rex v01-00 12Sep11 + startupProductList.rex v01-01 11Feb12 Contains: Startup code. Pre-requisites: Must be run from the parent folder of the Product folder. Changes: v01-00 12Sep11: First Version + v01-01 11Feb12: Add .application~setDefaults to this file. Outstanding Problems: None reported. *******************************************************************************/ +.Application~setDefaults("O", , .false) + .ProductListView~newInstance("SA") ::requires "Product\ProductListView.rex" Modified: main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Startup.rex =================================================================== --- main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Startup.rex 2012-02-11 13:45:14 UTC (rev 7518) +++ main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Startup.rex 2012-02-11 23:06:45 UTC (rev 7519) @@ -36,12 +36,14 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise 06: The Order Management Application - Startup.rex v00-03 02Dec11 + Startup.rex v00-04 11Feb12 Changes: v00-01 21Aug11: First version. v00-02 03Oct11: Deleted a bebug "say" instruction. v00-03 02Dec11: Changed name from OrderMgmt to OrderMgr. + v00-04 11Feb12: Added .application... to startup (and changed it to + .application~addToConstDir in component files). ------------------------------------------------------------------------------*/ @@ -51,6 +53,10 @@ ******************************************************************************/ +-- Set application defaults: +.Application~setDefaults("O", , .false) + + parse arg pwOption if pwOption = "enterPW" then do This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |