Ignore:
Timestamp:
Oct 3, 2023, 12:24:50 PM (23 months ago)
Author:
erdmann
Message:

merge back from trunk

Location:
branches/v2.9_Lars
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/v2.9_Lars

  • branches/v2.9_Lars/classes/c/c_audio/cwaudio.c

    r74 r105  
    264264      cwMoveNotebookButtonsWarp4(hwnd, IDPB_ID3HELP, 15);
    265265
    266       if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
    267         strcpy(name, "Track name");
    268       WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), name);
     266      /*if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
     267        strcpy(name, "Track name");*/
     268      WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), "");
    269269
    270270      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    … …  
    274274      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    275275      WinSendMsg(WinWindowFromID(hwnd,IDDD_ID3GENRE),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    276 #if 0
    277       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Name)-1),0);
    278       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Artist)-1),0);
    279       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Album)-1),0);
    280       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Comment)-1),0);
    281       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Year)-1),0);
    282 #endif     
     276      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     277      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     278      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     279      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     280      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)4),0);
    283281      /* Fill drop downlist with knwon genres */
    284282      hwndTemp=WinWindowFromID(hwnd, IDDD_ID3GENRE);
    … …  
    450448  //We have a major tab so we need a name
    451449  if(!getMessage(pageName, ID_TRACKNAMEPAGENAME, sizeof(pageName), queryResModuleHandle(), hwndNotebook))
    452     strcpy(pageName, "~Track name");
     450    strcpy(pageName, "~Track meta data");
    453451  pageinfo.pszName = pageName;
    454452  //Insert the page into the settings notebook

  • branches/v2.9_Lars/classes/c/c_audio/cwcdtrack.c

    r74 r105  
    214214    MMCDTrackMethodDebug("MMCDTrack","cwcdtrack_wpFilterPopupMenu");
    215215
    216     return CTXT_SETTINGS | CTXT_HELP;
     216    return CTXT_SETTINGS | CTXT_HELP | CTXT_DELETE;
    217217
    218218    /* We don't want to have XFolder or WPS-Wizard menus here. These are useless

  • branches/v2.9_Lars/classes/help/de/makefile

    r2 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp       
    2323
    2424

  • branches/v2.9_Lars/classes/help/en/cwmm.ipf

    r91 r105  
    115115
    116116.* ----------------------------------------------------------------------------
    117 :h1 res=012.Track meta
     117:h1 res=012.Track meta data
    118118:p.Use this page to edit track information. Unlike an ID3 tag, the contents of
    119119these fields will be saved in the extended attributes of the file upon pressing

  • branches/v2.9_Lars/classes/help/en/makefile

    r2 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf  cwmm$(LANGUAGE).hlp     
    2323
    2424

  • branches/v2.9_Lars/classes/help/es/makefile

    r35 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp   
    2323
    2424

  • branches/v2.9_Lars/classes/help/fr/makefile

    r35 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp   
    2323
    2424

  • branches/v2.9_Lars/classes/help/it/makefile

    r2 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp       
    2323
    2424

  • branches/v2.9_Lars/classes/help/nl/makefile

    r2 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf  cwmm$(LANGUAGE).hlp
    2323
    2424

  • branches/v2.9_Lars/classes/help/ru/makefile

    r39 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp
    2323
    2424

  • branches/v2.9_Lars/classes/help/tw/makefile

    r4 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp     
    2323
    2424

  • branches/v2.9_Lars/classes/idl/idl_audio/cwaudio.c

    r2 r105  
    251251      cwMoveNotebookButtonsWarp4(hwnd, IDPB_ID3HELP, 15);
    252252
    253       if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
    254         strcpy(name, "Track name");
    255       WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), name);
     253      /*if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
     254        strcpy(name, "Track name");*/
     255      WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), "");
    256256
    257257      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    … …  
    261261      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    262262      WinSendMsg(WinWindowFromID(hwnd,IDDD_ID3GENRE),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    263 #if 0
    264       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Name)-1),0);
    265       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Artist)-1),0);
    266       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Album)-1),0);
    267       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Comment)-1),0);
    268       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Year)-1),0);
     263#if 1
     264      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     265      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     266      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     267      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     268      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)4)-1),0);
    269269#endif     
    270270      /* Fill drop downlist with knwon genres */
    … …  
    399399  //We have a major tab so we need a name
    400400  if(!getMessage(pageName, ID_TRACKNAMEPAGENAME, sizeof(pageName), queryResModuleHandle(), hwndNotebook))
    401     strcpy(pageName, "~Track name");
     401    strcpy(pageName, "~Track meta data");
    402402  pageinfo.pszName = pageName;
    403403  //Insert the page into the settings notebook

  • branches/v2.9_Lars/classes/makefile

    r91 r105  
    192192        cd ./res && make
    193193        rc ./res/common_res/cwaudio.res cwmm.dll
    194         MAPSYM $(basename $@)
     194        MAPSYM cwmm.map
    195195
    196196###################################

  • branches/v2.9_Lars/classes/res/de/cwaudio_de.rc

    r4 r105  
    7171ID_WAVEINFOPAGENAME "~Audio-Information"
    7272ID_ID3TAGSPAGENAME  "~ID3-Tags"
    73 ID_TRACKNAMEPAGENAME "~Trackname"
     73ID_TRACKNAMEPAGENAME "~Track meta data"
    7474IDSTR_TRACKNAME      "Trackname"
    7575

  • branches/v2.9_Lars/classes/res/en/cwaudio_en.rc

    r91 r105  
    7272BEGIN
    7373ID_WAVEINFOPAGENAME "~Audio details"
    74 ID_ID3TAGSPAGENAME  "~ID3 tag"
    75 ID_TRACKNAMEPAGENAME "~Track meta"
    76 IDSTR_TRACKNAME      ""
     74ID_ID3TAGSPAGENAME  "~ID3 Tags"
     75ID_TRACKNAMEPAGENAME "~Track meta data"
     76IDSTR_TRACKNAME      "Trackname"
    7777
    7878IDSTR_PLAYTIME      "Play time"
Note: See TracChangeset for help on using the changeset viewer.