From: <os...@us...> - 2013-01-09 16:11:58
|
Revision: 8804 http://sourceforge.net/p/oorexx/code-0/8804 Author: osims Date: 2013-01-09 16:11:55 +0000 (Wed, 09 Jan 2013) Log Message: ----------- Added "Person" to the menubar,plus updates to comments. Modified Paths: -------------- ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.h ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.rc ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.rex ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrView.rex Modified: ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.h =================================================================== --- ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.h 2013-01-09 16:02:26 UTC (rev 8803) +++ ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.h 2013-01-09 16:11:55 UTC (rev 8804) @@ -1,3 +1,40 @@ +/*----------------------------------------------------------------------------*/ +/* */ +/* Copyright (c) 2011-2013 Rexx Language Association. All rights reserved. */ +/* */ +/* This program and the accompanying materials are made available under */ +/* the terms of the Common Public License v1.0 which accompanies this */ +/* distribution. A copy is also available at the following address: */ +/* http://www.oorexx.org/license.html */ +/* */ +/* Redistribution and use in source and binary forms, with or */ +/* without modification, are permitted provided that the following */ +/* conditions are met: */ +/* */ +/* Redistributions of source code must retain the above copyright */ +/* notice, this list of conditions and the following disclaimer. */ +/* Redistributions in binary form must reproduce the above copyright */ +/* notice, this list of conditions and the following disclaimer in */ +/* the documentation and/or other materials provided with the distribution. */ +/* */ +/* Neither the name of Rexx Language Association nor the names */ +/* of its contributors may be used to endorse or promote products */ +/* derived from this software without specific prior written permission. */ +/* */ +/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ +/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */ +/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */ +/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */ +/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */ +/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */ +/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */ +/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */ +/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */ +/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */ +/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* */ +/*----------------------------------------------------------------------------*/ + #ifndef IDC_STATIC #define IDC_STATIC (-1) #endif @@ -19,3 +56,4 @@ #define IDM_ORDMGR_ORDERNEW 40009 #define IDM_ORDMGR_ABOUT 40010 #define IDM_MESSAGE_SENDER1 40011 +#define IDM_PERSON1 40012 Modified: ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.rc =================================================================== --- ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.rc 2013-01-09 16:02:26 UTC (rev 8803) +++ ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.rc 2013-01-09 16:11:55 UTC (rev 8804) @@ -1,7 +1,41 @@ -// Generated by ResEdit 1.5.11 -// Copyright (C) 2006-2012 -// http://www.resedit.net +/*----------------------------------------------------------------------------*/ +/* */ +/* Copyright (c) 2011-2013 Rexx Language Association. All rights reserved. */ +/* */ +/* This program and the accompanying materials are made available under */ +/* the terms of the Common Public License v1.0 which accompanies this */ +/* distribution. A copy is also available at the following address: */ +/* http://www.oorexx.org/license.html */ +/* */ +/* Redistribution and use in source and binary forms, with or */ +/* without modification, are permitted provided that the following */ +/* conditions are met: */ +/* */ +/* Redistributions of source code must retain the above copyright */ +/* notice, this list of conditions and the following disclaimer. */ +/* Redistributions in binary form must reproduce the above copyright */ +/* notice, this list of conditions and the following disclaimer in */ +/* the documentation and/or other materials provided with the distribution. */ +/* */ +/* Neither the name of Rexx Language Association nor the names */ +/* of its contributors may be used to endorse or promote products */ +/* derived from this software without specific prior written permission. */ +/* */ +/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ +/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */ +/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */ +/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */ +/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */ +/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */ +/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */ +/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */ +/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */ +/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */ +/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* */ +/*----------------------------------------------------------------------------*/ + #include <windows.h> #include <commctrl.h> #include <richedit.h> @@ -43,6 +77,7 @@ { MENUITEM "About", IDM_ORDMGR_ABOUT MENUITEM "Message Sender", IDM_MESSAGE_SENDER1 + MENUITEM "Person", IDM_PERSON1 } } Modified: ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.rex =================================================================== --- ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.rex 2013-01-09 16:02:26 UTC (rev 8803) +++ ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrBaseView.rex 2013-01-09 16:11:55 UTC (rev 8804) @@ -36,7 +36,7 @@ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide Exercise 06: The OrderManagementBaseView class - OrderMgrBaseView.rex v01-00 07Jun12 + OrderMgrBaseView.rex v02-00 07Jan13 Contains: classes "OrderMgrBaseBase", HRSombv (private). @@ -44,11 +44,9 @@ Changes: v01-00 07Jun12: First Version + v02-00 07Jan13: Second version - no change other than tidy up some comments. - To Do: - Add Find Customer, Find Product (buttons or menu items?) - - Tidy up comments in code. - Possible future additions: - A configure option to allow user to decide whether to use buttons or menus for find Customer/Product/Order (this could illustrate dynamic @@ -85,13 +83,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD newInstance CLASS PUBLIC UNGUARDED - --say ".OrderMgrBaseView-newInstance-01: Start." -- Enable use of symbolic IDs in menu creation, and turn off AutoDetection -- (the third parameter: -- Create an instance of OrderMgrBaseView and show it: dlg = self~new - - --say ".OrderMgrBaseView-newInstance-02: dlg~Activate." dlg~activate @@ -311,8 +306,7 @@ ::METHOD onResize unguarded expose u sizing minMaximized lastSizeInfo use arg sizingType, sizeinfo - --say "OrderMgrBaseView-onResize." - --os - this methed sent while re-sizing. + -- This methed sent while re-sizing. -- Save the size information so we know the final size of the dialog. lastSizeInfo = sizeInfo @@ -348,7 +342,6 @@ ::METHOD onSizeMoveEnded UNGUARDED expose u sizing lastSizeInfo - --say "OrderMgrBaseView-onSizeMoveEnded." -- If we were resizing, force the dialog controls to redraw themselves. if sizing then do u~resize(self, lastSizeInfo) Modified: ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrView.rex =================================================================== --- ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrView.rex 2013-01-09 16:02:26 UTC (rev 8803) +++ ooDialog/trunk/examples/userGuide/exercises/Exercise07/OrderMgr/OrderMgrView.rex 2013-01-09 16:11:55 UTC (rev 8804) @@ -35,7 +35,7 @@ /* */ /*----------------------------------------------------------------------------*/ /* ooDialog User Guide - Exercise 06: OrderMgrView.rex v01-00 07Jun12 + Exercise 06: OrderMgrView.rex v02-00 07Jan13 Contains: class: "OrderMgrView", "HRSomv" @@ -51,6 +51,16 @@ Changes: v01-00 07Jun12: First Version + v02-00 07Jan13: + 1. Added get id of ObjectMgr in init method. + 2. Added menu item "Help - Person" to surface a Person Model in order to + illustrate MVF using Person class early in Chapter 7. + 3. Updated 'showModel' method to use the MVF (via ObjectMgr) to surface + List Views that are populated with data read from disk (instead of data + hard-coded in the ListView) also give listview the instance name of "a" + to indicate an anonymous component to ObjectMgr. + 4. Added methods "messageSender" and "person" to asllow user to surface + (so can explain stuff in text in appropriate sequence). ------------------------------------------------------------------------------*/ @@ -209,8 +219,13 @@ .MessageSender~newInstance(self) --self~noMenuFunction(.HRSomv~HelpAbout) + /*- - Message Sender- - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + ::METHOD person UNGUARDED + expose idObjectMgr + say "OrderMgrView-Person." + objectMgr = .local.my.ObjectMgr + idObjectMgr~showModel("PersonModel","PA150", self) - /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ ::METHOD noMenuFunction UNGUARDED use arg title @@ -273,12 +288,6 @@ className = record~ID say "OrderMgrView-showModel-01: className =" className -- Ex07 r = idObjectMgr~showModel(classname, "a", self) -- Ex07 -/* - viewClassName = className||"View" - r = O - interpret "."||viewClassName||"~newInstance(self)" -*/ - --say "OrderMgrView-showModel-02:" /*============================================================================*/ |