summaryrefslogtreecommitdiff
path: root/noncore/apps/odict/dingwidget.cpp
Side-by-side diff
Diffstat (limited to 'noncore/apps/odict/dingwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp30
1 files changed, 9 insertions, 21 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index ed67abf..55a716d 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -29,34 +29,30 @@ DingWidget::DingWidget( )
trenner = QString::null;
lines = 0L;
}
void DingWidget::loadDict( QString name )
{
- qDebug( "bin in DingWidget::loadDict(). name ist:" );
- qDebug( name );
+ lines.clear(); //as we will load a new list we have to
+ //remove the old one
+ qDebug( "DingWidget::loadDict( ... )" );
- dictName = name;
Config cfg( "odict" );
- if ( !methodname ) { return; }
- cfg.setGroup( "Method_" + methodname );
+ cfg.setGroup( "Method_" + name );
QFile file( cfg.readEntry( "file" ) );
- qDebug( cfg.readEntry( "file" ) );
-
if( file.open( IO_ReadOnly ) )
{
QTextStream stream( &file );
while ( !stream.eof() )
{
lines.append( stream.readLine() );
}
file.close();
}
loadValues();
-
}
QString DingWidget::loadedDict() const
{
return dictName;
}
@@ -68,17 +64,12 @@ void DingWidget::setCaseSensitive( bool caseS )
void DingWidget::setDict( QString dict )
{
methodname = dict;
}
-void DingWidget::setCompleteWord( bool cword )
-{
- isCompleteWord = cword;
-}
-
void DingWidget::setQueryWord( QString qword )
{
queryword = qword;
}
@@ -98,21 +89,17 @@ BroswerContent DingWidget::setText( QString word )
return parseInfo();
}
BroswerContent DingWidget::parseInfo()
{
- qDebug( "bin in DingWidget::parseInfo()" );
-
- if ( isCompleteWord )
- queryword = " " + queryword + " ";
QStringList search = lines.grep( queryword , isCaseSensitive );
- QString current;
- QString left;
- QString right;
+ QString current;
+ QString left;
+ QString right;
QRegExp reg_div( trenner );
QRegExp reg_word( queryword );
reg_word.setCaseSensitive( isCaseSensitive );
QStringList toplist, bottomlist;
QString substitute = "<strong>"+queryword+"</strong>";
@@ -136,9 +123,10 @@ BroswerContent DingWidget::parseInfo()
bottomlist.append( right );
}
}
s_strings.top = toplist.join( "<br>" );
s_strings.bottom = bottomlist.join( "<br>" );
-
+
return s_strings;
}
+