← Back to branch summary

~dcplusplus-team/dcplusplus/trunk

« back to all changes in this revision

Viewing changes to windows/SearchFrm.cpp

  • Committer: arnetheduck
  • Date: 2006-09-19 09:42:13 UTC
  • Revision ID: svn-v3-trunk1:f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:651
Removed some more code, fixed some utf8 issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
windows/SearchFrm.cpp
352
352
                } else {
353
353
                        // match all here
354
354
                        for(TStringIter j = search.begin(); j != search.end(); ++j) {
355
 
                                if((*j->begin() != _T('-') && Util::findSubString(aResult->getUtf8() ? aResult->getFile() : Text::acpToUtf8(aResult->getFile()), Text::fromT(*j)) == -1) ||
356
 
                                        (*j->begin() == _T('-') && j->size() != 1 && Util::findSubString(aResult->getUtf8() ? aResult->getFile() : Text::acpToUtf8(aResult->getFile()), Text::fromT(j->substr(1))) != -1)
 
355
                                if((*j->begin() != _T('-') && Util::findSubString(aResult->getFile(), Text::fromT(*j)) == -1) ||
 
356
                                        (*j->begin() == _T('-') && j->size() != 1 && Util::findSubString(aResult->getFile(), Text::fromT(j->substr(1))) != -1)
357
357
                                        )
358
358
                                {
359
359
                                        droppedResults++;
1109
1109
void SearchFrame::SearchInfo::update() {
1110
1110
        if(sr->getType() == SearchResult::TYPE_FILE) {
1111
1111
                if(sr->getFile().rfind(_T('\\')) == tstring::npos) {
1112
 
                        columns[COLUMN_FILENAME] = Text::toT(sr->getUtf8() ? sr->getFile() : Text::acpToUtf8(sr->getFile()));
 
1112
                        columns[COLUMN_FILENAME] = Text::toT(sr->getFile());
1113
1113
                } else {
1114
 
                        columns[COLUMN_FILENAME] = Text::toT(Util::getFileName(sr->getUtf8() ? sr->getFile() : Text::acpToUtf8(sr->getFile())));
1115
 
                        columns[COLUMN_PATH] = Text::toT(Util::getFilePath(sr->getUtf8() ? sr->getFile() : Text::acpToUtf8(sr->getFile())));
 
1114
                        columns[COLUMN_FILENAME] = Text::toT(Util::getFileName(sr->getFile()));
 
1115
                        columns[COLUMN_PATH] = Text::toT(Util::getFilePath(sr->getFile()));
1116
1116
                }
1117
1117
 
1118
1118
                columns[COLUMN_TYPE] = Text::toT(Util::getFileExt(Text::fromT(columns[COLUMN_FILENAME])));
1121
1121
                columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(sr->getSize()));
1122
1122
                columns[COLUMN_EXACT_SIZE] = Text::toT(Util::formatExactSize(sr->getSize()));
1123
1123
        } else {
1124
 
                columns[COLUMN_FILENAME] = Text::toT(sr->getUtf8() ? sr->getFileName() : Text::acpToUtf8(sr->getFileName()));
1125
 
                columns[COLUMN_PATH] = Text::toT(sr->getUtf8() ? sr->getFile() : Text::acpToUtf8(sr->getFile()));
 
1124
                columns[COLUMN_FILENAME] = Text::toT(sr->getFileName());
 
1125
                columns[COLUMN_PATH] = Text::toT(sr->getFile());
1126
1126
                columns[COLUMN_TYPE] = TSTRING(DIRECTORY);
1127
1127
                if(sr->getSize() > 0) {
1128
1128
                        columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(sr->getSize()));