1.3 updates

CB32.rc

@@ -164,6 +164,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 162
     END
+
+    IDD_PMERGE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 195
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 182
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -179,7 +187,7 @@ BEGIN
     "F",            ID_EDIT_FIND,           VIRTKEY, CONTROL, NOINVERT
     "N",            ID_FILE_NEW,            VIRTKEY, CONTROL, NOINVERT
     "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
-    "P",            ID_FILE_PRINT,          VIRTKEY, CONTROL, NOINVERT
+    "P",            ID_FILE_PRINT_MERGE,    VIRTKEY, CONTROL, NOINVERT
     "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT
     "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
     VK_BACK,        ID_EDIT_UNDO,           VIRTKEY, ALT, NOINVERT
@@ -764,6 +772,38 @@ BEGIN
     PUSHBUTTON      "Reset",IDC_RESETCOL,168,98,50,14
 END
 
+IDD_PMERGE DIALOG DISCARDABLE  0, 0, 202, 189
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Print Merge"
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDC_PMTEMPLATE,13,21,104,88,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "New",IDC_PMNEW,13,43,50,14
+    PUSHBUTTON      "Delete",IDC_PMDELETE,67,43,50,14
+    PUSHBUTTON      "Header",IDC_PMHEAD,132,20,50,14
+    PUSHBUTTON      "Body",IDC_PMBODY,132,36,50,14
+    PUSHBUTTON      "Footer",IDC_PMFOOT,132,52,50,14
+    EDITTEXT        IDC_PM_FILE,13,79,160,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PMBROW_FILE,178,79,11,12
+    EDITTEXT        IDC_PM_EDIT,13,106,160,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PMBROW_EDIT,178,106,11,12
+    EDITTEXT        IDC_PM_VIEW,13,133,160,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PMBROW_VIEW,178,133,11,12
+    CONTROL         "Launch File/Viewer Automatically",IDC_PMLAUNCH,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,40,149,121,10
+    DEFPUSHBUTTON   "OK",IDOK,90,168,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,145,168,50,14
+    GROUPBOX        "Template ",IDC_STATIC,7,3,188,160
+    GROUPBOX        "Edit ",IDC_STATIC,125,10,63,62
+    LTEXT           "Output File:  (include extension)",IDC_STATIC,13,68,100,
+                    8
+    LTEXT           "Editor:  (must accept filename on commandline)",
+                    IDC_STATIC,13,95,149,8
+    LTEXT           "Viewer:  (leave blank for default system viewer)",
+                    IDC_STATIC,13,121,148,8
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -834,6 +874,8 @@ BEGIN
             MENUITEM "&Tab Delimited",              ID_EXPORT_TAB
         END
         MENUITEM SEPARATOR
+        MENUITEM "Print Merge\tCtrl+P",         ID_FILE_PRINT_MERGE
+        MENUITEM SEPARATOR
         MENUITEM "Recent File",                 ID_FILE_MRU_FILE1, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "E&xit",                       ID_APP_EXIT
@@ -1113,6 +1155,7 @@ BEGIN
     ID_ENTRY_EDIT           "Edit the Current Address\nEdit"
     ID_ENTRY_DELETE         "Delete the Current Address\nDelete"
     ID_ENTRY_COPY           "Copy the Current Address\nCopy"
+    ID_FILE_PRINT_MERGE     "Generate a Print Merge file\nPrint Merge"
 END
 
 STRINGTABLE DISCARDABLE 
@@ -1198,6 +1241,10 @@ BEGIN
     IDS_COLSAVE             "Column widths have been saved."
     IDS_POSSAVE             "Column positions have been saved."
     IDS_PREFS               "Preferences"
+    IDS_PRN_PAGE_FORMAT     "Page: %2d"
+    IDS_MISSTMPL            "One of the template files appears to be missing. Please check the TMPL directory to ensure the 4 required files (.TPL, .HED, .BOD, .FOT) are present."
+    IDS_OFN_OUT             "Type New Filename or Choose Existing File"
+    IDS_OFN_EXE             "Select Executable File"
 END
 
 #endif    // English (U.S.) resources