Open Object Rexx

Revision: 7741
          http://oorexx.svn.sourceforge.net/oorexx/?rev=7741&view=rev
Author:   miesfeld
Date:     2012-04-07 20:05:43 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
ooDialog Samples - finish up renaming

Added Paths:
-----------
    main/trunk/samples/windows/oodialog/tutorial/employee10menuRc.rex

Removed Paths:
-------------
    main/trunk/samples/windows/oodialog/tutorial/employe10menuRc.rex
    main/trunk/samples/windows/oodialog/tutorial/persdata.rc

Deleted: main/trunk/samples/windows/oodialog/tutorial/employe10menuRc.rex
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employe10menuRc.rex	2012-04-07 19:54:55 UTC (rev 7740)
+++ main/trunk/samples/windows/oodialog/tutorial/employe10menuRc.rex	2012-04-07 20:05:43 UTC (rev 7741)
@@ -1,297 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/*                                                                            */
-/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved.             */
-/* Copyright (c) 2005-2012 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.               */
-/*                                                                            */
-/*----------------------------------------------------------------------------*/
-
-/**
- * Name: employe9menuRc.rex
- * Type: Open Object REXX Script
- *
- * Description:  Adds a menu, obtained from the .rc script, to the Employees
- *               application.  Continues the refinement / enhancement of the
- *               application.
- */
-
-    .application~setDefaults('O', 'employe7.h', .false)
-
-    dlg = .MyDialogClass~new("employe7.rc", IDD_EMPLOYEES7)
-    if dlg~initCode <> 0 then return 99
-    dlg~execute("SHOWTOP")
-
-return 0
-
-
-::requires "ooDialog.cls"
-
-::class 'MyDialogClass' subclass RcDialog
-
-::attribute employees
-::attribute empCount
-
-::method init
-    expose menuBar
-
-    forward class (super) continue
-    if self~initCode <> 0 then return self~initCode
-
-    self~employees = .array~new(10)
-    self~empCount = 0
-
-    self~connectButtonEvent(IDC_PB_PRINT, "CLICKED", "onPrint")
-    self~connectButtonEvent(IDC_PB_ADD, "CLICKED", "onAdd")
-    self~connectButtonEvent(IDC_PB_LIST, "CLICKED", "onList")
-    self~connectButtonEvent(IDC_RB_ADD, "CLICKED", "onAdding")
-    self~connectButtonEvent(IDC_RB_BROWSE, "CLICKED", "onBrowsing")
-
-    self~connectEditEvent(IDC_EDIT_NAME, "CHANGE", onNameChange)
-    self~connectUpDownEvent(IDC_UPD, "DELTAPOS", onEmpChange)
-
-    menuBar = .ScriptMenuBar~new("employe7.rc", IDM_MENUBAR, 0)
-    menuBar~connectCommandEvent(IDM_ADD, "onAdd", self)
-    menuBar~connectCommandEvent(IDM_PRINT, "onPrint", self)
-    menuBar~connectCommandEvent(IDM_LIST, "onList", self)
-    menuBar~connectCommandEvent(IDM_ABOUT, "about", self)
-
-    return self~initCode
-
-::method initDialog
-    expose cbCity lbPosition menuBar
-
-    cbCity = self~newComboBox(IDC_CB_CITY)
-    cbCity~add("Munich")
-    cbCity~add("New York")
-    cbCity~add("San Francisco")
-    cbCity~add("Stuttgart")
-    cbCity~add("San Diego")
-    cbCity~add("Tucson")
-    cbCity~add("Houston")
-    cbCity~add("Las Angles")
-
-    lbPosition = self~newListBox(IDC_LB_POSITION)
-    lbPosition~add("Business Manager")
-    lbPosition~add("Engineering Manager")
-    lbPosition~add("Software Developer")
-    lbPosition~add("Software QA")
-    lbPosition~add("Accountant")
-    lbPosition~add("Security")
-    lbPosition~add("Secretary")
-    lbPosition~add("Recptionist")
-    lbPosition~add("Lab Manager")
-    lbPosition~add("Lawyer")
-    lbPosition~add("CEO")
-
-    menuBar~attachTo(self, 1)
-
-    self~setControls
-    self~defaultForm
-
-
-::method onPrint
-    expose cbCity lbPosition rbMale chkMarried editName
-
-    title = "Acme Software - Employee:"
-
-    if rbMale~checked then msg = "Mr."
-    else msg = "Ms."
-    msg ||= editName~getText
-
-    if chkMarried~checked then msg ||= " (married) "
-    msg ||= "A"x || "City:" cbCity~selected || "A"x || "Profession:" lbPosition~selected
-
-    j = MessageDialog(msg, self~hwnd, title, , INFORMATION)
-
-::method onAdd
-    expose cbCity lbPosition rbMale chkMarried editName pbList upDown rbBrowse
-
-    self~empCount += 1
-    self~employees[self~empCount] = .directory~new
-    self~employees[self~empCount]['NAME'] = editName~getText
-    self~employees[self~empCount]['CITY'] = cbCity~selected
-    self~employees[self~empCount]['POSITION'] = lbPosition~selected
-
-    if rbMale~checked then sex = 1
-    else sex = 2
-
-    self~employees[self~empCount]['SEX'] = sex
-    self~employees[self~empCount]['MARRIED'] = chkMarried~checked
-
-    upDown~setRange(1, self~empCount)
-    if self~empCount == 1 then do
-      rbBrowse~enable
-      upDown~setPosition(1)
-    end
-
-    self~defaultForm
-
-::method onNameChange
-    expose menuBar editName rbAdd pbAdd pbPrint
-
-    if rbAdd~checked then do
-        if editName~getText~strip~length == 0 then do
-            pbAdd~disable
-            pbPrint~disable
-            menuBar~disable(IDM_ADD)
-            menuBar~disable(IDM_PRINT)
-        end
-        else do
-            pbAdd~enable
-            pbPrint~enable
-            menuBar~enable(IDM_ADD)
-            menuBar~enable(IDM_PRINT)
-        end
-    end
-
-::method onEmpChange
-    use arg curPos, increment
-
-    self~setEmpRecord(curPos + increment)
-    return .UpDown~deltaPosReply
-
-::method onAdding
-    self~defaultForm
-
-::method onBrowsing
-    expose upDown pbAdd menuBar
-
-    pbAdd~disable
-    menuBar~disable(IDM_ADD)
-    upDown~enable
-    self~setEmpRecord(upDown~getPosition)
-
-::method setEmpRecord
-    expose upDown editName cbCity lbPosition rbMale rbFemale chkMarried
-    use strict arg emp
-
-    if emp < 1 then return self~noRecord('bottom')
-    else if emp > upDown~getRange~max then return self~noRecord('top')
-
-    editName~setText(self~employees[emp]['NAME'])
-
-    cbCity~select(self~employees[emp]['CITY'])
-    lbPosition~select(self~employees[emp]['POSITION'])
-
-    if self~employees[emp]['SEX'] = 1 then do
-        rbMale~check
-        rbFemale~uncheck
-    end
-    else do
-        rbFemale~check
-        rbMale~uncheck
-    end
-
-    if self~employees[emp]['MARRIED'] then chkMarried~check
-    else chkMarried~uncheck
-
-
-::method onList
-   lDlg = .EmployeeListClass~new("employe7.rc", IDD_EMPLOYEE_LIST)
-   lDlg~parent = self
-   lDlg~execute("SHOWTOP")
-
-
-::method fillList
-    use strict arg list
-    do id = 1 to self~empCount
-        if self~employees[id]['SEX'] = 1 then title = "Mr."; else title = "Ms."
-        addstring = title self~employees[id]['NAME']
-        addstring = addstring || "9"x || self~employees[id]['POSITION']
-        addstring = addstring || "9"x || self~employees[id]['CITY']
-        list~insert(id, addstring)
-    end
-
-::method about
-    call infoDialog "Sample to demonstrate ooDialog menus."
-
-::method setControls private
-    expose rbMale rbFemale rbAdd rbBrowse chkMarried editName pbList pbAdd pbPrint upDown
-
-    pbAdd      = self~newPushButton(IDC_PB_ADD)
-    pbList     = self~newPushButton(IDC_PB_LIST)
-    pbPrint    = self~newPushButton(IDC_PB_PRINT)
-    rbMale     = self~newRadioButton(IDC_RB_MALE)
-    rbFemale   = self~newRadioButton(IDC_RB_FEMALE)
-    rbAdd      = self~newRadioButton(IDC_RB_ADD)
-    rbBrowse   = self~newRadioButton(IDC_RB_BROWSE)
-    chkMarried = self~newCheckBox(IDC_CHK_MARRIED)
-    editName   = self~newEdit(IDC_EDIT_NAME)
-    upDown     = self~newUpDown(IDC_UPD)
-
-::method defaultForm private
-    expose menuBar cbCity lbPosition rbMale rbFemale rbAdd rbBrowse chkMarried -
-           editName pbAdd pbList pbPrint upDown
-
-    editName~setText("")
-    cbCity~select("New York")
-    lbPosition~select("Software Developer")
-
-    rbMale~check
-    rbFemale~uncheck
-    chkMarried~uncheck
-
-    rbAdd~check
-    pbAdd~disable
-    pbPrint~disable
-    menuBar~disable(IDM_ADD)
-    menuBar~disable(IDM_PRINT)
-    upDown~disable
-
-    editName~assignFocus
-
-    if self~empCount < 1 then do
-        pbList~disable
-        rbBrowse~disable
-        upDown~setRange(0, 0)
-        upDown~setPosition(0)
-    end
-    else do
-        pbList~enable
-        menuBar~enable(IDM_LIST)
-    end
-
-::method noRecord private
-    use strict arg direction
-    return MessageDialog('At the' direction 'of the records', self~hwnd, -
-                         'Employee Records')
-
-
-::class 'EmployeeListClass' subclass RcDialog
-
-::attribute parent
-
-::method initDialog
-    lb = self~newListBox(IDC_LB_EMPLOYEES_LIST)
-    self~parent~fillList(lb)
-    lb~setTabulators(90, 190)

