fixed reslist header charset issues. 1.3.1 first
This commit is contained in:
dockes
parent
cc5f2369a1
commit
5015a42a0f
@ -1 +1 @@
|
||||
1.3.1pre2
|
||||
1.3.1
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef lint
|
||||
static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.14 2006-03-22 16:24:41 dockes Exp $ (C) 2005 J.F.Dockes";
|
||||
static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.15 2006-03-31 17:19:45 dockes Exp $ (C) 2005 J.F.Dockes";
|
||||
#endif
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -59,6 +59,7 @@ using std::pair;
|
||||
#include "uiprefs.h"
|
||||
#include "guiutils.h"
|
||||
#include "rclreslist.h"
|
||||
#include "transcode.h"
|
||||
|
||||
#include "rclmain.h"
|
||||
#include "moc_rclmain.cpp"
|
||||
@ -219,7 +220,13 @@ void RclMain::periodic100()
|
||||
} else if (indexingdone == 0) {
|
||||
if (toggle == 0) {
|
||||
QString msg = tr("Indexing in progress: ");
|
||||
msg += idxthread_currentfile().c_str();
|
||||
string cf = idxthread_currentfile();
|
||||
string mf;int ecnt = 0;
|
||||
string fcharset = rclconfig->getDefCharset(true);
|
||||
if (!transcode(cf, mf, fcharset, "UTF-8", &ecnt) || ecnt) {
|
||||
mf = url_encode(cf, 0);
|
||||
}
|
||||
msg += QString::fromUtf8(mf.c_str());
|
||||
statusBar()->message(msg);
|
||||
} else if (toggle == 9) {
|
||||
statusBar()->message("");
|
||||
@ -265,11 +272,11 @@ void RclMain::startAdvSearch(Rcl::AdvSearchData sdata)
|
||||
|
||||
DocSequence *docsource;
|
||||
if (sortwidth > 0) {
|
||||
DocSequenceDb myseq(rcldb, tr("Query results"));
|
||||
DocSequenceDb myseq(rcldb, string(tr("Query results").utf8()));
|
||||
docsource = new DocSeqSorted(myseq, sortwidth, sortspecs,
|
||||
tr("Query results (sorted)"));
|
||||
string(tr("Query results (sorted)").utf8()));
|
||||
} else {
|
||||
docsource = new DocSequenceDb(rcldb, tr("Query results"));
|
||||
docsource = new DocSequenceDb(rcldb, string(tr("Query results").utf8()));
|
||||
}
|
||||
currentQueryData = sdata;
|
||||
resList->setDocSource(docsource);
|
||||
@ -472,10 +479,10 @@ void RclMain::showDocHistory()
|
||||
if (sortwidth > 0) {
|
||||
DocSequenceHistory myseq(rcldb, m_history, tr("Document history"));
|
||||
docsource = new DocSeqSorted(myseq, sortwidth, sortspecs,
|
||||
tr("Document history (sorted)"));
|
||||
string(tr("Document history (sorted)").utf8()));
|
||||
} else {
|
||||
docsource = new DocSequenceHistory(rcldb, m_history,
|
||||
tr("Document history"));
|
||||
string(tr("Document history").utf8()));
|
||||
}
|
||||
currentQueryData.erase();
|
||||
currentQueryData.description = tr("History data").utf8();
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef lint
|
||||
static char rcsid[] = "@(#$Id: rclreslist.cpp,v 1.7 2006-03-29 13:08:08 dockes Exp $ (C) 2005 J.F.Dockes";
|
||||
static char rcsid[] = "@(#$Id: rclreslist.cpp,v 1.8 2006-03-31 17:19:45 dockes Exp $ (C) 2005 J.F.Dockes";
|
||||
#endif
|
||||
|
||||
#include <time.h>
|
||||
@ -63,7 +63,7 @@ RclResList::~RclResList()
|
||||
|
||||
void RclResList::languageChange()
|
||||
{
|
||||
setCaption( tr( "Result list" ) );
|
||||
setCaption(tr("Result list"));
|
||||
}
|
||||
|
||||
// Acquire new docsource
|
||||
@ -233,7 +233,7 @@ void RclResList::showResultPage()
|
||||
// gets confused. Hence the use of the 'chunk' text
|
||||
// accumulator
|
||||
QString chunk = "<p><font size=+1><b>";
|
||||
chunk += m_docsource->title().c_str();
|
||||
chunk += QString::fromUtf8(m_docsource->title().c_str());
|
||||
chunk += "</b></font><br>";
|
||||
chunk += "<a href=\"H-1\">";
|
||||
chunk += tr("Show query details");
|
||||
|
||||
@ -95,7 +95,7 @@ Click Cancel if you want to edit the configuration file before indexation starts
|
||||
</message>
|
||||
<message>
|
||||
<source>Query results</source>
|
||||
<translation>Query results</translation>
|
||||
<translation>Результаты поиска</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Query results (sorted)</source>
|
||||
@ -167,7 +167,7 @@ Click Cancel if you want to edit the configuration file before indexation starts
|
||||
</message>
|
||||
<message>
|
||||
<source>Indexing in progress: </source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Индексирование: </translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@ -282,44 +282,44 @@ Click Cancel if you want to edit the configuration file before indexation starts
|
||||
</message>
|
||||
<message>
|
||||
<source>Ctrl+Q</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Ctrl+Q</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RclResList</name>
|
||||
<message>
|
||||
<source>Result list</source>
|
||||
<translation type="unfinished">Список результатов</translation>
|
||||
<translation>Список результатов</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Unavailable document</source>
|
||||
<translation type="unfinished">Документ недоступен</translation>
|
||||
<translation>Документ недоступен</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Show query details</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Показать запрос</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><b>Displaying results starting at index %1 (maximum set size %2)</b></p>
|
||||
</source>
|
||||
<translation type="unfinished"><b>Отображаю результаты начиная с %1 (не более %2)</b></p>
|
||||
<translation><b>Результаты, начиная с %1 (всего %2)</b></p>
|
||||
</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Preview</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>&Просмотр</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Edit</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>&Редактирование</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Copy File Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>&Копировать имя файла</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Copy &Url</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Копировать &адрес</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@ -520,19 +520,19 @@ Click Cancel if you want to edit the configuration file before indexation starts
|
||||
</message>
|
||||
<message>
|
||||
<source>Choose type of search: any term, all terms, filename with possible wildcards.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Выберите тип поиска: любое слово, все слова, имя файла (шаблоны работают).</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Any term</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Любое слово</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>All terms</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Все слова</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>File name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Имя файла</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@ -723,15 +723,15 @@ May be slow for big documents.</source>
|
||||
</message>
|
||||
<message>
|
||||
<source>Search for files<br>having all of:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Искать файлы<br>со всем из:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>All non blank fields will be combined with AND conjunctions</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Все непустые поля будут объединены AND</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>File name matching</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Поиск по именам файлов</translation>
|
||||
</message>
|
||||
</context>
|
||||
</TS>
|
||||
|
||||
@ -92,7 +92,7 @@ Click Cancel if you want to edit the configuration file before indexation starts
|
||||
</message>
|
||||
<message>
|
||||
<source>Query results</source>
|
||||
<translation>Query results</translation>
|
||||
<translation>Результати запиту</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Query results (sorted)</source>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user