ChannelFeed:

- Sort the ChanMsgItems of the channel by date

ChanMsgItem:
- Fixed adding all files (SubFileItem) again by pressing the unsubscribe button (only in Friend Storm)
- Enable unsubscribe button only when channel is subscribed (only in Friend Storm)
- Fixed adding files with umlauts (utf8) on Windows
- Enabled Download and Play button in ChanMsgItem, when they are enabled in the SubFileItems

ftServer:
- Added the method alreadyHaveFile for use in the GUI - recompile of GUI needed

SubFileItem:
- Added state strings like LOCAL, REMOTE, ERROR, ... for translating


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3614 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-10-05 20:39:14 +00:00
parent 3c29434007
commit d31cef0f11
14 changed files with 290 additions and 120 deletions

View file

@ -338,7 +338,14 @@ bool p3Channels::channelExtraFileHash(std::string path, std::string chId, FileIn
bool p3Channels::cpyMsgFileToChFldr(std::string path, std::string fname, std::string chId, bool& fileTooLarge){
FILE *outFile = NULL, *inFile = fopen(path.c_str(), "rb");
FILE *outFile = NULL, *inFile;
#ifdef WINDOWS_SYS
std::wstring wpath;
librs::util::ConvertUtf8ToUtf16(path, wpath);
inFile = _wfopen(wpath.c_str(), L"rb");
#else
inFile = fopen(path.c_str(), "rb");
#endif
long buffSize = 0;
char* buffer = NULL;
@ -370,7 +377,13 @@ bool p3Channels::cpyMsgFileToChFldr(std::string path, std::string fname, std::st
fclose(inFile);
std::string localpath = mChannelsDir + "/" + chId + "/" + fname;
#ifdef WINDOWS_SYS
std::wstring wlocalpath;
librs::util::ConvertUtf8ToUtf16(localpath, wlocalpath);
outFile = _wfopen(wlocalpath.c_str(), L"wb");
#else
outFile = fopen(localpath.c_str(), "wb");
#endif
}
if(outFile){