Copied: main/trunk/samples/windows/oodialog/tutorial/employee10menuRc.rex (from rev 7740, main/trunk/samples/windows/oodialog/tutorial/employe10menuRc.rex)
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employee10menuRc.rex	                        (rev 0)
+++ main/trunk/samples/windows/oodialog/tutorial/employee10menuRc.rex	2012-04-07 20:05:43 UTC (rev 7741)
@@ -0,0 +1,297 @@
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved.             */
+/* Copyright (c) 2005-2012 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.               */
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+
+/**
+ * Name: employe9menuRc.rex
+ * Type: Open Object REXX Script
+ *
+ * Description:  Adds a menu, obtained from the .rc script, to the Employees
+ *               application.  Continues the refinement / enhancement of the
+ *               application.
+ */
+
+    .application~setDefaults('O', 'employe7.h', .false)
+
+    dlg = .MyDialogClass~new("employe7.rc", IDD_EMPLOYEES7)
+    if dlg~initCode <> 0 then return 99
+    dlg~execute("SHOWTOP")
+
+return 0
+
+
+::requires "ooDialog.cls"
+
+::class 'MyDialogClass' subclass RcDialog
+
+::attribute employees
+::attribute empCount
+
+::method init
+    expose menuBar
+
+    forward class (super) continue
+    if self~initCode <> 0 then return self~initCode
+
+    self~employees = .array~new(10)
+    self~empCount = 0
+
+    self~connectButtonEvent(IDC_PB_PRINT, "CLICKED", "onPrint")
+    self~connectButtonEvent(IDC_PB_ADD, "CLICKED", "onAdd")
+    self~connectButtonEvent(IDC_PB_LIST, "CLICKED", "onList")
+    self~connectButtonEvent(IDC_RB_ADD, "CLICKED", "onAdding")
+    self~connectButtonEvent(IDC_RB_BROWSE, "CLICKED", "onBrowsing")
+
+    self~connectEditEvent(IDC_EDIT_NAME, "CHANGE", onNameChange)
+    self~connectUpDownEvent(IDC_UPD, "DELTAPOS", onEmpChange)
+
+    menuBar = .ScriptMenuBar~new("employe7.rc", IDM_MENUBAR, 0)
+    menuBar~connectCommandEvent(IDM_ADD, "onAdd", self)
+    menuBar~connectCommandEvent(IDM_PRINT, "onPrint", self)
+    menuBar~connectCommandEvent(IDM_LIST, "onList", self)
+    menuBar~connectCommandEvent(IDM_ABOUT, "about", self)
+
+    return self~initCode
+
+::method initDialog
+    expose cbCity lbPosition menuBar
+
+    cbCity = self~newComboBox(IDC_CB_CITY)
+    cbCity~add("Munich")
+    cbCity~add("New York")
+    cbCity~add("San Francisco")
+    cbCity~add("Stuttgart")
+    cbCity~add("San Diego")
+    cbCity~add("Tucson")
+    cbCity~add("Houston")
+    cbCity~add("Las Angles")
+
+    lbPosition = self~newListBox(IDC_LB_POSITION)
+    lbPosition~add("Business Manager")
+    lbPosition~add("Engineering Manager")
+    lbPosition~add("Software Developer")
+    lbPosition~add("Software QA")
+    lbPosition~add("Accountant")
+    lbPosition~add("Security")
+    lbPosition~add("Secretary")
+    lbPosition~add("Recptionist")
+    lbPosition~add("Lab Manager")
+    lbPosition~add("Lawyer")
+    lbPosition~add("CEO")
+
+    menuBar~attachTo(self, 1)
+
+    self~setControls
+    self~defaultForm
+
+
+::method onPrint
+    expose cbCity lbPosition rbMale chkMarried editName
+
+    title = "Acme Software - Employee:"
+
+    if rbMale~checked then msg = "Mr."
+    else msg = "Ms."
+    msg ||= editName~getText
+
+    if chkMarried~checked then msg ||= " (married) "
+    msg ||= "A"x || "City:" cbCity~selected || "A"x || "Profession:" lbPosition~selected
+
+    j = MessageDialog(msg, self~hwnd, title, , INFORMATION)
+
+::method onAdd
+    expose cbCity lbPosition rbMale chkMarried editName pbList upDown rbBrowse
+
+    self~empCount += 1
+    self~employees[self~empCount] = .directory~new
+    self~employees[self~empCount]['NAME'] = editName~getText
+    self~employees[self~empCount]['CITY'] = cbCity~selected
+    self~employees[self~empCount]['POSITION'] = lbPosition~selected
+
+    if rbMale~checked then sex = 1
+    else sex = 2
+
+    self~employees[self~empCount]['SEX'] = sex
+    self~employees[self~empCount]['MARRIED'] = chkMarried~checked
+
+    upDown~setRange(1, self~empCount)
+    if self~empCount == 1 then do
+      rbBrowse~enable
+      upDown~setPosition(1)
+    end
+
+    self~defaultForm
+
+::method onNameChange
+    expose menuBar editName rbAdd pbAdd pbPrint
+
+    if rbAdd~checked then do
+        if editName~getText~strip~length == 0 then do
+            pbAdd~disable
+            pbPrint~disable
+            menuBar~disable(IDM_ADD)
+            menuBar~disable(IDM_PRINT)
+        end
+        else do
+            pbAdd~enable
+            pbPrint~enable
+            menuBar~enable(IDM_ADD)
+            menuBar~enable(IDM_PRINT)
+        end
+    end
+
+::method onEmpChange
+    use arg curPos, increment
+
+    self~setEmpRecord(curPos + increment)
+    return .UpDown~deltaPosReply
+
+::method onAdding
+    self~defaultForm
+
+::method onBrowsing
+    expose upDown pbAdd menuBar
+
+    pbAdd~disable
+    menuBar~disable(IDM_ADD)
+    upDown~enable
+    self~setEmpRecord(upDown~getPosition)
+
+::method setEmpRecord
+    expose upDown editName cbCity lbPosition rbMale rbFemale chkMarried
+    use strict arg emp
+
+    if emp < 1 then return self~noRecord('bottom')
+    else if emp > upDown~getRange~max then return self~noRecord('top')
+
+    editName~setText(self~employees[emp]['NAME'])
+
+    cbCity~select(self~employees[emp]['CITY'])
+    lbPosition~select(self~employees[emp]['POSITION'])
+
+    if self~employees[emp]['SEX'] = 1 then do
+        rbMale~check
+        rbFemale~uncheck
+    end
+    else do
+        rbFemale~check
+        rbMale~uncheck
+    end
+
+    if self~employees[emp]['MARRIED'] then chkMarried~check
+    else chkMarried~uncheck
+
+
+::method onList
+   lDlg = .EmployeeListClass~new("employe7.rc", IDD_EMPLOYEE_LIST)
+   lDlg~parent = self
+   lDlg~execute("SHOWTOP")
+
+
+::method fillList
+    use strict arg list
+    do id = 1 to self~empCount
+        if self~employees[id]['SEX'] = 1 then title = "Mr."; else title = "Ms."
+        addstring = title self~employees[id]['NAME']
+        addstring = addstring || "9"x || self~employees[id]['POSITION']
+        addstring = addstring || "9"x || self~employees[id]['CITY']
+        list~insert(id, addstring)
+    end
+
+::method about
+    call infoDialog "Sample to demonstrate ooDialog menus."
+
+::method setControls private
+    expose rbMale rbFemale rbAdd rbBrowse chkMarried editName pbList pbAdd pbPrint upDown
+
+    pbAdd      = self~newPushButton(IDC_PB_ADD)
+    pbList     = self~newPushButton(IDC_PB_LIST)
+    pbPrint    = self~newPushButton(IDC_PB_PRINT)
+    rbMale     = self~newRadioButton(IDC_RB_MALE)
+    rbFemale   = self~newRadioButton(IDC_RB_FEMALE)
+    rbAdd      = self~newRadioButton(IDC_RB_ADD)
+    rbBrowse   = self~newRadioButton(IDC_RB_BROWSE)
+    chkMarried = self~newCheckBox(IDC_CHK_MARRIED)
+    editName   = self~newEdit(IDC_EDIT_NAME)
+    upDown     = self~newUpDown(IDC_UPD)
+
+::method defaultForm private
+    expose menuBar cbCity lbPosition rbMale rbFemale rbAdd rbBrowse chkMarried -
+           editName pbAdd pbList pbPrint upDown
+
+    editName~setText("")
+    cbCity~select("New York")
+    lbPosition~select("Software Developer")
+
+    rbMale~check
+    rbFemale~uncheck
+    chkMarried~uncheck
+
+    rbAdd~check
+    pbAdd~disable
+    pbPrint~disable
+    menuBar~disable(IDM_ADD)
+    menuBar~disable(IDM_PRINT)
+    upDown~disable
+
+    editName~assignFocus
+
+    if self~empCount < 1 then do
+        pbList~disable
+        rbBrowse~disable
+        upDown~setRange(0, 0)
+        upDown~setPosition(0)
+    end
+    else do
+        pbList~enable
+        menuBar~enable(IDM_LIST)
+    end
+
+::method noRecord private
+    use strict arg direction
+    return MessageDialog('At the' direction 'of the records', self~hwnd, -
+                         'Employee Records')
+
+
+::class 'EmployeeListClass' subclass RcDialog
+
+::attribute parent
+
+::method initDialog
+    lb = self~newListBox(IDC_LB_EMPLOYEES_LIST)
+    self~parent~fillList(lb)
+    lb~setTabulators(90, 190)

Deleted: main/trunk/samples/windows/oodialog/tutorial/persdata.rc
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/persdata.rc	2012-04-07 19:54:55 UTC (rev 7740)
+++ main/trunk/samples/windows/oodialog/tutorial/persdata.rc	2012-04-07 20:05:43 UTC (rev 7741)
@@ -1,67 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/*                                                                            */
-/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved.             */
-/* Copyright (c) 2005-2012 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.               */
-/*                                                                            */
-/*----------------------------------------------------------------------------*/
-/****************************************************************************
-
-persdata.rc
-
-produced by VisualAge Resource Workshop
-
-*****************************************************************************/
-
-#define DIALOG_1	1
-
-100 DIALOG 6, 15, 242, 130
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Employees"
-FONT 8, "System"
-{
- CONTROL "Name", 21, "EDIT", WS_BORDER | WS_TABSTOP, 50, 11, 177, 12
- CONTROL "City", 22, "COMBOBOX", CBS_DROPDOWNLIST | WS_TABSTOP, 50, 30, 174, 55
- CONTROL "Profession", 23, "LISTBOX", LBS_STANDARD, 73, 52, 156, 50
- AUTORADIOBUTTON "&Male", 31, 12, 71, 28, 12
- AUTOCHECKBOX "M&arried", 41, 12, 99, 37, 12
- DEFPUSHBUTTON "OK", IDOK, 76, 111, 50, 14
- PUSHBUTTON "Cancel", IDCANCEL, 132, 111, 50, 14
- PUSHBUTTON "Help", IDHELP, 187, 111, 50, 14
- LTEXT "Person:", -1, 10, 12, 34, 8
- LTEXT "City:", -1, 10, 32, 34, 8
- LTEXT "Profession:", -1, 10, 53, 42, 8
- CONTROL "", -1, "static", SS_BLACKFRAME | WS_CHILD | WS_VISIBLE, 9, 68, 47, 45
- AUTORADIOBUTTON "&Female", 32, 12, 84, 39, 12
-}
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7745
          http://oorexx.svn.sourceforge.net/oorexx/?rev=7745&view=rev
Author:   miesfeld
Date:     2012-04-09 23:53:46 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
ooDialog - continue updating the tutorial sample programs

Modified Paths:
--------------
    main/trunk/samples/windows/oodialog/tutorial/employee10menuRc.rex
    main/trunk/samples/windows/oodialog/tutorial/employee11tab.h
    main/trunk/samples/windows/oodialog/tutorial/employee11tab.rc
    main/trunk/samples/windows/oodialog/tutorial/employee11tab.rex

Modified: main/trunk/samples/windows/oodialog/tutorial/employee10menuRc.rex
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employee10menuRc.rex	2012-04-09 23:53:03 UTC (rev 7744)
+++ main/trunk/samples/windows/oodialog/tutorial/employee10menuRc.rex	2012-04-09 23:53:46 UTC (rev 7745)
@@ -98,7 +98,7 @@
     cbCity~add("San Diego")
     cbCity~add("Tucson")
     cbCity~add("Houston")
-    cbCity~add("Las Angles")
+    cbCity~add("Los Angeles")
 
     lbPosition = self~newListBox(IDC_LB_POSITION)
     lbPosition~add("Business Manager")

