Changeset 22 for branches/1.0


Ignore:
Timestamp:
Apr 19, 2010, 2:37:55 PM (15 years ago)
Author:
diver
Message:

reworked some stuff

Location:
branches/1.0/src
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.0/src/de/uni.ipf

    r21 r22  
    1 #include "uni.h"
     1#include "version.h"
    22
    33:userdoc.
     
    77.nameit symbol=unipdr text='Universal Port Driver fr &os.'
    88.nameit symbol=usage text='Usage'
    9 .nameit symbol=build text='&unipdr. version _VERSION_ build _BUILD_'
     9.nameit symbol=build text='&unipdr. version <$UNIPDR_VERSION> build <$UNIPDR_BUILD>'
    1010
    1111:title.&unipdr.
  • branches/1.0/src/en/uni.dlg

    r13 r22  
    66DLGTEMPLATE IDD_UNI LOADONCALL MOVEABLE DISCARDABLE
    77BEGIN
    8     DIALOG  "Port Properties - ", IDD_UNI, 19, 37, 233, 156, FS_NOBYTEALIGN |
     8    DIALOG  "Port Properties - ", IDD_UNI, 19, 49, 231, 144, FS_NOBYTEALIGN |
    99            WS_VISIBLE | WS_SYNCPAINT, FCF_SYSMENU | FCF_TITLEBAR |
    1010            FCF_NOBYTEALIGN
     
    1515        PUSHBUTTON      "Cancel ", DID_CANCEL, 149, 5, 76, 14
    1616                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
    17         GROUPBOX        "Universal port driver properties", GB_UNICFG, 5, 96,
    18                         220, 54,
     17        GROUPBOX        "Universal port driver properties", GB_UNICFG, 5, 24,
     18                        220, 114,
    1919                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
    2020                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
    21         GROUPBOX        "Login as", 1024, 5, 53, 220, 40, NOT WS_VISIBLE
    22                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
    23                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
    24         LTEXT           "Program:", DT_PROGRAM, 13, 130, 53, 8, DT_VCENTER
    25         ENTRYFIELD      "", ID_PROGRAM, 71, 131, 142, 8, ES_MARGIN
    26         LTEXT           "Parameters:", DT_PARAMETERS, 13, 116, 53, 8,
     21        LTEXT           "Program:", DT_PROGRAM, 13, 118, 53, 8, DT_VCENTER
     22        ENTRYFIELD      "", ID_PROGRAM, 15, 106, 200, 8, ES_MARGIN
     23        LTEXT           "Parameters:", DT_PARAMETERS, 13, 71, 204, 8,
    2724                        DT_VCENTER
    28         LTEXT           "Printer:", DT_UNIQUEUE, 13, 102, 53, 8, DT_VCENTER |
    29                         NOT WS_VISIBLE
    30         ENTRYFIELD      "", ID_UNIQUEUE, 71, 103, 142, 8, ES_MARGIN | NOT
    31                         WS_VISIBLE
    32         AUTOCHECKBOX    "Send as binary file", ID_BINARY, 115, 148, 75, 8,
    33                         NOT WS_VISIBLE | WS_DISABLED
    34         GROUPBOX        "Number of copies", GB_COPIES, 5, 24, 220, 26, NOT
    35                         WS_VISIBLE
    36                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
    37                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
    38         LTEXT           "Spool this job", DT_COPIES, 13, 30, 54, 8,
    39                         DT_VCENTER | NOT WS_VISIBLE
    40         LTEXT           "times to the server", DT_COPIES2, 104, 30, 83, 8,
    41                         DT_VCENTER | NOT WS_VISIBLE
    42         ENTRYFIELD      "", ID_COPIES, 71, 31, 23, 8, ES_MARGIN | NOT
    43                         WS_VISIBLE
     25        ENTRYFIELD      "", ID_PARAMETERS, 15, 59, 200, 8, ES_MARGIN
     26        LTEXT           "Working directory:", DT_DIRECTORY, 13, 45, 203, 8
     27        ENTRYFIELD      "", ID_DIRECTORY, 15, 33, 200, 8, ES_MARGIN
     28        PUSHBUTTON      "Find", PB_FIND, 13, 86, 62, 14, WS_DISABLED
     29
    4430    END
    4531END
  • branches/1.0/src/en/uni.ipf

    r21 r22  
    77.nameit symbol=unipdr text='Universal Port Driver for &os.'
    88.nameit symbol=usage text='Usage'
    9 .nameit symbol=build text='&unipdr. version _VERSION_ build _BUILD_'
     9.nameit symbol=build text='&unipdr. version <$UNIPDR_VERSION> build <$UNIPDR_BUILD>'
    1010
    1111:title.&unipdr.
  • branches/1.0/src/makefile.kmk

    r21 r22  
    5555
    5656#build other files en (e.g. help)
    57 OTHERS = /en/uni.ipf $(PATH_BIN)/en/uni.hlp $(PATH_BIN)/en/readme.txt
     57OTHERS = $(PATH_BIN)/en/uni.hlp $(PATH_BIN)/en/readme.txt
    5858OTHER_CLEAN = $(PATH_BIN)/en/uni.hlp $(PATH_BIN)/en/readme.txt
    5959
    6060#build other files de (e.g. help)
    61 OTHERS += /de/uni.ipf $(PATH_BIN)/de/uni.hlp $(PATH_BIN)/de/readme.txt
     61OTHERS += $(PATH_BIN)/de/uni.hlp $(PATH_BIN)/de/readme.txt
    6262OTHER_CLEAN += $(PATH_BIN)/de/uni.hlp $(PATH_BIN)/de/readme.txt
    6363
     
    9393        @BldLevelInf0.cmd $(VERSION) $(BUILD)
    9494
    95 # substitute macros in ipf file en
    96 /en/uni.ipf: Config.kmk ./en/uni.ipf
    97         $(QUIET)$(SED) "s;_VERSION_;$(VERSION);g" ./en/uni.ipf \
    98                 | $(SED) "s;_BUILD_;$(BUILD);g" \
    99                 > uni_en.ipf
    100 
    101 # substitute macros in ipf file de
    102 /de/uni.ipf: Config.kmk ./de/uni.ipf
    103         $(QUIET)$(SED) "s;_VERSION_;$(VERSION);g" ./de/uni.ipf \
    104                 | $(SED) "s;_BUILD_;$(BUILD);g" \
    105                 > uni_de.ipf
    10695
    10796# compile english help file
    108 $(PATH_BIN)/en/uni.hlp: en/uni.ipf ./uni.h config.kmk
    109         -gcc -E -I./h -I./en -x c uni_en.ipf > uni_en.i
     97$(PATH_BIN)/en/uni.hlp: ./en/uni.ipf version.h Config.kmk
     98        -@mkdir $(PATH_OBJ)
     99        -@mkdir $(PATH_OBJ)\en
     100        @ppwizard.cmd ./en/uni.ipf /Pack:N /output:$(PATH_OBJ)/en/uni.ipf /other /WarningsRc:0
    110101        -@mkdir $(PATH_BIN)
    111         -@mkdir $(PATH_BIN)/en
    112         $(TOOLKIT)\bin\ipfc.exe uni_en.i $(PATH_BIN)/en/uni.hlp /COUNTRY=001 /CODEPAGE=850
    113         rm uni_en.i
    114         rm uni_en.ipf
     102        -@mkdir $(PATH_BIN)\en
     103        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/uni.ipf $(PATH_BIN)/en/uni.hlp /COUNTRY=001 /CODEPAGE=850
    115104
    116105# compile german help file
    117 $(PATH_BIN)/de/uni.hlp: de/uni.ipf ./uni.h config.kmk
    118         -gcc -E -I./h -I./de -x c uni_de.ipf > uni_de.i
     106$(PATH_BIN)/de/uni.hlp: ./de/uni.ipf version.h Config.kmk
     107        -@mkdir $(PATH_OBJ)
     108        -@mkdir $(PATH_OBJ)\de
     109        @ppwizard.cmd ./de/uni.ipf /Pack:N /output:$(PATH_OBJ)/de/uni.ipf /other /WarningsRc:0
    119110        -@mkdir $(PATH_BIN)
    120         -@mkdir $(PATH_BIN)/de
    121         $(TOOLKIT)\bin\ipfc.exe uni_de.i $(PATH_BIN)/de/uni.hlp /COUNTRY=001 /CODEPAGE=850
    122         rm uni_de.i
    123         rm uni_de.ipf
     111        -@mkdir $(PATH_BIN)\de
     112        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/de/uni.ipf $(PATH_BIN)/de/uni.hlp /COUNTRY=001 /CODEPAGE=850
     113
    124114
    125115# substitute macros in docs en
     
    135125                > $(PATH_BIN)/de/readme.txt
    136126
     127# substitute macros in version.h
     128version.h: Config.kmk version.h_
     129        $(SED) "s;_VERSION_;$(VERSION);g" version.h_ \
     130                | $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" \
     131                | $(SED) "s;_BUILD_;$(BUILD);g" \
     132                > version.h
    137133
    138134# final: zip all files!
Note: See TracChangeset for help on using the changeset viewer.