tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed reslist header charset issues. 1.3.1 first

Browse Source
This commit is contained in:
dockes 2006-03-31 17:19:45 +00:00
parent cc5f2369a1
commit 5015a42a0f
5 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/VERSION
View File

@ -1 +1 @@
1.3.1pre2 1.3.1

21
src/qtgui/rclmain.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #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 #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -59,6 +59,7 @@ using std::pair;
#include "uiprefs.h" #include "uiprefs.h"
#include "guiutils.h" #include "guiutils.h"
#include "rclreslist.h" #include "rclreslist.h"
#include "transcode.h"
#include "rclmain.h" #include "rclmain.h"
#include "moc_rclmain.cpp" #include "moc_rclmain.cpp"
@ -219,7 +220,13 @@ void RclMain::periodic100()
} else if (indexingdone == 0) { } else if (indexingdone == 0) {
if (toggle == 0) { if (toggle == 0) {
QString msg = tr("Indexing in progress: "); 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); statusBar()->message(msg);
} else if (toggle == 9) { } else if (toggle == 9) {
statusBar()->message(""); statusBar()->message("");
@ -265,11 +272,11 @@ void RclMain::startAdvSearch(Rcl::AdvSearchData sdata)
DocSequence *docsource; DocSequence *docsource;
if (sortwidth > 0) { if (sortwidth > 0) {
DocSequenceDb myseq(rcldb, tr("Query results")); DocSequenceDb myseq(rcldb, string(tr("Query results").utf8()));
docsource = new DocSeqSorted(myseq, sortwidth, sortspecs, docsource = new DocSeqSorted(myseq, sortwidth, sortspecs,
tr("Query results (sorted)")); string(tr("Query results (sorted)").utf8()));
} else { } else {
docsource = new DocSequenceDb(rcldb, tr("Query results")); docsource = new DocSequenceDb(rcldb, string(tr("Query results").utf8()));
} }
currentQueryData = sdata; currentQueryData = sdata;
resList->setDocSource(docsource); resList->setDocSource(docsource);
@ -472,10 +479,10 @@ void RclMain::showDocHistory()
if (sortwidth > 0) { if (sortwidth > 0) {
DocSequenceHistory myseq(rcldb, m_history, tr("Document history")); DocSequenceHistory myseq(rcldb, m_history, tr("Document history"));
docsource = new DocSeqSorted(myseq, sortwidth, sortspecs, docsource = new DocSeqSorted(myseq, sortwidth, sortspecs,
tr("Document history (sorted)")); string(tr("Document history (sorted)").utf8()));
} else { } else {
docsource = new DocSequenceHistory(rcldb, m_history, docsource = new DocSequenceHistory(rcldb, m_history,
tr("Document history")); string(tr("Document history").utf8()));
} }
currentQueryData.erase(); currentQueryData.erase();
currentQueryData.description = tr("History data").utf8(); currentQueryData.description = tr("History data").utf8();

6
src/qtgui/rclreslist.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #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 #endif
#include <time.h> #include <time.h>
@ -63,7 +63,7 @@ RclResList::~RclResList()
void RclResList::languageChange() void RclResList::languageChange()
{ {
setCaption( tr( "Result list" ) ); setCaption(tr("Result list"));
} }
// Acquire new docsource // Acquire new docsource
@ -233,7 +233,7 @@ void RclResList::showResultPage()
// gets confused. Hence the use of the 'chunk' text // gets confused. Hence the use of the 'chunk' text
// accumulator // accumulator
QString chunk = "<p><font size=+1><b>"; 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 += "</b></font><br>";
chunk += "<a href=\"H-1\">"; chunk += "<a href=\"H-1\">";
chunk += tr("Show query details"); chunk += tr("Show query details");

36
src/qtgui/recoll_ru.ts
View File

@ -95,7 +95,7 @@ Click Cancel if you want to edit the configuration file before indexation starts
</message> </message>
<message> <message>
<source>Query results</source> <source>Query results</source>
<translation>Query results</translation> <translation>Результаты поиска</translation>
</message> </message>
<message> <message>
<source>Query results (sorted)</source> <source>Query results (sorted)</source>
@ -167,7 +167,7 @@ Click Cancel if you want to edit the configuration file before indexation starts
</message> </message>
<message> <message>
<source>Indexing in progress: </source> <source>Indexing in progress: </source>
<translation type="unfinished"></translation> <translation>Индексирование: </translation>
</message> </message>
</context> </context>
<context> <context>
@ -282,44 +282,44 @@ Click Cancel if you want to edit the configuration file before indexation starts
</message> </message>
<message> <message>
<source>Ctrl+Q</source> <source>Ctrl+Q</source>
<translation type="unfinished"></translation> <translation>Ctrl+Q</translation>
</message> </message>
</context> </context>
<context> <context>
<name>RclResList</name> <name>RclResList</name>
<message> <message>
<source>Result list</source> <source>Result list</source>
<translation type="unfinished">Список результатов</translation> <translation>Список результатов</translation>
</message> </message>
<message> <message>
<source>Unavailable document</source> <source>Unavailable document</source>
<translation type="unfinished">Документ недоступен</translation> <translation>Документ недоступен</translation>
</message> </message>
<message> <message>
<source>Show query details</source> <source>Show query details</source>
<translation type="unfinished"></translation> <translation>Показать запрос</translation>
</message> </message>
<message> <message>
<source>&lt;b&gt;Displaying results starting at index %1 (maximum set size %2)&lt;/b&gt;&lt;/p&gt; <source>&lt;b&gt;Displaying results starting at index %1 (maximum set size %2)&lt;/b&gt;&lt;/p&gt;
</source> </source>
<translation type="unfinished">&lt;b&gt;Отображаю результаты начиная с %1 (не более %2)&lt;/b&gt;&lt;/p&gt; <translation>&lt;b&gt;Результаты, начиная с %1 (всего %2)&lt;/b&gt;&lt;/p&gt;
</translation> </translation>
</message> </message>
<message> <message>
<source>&amp;Preview</source> <source>&amp;Preview</source>
<translation type="unfinished"></translation> <translation>&amp;Просмотр</translation>
</message> </message>
<message> <message>
<source>&amp;Edit</source> <source>&amp;Edit</source>
<translation type="unfinished"></translation> <translation>&amp;Редактирование</translation>
</message> </message>
<message> <message>
<source>&amp;Copy File Name</source> <source>&amp;Copy File Name</source>
<translation type="unfinished"></translation> <translation>&amp;Копировать имя файла</translation>
</message> </message>
<message> <message>
<source>Copy &amp;Url</source> <source>Copy &amp;Url</source>
<translation type="unfinished"></translation> <translation>Копировать &amp;адрес</translation>
</message> </message>
</context> </context>
<context> <context>
@ -520,19 +520,19 @@ Click Cancel if you want to edit the configuration file before indexation starts
</message> </message>
<message> <message>
<source>Choose type of search: any term, all terms, filename with possible wildcards.</source> <source>Choose type of search: any term, all terms, filename with possible wildcards.</source>
<translation type="unfinished"></translation> <translation>Выберите тип поиска: любое слово, все слова, имя файла (шаблоны работают).</translation>
</message> </message>
<message> <message>
<source>Any term</source> <source>Any term</source>
<translation type="unfinished"></translation> <translation>Любое слово</translation>
</message> </message>
<message> <message>
<source>All terms</source> <source>All terms</source>
<translation type="unfinished"></translation> <translation>Все слова</translation>
</message> </message>
<message> <message>
<source>File name</source> <source>File name</source>
<translation type="unfinished"></translation> <translation>Имя файла</translation>
</message> </message>
</context> </context>
<context> <context>
@ -723,15 +723,15 @@ May be slow for big documents.</source>
</message> </message>
<message> <message>
<source>Search for files&lt;br&gt;having all of:</source> <source>Search for files&lt;br&gt;having all of:</source>
<translation type="unfinished"></translation> <translation>Искать файлы&lt;br&gt;со всем из:</translation>
</message> </message>
<message> <message>
<source>All non blank fields will be combined with AND conjunctions</source> <source>All non blank fields will be combined with AND conjunctions</source>
<translation type="unfinished"></translation> <translation>Все непустые поля будут объединены AND</translation>
</message> </message>
<message> <message>
<source>File name matching</source> <source>File name matching</source>
<translation type="unfinished"></translation> <translation>Поиск по именам файлов</translation>
</message> </message>
</context> </context>
</TS> </TS>

2
src/qtgui/recoll_uk.ts
View File

@ -92,7 +92,7 @@ Click Cancel if you want to edit the configuration file before indexation starts
</message> </message>
<message> <message>
<source>Query results</source> <source>Query results</source>
<translation>Query results</translation> <translation>Результати запиту</translation>
</message> </message>
<message> <message>
<source>Query results (sorted)</source> <source>Query results (sorted)</source>