Modified: main/trunk/samples/windows/oodialog/tutorial/employee11tab.h
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employee11tab.h	2012-04-09 23:53:03 UTC (rev 7744)
+++ main/trunk/samples/windows/oodialog/tutorial/employee11tab.h	2012-04-09 23:53:46 UTC (rev 7745)
@@ -1,3 +1,39 @@
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/* Copyright (c) 2005-2012 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
@@ -11,7 +47,9 @@
 #define IDC_PB_PRINT_A                          1001
 #define IDC_PB_PRINT_E                          1002
 #define IDC_UPD                                 1002
+#define IDC_PB_ADD_A                            1003
 #define IDC_PB_PRINT_E1                         1003
+#define IDC_PB_SAVE_E                           1004
 #define IDC_EDIT_NAME_B                         1005
 #define IDC_CB_CITY_B                           1009
 #define IDC_LB_POSITION_B                       1011

Modified: main/trunk/samples/windows/oodialog/tutorial/employee11tab.rc
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employee11tab.rc	2012-04-09 23:53:03 UTC (rev 7744)
+++ main/trunk/samples/windows/oodialog/tutorial/employee11tab.rc	2012-04-09 23:53:46 UTC (rev 7745)
@@ -1,3 +1,40 @@
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved.             */
+/* Copyright (c) 2005-2012 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 <winuser.h>
 #include <commctrl.h>
@@ -4,8 +41,6 @@
 #include "employee11tab.h"
 
 
-
-
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_EMPLOYEES_ADD DIALOG 0, 0, 227, 160
 STYLE DS_3DLOOK | DS_CONTROL | DS_SHELLFONT | WS_CHILDWINDOW | WS_TABSTOP
@@ -23,6 +58,7 @@
     AUTORADIOBUTTON "&Female", IDC_RB_FEMALE_A, 161, 46, 40, 12
     AUTOCHECKBOX    "Ma&rried", IDC_CHK_MARRIED_A, 161, 63, 40, 12, WS_GROUP
     AUTOCHECKBOX    "Full Time", IDC_CHK_FULLTIME_A, 161, 82, 40, 12, WS_GROUP
+    PUSHBUTTON      "Add", IDC_PB_ADD_A, 167, 117, 50, 14
     PUSHBUTTON      "Print", IDC_PB_PRINT_A, 167, 136, 50, 14
 }
 
@@ -68,6 +104,7 @@
     AUTORADIOBUTTON "&Female", IDC_RB_FEMALE_E, 161, 46, 40, 12
     AUTOCHECKBOX    "Ma&rried", IDC_CHK_MARRIED_E, 161, 63, 40, 12, WS_GROUP
     AUTOCHECKBOX    "Full Time", IDC_CHK_FULLTIME_E, 161, 82, 40, 12, WS_GROUP
+    PUSHBUTTON      "Save", IDC_PB_SAVE_E, 167, 117, 50, 14
     PUSHBUTTON      "Print", IDC_PB_PRINT_E, 167, 136, 50, 14
 }
 

Modified: main/trunk/samples/windows/oodialog/tutorial/employee11tab.rex
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employee11tab.rex	2012-04-09 23:53:03 UTC (rev 7744)
+++ main/trunk/samples/windows/oodialog/tutorial/employee11tab.rex	2012-04-09 23:53:46 UTC (rev 7745)
@@ -53,7 +53,7 @@
   p4 = .EmployeeList~new("employee11tab.rc", IDD_EMPLOYEES_LIST)
 
   pages = .array~of(p1, p2, p3, p4)
-  dlg = .AcmeEmployeesDlg~new(pages, "", "Acme Software - Employee Manager Version 10.00.0")
+  dlg = .AcmeEmployeesDlg~new(pages, "NOAPPLYNOW", "Acme Software - Employee Manager Version 10.00.0")
 
   dlg~execute
 
@@ -62,51 +62,353 @@
 ::requires "ooDialog.cls"
 
 
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  AcmeEmployeesDlg - The property sheet dialog for this application.
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 ::class 'AcmeEmployeesDlg' subclass PropertySheetDialog
 
+::constant  DATABASE    'employee11tab.db'
+
 ::attribute employees
 ::attribute empCount
 ::attribute empIndex
 
 ::method init
+    expose dbChanged
+
     forward class (super) continue
-    --say 'In' self 'init()'
 
     -- need to get employees from database
-    self~employees = .array~new(10)
-    self~empCount  = 0
-    self~empIndex  = 0
+    self~readDataBase
 
+    dbChanged = .false
 
-    --say 'Pages:'
-    do d over self~pages
-      --say ' ' d
-      d~configure(self~employees, self~empCount, self~empIndex)
+    if self~employees~items == 0 then self~startPage = 1
+    else self~startPage = 4
+
+    do page over self~pages
+      page~configure(self~employees, self~empCount, self~empIndex)
     end
 
-::method initDialog
+::method newEmployeeNotify
+    expose dbChanged
+    use strict arg emp
 
-    say 'In' self 'initDialog()'
+    dbChanged = .true
 
+    self~empCount += 1
+    self~employees[self~empCount] = emp
+    self~empIndex = self~empCount
+
+    self~notifyPages
+
+    listPage = self~pages[4]
+
+    -- If the user has not yet visited the List Employees page, then there is
+    -- no list view to update.  Instead, when the user first visits that page,
+    -- the list view will be filled with all existing employees.
+    if listPage~wasActivated then listPage~newEmployeeNotify
+
+
+::method editedEmployeeNotify
+    expose dbChanged
+
+    dbChanged = .true
+
+    listPage = self~pages[4]
+    if listPage~wasActivated then listPage~editedEmployeeNotify
+
+
+::method leaving
+    expose dbChanged
+
+    if dbChanged & self~getResult == 'CLOSEDOK' then do
+        self~writeDataBase
+    end
+
+
+::method notifyPages private
+
+    do page over self~pages
+      page~empCount = self~empCount
+      page~empIndex = self~empIndex
+    end
+
+
+::method readDataBase private
+
+    db = self~DATABASE
+
+    fsObj = .stream~new(db)
+    if fsObj~query('EXISTS') == '' then do
+        self~employees = .array~new(10)
+        self~empCount  = 0
+        self~empIndex  = 0
+    end
+    else do
+        lines = fsObj~makeArray
+        fsObj~close
+
+        emps = .array~new(lines~items)
+        do l over lines
+            l = l~strip
+            if l~length == 0 | l~abbrev("#") | l~abbrev("/*") then iterate
+
+            parse var l name', 'city', 'pos', 'male', 'married', 'fullTime .
+
+            if male == 'M' then male = .true
+            else male = .false
+
+            if married == 'M' then married = .true
+            else married = .false
+
+            if fullTime == 'F' then fullTime = .true
+            else fullTime = .false
+
+            emp = .Employee~new(name, city, pos, male, married, fullTime)
+            emps~append(emp)
+        end
+
+        self~employees = emps
+        self~empCount  = emps~items
+        self~empIndex  = 1
+    end
+
+
+::method writeDataBase private
+
+    db = self~DATABASE
+
+    fsObj = .stream~new(db)
+
+    fsObj~open('WRITE REPLACE')
+
+    if fsObj~state == 'READY' then do e over self~employees
+        line = e~toCSV
+        fsObj~lineout(line)
+    end
+    else do
+      say "ERROR ERROR" -- TODO put up message box
+    end
+
+    fsObj~close
+
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  Employee - A class that reflects a single, specific, employee.
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
+::class 'Employee'
+
+::attribute name
+::attribute city
+::attribute position
+::attribute male
+::attribute married
+::attribute fullTime
+
+::method init
+    expose name city position male married fullTime
+    use strict arg name = "", city = "New York", position = "Software Developer",     -
+                   male = .true, married = .false, fullTime = .true
+
+::method isValid
+    expose name
+    return name \== ''
+
+
+::method print
+    expose name city position male married fullTime
+    use strict arg dlg
+
+    eol = .endOfLine
+    tab = '09'x
+
+    if \ self~isValid then do
+        title = "Acme Software - Internal Error Detected"
+        msg = "Attempting to print invalid employee record." || eol~copies(2)  -
+              "Employee record has no assigned name."
+        icon = 'ERROR'
+    end
+    else do
+        title = "Acme Software - Employee:"
+
+        if male then msg = "Mr." name
+        else msg = "Ms." name
+
+        if married then msg ||= " (married) "
+
+        if fullTime then status = 'Full Time Employee'
+        else status = 'Part Time Employee'
+
+        msg ||= eol || "City:"       || tab~copies(2) || city     || eol || -
+                       "Profession:" || tab           || position || eol || -
+                       'Status:'     || tab~copies(2) || status
+
+        icon = 'INFORMATION'
+    end
+
+    j = MessageDialog(msg, dlg~hwnd, title, , icon)
+
+
+::method toCSV
+    expose name city position male married fullTime
+    use strict arg
+
+    if male then mf = "M"
+    else mf = "F"
+
+    if married then mu = "M"
+    else mu = 'U'
+
+    if fullTime then fp = 'F'
+    else fp = 'P'
+
+    txt = name', 'city', 'position', 'mf', 'mu', 'fp
+
+    return txt
+
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  EmployeeView - A class containing the dialog controls used to display an
+                 employee in a dialog.
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
+::class 'EmployeeView' public
+
+::attribute editName
+::attribute cbCity
+::attribute lbPosition
+::attribute rbMale
+::attribute rbFemale
+::attribute chkMarried
+::attribute chkFullTime
+
+::method init
+  expose editName cbCity lbPosition rbMale rbFemale chkMarried chkFullTime
+  use strict arg editName, cbCity, lbPosition, rbMale, rbFemale, chkMarried, chkFullTime
+
+/** displayEmployee()
+ * Sets the state of the controls to reflect the specified employee
+ */
+::method displayEmployee
+    use strict arg emp
+
+    self~editName~setText(emp~name)
+    self~cbCity~select(emp~City)
+    self~lbPosition~select(emp~Position)
+
+    if emp~male then do
+        self~rbMale~check
+        self~rbFemale~uncheck
+    end
+    else do
+        self~rbFemale~check
+        self~rbMale~uncheck
+    end
+
+    if emp~married then self~chkMarried~check
+    else self~chkMarried~uncheck
+
+    if emp~fullTime then self~chkFullTime~check
+    else self~chkFullTime~uncheck
+
+
+/** disable()
+ * Disables all the controls and sets the edit control text to the empty string.
+ */
+::method disable
+    use strict arg
+
+    self~editName~setText("")
+
+    self~editName~disable
+    self~cbCity~disable
+    self~lbPosition~disable
+
+    self~rbMale~disable
+    self~rbFemale~disable
+    self~chkMarried~disable
+    self~chkFullTime~disable
+
+
+/** match()
+ * Tests if the state of the controls match the specified employee.
+ */
+::method sameAs
+    use strict arg emp
+
+    if self~editName~getText      \== emp~name     then return .false
+    if self~cbCity~selected       \== emp~City     then return .false
+    if self~lbPosition~selected   \== emp~Position then return .false
+
+    if self~rbMale~checked        & \ emp~male     then return .false
+    if \ self~rbMale~checked      &   emp~male     then return .false
+
+    if self~chkMarried~checked    & \ emp~married  then return .false
+    if \ self~chkMarried~checked  &   emp~married  then return .false
+
+    if self~chkFullTime~checked   & \ emp~fullTime then return .false
+    if \ self~chkFullTime~checked &  emp~fullTime  then return .false
+
+    return .true
+
+/** createEmployee()
+ * Instantiates a new Employee object using the current state of the controls,
+ * and returns it if it is valid.  If it is not valid, returns .nil
+ */
+::method createEmployee
+    use strict arg
+
+    name     = self~editName~getText~strip
+    city     = self~cbCity~selected
+    position = self~lbPosition~selected
+    male     = self~rbMale~checked
+    married  =  self~chkMarried~checked
+    fullTime = self~chkFullTime~checked
+
+    emp = .Employee~new(name, city, position, male, married, fullTime)
+
+    if emp~isValid then return emp
+    else return .nil
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  EmployeeAdd - A dialog class for a page in the PropertySheetDialog.  This page
+                allows the user to add employee records.
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 ::class 'EmployeeAdd' subclass RcPSPDialog
 
 ::attribute employees
 ::attribute empCount
 ::attribute empIndex
+::attribute empView
+::attribute empInitial
 
 ::method configure
-    use arg employees, count
+    expose isChanged
+    use arg employees, count, index
 
     self~employees = employess
-    self~empCount = count
+    self~empCount  = count
+    self~empIndex  = index
+    self~empInitial = .Employee~new()
 
-    self~connectEditEvent(IDC_EDIT_NAME_A, "CHANGE", onNameChange)
-    say 'In' self 'configure() propSheet?' self~propSheet
+    self~connectEditEvent(IDC_EDIT_NAME_A,      "CHANGE",    onChange)
+    self~connectComboBoxEvent(IDC_CB_CITY_A,    "SELCHANGE", onChange)
+    self~connectListBoxEvent(IDC_LB_POSITION_A, "SELCHANGE", onChange)
+    self~connectButtonEvent(IDC_RB_MALE_A,      "CLICKED",   onChange)
+    self~connectButtonEvent(IDC_RB_FEMALE_A,    "CLICKED",   onChange)
+    self~connectButtonEvent(IDC_CHK_MARRIED_A,  "CLICKED",   onChange)
+    self~connectButtonEvent(IDC_CHK_FULLTIME_A, "CLICKED",   onChange)
+    isChanged = .false
 
+    self~connectButtonEvent(IDC_PB_PRINT_A, "CLICKED", onPrint)
+    self~connectButtonEvent(IDC_PB_ADD_A, "CLICKED", onAdd)
+
 ::method initDialog
-    expose cbCity lbPosition
+    expose cbCity lbPosition editName
 
-    say 'In' self 'init() self~propSheet?' self~propSheet
     self~setControls
 
     cbCity~add("Munich")
@@ -116,7 +418,7 @@
     cbCity~add("San Diego")
     cbCity~add("Tucson")
     cbCity~add("Houston")
-    cbCity~add("Las Angles")
+    cbCity~add("Los Angeles")
 
     lbPosition~add("Business Manager")
     lbPosition~add("Engineering Manager")
@@ -130,198 +432,170 @@
     lbPosition~add("Lawyer")
     lbPosition~add("CEO")
 
-    self~defaultForm
+    editName~connectCharEvent(onChar)
 
+    /* Bypass this during development
+    -- If we are the start page, it means there are no employees.  So we put up
+    -- a message box informing the user she needs to add employees through this
+    -- page.
+    if self~propSheet~startPage == 1 then do
+        title = "Acme Software - Employee Manager"
+        msg   = "The Employee Database is empty." || .endOfLine~copies(2) ||     -
+                "Use the 'Add Employees' page to add employees."
 
+        ret = MessageDialog(msg, self~hwnd, title)
+    end
+    */
+
+
 ::method setActive unguarded
 
-  self~defaultForm
-  return 0
+    self~defaultForm
+    return 0
 
 ::method killActive unguarded
