Ignore:
Timestamp:
Oct 2, 2023, 11:34:35 PM (2 years ago)
Author:
gyoung
Message:

Remaining changes from merge with Lars 2.9 branch

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/mediafolder/res/en/about_ecs_en.dlg

    r70 r104  
    77DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
    88BEGIN
    9     DIALOG  "Product Information", IDDLG_ABOUT, 100, 120, 194, 67, 
     9    DIALOG  "Product Information", IDDLG_ABOUT, 100, 120, 194, 67,
    1010            WS_VISIBLE, FCF_TITLEBAR
    1111    BEGIN
    1212        ICON            IDICON_FOLDER1, IDICON_FOLDER1, 10, 39, 16, 15, WS_GROUP
    13         LTEXT           "Multimedia integration for the desktop", 
    14                         IDST_PRODNAME, 38, 50, 154, 10, DT_WORDBREAK | NOT 
     13        LTEXT           "Multimedia integration for the desktop",
     14                        IDST_PRODNAME, 38, 50, 154, 10, DT_WORDBREAK | NOT
    1515                        WS_GROUP
    1616                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
    1717        CONTROL         "", 607, 38, 43, 154, 7, "CW_SEPARATOR", WS_VISIBLE
    18         LTEXT           "(C) 2002-2004 Chris Wohlgemuth", IDST_PRODCOPY, 38,
    19                         29, 154, 11, DT_VCENTER | DT_WORDBREAK | NOT 
     18        LTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 38,
     19                        29, 154, 11, DT_VCENTER | DT_WORDBREAK | NOT
    2020                        WS_GROUP
    21         //                PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
    22         //LTEXT           "Licensed to Serenity Systems", 608, 38, 19, 154, 9
    2321                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
    2422        DEFPUSHBUTTON   "~Ok", IDSTR_CLOSETEXT, 38, 2, 34, 13
  • trunk/mediafolder/res/en/about_en.dlg

    r2 r104  
    1 #define VER_STRING "Media-Ordner V" \
     1#define VER_STRING "Media Folder v" \
    22MFLDR_VERSION \
    33BUILD_STRING
     
    55DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
    66BEGIN
    7     DIALOG  "Product Information", IDDLG_ABOUT, 115, 69, 208, 132, 
     7    DIALOG  "Product Information", IDDLG_ABOUT, 115, 69, 208, 132,
    88            WS_VISIBLE, FCF_TITLEBAR
    99    BEGIN
    1010        GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
    11 ;        CTEXT           "Media-Folder V0.2.9", IDST_PRODNAME, 36, 107, 135,
    12         CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
     11        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
    1312                        12, DT_VCENTER | NOT WS_GROUP
    14         CTEXT           "(C) Chris Wohlgemuth 2002/2003", IDST_PRODCOPY, 10, 87,
    15                         186, 12, DT_VCENTER | NOT WS_GROUP
     13        CTEXT           MFLDR_AUTHOR,
     14                        IDST_PRODCOPY, 10, 87, 186, 12, DT_VCENTER | NOT WS_GROUP
     15        CTEXT           "Copyright (c) netlabs.org 2020",
     16                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP
    1617        CTEXT           "Graphics by Klaus Staedtler-Przyborski",
    17                         IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
     18                        IDST_PRODGRAPHICS, 10, 46, 186, 17, DT_WORDBREAK |
    1819                        NOT WS_GROUP
    19         CTEXT           "http://www.geocities.com/SiliconValley/Sector/5785/"
    20                         "index.html", IDST_URL1, 10, 46, 186, 18,
    21                         DT_WORDBREAK | NOT WS_GROUP
    22                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    23         CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10,
    24                         30, 186, 16, DT_WORDBREAK
     20        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
     21                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
    2522                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    2623        DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
    2724    END
    2825END
    29 
    30 
  • trunk/mediafolder/res/en/create_res_en_def.CMD

    r2 r104  
    5353def=def||'0d'x||'0a'x
    5454
    55 def=def||"LIBRARY MFLDR_EN INITGLOBAL"||'0d'x||'0a'x
     55def=def||"LIBRARY MFLDR_EN INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
    5656def=def||"DESCRIPTION '$@#(C) C. Wohlgemuth "
    5757def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        My ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@Media-Folder V"||theVersion||" resource DLL -english-'"||'0d'x||'0a'x
    58 def=def||"PROTMODE"||'0d'x||'0a'x
    59 def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
    60 def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
     58def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
    6159def=def||"EXPORTS  "||'0d'x||'0a'x
    6260def=def||"        queryLanguage"||'0d'x||'0a'x
  • trunk/mediafolder/res/en/mediafolder_en.dlg

    r2 r104  
    4141        GROUPBOX        "Toolbar", IDGB_TOOLBAR, 9, 24, 181, 127, NOT
    4242                        WS_GROUP
    43         AUTOCHECKBOX    "~Enable fly over help", IDCB_ENABLETBFLYOVER, 16,
     43        AUTOCHECKBOX    "~Enable fly-over help", IDCB_ENABLETBFLYOVER, 16,
    4444                        129, 152, 10
    4545        SPINBUTTON      IDSB_TBFLYOVERDELAY, 97, 115, 40, 12,
    4646                        SPBS_NUMERICONLY | SPBS_MASTER | SPBS_FASTSPIN |
    4747                        WS_GROUP
    48         GROUPBOX        "Fly over colours and font", IDGB_COLORANDFONT, 15,
     48        GROUPBOX        "Fly-over colors and font", IDGB_COLORANDFONT, 15,
    4949                        30, 168, 76, NOT WS_GROUP
    50         LTEXT           "Klick button for colour- or fontpalette.           "
     50        LTEXT           "Click button for color or font palette.           "
    5151                        "             
    52 Press <CTRL> during drag 'n drop to change the text colour.",
     52Hold <Ctrl> during drag'n'drop to change the text color.",
    5353                        IDST_TEXTDEMOFIELD, 23, 35, 95, 57, DT_WORDBREAK
    5454                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x000000FFL
    5555                        PRESPARAMS PP_BACKGROUNDCOLOR, 0x00FFFFFFL
    56         PUSHBUTTON      "~Colour...", IDPB_COLORPALETTE, 129, 72, 45, 14
     56        PUSHBUTTON      "~Color...", IDPB_COLORPALETTE, 129, 72, 45, 14
    5757        PUSHBUTTON      "~Font...", IDPB_FONTPALETTE, 129, 49, 45, 14
    5858        PUSHBUTTON      "~Undo", IDPB_COLORUNDO, 16, 7, 52, 14
     
    100100    END
    101101END
    102 
    103 
  • trunk/mediafolder/res/en/mediafolder_en.rc

    r4 r104  
    1515BEGIN
    1616   MENUITEM  "" , ID_MENUSEPARATOR, MIS_SEPARATOR
    17    MENUITEM "~Product Information",ID_ABOUTITEM   
     17   MENUITEM "~Product Information",ID_ABOUTITEM
    1818END
    1919#else
     
    2121BEGIN
    2222   MENUITEM  "" , ID_MENUSEPARATOR, MIS_SEPARATOR
    23    MENUITEM "~Media Folder Information",ID_ABOUTITEM   
     23   MENUITEM "~Media Folder Information",ID_ABOUTITEM
    2424END
    2525#endif
     
    4545BEGIN
    4646        MENUITEM "~Save"   ,            ID_MENUITEMSAVE
    47         MENUITEM ""           ,                 ID_MENUSEPARATOR, MIS_SEPARATOR               
     47        MENUITEM ""           ,                 ID_MENUSEPARATOR, MIS_SEPARATOR
    4848        MENUITEM "~Exit" ,                      ID_MENUITEMEXIT
    4949END
     
    5353BEGIN
    5454IDSTR_CLOSETITLE "Confirmation"
    55 IDSTR_CLOSETEXT  "There's currently a song playing. Do you really want to stop playing and close the player?"
     55IDSTR_CLOSETEXT  "There's currently an audio file playing. Do you really want to stop playing and close the player?"
    5656IDSTRSETTING_TOOLBAR "Toolbar"
    57 IDSTRS_NOFONTPALETTE          "Can't open the font palette. It may have lost it's ID. Check your INI files."
    58 IDSTRS_NOCOLORPALETTE         "Can't open the color palette. It may have lost it's ID. Check your INI files."
     57IDSTRS_NOFONTPALETTE          "Can't open the font palette. It may have lost its ID. Check your INI files."
     58IDSTRS_NOCOLORPALETTE         "Can't open the color palette. It may have lost its ID. Check your INI files."
    5959IDSTRS_MEDIAFLDRSETTINGS   "Media-Folder setup"
    6060#ifdef ECS
Note: See TracChangeset for help on using the changeset viewer.