Changeset 97 for trunk/gui


Ignore:
Timestamp:
Feb 19, 2023, 2:33:51 AM (3 years ago)
Author:
Alex Taylor
Message:

Various updates and refactoring of font scaling logic; documentation and WIS updates.

Location:
trunk/gui
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/gui/printer/cupswiz/cupswiz.VRP

    r96 r97  
    77VRXWindow: __VREMainWindow,1,650,2746,5770,9106
    88VRXWindow: __VRESectionListWindow,1,795,11900,4529,3891
    9 VRXWindow: __VREToolsWindow,1,1722,9973,5477,1659
     9VRXWindow: __VREToolsWindow,1,1722,9973,5471,1663
    1010VRXWindow: __VREWindListWindow,1,5264,11900,2650,3891
    1111UserFile: 1

  • trunk/gui/printer/cupswiz/cupswiz.VRX

    r96 r97  
    20702070    CALL NLSSetText 'SW_ABOUT',  'Caption', 10                                          /* 10: Product Information */
    20712071    CALL NLSSetText 'DT_ABOUT1', 'Caption', 11                                          /* 11: eCups Printer Install Utility */
    2072     CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.20'                                  /* 12: Version %1 */
    2073     CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2020'                             /* 13: (C) %1 Alex Taylor */
     2072    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.21'                                  /* 12: Version %1 */
     2073    CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2023'                             /* 13: (C) %1 Alex Taylor */
    20742074    CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */
    20752075

  • trunk/gui/printer/cupswiz/cupswiz.txt

    r92 r97  
    11CUPSWIZ - CUPS printer-creation wizard
    2 Version 1.20
     2Version 1.21
    33
    44  This program is simple graphical front-end for creating CUPS-based printers

  • trunk/gui/printer/manager/PRINTOOL.VRP

    r94 r97  
    88VRXWindow: __VREMainWindow,1,1012,4288,6697,8046
    99VRXWindow: __VRESectionListWindow,1,1132,16044,4204,4059
    10 VRXWindow: __VREToolsWindow,1,1144,14309,5475,1665
     10VRXWindow: __VREToolsWindow,1,1144,14309,5466,1667
    1111VRXWindow: __VREWindListWindow,1,5360,16044,3505,4059
    1212UserFile: 1

  • trunk/gui/printer/manager/PRINTOOL.VRX

    r94 r97  
    524524RETURN _count
    525525
    526 /*:VRX         GetScalingFactor
    527 */
    528 /* Return the UI scaling factor based on the difference between the specified
    529  * font size and the design-default font size.
    530  */
    531 GetScalingFactor: PROCEDURE EXPOSE globals.
    532     PARSE ARG newSize, orgSize
    533 
    534     IF orgSize == '' THEN
    535         orgSize = globals.!defaultSize
    536 
    537     IF newSize < globals.!defaultSize THEN
    538         newSize = globals.!defaultSize
    539 
    540     scaleFactor = newSize / orgSize
    541 
    542 RETURN scaleFactor
    543 
    544526/*:VRX         GetShippedDrivers
    545527*/
    … …  
    13591341
    13601342RETURN ok
    1361 
    1362 /*:VRX         ParseFontSize
    1363 */
    1364 ParseFontSize: PROCEDURE EXPOSE globals.
    1365     PARSE ARG font
    1366     IF font == '' | font == '<default>' THEN
    1367         RETURN globals.!defaultSize
    1368 
    1369     PARSE VAR font _pts'.'.
    1370     IF _pts < globals.!defaultSize THEN
    1371         _pts = globals.!defaultSize
    1372 
    1373 RETURN _pts
    13741343
    13751344/*:VRX         PB_ABOUT_OK_Click
    … …  
    22812250RETURN
    22822251
    2283 /*:VRX         RescaleObject
    2284 */
    2285 RescaleObject: PROCEDURE
    2286     PARSE ARG object, factor, move
    2287 
    2288     x = VRGet( object, 'Left')
    2289     y = VRGet( object, 'Top')
    2290     w = VRGet( object, 'Width')
    2291     h = VRGet( object, 'Height')
    2292     nx = TRUNC( x * factor )
    2293     ny = TRUNC( y * factor  )
    2294     nw = TRUNC( w * factor )
    2295     nh = TRUNC( h * factor  )
    2296 
    2297     /* SAY object ': ('||x','y','w','h') --> ('nx','ny','nw','nh')' */
    2298 
    2299     IF move <> 0 THEN DO
    2300         ok = VRSet( object, 'Left', nx )
    2301         ok = VRSet( object, 'Top', ny )
    2302     END
    2303     ok = VRSet( object, 'Width', nw )
    2304     ok = VRSet( object, 'Height', nh )
    2305 
    2306 RETURN
    2307 
    23082252/*:VRX         SetDriverList
    23092253*/

  • trunk/gui/printer/manager/readme.txt

    r92 r97  
    11PM Printer Manager
    2 Version 0.86
     2Version 0.87
    33
    44  Printer Manager is a new graphical printer management tool designed to
    … …  
    4747
    4848  PM Printer Manager
    49   (C) 2013-2019 Alexander Taylor
     49  (C) 2013-2023 Alexander Taylor
    5050
    5151    This program is free software; you can redistribute it and/or modify
    … …  
    7171--
    7272Alex Taylor
    73 February 2019
     73January 2023

  • trunk/gui/printer/manager/wpi/makewpi.cmd

    r56 r97  
    1717'@SET PATH='warpin';%PATH%'
    1818'@SET BEGINLIBPATH='warpin
    19 '@wic.exe' pkgname'.wpi -a 1 printman.exe'
    20 '@wic.exe' pkgname'.wpi -a 1 printmen.msg'
     19'@wic.exe' pkgname'.wpi -a 1 -c.. printman.exe'
     20'@wic.exe' pkgname'.wpi -a 1 -c.. printmen.msg'
    2121'@wic.exe' pkgname'.wpi -a 1 -c.. newprint.ico'
    2222'@wic.exe' pkgname'.wpi -a 1 -c.. COPYING'

  • trunk/gui/printer/manager/wpi/printman.wis

    r83 r97  
    122122
    123123    <PCK INDEX=1
    124         PACKAGEID="Alex Taylor\Printer Manager\Program\0\8\5"
     124        PACKAGEID="Alex Taylor\Printer Manager\Program\0\8\7"
    125125        TITLE="Printer Manager (including English language support)"
    126126        TARGET="=("DefaultPath")\printman"

  • trunk/gui/shared/PrManUtl.VRS

    r91 r97  
    229229            RETURN 0
    230230
    231         ADDRESS CMD '@UNLOCK' driver '2>NUL 1>NUL'
    232         ADDRESS CMD '@EAUTIL' driver ea_file '/j /p 2>NUL 1>NUL'
     231        ADDRESS CMD '@ UNLOCK' driver '2>NUL 1>NUL'
     232        ADDRESS CMD '@ EAUTIL' driver ea_file '/j /p 2>NUL 1>NUL'
    233233    END
    234234RETURN 1
    … …  
    350350    IF VRFileExists( newdrvdir'\'eafile ) THEN
    351351        CALL VRDeleteFile newdrvdir'\'eafile
    352     ADDRESS CMD '@EAUTIL' newdrvdir'\'drv_name newdrvdir'\'eafile '/s /p 2>NUL 1>NUL'
     352    ADDRESS CMD '@ EAUTIL' newdrvdir'\'drv_name newdrvdir'\'eafile '/s /p 2>NUL 1>NUL'
    353353
    354354RETURN 1
    … …  
    11861186RETURN success
    11871187
     1188
     1189/*:VRX         GetScalingFactor
     1190 */
     1191/* Return the UI scaling factor based on the difference between the specified
     1192 * font size and the design-default font size.
     1193 */
     1194GetScalingFactor: PROCEDURE EXPOSE globals.
     1195    PARSE ARG newSize, orgSize
     1196
     1197    IF orgSize == '' THEN
     1198        orgSize = globals.!defaultSize
     1199
     1200    IF newSize < globals.!defaultSize THEN
     1201        newSize = globals.!defaultSize
     1202
     1203    scaleFactor = newSize / orgSize
     1204
     1205RETURN scaleFactor
     1206
     1207
     1208/*:VRX         ParseFontSize
     1209 */
     1210ParseFontSize: PROCEDURE EXPOSE globals.
     1211    PARSE ARG font
     1212    IF font == '' | font == '<default>' THEN
     1213        RETURN globals.!defaultSize
     1214
     1215    PARSE VAR font _pts'.'.
     1216    IF _pts < globals.!defaultSize THEN
     1217        _pts = globals.!defaultSize
     1218
     1219RETURN _pts
     1220
     1221
     1222/*:VRX         RescaleObject
     1223 */
     1224RescaleObject: PROCEDURE
     1225    PARSE ARG object, factor, move
     1226
     1227    x = VRGet( object, 'Left')
     1228    y = VRGet( object, 'Top')
     1229    w = VRGet( object, 'Width')
     1230    h = VRGet( object, 'Height')
     1231    nx = TRUNC( x * factor )
     1232    ny = TRUNC( y * factor  )
     1233    nw = TRUNC( w * factor )
     1234    nh = TRUNC( h * factor  )
     1235
     1236    /* SAY object ': ('||x','y','w','h') --> ('nx','ny','nw','nh')' */
     1237
     1238    IF move <> 0 THEN DO
     1239        ok = VRSet( object, 'Left', nx )
     1240        ok = VRSet( object, 'Top', ny )
     1241    END
     1242    ok = VRSet( object, 'Width', nw )
     1243    ok = VRSet( object, 'Height', nh )
     1244
     1245RETURN
     1246
     1247
    11881248/*:VRX         StringTokenize
    11891249*/

  • trunk/gui/shared/PrintUtl.VRS

    r91 r97  
    1717 */
    1818GetDriverSource: PROCEDURE EXPOSE globals. pmdx
     19    /* Can replace with   PrManUtl */
    1920    ARG driver
    2021    IF driver == '' THEN RETURN ''
    … …  
    8081 */
    8182GetDriverPMDD: PROCEDURE
     83    /* Can remove */
    8284    PARSE ARG driver, prdrv_lst
    8385
    … …  
    101103 */
    102104VerifyDriverEAs: PROCEDURE EXPOSE globals.
     105    /* Can replace with PrManUtl */
    103106    PARSE ARG driver
    104107    eas.0 = 0
    … …  
    111114            RETURN 0
    112115
    113         ADDRESS CMD '@UNLOCK' driver '2>NUL 1>NUL'
    114         ADDRESS CMD '@EAUTIL' driver ea_file '/j /p 2>NUL 1>NUL'
     116        ADDRESS CMD '@ UNLOCK' driver '2>NUL 1>NUL'
     117        ADDRESS CMD '@ EAUTIL' driver ea_file '/j /p 2>NUL 1>NUL'
    115118    END
    116119RETURN 1
    … …  
    130133 */
    131134CopyDriverToSource: PROCEDURE EXPOSE globals.
     135    /* Can replace with CopyDriverFiles from PrManUtl */
    132136    PARSE ARG driver, newdrvdir
    133137
    … …  
    716720RETURN success
    717721
     722/*:VRX         GetScalingFactor
     723*/
     724/* Return the UI scaling factor based on the difference between the specified
     725 * font size and the design-default font size.
     726 */
     727GetScalingFactor: PROCEDURE EXPOSE globals.
     728    PARSE ARG newSize, orgSize
     729
     730    IF orgSize == '' THEN
     731        orgSize = globals.!defaultSize
     732
     733    IF newSize < globals.!defaultSize THEN
     734        newSize = globals.!defaultSize
     735
     736    scaleFactor = newSize / orgSize
     737
     738RETURN scaleFactor
     739
     740/*:VRX         ParseFontSize
     741*/
     742ParseFontSize: PROCEDURE EXPOSE globals.
     743    PARSE ARG font
     744    IF font == '' | font == '<default>' THEN
     745        RETURN globals.!defaultSize
     746
     747    PARSE VAR font _pts'.'.
     748    IF _pts < globals.!defaultSize THEN
     749        _pts = globals.!defaultSize
     750
     751RETURN _pts
     752
     753/*:VRX         RescaleObject
     754*/
     755RescaleObject: PROCEDURE
     756    PARSE ARG object, factor, move
     757
     758    x = VRGet( object, 'Left')
     759    y = VRGet( object, 'Top')
     760    w = VRGet( object, 'Width')
     761    h = VRGet( object, 'Height')
     762    nx = TRUNC( x * factor )
     763    ny = TRUNC( y * factor  )
     764    nw = TRUNC( w * factor )
     765    nh = TRUNC( h * factor  )
     766
     767    /* SAY object ': ('||x','y','w','h') --> ('nx','ny','nw','nh')' */
     768
     769    IF move <> 0 THEN DO
     770        ok = VRSet( object, 'Left', nx )
     771        ok = VRSet( object, 'Top', ny )
     772    END
     773    ok = VRSet( object, 'Width', nw )
     774    ok = VRSet( object, 'Height', nh )
     775
     776RETURN
     777
Note: See TracChangeset for help on using the changeset viewer.