+  expose isChanged
   use arg psDlg
 
-  say 'leaving will abandon changes'
-  return .true
+  if isChanged then do
+      title = "Acme Software - Add Employee"
+      msg   = 'The addition of the new employee is not'  || .endOfLine ||           -
+              'complete.  Leaving this page will result' || .endOfLine ||           -
+              'in all changes being lost.'               || .endOfLine~copies(2) || -
+              'To leave this page and abandon changes,'  || .endOfLine ||           -
+              'press Ok.  To stay on the page and con-'  || .endOfLine ||           -
+              'tinue adding a new employee, press Cancel'
 
-::method onPrint
-    expose cbCity lbPosition rbMale chkMarried editName
+      ret = MessageDialog(msg, self~hwnd, title, "OKCANCEL", "WARNING", 'DEFBUTTON2')
+      if ret == self~IDCANCEL then return .false
+  end
 
-    title = "Acme Software - Employee:"
+  return .true
 
-    if rbMale~checked then msg = "Mr."
-    else msg = "Ms."
-    msg ||= editName~getText
 
-    if chkMarried~checked then msg ||= " (married) "
-    msg ||= "A"x || "City:" cbCity~selected || "A"x || "Profession:" lbPosition~selected
+::method onPrint unguarded
 
-    j = MessageDialog(msg, self~hwnd, title, , INFORMATION)
+    currentEmployee = self~empView~createEmployee
+    currentEmployee~print(self)
+    return 0
 
-::method onAdd
-    expose cbCity lbPosition rbMale chkMarried editName pbList upDown rbBrowse
 
-    self~empCount += 1
-    self~employees[self~empCount] = .directory~new
-    self~employees[self~empCount]['NAME'] = editName~getText
-    self~employees[self~empCount]['CITY'] = cbCity~selected
-    self~employees[self~empCount]['POSITION'] = lbPosition~selected
-
-    if rbMale~checked then sex = 1
-    else sex = 2
-
-    self~employees[self~empCount]['SEX'] = sex
-    self~employees[self~empCount]['MARRIED'] = chkMarried~checked
-
-    upDown~setRange(1, self~empCount)
-    if self~empCount == 1 then do
-      rbBrowse~enable
-      upDown~setPosition(1)
-    end
-
-    self~defaultForm
-
-::method onNameChange
+::method onAdd unguarded
     expose editName
-    say 'NEED TO DO SOMETHING HERE'
-    /*
-    if rbAdd~checked then do
-        if editName~getText~strip~length == 0 then do
-            pbAdd~disable
-            pbPrint~disable
-            menuBar~disable(IDM_ADD)
-            menuBar~disable(IDM_PRINT)
-        end
-        else do
-            pbAdd~enable
-            pbPrint~enable
-            menuBar~enable(IDM_ADD)
-            menuBar~enable(IDM_PRINT)
-        end
-    end
-    */
 
-::method onEmpChange
-    use arg curPos, increment
+    newEmployee = self~empView~createEmployee
+    self~propSheet~newEmployeeNotify(newEmployee)
 
-    self~setEmpRecord(curPos + increment)
-    return .UpDown~deltaPosReply
-
-::method onAdding
     self~defaultForm
+    return 0
 
-::method onBrowsing
-    expose upDown pbAdd menuBar
 
-    pbAdd~disable
-    menuBar~disable(IDM_ADD)
-    upDown~enable
-    self~setEmpRecord(upDown~getPosition)
+::method onChar unguarded
+    use arg char, isShift, isCtrl, isAlt, misc, editControl
 
-::method setEmpRecord
-    expose upDown editName cbCity lbPosition rbMale rbFemale chkMarried
-    use strict arg emp
+    if char~d2c == ',' then do
+      result = ' '~c2d
+      reply result
 
-    if emp < 1 then return self~noRecord('bottom')
-    else if emp > upDown~getRange~max then return self~noRecord('top')
+      msg   = 'Employee names can not contain a comma. You can not type a comma here'
+      title = "Unacceptable Character"
+      editControl~showBalloon(title, msg, "ERROR")
+    end
+    else do
+      return .true
+    end
 
-    editName~setText(self~employees[emp]['NAME'])
 
-    cbCity~select(self~employees[emp]['CITY'])
-    lbPosition~select(self~employees[emp]['POSITION'])
+::method onChange unguarded
+    expose isChanged pbPrint pbAdd editName
 
-    if self~employees[emp]['SEX'] = 1 then do
-        rbMale~check
-        rbFemale~uncheck
+    if isChanged then do
+        if self~empView~sameAs(self~empInitial) then isChanged = .false
     end
     else do
-        rbFemale~check
-        rbMale~uncheck
+        if \ self~empView~sameAs(self~empInitial) then isChanged = .true
     end
 
-    if self~employees[emp]['MARRIED'] then chkMarried~check
-    else chkMarried~uncheck
+    -- The Add and Print buttons are only enabled when there is some change and
+    -- the employee name is not blank.  The status of the buttons *could* change
+    -- on any change, but only *will* change under certain cicrcumstances.
+    -- Rather than try to track and determine those exact circumstances, we just
+    -- check if the buttons should be enabled or not and do that on each change.
+    if isChanged, editName~getText~strip \== '' then do
+        pbPrint~enable
+        pbAdd~enable
+    end
+    else do
+    		pbPrint~disable
+        pbAdd~disable
+    end
 
+    return 0
 
-::method onList
-   lDlg = .EmployeeListClass~new("employe7.rc", IDD_EMPLOYEE_LIST)
-   lDlg~parent = self
-   lDlg~execute("SHOWTOP")
 
-
-::method fillList
-    use strict arg list
-    do id = 1 to self~empCount
-        if self~employees[id]['SEX'] = 1 then title = "Mr."; else title = "Ms."
-        addstring = title self~employees[id]['NAME']
-        addstring = addstring || "9"x || self~employees[id]['POSITION']
-        addstring = addstring || "9"x || self~employees[id]['CITY']
-        list~insert(id, addstring)
-    end
-
-::method about
-    call infoDialog "Sample to demonstrate ooDialog menus."
-
 ::method setControls private
-    expose cbCity lbPosition rbMale rbFemale chkMarried chkFullTime editName
+    expose editName cbCity lbPosition rbMale rbFemale chkMarried chkFullTime pbPrint pbAdd
 
+    editName    = self~newEdit(IDC_EDIT_NAME_A)
     cbCity      = self~newComboBox(IDC_CB_CITY_A)
     lbPosition  = self~newListBox(IDC_LB_POSITION_A)
     rbMale      = self~newRadioButton(IDC_RB_MALE_A)
     rbFemale    = self~newRadioButton(IDC_RB_FEMALE_A)
     chkMarried  = self~newCheckBox(IDC_CHK_MARRIED_A)
     chkFullTime = self~newCheckBox(IDC_CHK_FULLTIME_A)
-    editName    = self~newEdit(IDC_EDIT_NAME_A)
 
-::method defaultForm private
-    expose cbCity lbPosition rbMale rbFemale chkMarried chkFullTime editName
-    say 'In defaultForm()'
-    editName~setText("")
-    cbCity~select("New York")
-    lbPosition~select("Software Developer")
+    self~empView = .EmployeeView~new(editName, cbCity, lbPosition, rbMale, rbFemale, chkMarried, chkFullTime)
 
-    rbMale~check
-    rbFemale~uncheck
-    chkMarried~uncheck
-    chkFullTime~check
+    pbPrint = self~newPushButton(IDC_PB_PRINT_A)
+    pbAdd   = self~newPushButton(IDC_PB_ADD_A)
 
-    editName~assignFocus
 
-    /*
-    if self~empCount < 1 then do
-        pbList~disable
-        rbBrowse~disable
-        upDown~setRange(0, 0)
-        upDown~setPosition(0)
-    end
-    else do
-        pbList~enable
-        menuBar~enable(IDM_LIST)
-    end
-    */
+::method defaultForm private
+    expose pbPrint pbAdd
 
-::method noRecord private
-    use strict arg direction
-    return MessageDialog('At the' direction 'of the records', self~hwnd, -
-                         'Employee Records')
+    pbPrint~disable
+    pbAdd~disable
 
+    self~empView~displayEmployee(self~empInitial)
+    self~empView~editName~assignFocus
 
 
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  EmployeeEdit - A dialog class for a page in the PropertySheetDialog.  This
+                 page allows the user to edit an existing employee's record
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 ::class 'EmployeeEdit' subclass RcPSPDialog
 
 ::attribute employees
 ::attribute empCount
 ::attribute empIndex
+::attribute empInitial
+::attribute empView
 
 ::method configure
-    use arg employees, count
+    expose isChanged
+    use arg employees, count, index
 
-    self~employees = employess
-    self~empCount = count
+    self~employees = employees
+    self~empCount  = count
+    self~empIndex  = index
 
-    self~connectEditEvent(IDC_EDIT_NAME_A, "CHANGE", onNameChange)
-    say 'In' self 'configure() propSheet?' self~propSheet
+    self~empInitial = .nil
 
+    self~connectEditEvent(IDC_EDIT_NAME_E,      "CHANGE",    onChange)
+    self~connectComboBoxEvent(IDC_CB_CITY_E,    "SELCHANGE", onChange)
+    self~connectListBoxEvent(IDC_LB_POSITION_E, "SELCHANGE", onChange)
+    self~connectButtonEvent(IDC_RB_MALE_E,      "CLICKED",   onChange)
+    self~connectButtonEvent(IDC_RB_FEMALE_E,    "CLICKED",   onChange)
+    self~connectButtonEvent(IDC_CHK_MARRIED_E,  "CLICKED",   onChange)
+    self~connectButtonEvent(IDC_CHK_FULLTIME_E, "CLICKED",   onChange)
+    isChanged = .false
+
+    self~connectButtonEvent(IDC_PB_PRINT_E, "CLICKED", onPrint)
+    self~connectButtonEvent(IDC_PB_SAVE_E, "CLICKED", onSave)
+
+
 ::method initDialog
     expose cbCity lbPosition
 
@@ -334,7 +608,7 @@
     cbCity~add("San Diego")
     cbCity~add("Tucson")
     cbCity~add("Houston")
-    cbCity~add("Las Angles")
+    cbCity~add("Los Angeles")
 
     lbPosition~add("Business Manager")
     lbPosition~add("Engineering Manager")
@@ -349,22 +623,22 @@
     lbPosition~add("CEO")
 
 
+::method setActive unguarded
+  say 'In' self 'setActive()'
 
-::method onPrint
-    expose cbCity lbPosition rbMale chkMarried editName
+  self~setEmpRecord
+  return 0
 
-    title = "Acme Software - Employee:"
 
-    if rbMale~checked then msg = "Mr."
-    else msg = "Ms."
-    msg ||= editName~getText
+::method onPrint unguarded
 
-    if chkMarried~checked then msg ||= " (married) "
-    msg ||= "A"x || "City:" cbCity~selected || "A"x || "Profession:" lbPosition~selected
+    if self~empInitial \== .nil then do
+        currentEmployee = self~empView~createEmployee
+        currentEmployee~print(self)
+    end
+    return 0
 
-    j = MessageDialog(msg, self~hwnd, title, , INFORMATION)
-
-::method onAdd
+::method onSave
     expose cbCity lbPosition rbMale chkMarried editName pbList upDown rbBrowse
 
     self~empCount += 1
@@ -386,129 +660,71 @@
     end
 
     self~defaultForm
+    return 0
 
-::method onNameChange
-    expose menuBar editName rbAdd pbAdd pbPrint
 
-    if rbAdd~checked then do
-        if editName~getText~strip~length == 0 then do
-            pbAdd~disable
-            pbPrint~disable
-            menuBar~disable(IDM_ADD)
-            menuBar~disable(IDM_PRINT)
-        end
-        else do
-            pbAdd~enable
-            pbPrint~enable
-            menuBar~enable(IDM_ADD)
-            menuBar~enable(IDM_PRINT)
-        end
-    end
+::method onChange
+    expose isChanged pbPrint pbSave editName
 
-::method onEmpChange
-    use arg curPos, increment
+    if self~empInitial == .nil then return 0
 
-    self~setEmpRecord(curPos + increment)
-    return .UpDown~deltaPosReply
+    if isChanged then do
+        if self~empView~sameAs(self~empInitial) then isChanged = .false
+    end
+    else do
+        if \ self~empView~sameAs(self~empInitial) then isChanged = .true
+    end
 
