author | cniehaus <cniehaus> | 2003-01-11 18:28:09 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-01-11 18:28:09 (UTC) |
commit | e3fa5685865712ca930d9124b974506766e7b11e (patch) (unidiff) | |
tree | 377298838435ca45a23945660f687583788d4a97 /noncore | |
parent | fecbb2ca2714c1699a76036865e6e1120110ac1d (diff) | |
download | opie-e3fa5685865712ca930d9124b974506766e7b11e.zip opie-e3fa5685865712ca930d9124b974506766e7b11e.tar.gz opie-e3fa5685865712ca930d9124b974506766e7b11e.tar.bz2 |
check if the user want to serach casesensitive or not
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 12 |
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 | |||
@@ -114,7 +114,7 @@ void DingWidget::loadValues() | |||
114 | 114 | ||
115 | BroswerContent DingWidget::parseInfo() | 115 | BroswerContent DingWidget::parseInfo() |
116 | { | 116 | { |
117 | QStringList search = lines.grep( queryword ); | 117 | QStringList search = lines.grep( queryword , isCaseSensitive ); |
118 | 118 | ||
119 | QString current; | 119 | QString current; |
120 | QString left; | 120 | QString left; |
@@ -126,6 +126,7 @@ BroswerContent DingWidget::parseInfo() | |||
126 | QString html_table_right = "</td></tr>"; | 126 | QString html_table_right = "</td></tr>"; |
127 | QRegExp reg_div( trenner ); | 127 | QRegExp reg_div( trenner ); |
128 | QRegExp reg_word( queryword ); | 128 | QRegExp reg_word( queryword ); |
129 | reg_word.setCaseSensitive( isCaseSensitive ); | ||
129 | QStringList toplist, bottomlist; | 130 | QStringList toplist, bottomlist; |
130 | QString substitute = "<strong>"+queryword+"</strong>"; | 131 | QString substitute = "<strong>"+queryword+"</strong>"; |
131 | 132 | ||
@@ -163,7 +164,7 @@ BroswerContent DingWidget::parseInfo() | |||
163 | 164 | ||
164 | right = current.right( current.length() - current.find(trenner) -2 ); | 165 | right = current.right( current.length() - current.find(trenner) -2 ); |
165 | 166 | ||
166 | if ( left.contains( queryword ) ) | 167 | if ( left.contains( queryword , isCaseSensitive ) ) |
167 | { | 168 | { |
168 | left.replace( queryword, substitute ); | 169 | left.replace( queryword, substitute ); |
169 | left = left + "-->" + right; | 170 | left = left + "-->" + right; |
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 | |||
@@ -94,7 +94,7 @@ void ODict::saveConfig() | |||
94 | 94 | ||
95 | void ODict::slotDisplayAbout() | 95 | void ODict::slotDisplayAbout() |
96 | { | 96 | { |
97 | QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030108" ) ); | 97 | QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030111" ) ); |
98 | } | 98 | } |
99 | 99 | ||
100 | void ODict::slotStartQuery() | 100 | void ODict::slotStartQuery() |
@@ -109,16 +109,14 @@ void ODict::slotStartQuery() | |||
109 | //X QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); | 109 | //X QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); |
110 | //X else | 110 | //X else |
111 | //X { | 111 | //X { |
112 | |||
113 | if ( casesens ) qDebug( "casesens = TRUE" ); | ||
114 | else qDebug( "casesens = FALSE" ); | ||
112 | 115 | ||
113 | ding->setCaseSensitive( casesens ); | 116 | ding->setCaseSensitive( casesens ); |
114 | ding->setCompleteWord( completewords ); | 117 | ding->setCompleteWord( completewords ); |
115 | ding->setDict( activated_name ); | 118 | ding->setDict( activated_name ); |
116 | 119 | ||
117 | qDebug( " activated_name ist :" ); | ||
118 | qDebug( activated_name ); | ||
119 | |||
120 | qDebug( " loadedDict() ist :" ); | ||
121 | qDebug( ding->loadedDict() ); | ||
122 | if ( activated_name != ding->loadedDict() ) | 120 | if ( activated_name != ding->loadedDict() ) |
123 | { | 121 | { |
124 | qDebug( "ComboBox geändert" ); | 122 | qDebug( "ComboBox geändert" ); |
@@ -132,9 +130,7 @@ void ODict::slotStartQuery() | |||
132 | browser_bottom->setText( test.bottom ); | 130 | browser_bottom->setText( test.bottom ); |
133 | 131 | ||
134 | qDebug( "Text sollte gesetzt sein..." ); | 132 | qDebug( "Text sollte gesetzt sein..." ); |
135 | |||
136 | //X } | 133 | //X } |
137 | |||
138 | } | 134 | } |
139 | 135 | ||
140 | 136 | ||