Changeset 75 for trunk/gui


Ignore:
Timestamp:
Jan 4, 2019, 4:48:40 AM (7 years ago)
Author:
Alex Taylor
Message:

Implemented same parsing fix for CUPSWIZ.

Location:
trunk/gui
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r73 r75  
    66RunDirectory:
    77VRXWindow: __VREMainWindow,1,578,2746,5770,9106
    8 VRXWindow: __VRESectionListWindow,1,675,11900,4529,3891
    9 VRXWindow: __VREToolsWindow,1,1650,9973,5477,1663
     8VRXWindow: __VRESectionListWindow,1,711,11900,4529,3891
     9VRXWindow: __VREToolsWindow,1,1650,9973,5468,1665
    1010VRXWindow: __VREWindListWindow,1,5191,11900,2650,3891
    1111UserFile: 1

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

    r73 r75  
    10131013     * to our working directory.
    10141014     */
    1015     CALL LINEOUT globals.!log1, 'Converting PPD with:' ppd_exe ppdfile ppd_use
    1016     ADDRESS CMD '@'ppd_exe ppdfile ppd_use '2>NUL | RXQUEUE' nq
     1015    CALL LINEOUT globals.!log1, 'Converting PPD with:' ppd_exe '"'ppdfile'" "'ppd_use'"'
     1016    ADDRESS CMD '@'ppd_exe '"'ppdfile'" "'ppd_use'" 2>NUL | RXQUEUE' nq
    10171017    DO QUEUED()
    10181018        PULL output
    … …  
    20112011    CALL NLSSetText 'SW_ABOUT',  'Caption', 10                                          /* 10: Product Information */
    20122012    CALL NLSSetText 'DT_ABOUT1', 'Caption', 11                                          /* 11: eCups Printer Install Utility */
    2013     CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.16'                                  /* 12: Version %1 */
    2014     CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2018'                             /* 13: (C) %1 Alex Taylor */
     2013    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.17'                                  /* 12: Version %1 */
     2014    CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2019'                             /* 13: (C) %1 Alex Taylor */
    20152015    CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */
    20162016

  • trunk/gui/shared/PrManUtl.VRS

    r74 r75  
    637637            PARSE VAR line . ':' _nick '0D'x .
    638638                nickname = STRIP( _nick )
     639                nickname = STRIP( nickname, 'B', '09'x )
    639640                nickname = STRIP( nickname, 'B', '"')
    640641                LEAVE
    … …  
    653654                nickname = STRIP( nickname, 'B', '09'x )
    654655                nickname = STRIP( nickname, 'B', '"')
    655                 nickname = TRANSLATE( nickname, ' ', '"')
    656                 nickname = TRANSLATE( nickname, ' ', "'")
    657656                LEAVE
    658657            END
    … …  
    660659        CALL STREAM ppd_file,  'C', 'CLOSE'
    661660    END
     661    nickname = TRANSLATE( nickname, ' ', '"')
     662    nickname = TRANSLATE( nickname, ' ', "'")
    662663
    663664RETURN nickname

  • trunk/gui/shared/PrintUtl.VRS

    r55 r75  
    486486            PARSE VAR line . ':' _nick '0D'x .
    487487                nickname = STRIP( _nick )
     488                nickname = STRIP( nickname, 'B', '09'x )
    488489                nickname = STRIP( nickname, 'B', '"')
    489490                LEAVE
    … …  
    500501            PARSE VAR line . ':' _nick '0D'x .
    501502                nickname = STRIP( _nick )
     503                nickname = STRIP( nickname, 'B', '09'x )
    502504                nickname = STRIP( nickname, 'B', '"')
    503505                LEAVE
    … …  
    506508        CALL STREAM ppd_file,  'C', 'CLOSE'
    507509    END
     510    nickname = TRANSLATE( nickname, ' ', '"')
     511    nickname = TRANSLATE( nickname, ' ', "'")
    508512
    509513RETURN nickname
Note: See TracChangeset for help on using the changeset viewer.