-::method onAdding
-    self~defaultForm
-
-::method onBrowsing
-    expose upDown pbAdd menuBar
-
-    pbAdd~disable
-    menuBar~disable(IDM_ADD)
-    upDown~enable
-    self~setEmpRecord(upDown~getPosition)
-
-::method setEmpRecord
-    expose upDown editName cbCity lbPosition rbMale rbFemale chkMarried
-    use strict arg emp
-
-    if emp < 1 then return self~noRecord('bottom')
-    else if emp > upDown~getRange~max then return self~noRecord('top')
-
-    editName~setText(self~employees[emp]['NAME'])
-
-    cbCity~select(self~employees[emp]['CITY'])
-    lbPosition~select(self~employees[emp]['POSITION'])
-
-    if self~employees[emp]['SEX'] = 1 then do
-        rbMale~check
-        rbFemale~uncheck
+    if isChanged, editName~getText~strip \== '' then do
+        pbPrint~enable
+        pbSave~enable
     end
     else do
-        rbFemale~check
-        rbMale~uncheck
+    		pbPrint~disable
+        pbSave~disable
     end
 
-    if self~employees[emp]['MARRIED'] then chkMarried~check
-    else chkMarried~uncheck
+    return 0
 
 
-::method fillList
-    use strict arg list
-    do id = 1 to self~empCount
-        if self~employees[id]['SEX'] = 1 then title = "Mr."; else title = "Ms."
-        addstring = title self~employees[id]['NAME']
-        addstring = addstring || "9"x || self~employees[id]['POSITION']
-        addstring = addstring || "9"x || self~employees[id]['CITY']
-        list~insert(id, addstring)
-    end
-
-::method about
-    call infoDialog "Sample to demonstrate ooDialog menus."
-
 ::method setControls private
-    expose cbCity lbPosition rbMale rbFemale chkMarried chkFullTime editName
+    expose cbCity lbPosition rbMale rbFemale chkMarried chkFullTime editName pbPrint pbSave
 
-    cbCity     = self~newComboBox(IDC_CB_CITY_E)
-    lbPosition = self~newListBox(IDC_LB_POSITION_E)
-    rbMale     = self~newRadioButton(IDC_RB_MALE_E)
-    rbFemale   = self~newRadioButton(IDC_RB_FEMALE_E)
-    chkMarried = self~newCheckBox(IDC_CHK_MARRIED_E)
-    editName   = self~newEdit(IDC_EDIT_NAME_E)
+    cbCity      = self~newComboBox(IDC_CB_CITY_E)
+    lbPosition  = self~newListBox(IDC_LB_POSITION_E)
+    rbMale      = self~newRadioButton(IDC_RB_MALE_E)
+    rbFemale    = self~newRadioButton(IDC_RB_FEMALE_E)
+    chkMarried  = self~newCheckBox(IDC_CHK_MARRIED_E)
+    chkFullTime = self~newCheckBox(IDC_CHK_FULLTIME_E)
+    editName    = self~newEdit(IDC_EDIT_NAME_E)
 
-::method defaultForm private
-    expose menuBar cbCity lbPosition rbMale rbFemale rbAdd rbBrowse chkMarried -
-           editName pbAdd pbList pbPrint upDown
+    self~empView = .EmployeeView~new(editName, cbCity, lbPosition, rbMale, rbFemale, chkMarried, chkFullTime)
 
-    editName~setText("")
-    cbCity~select("New York")
-    lbPosition~select("Software Developer")
+    pbPrint = self~newPushButton(IDC_PB_PRINT_E)
+    pbSave   = self~newPushButton(IDC_PB_SAVE_E)
 
-    rbMale~check
-    rbFemale~uncheck
-    chkMarried~uncheck
 
-    rbAdd~check
-    pbAdd~disable
-    pbPrint~disable
-    menuBar~disable(IDM_ADD)
-    menuBar~disable(IDM_PRINT)
-    upDown~disable
+::method setEmpRecord
+    expose pbSave pbPrint
 
-    editName~assignFocus
-
     if self~empCount < 1 then do
-        pbList~disable
-        rbBrowse~disable
-        upDown~setRange(0, 0)
-        upDown~setPosition(0)
+        self~empView~disable
+        pbSave~disable
+        pbPrint~disable
+        return 0
     end
-    else do
-        pbList~enable
-        menuBar~enable(IDM_LIST)
-    end
 
-::method noRecord private
-    use strict arg direction
-    return MessageDialog('At the' direction 'of the records', self~hwnd, -
-                         'Employee Records')
+    self~empInitial = self~employees[self~empIndex]
+    self~empView~displayEmployee(self~empInitial)
+    self~empView~editName~assignFocus
 
 
 
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  EmployeeBrowse - A dialog class for a page in the PropertySheetDialog.  This
+                   page allows the user to scroll through employee records one
+                   at a time.
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 ::class 'EmployeeBrowse' subclass RcPSPDialog
 
 ::attribute employees
@@ -518,11 +734,10 @@
 ::method configure
     use arg employees, count, empIndex
 
-    self~employees = employess
+    self~employees = employees
     self~empCount  = count
     self~empIndex  = empIndex
 
-    say 'In' self 'configure() propSheet?' self~propSheet
 
 ::method initDialog
     expose cbCity lbPosition
@@ -535,7 +750,7 @@
     cbCity~add("San Diego")
     cbCity~add("Tucson")
     cbCity~add("Houston")
-    cbCity~add("Las Angles")
+    cbCity~add("Los Angeles")
 
     lbPosition = self~newListBox(IDC_LB_POSITION_B)
     lbPosition~add("Business Manager")
@@ -567,7 +782,8 @@
 
     j = MessageDialog(msg, self~hwnd, title, , INFORMATION)
 
-::method onAdd
+
+::method onSave
     expose cbCity lbPosition rbMale chkMarried editName pbList upDown rbBrowse
 
     self~empCount += 1
@@ -715,6 +931,11 @@
 
 
 
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  EmployeeList - A dialog class for a page in the PropertySheetDialog.  This
+                 page allows the user to look at multiple employee records in
+                 one view.
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 ::class 'EmployeeList' subclass RcPSPDialog
 
 ::attribute employees
@@ -722,24 +943,53 @@
 ::attribute empIndex
 
 ::method configure
-    use arg employees, count
+    use arg employees, count, index
 
-    self~employees = employess
-    self~empCount = count
+    self~employees = employees
+    self~empCount  = count
+    self~empIndex  = index
 
-    say 'In' self 'configure() propSheet?' self~propSheet
+::method newEmployeeNotify
+    expose lv
 
+    emp = self~employees[self~empIndex]
+    self~addEmployee(lv, emp)
+    lv~select(self~empIndex - 1)
+
+
 ::method initDialog
-    say 'In' self 'initDialog() need to fill listview'
+    expose lv
 
-::method fillList
-    use strict arg list
+    lv = self~newListView(IDC_LV_EMPLOYEES)
 
-    do id = 1 to self~empCount
-        if self~employees[id]['SEX'] = 1 then title = "Mr."; else title = "Ms."
-        addstring = title self~employees[id]['NAME']
-        addstring = addstring || "9"x || self~employees[id]['POSITION']
-        addstring = addstring || "9"x || self~employees[id]['CITY']
-        list~insert(id, addstring)
+    lv~addExtendedStyle('CHECKBOXES GRIDLINES FULLROWSELECT')
+
+    lv~insertColumn(0, "Name", 50)
+    lv~insertColumn(1, "City", 40)
+    lv~insertColumn(2, "Position", 40)
+    lv~insertColumn(3, "Gender", 30)
+    lv~insertColumn(4, "Marital Status", 30)
+    lv~insertColumn(5, "Employment Classification", 40)
+
+    do i = 1 to self~empCount
+      self~addEmployee(lv, self~employees[i])
     end
 
+    lv~select(self~empIndex - 1)
+
+::method addEmployee private
+    use strict arg list, employee
+
+    gender = 'Male'
+    if \ employee~male then gender = 'Female'
+
+    mStatus = 'Married'
+    if \ employee~married then mStatus = 'Unmarried'
+
+    eStatus = 'Full Time'
+    if \ employee~fullTime then eStatus = 'Part Time'
+
+    e = employee
+    list~addRow( , , e~name, e~city, e~position, gender, mStatus, eStatus)
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7749
          http://oorexx.svn.sourceforge.net/oorexx/?rev=7749&view=rev
Author:   miesfeld
Date:     2012-04-10 21:14:41 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
ooDialog - finish up the tutorial samples update

Modified Paths:
--------------
    main/trunk/samples/windows/oodialog/tutorial/employee11tab.h
    main/trunk/samples/windows/oodialog/tutorial/employee11tab.rc
    main/trunk/samples/windows/oodialog/tutorial/employee11tab.rex

Modified: main/trunk/samples/windows/oodialog/tutorial/employee11tab.h
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employee11tab.h	2012-04-10 21:14:06 UTC (rev 7748)
+++ main/trunk/samples/windows/oodialog/tutorial/employee11tab.h	2012-04-10 21:14:41 UTC (rev 7749)
@@ -42,13 +42,15 @@
 #define IDD_EMPLOYEES_BROWSE                    208
 #define IDD_EMPLOYEES_ADD                       209
 #define IDD_EMPLOYEES_EDIT                      210
+#define IDM_CONTEXT_MENUBAR                     212
 #define IDC_GB1                                 1000
 #define IDC_LV_EMPLOYEES                        1001
 #define IDC_PB_PRINT_A                          1001
 #define IDC_PB_PRINT_E                          1002
 #define IDC_UPD                                 1002
 #define IDC_PB_ADD_A                            1003
-#define IDC_PB_PRINT_E1                         1003
+#define IDC_PB_PRINT_B                          1003
+#define IDC_PB_RESET_E                          1003
 #define IDC_PB_SAVE_E                           1004
 #define IDC_EDIT_NAME_B                         1005
 #define IDC_CB_CITY_B                           1009
@@ -71,3 +73,10 @@
 #define IDC_RB_FEMALE_E                         1027
 #define IDC_CHK_MARRIED_E                       1028
 #define IDC_CHK_FULLTIME_E                      1029
+#define IDM_POP_CONTEXT                         40000
+#define IDM_EDIT                                40001
+#define IDM_ADD                                 40002
+#define IDM_BROWSE                              40003
+#define IDM_DELETE                              40004
+#define IDM_SEP1                                40005
+#define IDM_SEP2                                40006

Modified: main/trunk/samples/windows/oodialog/tutorial/employee11tab.rc
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employee11tab.rc	2012-04-10 21:14:06 UTC (rev 7748)
+++ main/trunk/samples/windows/oodialog/tutorial/employee11tab.rc	2012-04-10 21:14:41 UTC (rev 7749)
@@ -42,6 +42,21 @@
 
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDM_CONTEXT_MENUBAR MENUEX
+{
+    POPUP "Context", IDM_POP_CONTEXT, 0, 0
+    {
+        MENUITEM "&Browse Employees...", IDM_BROWSE, 0, 0
+        MENUITEM "", IDM_SEP1, MFT_SEPARATOR, 0
+        MENUITEM "&Add Employee...", IDM_ADD, 0, 0
+        MENUITEM "&Edit Employee...", IDM_EDIT, 0, 0
+        MENUITEM "", IDM_SEP2, MFT_SEPARATOR, 0
+        MENUITEM "&Delete Employee...", IDM_DELETE, 0, 0
+    }
+}
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_EMPLOYEES_ADD DIALOG 0, 0, 227, 160
 STYLE DS_3DLOOK | DS_CONTROL | DS_SHELLFONT | WS_CHILDWINDOW | WS_TABSTOP
 CAPTION "Add Employees"
@@ -53,11 +68,11 @@
     COMBOBOX        IDC_CB_CITY_A, 40, 37, 102, 56, WS_TABSTOP | CBS_DROPDOWNLIST
     LTEXT           "Position:", -1, 12, 58, 30, 8, SS_LEFT
     LISTBOX         IDC_LB_POSITION_A, 10, 68, 132, 82, WS_TABSTOP | WS_VSCROLL | LBS_SORT | LBS_NOTIFY
