summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 4be6e71..5c4b13b 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -26,58 +26,53 @@
#include <qstring.h>
#include <qtextstream.h>
#include <qstringlist.h>
#include <qregexp.h>
#include <qtextbrowser.h>
#include <stdlib.h> // for getenv
DingWidget::DingWidget( )
{
methodname = QString::null;
trenner = QString::null;
lines = 0L;
}
void DingWidget::loadDict( QString name )
{
- qDebug( "MUSS ich wirklich aufgerufen werder? schreit loadDict" );
- qDebug( "Starte mit dem loadedDict(...)" );
dictName = name;
- qDebug( "bin in loadedDict() und lade das Dict:" );
- qDebug( dictName );
QString opie_dir = getenv("OPIEDIR");
- QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
- //FIXME:this should of course be not hardcoded ;)
+
+ Config cfg( "odict" );
+ cfg.setGroup( "Method_" + methodname );
+ QFile file( cfg.readEntry( "file" ) );
if( file.open( IO_ReadOnly ) )
{
QTextStream stream( &file );
while ( !stream.eof() )
{
lines.append( stream.readLine() );
}
file.close();
}
- qDebug( "loadedDict(...) ist beended" );
loadValues();
}
QString DingWidget::loadedDict()
{
- qDebug( dictName );
- qDebug( "^ ^ ^ ^ ^ ^ ^ war der dictName" );
return dictName;
}
void DingWidget::setCaseSensitive( bool caseS )
{
isCaseSensitive = caseS;
}
void DingWidget::setDict( QString dict )
{
methodname = dict;
}
void DingWidget::setCompleteWord( bool cword )
{
isCompleteWord = cword;
@@ -86,34 +81,32 @@ void DingWidget::setCompleteWord( bool cword )
void DingWidget::setQueryWord( QString qword )
{
queryword = qword;
}
void DingWidget::loadValues()
{
Config cfg( "odict" );
cfg.setGroup( "Method_" + methodname );
trenner = cfg.readEntry( "Seperator" );
}
BroswerContent DingWidget::setText( QString word )
{
queryword = word;
- qDebug( queryword );
- qDebug( "^ ^ ^ ^ ^ ^ ^ war das gesuchte Word");
return parseInfo();
}
BroswerContent DingWidget::parseInfo()
{
if ( isCompleteWord )
queryword = " " + queryword + " ";
QStringList search = lines.grep( queryword , isCaseSensitive );
QString current;
QString left;
QString right;
QRegExp reg_div( trenner );
QRegExp reg_word( queryword );
reg_word.setCaseSensitive( isCaseSensitive );