diff --git a/EgtGeneral.rc b/EgtGeneral.rc index ea0c7c3..8977ced 100644 Binary files a/EgtGeneral.rc and b/EgtGeneral.rc differ diff --git a/FileUtils.cpp b/FileUtils.cpp index 50f032a..3c4e68f 100644 --- a/FileUtils.cpp +++ b/FileUtils.cpp @@ -13,9 +13,9 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" -#include "\EgtDev\Include\EgnFileUtils.h" -#include "\EgtDev\Include\EgnStringUtils.h" -#include "\EgtDev\Include\EgtStringConverter.h" +#include "\EgtDev\Include\EGnFileUtils.h" +#include "\EgtDev\Include\EGnStringUtils.h" +#include "\EgtDev\Include\EGtStringConverter.h" #include using namespace std ; @@ -48,16 +48,38 @@ EraseFile( const string& sFile) } //----------------------------------------------------------------------------- -bool -FileExtensionMatches( const string& sFile, const string& sExt) +string +ChangeFileExtension( const string& sFile, const string& sNewExt) { + // separo l'estensione dal resto string sFileTitle ; string sFileExt ; SplitLast( sFile, ".", sFileTitle, sFileExt) ; - ToUpper( sFileExt) ; - string sExtUp = sExt ; - ToUpper( sExtUp) ; - return ( sFileExt == sExtUp) ; + if ( sFileExt.find_first_of( "/\\") != string::npos) { + sFileTitle = sFile ; + sFileExt = "" ; + } + // genero il nome con la nuova estensione + if ( sNewExt[0] == '.') + return ( sFileTitle + sNewExt) ; + else + return ( sFileTitle + "." + sNewExt) ; +} + +//----------------------------------------------------------------------------- +bool +FileExtensionMatches( const string& sFile, const string& sExt) +{ + // separo l'estensione dal resto + string sFileTitle ; + string sFileExt ; + SplitLast( sFile, ".", sFileTitle, sFileExt) ; + if ( sFileExt.find_first_of( "/\\") != string::npos) { + sFileTitle = sFile ; + sFileExt = "" ; + } + // confronto + return ( CompareNoCase( sFileExt, sExt)) ; } //-----------------------------------------------------------------------------