-    GROUPBOX        "Statistics", IDC_GB1, 153, 20, 64, 80, WS_GROUP
-    AUTORADIOBUTTON "&Male", IDC_RB_MALE_A, 161, 31, 40, 12, WS_TABSTOP
-    AUTORADIOBUTTON "&Female", IDC_RB_FEMALE_A, 161, 46, 40, 12
-    AUTOCHECKBOX    "Ma&rried", IDC_CHK_MARRIED_A, 161, 63, 40, 12, WS_GROUP
-    AUTOCHECKBOX    "Full Time", IDC_CHK_FULLTIME_A, 161, 82, 40, 12, WS_GROUP
+    GROUPBOX        "Statistics", IDC_GB1, 153, 16, 64, 80, WS_GROUP
+    AUTORADIOBUTTON "&Male", IDC_RB_MALE_A, 161, 27, 40, 12, WS_TABSTOP
+    AUTORADIOBUTTON "&Female", IDC_RB_FEMALE_A, 161, 42, 40, 12
+    AUTOCHECKBOX    "Ma&rried", IDC_CHK_MARRIED_A, 161, 59, 40, 12, WS_GROUP
+    AUTOCHECKBOX    "Full Time", IDC_CHK_FULLTIME_A, 161, 78, 40, 12, WS_GROUP
     PUSHBUTTON      "Add", IDC_PB_ADD_A, 167, 117, 50, 14
     PUSHBUTTON      "Print", IDC_PB_PRINT_A, 167, 136, 50, 14
 }
@@ -77,12 +92,12 @@
     COMBOBOX        IDC_CB_CITY_B, 40, 37, 102, 56, WS_TABSTOP | WS_DISABLED | CBS_DROPDOWNLIST
     LTEXT           "Position:", -1, 12, 58, 30, 8, SS_LEFT
     LISTBOX         IDC_LB_POSITION_B, 10, 68, 132, 82, WS_TABSTOP | WS_VSCROLL | WS_DISABLED | LBS_SORT | LBS_NOTIFY
-    GROUPBOX        "Statistics", IDC_GB1, 153, 20, 64, 80, WS_GROUP
-    AUTORADIOBUTTON "&Male", IDC_RB_MALE_B, 161, 31, 40, 12, WS_TABSTOP | WS_DISABLED
-    AUTORADIOBUTTON "&Female", IDC_RB_FEMALE_B, 161, 46, 40, 12, WS_DISABLED
-    AUTOCHECKBOX    "Ma&rried", IDC_CHK_MARRIED_B, 161, 63, 40, 12, WS_GROUP | WS_DISABLED
-    AUTOCHECKBOX    "Full Time", IDC_CHK_FULLTIME_B, 161, 82, 40, 12, WS_GROUP | WS_DISABLED
-    PUSHBUTTON      "Print", IDC_PB_PRINT_E1, 167, 136, 50, 14
+    GROUPBOX        "Statistics", IDC_GB1, 153, 16, 64, 80, WS_GROUP
+    AUTORADIOBUTTON "&Male", IDC_RB_MALE_B, 161, 27, 40, 12, WS_TABSTOP | WS_DISABLED
+    AUTORADIOBUTTON "&Female", IDC_RB_FEMALE_B, 161, 42, 40, 12, WS_DISABLED
+    AUTOCHECKBOX    "Ma&rried", IDC_CHK_MARRIED_B, 161, 59, 40, 12, WS_GROUP | WS_DISABLED
+    AUTOCHECKBOX    "Full Time", IDC_CHK_FULLTIME_B, 161, 78, 40, 12, WS_GROUP | WS_DISABLED
+    PUSHBUTTON      "Print", IDC_PB_PRINT_B, 167, 136, 50, 14
 }
 
 
@@ -99,11 +114,12 @@
     COMBOBOX        IDC_CB_CITY_E, 40, 37, 102, 56, WS_TABSTOP | CBS_DROPDOWNLIST
     LTEXT           "Position:", -1, 12, 58, 30, 8, SS_LEFT
     LISTBOX         IDC_LB_POSITION_E, 10, 68, 132, 82, WS_TABSTOP | WS_VSCROLL | LBS_SORT | LBS_NOTIFY
-    GROUPBOX        "Statistics", IDC_GB1, 153, 20, 64, 80, WS_GROUP
-    AUTORADIOBUTTON "&Male", IDC_RB_MALE_E, 161, 31, 40, 12, WS_TABSTOP
-    AUTORADIOBUTTON "&Female", IDC_RB_FEMALE_E, 161, 46, 40, 12
-    AUTOCHECKBOX    "Ma&rried", IDC_CHK_MARRIED_E, 161, 63, 40, 12, WS_GROUP
-    AUTOCHECKBOX    "Full Time", IDC_CHK_FULLTIME_E, 161, 82, 40, 12, WS_GROUP
+    GROUPBOX        "Statistics", IDC_GB1, 153, 16, 64, 80, WS_GROUP
+    AUTORADIOBUTTON "&Male", IDC_RB_MALE_E, 161, 27, 40, 12, WS_TABSTOP
+    AUTORADIOBUTTON "&Female", IDC_RB_FEMALE_E, 161, 42, 40, 12
+    AUTOCHECKBOX    "Ma&rried", IDC_CHK_MARRIED_E, 161, 59, 40, 12, WS_GROUP
+    AUTOCHECKBOX    "Full Time", IDC_CHK_FULLTIME_E, 161, 78, 40, 12, WS_GROUP
+    PUSHBUTTON      "Reset", IDC_PB_RESET_E, 167, 98, 50, 14
     PUSHBUTTON      "Save", IDC_PB_SAVE_E, 167, 117, 50, 14
     PUSHBUTTON      "Print", IDC_PB_PRINT_E, 167, 136, 50, 14
 }

Modified: main/trunk/samples/windows/oodialog/tutorial/employee11tab.rex
===================================================================
--- main/trunk/samples/windows/oodialog/tutorial/employee11tab.rex	2012-04-10 21:14:06 UTC (rev 7748)
+++ main/trunk/samples/windows/oodialog/tutorial/employee11tab.rex	2012-04-10 21:14:41 UTC (rev 7749)
@@ -78,7 +78,6 @@
 
     forward class (super) continue
 
-    -- need to get employees from database
     self~readDataBase
 
     dbChanged = .false
@@ -90,6 +89,7 @@
       page~configure(self~employees, self~empCount, self~empIndex)
     end
 
+
 ::method newEmployeeNotify
     expose dbChanged
     use strict arg emp
@@ -112,20 +112,52 @@
 
 ::method editedEmployeeNotify
     expose dbChanged
+    use strict arg emp
 
     dbChanged = .true
+    self~employees[self~empIndex] = emp
 
     listPage = self~pages[4]
     if listPage~wasActivated then listPage~editedEmployeeNotify
 
+    self~setCurSel( , 4)
 
+
 ::method selectedEmployeeNotify
     use strict arg index
 
-    self~empIndex = index + 1
+    self~empIndex = index
     self~notifyPages
 
 
+::method maybeDeleteEmployee
+    expose dbChanged
+
+    emp = self~employees[self~empIndex]
+
+    pronoun = 'him'
+    if \ emp~male then pronoun = 'her'
+
+    title = "Acme Software - Deleting Employee:" emp~name
+    msg   = "Deleting" emp~name "will permanently remove" pronoun "from"        || .endOfLine ||           -
+            'the database.  No further pay checks can be issued to' emp~name'.' || .endOfLine~copies(2) || -
+            "Are you sure you want to continue this action?"
+
+    answer = MessageDialog(msg, self~hwnd, title, 'YESNO', 'QUESTION', 'DEFBUTTON2')
+    if answer == self~IDYES then do
+        oldIndex = self~empIndex
+
+        self~employees~delete(self~empIndex)
+        self~empCount -= 1
+        self~empIndex = 1
+
+        listPage = self~pages[4]
+        if listPage~wasActivated then listPage~deleteEmployeeNotify(oldIndex)
+
+        self~notifyPages
+        dbChanged = .true
+    end
+
 ::method leaving
     expose dbChanged
 
@@ -195,7 +227,9 @@
         fsObj~lineout(line)
     end
     else do
-      say "ERROR ERROR" -- TODO put up message box
+      title = "Acme Software - Internal Error Detected"
+      msg   = "The database could not be opened to record current changes."
+      j = MessageDialog(msg, 0, title, 'OK', 'ERROR')
     end
 
     fsObj~close
@@ -203,184 +237,6 @@
 
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
-  Employee - A class that reflects a single, specific, employee.
-\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
-::class 'Employee'
-
-::attribute name
-::attribute city
-::attribute position
-::attribute male
-::attribute married
-::attribute fullTime
-
-::method init
-    expose name city position male married fullTime
-    use strict arg name = "", city = "New York", position = "Software Developer",     -
-                   male = .true, married = .false, fullTime = .true
-
-::method isValid
-    expose name
-    return name \== ''
-
-
-::method print
-    expose name city position male married fullTime
-    use strict arg dlg
-
-    eol = .endOfLine
-    tab = '09'x
-
-    if \ self~isValid then do
-        title = "Acme Software - Internal Error Detected"
-        msg = "Attempting to print invalid employee record." || eol~copies(2)  -
-              "Employee record has no assigned name."
-        icon = 'ERROR'
-    end
-    else do
-        title = "Acme Software - Employee:"
-
-        if male then msg = "Mr." name
-        else msg = "Ms." name
-
-        if married then msg ||= " (married) "
-
-        if fullTime then status = 'Full Time Employee'
-        else status = 'Part Time Employee'
-
-        msg ||= eol || "City:"       || tab~copies(2) || city     || eol || -
-                       "Profession:" || tab           || position || eol || -
-                       'Status:'     || tab~copies(2) || status
-
-        icon = 'INFORMATION'
-    end
-
-    j = MessageDialog(msg, dlg~hwnd, title, , icon)
-
-
-::method toCSV
-    expose name city position male married fullTime
-    use strict arg
-
-    if male then mf = "M"
-    else mf = "F"
-
-    if married then mu = "M"
-    else mu = 'U'
-
-    if fullTime then fp = 'F'
-    else fp = 'P'
-
-    txt = name', 'city', 'position', 'mf', 'mu', 'fp
-
-    return txt
-
-
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
-  EmployeeView - A class containing the dialog controls used to display an
-                 employee in a dialog.
-\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
-::class 'EmployeeView' public
-
-::attribute editName
-::attribute cbCity
-::attribute lbPosition
-::attribute rbMale
-::attribute rbFemale
-::attribute chkMarried
-::attribute chkFullTime
-
-::method init
-  expose editName cbCity lbPosition rbMale rbFemale chkMarried chkFullTime
-  use strict arg editName, cbCity, lbPosition, rbMale, rbFemale, chkMarried, chkFullTime
-
-/** displayEmployee()
- * Sets the state of the controls to reflect the specified employee
- */
-::method displayEmployee
-    use strict arg emp
-
-    self~editName~setText(emp~name)
-    self~cbCity~select(emp~City)
-    self~lbPosition~select(emp~Position)
-
-    if emp~male then do
-        self~rbMale~check
-        self~rbFemale~uncheck
-    end
-    else do
-        self~rbFemale~check
-        self~rbMale~uncheck
-    end
-
-    if emp~married then self~chkMarried~check
-    else self~chkMarried~uncheck
-
-    if emp~fullTime then self~chkFullTime~check
-    else self~chkFullTime~uncheck
-
-
-/** disable()
- * Disables all the controls and sets the edit control text to the empty string.
- */
-::method disable
-    use strict arg
-
-    self~editName~setText("")
-
-    self~editName~disable
-    self~cbCity~disable
-    self~lbPosition~disable
-
-    self~rbMale~disable
-    self~rbFemale~disable
-    self~chkMarried~disable
-    self~chkFullTime~disable
-
-
-/** match()
- * Tests if the state of the controls match the specified employee.
- */
-::method sameAs
-    use strict arg emp
-
-    if self~editName~getText      \== emp~name     then return .false
-    if self~cbCity~selected       \== emp~City     then return .false
-    if self~lbPosition~selected   \== emp~Position then return .false
-
-    if self~rbMale~checked        & \ emp~male     then return .false
-    if \ self~rbMale~checked      &   emp~male     then return .false
-
-    if self~chkMarried~checked    & \ emp~married  then return .false
-    if \ self~chkMarried~checked  &   emp~married  then return .false
-
-    if self~chkFullTime~checked   & \ emp~fullTime then return .false
-    if \ self~chkFullTime~checked &  emp~fullTime  then return .false
-
-    return .true
-
-/** createEmployee()
- * Instantiates a new Employee object using the current state of the controls,
- * and returns it if it is valid.  If it is not valid, returns .nil
- */
-::method createEmployee
-    use strict arg
-
-    name     = self~editName~getText~strip
-    city     = self~cbCity~selected
-    position = self~lbPosition~selected
-    male     = self~rbMale~checked
-    married  =  self~chkMarried~checked
-    fullTime = self~chkFullTime~checked
-
-    emp = .Employee~new(name, city, position, male, married, fullTime)
-
-    if emp~isValid then return emp
-    else return .nil
-
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
   EmployeeAdd - A dialog class for a page in the PropertySheetDialog.  This page
                 allows the user to add employee records.
 \* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
