summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp5
-rw-r--r--noncore/apps/odict/odict.cpp12
2 files changed, 7 insertions, 10 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 7abad22..5b5d731 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -113,9 +113,9 @@ void DingWidget::loadValues()
}
BroswerContent DingWidget::parseInfo()
{
- QStringList search = lines.grep( queryword );
+ QStringList search = lines.grep( queryword , isCaseSensitive );
QString current;
QString left;
QString right;
@@ -125,8 +125,9 @@ BroswerContent DingWidget::parseInfo()
QString html_table_sep = "</td><td>";
QString html_table_right = "</td></tr>";
QRegExp reg_div( trenner );
QRegExp reg_word( queryword );
+ reg_word.setCaseSensitive( isCaseSensitive );
QStringList toplist, bottomlist;
QString substitute = "<strong>"+queryword+"</strong>";
/* Dieser Block ist von Patrik. Ich versuche einen neuen
@@ -162,9 +163,9 @@ BroswerContent DingWidget::parseInfo()
left = current.left( current.find( trenner ) );
right = current.right( current.length() - current.find(trenner) -2 );
- if ( left.contains( queryword ) )
+ if ( left.contains( queryword , isCaseSensitive ) )
{
left.replace( queryword, substitute );
left = left + "-->" + right;
toplist.append( left );
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 549c40a..42604ee 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -93,9 +93,9 @@ void ODict::saveConfig()
}
void ODict::slotDisplayAbout()
{
- QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030108" ) );
+ QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030111" ) );
}
void ODict::slotStartQuery()
{
@@ -108,18 +108,16 @@ void ODict::slotStartQuery()
//X if (!activated_name || activated_name.isEmpty())
//X QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
//X else
//X {
+
+ if ( casesens ) qDebug( "casesens = TRUE" );
+ else qDebug( "casesens = FALSE" );
ding->setCaseSensitive( casesens );
ding->setCompleteWord( completewords );
ding->setDict( activated_name );
- qDebug( " activated_name ist :" );
- qDebug( activated_name );
-
- qDebug( " loadedDict() ist :" );
- qDebug( ding->loadedDict() );
if ( activated_name != ding->loadedDict() )
{
qDebug( "ComboBox geändert" );
ding->loadDict(activated_name);
@@ -131,11 +129,9 @@ void ODict::slotStartQuery()
browser_top->setText( test.top );
browser_bottom->setText( test.bottom );
qDebug( "Text sollte gesetzt sein..." );
-
//X }
-
}
void ODict::slotSetErrorcount( int count )