@@ -417,31 +273,10 @@
     expose cbCity lbPosition editName
 
     self~setControls
+    self~empView~fillBoxes
 
-    cbCity~add("Munich")
-    cbCity~add("New York")
-    cbCity~add("San Francisco")
-    cbCity~add("Stuttgart")
-    cbCity~add("San Diego")
-    cbCity~add("Tucson")
-    cbCity~add("Houston")
-    cbCity~add("Los Angeles")
-
-    lbPosition~add("Business Manager")
-    lbPosition~add("Engineering Manager")
-    lbPosition~add("Software Developer")
-    lbPosition~add("Software QA")
-    lbPosition~add("Accountant")
-    lbPosition~add("Security")
-    lbPosition~add("Secretary")
-    lbPosition~add("Recptionist")
-    lbPosition~add("Lab Manager")
-    lbPosition~add("Lawyer")
-    lbPosition~add("CEO")
-
     editName~connectCharEvent(onChar)
 
-    /* Bypass this during development
     -- If we are the start page, it means there are no employees.  So we put up
     -- a message box informing the user she needs to add employees through this
     -- page.
@@ -452,7 +287,6 @@
 
         ret = MessageDialog(msg, self~hwnd, title)
     end
-    */
 
 
 ::method setActive unguarded
@@ -488,7 +322,6 @@
 
 
 ::method onAdd unguarded
-    expose editName
 
     newEmployee = self~empView~createEmployee
     self~propSheet~newEmployeeNotify(newEmployee)
@@ -601,37 +434,17 @@
 
     self~connectButtonEvent(IDC_PB_PRINT_E, "CLICKED", onPrint)
     self~connectButtonEvent(IDC_PB_SAVE_E, "CLICKED", onSave)
+    self~connectButtonEvent(IDC_PB_RESET_E, "CLICKED", onReset)
 
 
 ::method initDialog
     expose cbCity lbPosition
 
     self~setControls
+    self~empView~fillBoxes
 
-    cbCity~add("Munich")
-    cbCity~add("New York")
-    cbCity~add("San Francisco")
-    cbCity~add("Stuttgart")
-    cbCity~add("San Diego")
-    cbCity~add("Tucson")
-    cbCity~add("Houston")
-    cbCity~add("Los Angeles")
 
-    lbPosition~add("Business Manager")
-    lbPosition~add("Engineering Manager")
-    lbPosition~add("Software Developer")
-    lbPosition~add("Software QA")
-    lbPosition~add("Accountant")
-    lbPosition~add("Security")
-    lbPosition~add("Secretary")
-    lbPosition~add("Recptionist")
-    lbPosition~add("Lab Manager")
-    lbPosition~add("Lawyer")
-    lbPosition~add("CEO")
-
-
 ::method setActive unguarded
-  say 'In' self 'setActive()'
 
   self~setEmpRecord
   return 0
@@ -645,34 +458,21 @@
     end
     return 0
 
-::method onSave
-    expose cbCity lbPosition rbMale chkMarried editName pbList upDown rbBrowse
+::method onSave unguarded
 
-    self~empCount += 1
-    self~employees[self~empCount] = .directory~new
-    self~employees[self~empCount]['NAME'] = editName~getText
-    self~employees[self~empCount]['CITY'] = cbCity~selected
-    self~employees[self~empCount]['POSITION'] = lbPosition~selected
+    editedEmployee = self~empView~createEmployee
+    self~propSheet~editedEmployeeNotify(editedEmployee)
 
-    if rbMale~checked then sex = 1
-    else sex = 2
+    return 0
 
-    self~employees[self~empCount]['SEX'] = sex
-    self~employees[self~empCount]['MARRIED'] = chkMarried~checked
 
-    upDown~setRange(1, self~empCount)
-    if self~empCount == 1 then do
-      rbBrowse~enable
-      upDown~setPosition(1)
-    end
+::method onReset unguarded
+    self~setEmpRecord
 
-    self~defaultForm
-    return 0
 
+::method onChange unguarded
+    expose isChanged pbPrint pbSave pbReset editName
 
-::method onChange
-    expose isChanged pbPrint pbSave editName
-
     if self~empInitial == .nil then return 0
 
     if isChanged then do
@@ -687,20 +487,24 @@
     if txt == '' then do
     		pbPrint~disable
         pbSave~disable
+        pbReset~enable
     end
     else if isChanged then do
         pbPrint~enable
         pbSave~enable
+        pbReset~enable
     end
     else do
         pbPrint~enable
+        pbSave~disable
+        pbReset~disable
     end
 
     return 0
 
 
 ::method setControls private
-    expose cbCity lbPosition rbMale rbFemale chkMarried chkFullTime editName pbPrint pbSave
+    expose cbCity lbPosition rbMale rbFemale chkMarried chkFullTime editName pbPrint pbSave pbReset
 
     cbCity      = self~newComboBox(IDC_CB_CITY_E)
     lbPosition  = self~newListBox(IDC_LB_POSITION_E)
@@ -712,17 +516,19 @@
 
     self~empView = .EmployeeView~new(editName, cbCity, lbPosition, rbMale, rbFemale, chkMarried, chkFullTime)
 
+    pbReset = self~newPushButton(IDC_PB_RESET_E)
+    pbSave  = self~newPushButton(IDC_PB_SAVE_E)
     pbPrint = self~newPushButton(IDC_PB_PRINT_E)
-    pbSave   = self~newPushButton(IDC_PB_SAVE_E)
 
 
 ::method setEmpRecord
-    expose pbSave pbPrint isChanged
+    expose pbSave pbPrint pbReset isChanged
 
     if self~empCount < 1 then do
         self~empView~disable
         pbSave~disable
         pbPrint~disable
+        pbReset~disable
         return 0
     end
 
@@ -746,6 +552,7 @@
 ::attribute employees
 ::attribute empCount
 ::attribute empIndex
+::attribute empView
 
 ::method configure
     use arg employees, count, empIndex
@@ -754,199 +561,95 @@
     self~empCount  = count
     self~empIndex  = empIndex
 
+    self~connectButtonEvent(IDC_PB_PRINT_B, "CLICKED", onPrint)
+    self~connectUpDownEvent(IDC_UPD, "DELTAPOS", onEmpChange)
 
+
 ::method initDialog
-    expose cbCity lbPosition
+    expose upDown
 
-    cbCity = self~newComboBox(IDC_CB_CITY_B)
-    cbCity~add("Munich")
-    cbCity~add("New York")
-    cbCity~add("San Francisco")
-    cbCity~add("Stuttgart")
-    cbCity~add("San Diego")
-    cbCity~add("Tucson")
-    cbCity~add("Houston")
-    cbCity~add("Los Angeles")
-
-    lbPosition = self~newListBox(IDC_LB_POSITION_B)
-    lbPosition~add("Business Manager")
-    lbPosition~add("Engineering Manager")
-    lbPosition~add("Software Developer")
-    lbPosition~add("Software QA")
-    lbPosition~add("Accountant")
-    lbPosition~add("Security")
-    lbPosition~add("Secretary")
-    lbPosition~add("Recptionist")
-    lbPosition~add("Lab Manager")
-    lbPosition~add("Lawyer")
-    lbPosition~add("CEO")
-
     self~setControls
+    self~empView~fillBoxes
 
 
-::method onPrint
-    expose cbCity lbPosition rbMale chkMarried editName
+::method setActive unguarded
 
-    title = "Acme Software - Employee:"
+    self~updateUpdown
+    return 0
 
-    if rbMale~checked then msg = "Mr."
-    else msg = "Ms."
-    msg ||= editName~getText
 
-    if chkMarried~checked then msg ||= " (married) "
-    msg ||= "A"x || "City:" cbCity~selected || "A"x || "Profession:" lbPosition~selected
+::method onPrint unguarded
 
-    j = MessageDialog(msg, self~hwnd, title, , INFORMATION)
-
-
-::method onSave
-    expose cbCity lbPosition rbMale chkMarried editName pbList upDown rbBrowse
-
-    self~empCount += 1
-    self~employees[self~empCount] = .directory~new
-    self~employees[self~empCount]['NAME'] = editName~getText
-    self~employees[self~empCount]['CITY'] = cbCity~selected
-    self~employees[self~empCount]['POSITION'] = lbPosition~selected
-
-    if rbMale~checked then sex = 1
-    else sex = 2
-
-    self~employees[self~empCount]['SEX'] = sex
-    self~employees[self~empCount]['MARRIED'] = chkMarried~checked
-
-    upDown~setRange(1, self~empCount)
-    if self~empCount == 1 then do
-      rbBrowse~enable
-      upDown~setPosition(1)
+    if self~empCount > 0 then do
+        currentEmployee = self~empView~createEmployee
+        currentEmployee~print(self)
     end
+    return 0
 
-    self~defaultForm
 
-::method onNameChange
-    expose menuBar editName rbAdd pbAdd pbPrint
-
-    if rbAdd~checked then do
-        if editName~getText~strip~length == 0 then do
-            pbAdd~disable
-            pbPrint~disable
-            menuBar~disable(IDM_ADD)
-            menuBar~disable(IDM_PRINT)
-        end
-        else do
-            pbAdd~enable
-            pbPrint~enable
-            menuBar~enable(IDM_ADD)
-            menuBar~enable(IDM_PRINT)
-        end
-    end
-
-::method onEmpChange
+::method onEmpChange unguarded
     use arg curPos, increment
 
     self~setEmpRecord(curPos + increment)
     return .UpDown~deltaPosReply
 
-::method onAdding
-    self~defaultForm
 
-::method onBrowsing
-    expose upDown pbAdd menuBar
+::method setEmpRecord private
+    expose upDown
+    use strict arg empIndex
 
-    pbAdd~disable
-    menuBar~disable(IDM_ADD)
-    upDown~enable
-    self~setEmpRecord(upDown~getPosition)
+    if empIndex < 1 then return self~noRecord('bottom')
+    else if empIndex > upDown~getRange~max then return self~noRecord('top')
 
-::method setEmpRecord
-    expose upDown editName cbCity lbPosition rbMale rbFemale chkMarried
-    use strict arg emp
+    emp = self~employees[empIndex]
+    self~empView~displayEmployee(emp)
 
-    if emp < 1 then return self~noRecord('bottom')
-    else if emp > upDown~getRange~max then return self~noRecord('top')
+    self~propSheet~selectedEmployeeNotify(empIndex)
 
-    editName~setText(self~employees[emp]['NAME'])
 
-    cbCity~select(self~employees[emp]['CITY'])
-    lbPosition~select(self~employees[emp]['POSITION'])
+::method setControls private
+    expose cbCity lbPosition rbMale rbFemale chkMarried chkFullTime editName upDown pbPrint
 
-    if self~employees[emp]['SEX'] = 1 then do
-        rbMale~check
-        rbFemale~uncheck
-    end
-    else do
-        rbFemale~check
-        rbMale~uncheck
-    end
+    cbCity      = self~newComboBox(IDC_CB_CITY_B)
+    lbPosition  = self~newListBox(IDC_LB_POSITION_B)
+    rbMale      = self~newRadioButton(IDC_RB_MALE_B)
+    rbFemale    = self~newRadioButton(IDC_RB_FEMALE_B)
+    chkMarried  = self~newCheckBox(IDC_CHK_MARRIED_B)
+    chkFullTime = self~newCheckBox(IDC_CHK_FULLTIME_B)
+    editName    = self~newEdit(IDC_EDIT_NAME_B)
 
-    if self~employees[emp]['MARRIED'] then chkMarried~check
-    else chkMarried~uncheck
+    self~empView = .EmployeeView~new(editName, cbCity, lbPosition, rbMale, rbFemale, chkMarried, chkFullTime)
 
+    upDown  = self~newUpDown(IDC_UPD)
+    pbPrint = self~newPushButton(IDC_PB_PRINT_B)
 
-::method onList
-   lDlg = .EmployeeListClass~new("employe7.rc", IDD_EMPLOYEE_LIST)
-   lDlg~parent = self
-   lDlg~execute("SHOWTOP")
 
+::method noRecord private
+    use strict arg direction
+    return MessageDialog('At the' direction 'of the records', self~hwnd, -
+                         'Employee Records')
 
-::method fillList
-    use strict arg list
-    do id = 1 to self~empCount
-        if self~employees[id]['SEX'] = 1 then title = "Mr."; else title = "Ms."
-        addstring = title self~employees[id]['NAME']
-        addstring = addstring || "9"x || self~employees[id]['POSITION']
-        addstring = addstring || "9"x || self~employees[id]['CITY']
-        list~insert(id, addstring)
-    end
 
-::method setControls private
-    expose cbCity lbPosition rbMale rbFemale chkMarried chkFullTime editName
+::method updateUpdown private
+    expose pbPrint upDown
 
-    cbCity     = self~newComboBox(IDC_CB_CITY_B)
-    lbPosition = self~newListBox(IDC_LB_POSITION_B)
-    rbMale     = self~newRadioButton(IDC_RB_MALE_B)
-    rbFemale   = self~newRadioButton(IDC_RB_FEMALE_B)
-    chkMarried = self~newCheckBox(IDC_CHK_MARRIED_B)
-    editName   = self~newEdit(IDC_EDIT_NAME_B)
-
-::method defaultForm private
-    expose menuBar cbCity lbPosition rbMale rbFemale rbAdd rbBrowse chkMarried -
-           editName pbAdd pbList pbPrint upDown
-
-    editName~setText("")
-    cbCity~select("New York")
-    lbPosition~select("Software Developer")
-
-    rbMale~check
-    rbFemale~uncheck
-    chkMarried~uncheck
-
-    rbAdd~check
-    pbAdd~disable
-    pbPrint~disable
-    menuBar~disable(IDM_ADD)
-    menuBar~disable(IDM_PRINT)
-    upDown~disable
-
-    editName~assignFocus
-
     if self~empCount < 1 then do
-        pbList~disable
-        rbBrowse~disable
         upDown~setRange(0, 0)
         upDown~setPosition(0)
+        upDown~disable
+        pbPrint~disable
+        self~empView~blank
     end
     else do
-        pbList~enable
-        menuBar~enable(IDM_LIST)
+        upDown~enable
+        upDown~setRange(1, self~empCount)
+        upDown~setPosition(self~empIndex)
+        pbPrint~enable
+        self~empView~displayEmployee(self~employees[self~empIndex])
     end
 
-::method noRecord private
-    use strict arg direction
-    return MessageDialog('At the' direction 'of the records', self~hwnd, -
-                         'Employee Records')
 
 
-
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
   EmployeeList - A dialog class for a page in the PropertySheetDialog.  This
                  page allows the user to look at multiple employee records in
@@ -959,6 +662,7 @@
 ::attribute empIndex
 
 ::method configure
+    expose contextMenu
     use arg employees, count, index
 
     self~employees = employees
@@ -967,18 +671,46 @@
 
     self~connectListViewEvent(IDC_LV_EMPLOYEES, "SELECTCHANGED", onSelectionChanged)
 
+    mb = .ScriptMenuBar~new('employee11tab.rc', IDM_CONTEXT_MENUBAR)
+    contextMenu = mb~getPopup(IDM_POP_CONTEXT)
+
 ::method newEmployeeNotify
     expose lv
 
     emp = self~employees[self~empIndex]
-    self~addEmployee(lv, emp)
+    self~addEmployeeRow(lv, emp)
 
     self~ensureSelection
 
 
-::method initDialog
+::method editedEmployeeNotify
     expose lv
 
+    emp   = self~employees[self~empIndex]
+    index = self~empIndex - 1
+
+    gender = 'Male'
+    if \ emp~male then gender = 'Female'
+
+    mStatus = 'Married'
+    if \ emp~married then mStatus = 'Unmarried'
+
+    eStatus = 'Full Time'
+    if \ emp~fullTime then eStatus = 'Part Time'
+
+    lv~setItemText(index, 0, emp~name)
+    lv~setItemText(index, 1, emp~city)
+    lv~setItemText(index, 2, emp~position)
+    lv~setItemText(index, 3, gender)
+    lv~setItemText(index, 4, mStatus)
+    lv~setItemText(index, 5, eStatus)
+
+    self~ensureSelection
+
+
+::method initDialog
+    expose lv contextMenu
+
     lv = self~newListView(IDC_LV_EMPLOYEES)
 
     lv~addExtendedStyle('CHECKBOXES GRIDLINES FULLROWSELECT')
@@ -991,18 +723,20 @@
     lv~insertColumn(5, "Employment Classification", 40)
 
     do i = 1 to self~empCount
-      self~addEmployee(lv, self~employees[i])
+      self~addEmployeeRow(lv, self~employees[i])
     end
 
     self~ensureSelection
 
+    contextMenu~assignTo(self, .true)
+    contextMenu~connectContextMenu(onContext, lv~hwnd)
 
+
 ::method onSelectionChanged unguarded
     use arg id, itemIndex, state
 
     if state == 'SELECTED' then do
-      say 'selected changed index:' itemIndex
-      self~propSheet~selectedEmployeeNotify(itemIndex)
+      self~propSheet~selectedEmployeeNotify(itemIndex + 1)
     end
 
 
@@ -1013,13 +747,71 @@
     return 0
 
 
+::method onContext
+  expose contextMenu lv
+  use arg hwnd, x, y
+
+  if x == -1, y == -1 then do
+      -- The keyboard was used, not the mouse.  Position the context menu
+      -- towards the bottom right corner of the list view.
+      rect = lv~windowRect
+      x = rect~right - .SM~cxVScroll - 15
+      y = rect~bottom - 15
+
+      pos = .Point~new(x, y)
+  end
+  else do
+      pos = .Point~new(x, y)
+
+      p = pos~copy
+      lv~screen2client(p)
+      index = lv~hitTestInfo(p)
+
+      if index == -1 then do
+        contextMenu~disable(.array~of(IDM_EDIT, IDM_DELETE))
+        self~ensureSelection
+      end
+  end
+
+  ret = contextMenu~show(pos)
+
+  return 0
+
+::method browseEmployees unguarded
+    self~propSheet~setCurSel( , 3)
+    return 0
+
+::method addEmployee unguarded
+    self~propSheet~setCurSel( , 1)
+    return 0
+
+::method editEmployee unguarded
+    self~propSheet~setCurSel( , 2)
+    return 0
+
+::method deleteEmployee unguarded
+    self~propSheet~maybeDeleteEmployee
+    return 0
+
+::method deleteEmployeeNotify unguarded
+    expose lv
+    use strict arg index
+
+    lv~delete(index - 1)
+    self~ensureSelection
+
+    return 0
+
 ::method ensureSelection private
     expose lv
 
     lv~select(self~empIndex - 1)
+    lv~focus(self~empIndex - 1)
 
+    return 0
 
-::method addEmployee private
+
+::method addEmployeeRow private
     use strict arg list, employee
 
     gender = 'Male'
@@ -1035,3 +827,228 @@
     list~addRow( , , e~name, e~city, e~position, gender, mStatus, eStatus)
 
 
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  Employee - A class that reflects a single, specific, employee.
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
+::class 'Employee'
+
+::attribute name
+::attribute city
+::attribute position
+::attribute male
+::attribute married
+::attribute fullTime
+
+::method init
+    expose name city position male married fullTime
+    use strict arg name = "", city = "New York", position = "Software Developer",     -
+                   male = .true, married = .false, fullTime = .true
+
+::method isValid
+    expose name
+    return name \== ''
+
+
+::method print
+    expose name city position male married fullTime
+    use strict arg dlg
+
+    eol = .endOfLine
+    tab = '09'x
+
+    if \ self~isValid then do
+        title = "Acme Software - Internal Error Detected"
+        msg = "Attempting to print invalid employee record." || eol~copies(2)  -
+              "Employee record has no assigned name."
+        icon = 'ERROR'
+    end
+    else do
+        title = "Acme Software - Employee:"
+
+        if male then msg = "Mr." name
+        else msg = "Ms." name
+
+        if married then msg ||= " (married) "
+
+        msg ||= eol
+
+        if fullTime then status = 'Full Time Employee'
+        else status = 'Part Time Employee'
+
+        msg ||= eol || "City:"       || tab~copies(2) || city     || eol || -
+                       "Profession:" || tab           || position || eol || -
+                       'Status:'     || tab~copies(2) || status
+
+        icon = 'INFORMATION'
+    end
+
+    j = MessageDialog(msg, dlg~hwnd, title, , icon)
+
+
+::method toCSV
+    expose name city position male married fullTime
+    use strict arg
+
+    if male then mf = "M"
+    else mf = "F"
+
+    if married then mu = "M"
+    else mu = 'U'
+
+    if fullTime then fp = 'F'
+    else fp = 'P'
+
+    txt = name', 'city', 'position', 'mf', 'mu', 'fp
+
+    return txt
+
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*\
+  EmployeeView - A class containing the dialog controls used to display an
+                 employee in a dialog.
+\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
+::class 'EmployeeView' public
+
+::attribute editName
+::attribute cbCity
+::attribute lbPosition
+::attribute rbMale
+::attribute rbFemale
+::attribute chkMarried
+::attribute chkFullTime
+
+::method init
+  expose editName cbCity lbPosition rbMale rbFemale chkMarried chkFullTime
+  use strict arg editName, cbCity, lbPosition, rbMale, rbFemale, chkMarried, chkFullTime
+
+/** fillBoxes()
+ * Fills the city combo box and the position list box with the correct items.
+ */
+::method fillBoxes
+    expose cbCity lbPosition
+    use strict arg
+
+    cbCity~add("Munich")
+    cbCity~add("New York")
+    cbCity~add("San Francisco")
+    cbCity~add("Stuttgart")
+    cbCity~add("San Diego")
+    cbCity~add("Tucson")
+    cbCity~add("Houston")
+    cbCity~add("Los Angeles")
+
+    lbPosition~add("Business Manager")
+    lbPosition~add("Engineering Manager")
+    lbPosition~add("Software Developer")
+    lbPosition~add("Software QA")
+    lbPosition~add("Accountant")
+    lbPosition~add("Security")
+    lbPosition~add("Secretary")
+    lbPosition~add("Recptionist")
+    lbPosition~add("Lab Manager")
+    lbPosition~add("Lawyer")
+    lbPosition~add("CEO")
+
+
+/** displayEmployee()
+ * Sets the state of the controls to reflect the specified employee
+ */
+::method displayEmployee
+    use strict arg emp
+
+    self~editName~setText(emp~name)
+    self~cbCity~select(emp~City)
+    self~lbPosition~select(emp~Position)
+
+    if emp~male then do
+        self~rbMale~check
+        self~rbFemale~uncheck
+    end
+    else do
+        self~rbFemale~check
+        self~rbMale~uncheck
+    end
+
+    if emp~married then self~chkMarried~check
+    else self~chkMarried~uncheck
+
+    if emp~fullTime then self~chkFullTime~check
+    else self~chkFullTime~uncheck
+
+
+/** disable()
+ * Disables all the controls and sets the edit control text to the empty string.
+ */
+::method disable
+    use strict arg
+
+    self~editName~setText("")
+
+    self~editName~disable
+    self~cbCity~disable
+    self~lbPosition~disable
+
+    self~rbMale~disable
+    self~rbFemale~disable
+    self~chkMarried~disable
+    self~chkFullTime~disable
+
+
+/** blank()
+ * Sets all the controls to a 'blank' state.
+ */
+::method blank
+    use strict arg
+
+    self~editName~setText("")
+    --self~cbCity~
+    self~lbPosition~deselectIndex
+
+    self~rbMale~uncheck
+    self~rbFemale~uncheck
+    self~chkMarried~uncheck
+    self~chkFullTime~uncheck
+
+
+/** match()
+ * Tests if the state of the controls match the specified employee.
+ */
+::method sameAs
+    use strict arg emp
+
+    if self~editName~getText      \== emp~name     then return .false
+    if self~cbCity~selected       \== emp~City     then return .false
+    if self~lbPosition~selected   \== emp~Position then return .false
+
+    if self~rbMale~checked        & \ emp~male     then return .false
+    if \ self~rbMale~checked      &   emp~male     then return .false
+
+    if self~chkMarried~checked    & \ emp~married  then return .false
+    if \ self~chkMarried~checked  &   emp~married  then return .false
+
+    if self~chkFullTime~checked   & \ emp~fullTime then return .false
+    if \ self~chkFullTime~checked &  emp~fullTime  then return .false
+
+    return .true
+
+/** createEmployee()
+ * Instantiates a new Employee object using the current state of the controls,
+ * and returns it if it is valid.  If it is not valid, returns .nil
+ */
+::method createEmployee
+    use strict arg
+
+    name     = self~editName~getText~strip
+    city     = self~cbCity~selected
+    position = self~lbPosition~selected
+    male     = self~rbMale~checked
+    married  =  self~chkMarried~checked
+    fullTime = self~chkFullTime~checked
+
+    emp = .Employee~new(name, city, position, male, married, fullTime)
+
+    if emp~isValid then return emp
+    else return .nil
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.