author | cniehaus <cniehaus> | 2003-05-10 20:58:31 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-05-10 20:58:31 (UTC) |
commit | cd5ea84b4061c1d3b8401252fd2c36efade02c95 (patch) (unidiff) | |
tree | c97d2f5ed8a1fed0c2aec3aafdf621e996719663 | |
parent | 1bff948326aa752c3f4aceac4083717f8c2066e8 (diff) | |
download | opie-cd5ea84b4061c1d3b8401252fd2c36efade02c95.zip opie-cd5ea84b4061c1d3b8401252fd2c36efade02c95.tar.gz opie-cd5ea84b4061c1d3b8401252fd2c36efade02c95.tar.bz2 |
fix a stupid bug
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.h | 3 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 55a716d..c804385 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp | |||
@@ -33,9 +33,8 @@ DingWidget::DingWidget( ) | |||
33 | void DingWidget::loadDict( QString name ) | 33 | void DingWidget::loadDict( QString name ) |
34 | { | 34 | { |
35 | lines.clear(); //as we will load a new list we have to | 35 | lines.clear(); //as we will load a new list we have to |
36 | //remove the old one | 36 | //remove the old one |
37 | qDebug( "DingWidget::loadDict( ... )" ); | ||
38 | 37 | ||
39 | Config cfg( "odict" ); | 38 | Config cfg( "odict" ); |
40 | cfg.setGroup( "Method_" + name ); | 39 | cfg.setGroup( "Method_" + name ); |
41 | QFile file( cfg.readEntry( "file" ) ); | 40 | QFile file( cfg.readEntry( "file" ) ); |
@@ -48,8 +47,11 @@ void DingWidget::loadDict( QString name ) | |||
48 | lines.append( stream.readLine() ); | 47 | lines.append( stream.readLine() ); |
49 | } | 48 | } |
50 | file.close(); | 49 | file.close(); |
51 | } | 50 | } |
51 | |||
52 | setDict( name ); | ||
53 | |||
52 | loadValues(); | 54 | loadValues(); |
53 | } | 55 | } |
54 | 56 | ||
55 | QString DingWidget::loadedDict() const | 57 | QString DingWidget::loadedDict() const |
@@ -78,8 +80,9 @@ void DingWidget::loadValues() | |||
78 | if ( !methodname ) return; | 80 | if ( !methodname ) return; |
79 | Config cfg( "odict" ); | 81 | Config cfg( "odict" ); |
80 | cfg.setGroup( "Method_" + methodname ); | 82 | cfg.setGroup( "Method_" + methodname ); |
81 | trenner = cfg.readEntry( "Seperator" ); | 83 | trenner = cfg.readEntry( "Seperator" ); |
84 | |||
82 | lang1_name = cfg.readEntry( "Lang1" ); | 85 | lang1_name = cfg.readEntry( "Lang1" ); |
83 | lang2_name = cfg.readEntry( "Lang2" ); | 86 | lang2_name = cfg.readEntry( "Lang2" ); |
84 | } | 87 | } |
85 | 88 | ||
@@ -106,18 +109,18 @@ BroswerContent DingWidget::parseInfo() | |||
106 | for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it ) | 109 | for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it ) |
107 | { | 110 | { |
108 | current = *it; | 111 | current = *it; |
109 | left = current.left( current.find( trenner ) ); | 112 | left = current.left( current.find( trenner ) ); |
110 | 113 | ||
111 | right = current.right( current.length() - current.find(trenner) - trenner.length() ); | 114 | right = current.right( current.length() - current.find(trenner) - trenner.length() ); |
112 | 115 | ||
113 | if ( left.contains( queryword , isCaseSensitive ) ) | 116 | if ( left.contains( queryword , isCaseSensitive ) ) |
114 | { | 117 | { |
115 | left.replace( queryword, substitute ); | 118 | left.replace( queryword, substitute ); |
116 | left = left + " --> " + right; | 119 | left = left + " --> " + right; |
117 | toplist.append( left ); | 120 | toplist.append( left ); |
118 | } | 121 | } |
119 | else | 122 | else if( right.contains( queryword , isCaseSensitive ) ) |
120 | { | 123 | { |
121 | right.replace( queryword, substitute ); | 124 | right.replace( queryword, substitute ); |
122 | right = right + " --> " + left; | 125 | right = right + " --> " + left; |
123 | bottomlist.append( right ); | 126 | bottomlist.append( right ); |
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index dbb55e2..9163a43 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h | |||
@@ -23,9 +23,8 @@ class DingWidget | |||
23 | 23 | ||
24 | BroswerContent setText( QString ); | 24 | BroswerContent setText( QString ); |
25 | QStringList lines; | 25 | QStringList lines; |
26 | void setCaseSensitive( bool ); | 26 | void setCaseSensitive( bool ); |
27 | void setCompleteWord( bool ); | ||
28 | void loadDict( QString ); | 27 | void loadDict( QString ); |
29 | QString loadedDict() const; | 28 | QString loadedDict() const; |
30 | void setQueryWord( QString ); | 29 | void setQueryWord( QString ); |
31 | void setDict( QString ); | 30 | void setDict( QString ); |
@@ -34,13 +33,13 @@ class DingWidget | |||
34 | QString lang1_name, | 33 | QString lang1_name, |
35 | lang2_name; | 34 | lang2_name; |
36 | 35 | ||
37 | bool isCaseSensitive; | 36 | bool isCaseSensitive; |
37 | |||
38 | private: | 38 | private: |
39 | BroswerContent parseInfo(); | 39 | BroswerContent parseInfo(); |
40 | 40 | ||
41 | BroswerContent s_strings; | 41 | BroswerContent s_strings; |
42 | bool isCompleteWord; | ||
43 | 42 | ||
44 | QString dictName; | 43 | QString dictName; |
45 | 44 | ||
46 | QString search_word; | 45 | QString search_word; |
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index c1de6ac..2028701 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp | |||
@@ -60,9 +60,8 @@ ODict::ODict() : QMainWindow() | |||
60 | bottom_name->setAlignment( AlignHCenter ); | 60 | bottom_name->setAlignment( AlignHCenter ); |
61 | browser_bottom = new QTextBrowser( vbox ); | 61 | browser_bottom = new QTextBrowser( vbox ); |
62 | 62 | ||
63 | ding = new DingWidget(); | 63 | ding = new DingWidget(); |
64 | ding->loadValues(); | ||
65 | 64 | ||
66 | loadConfig(); | 65 | loadConfig(); |
67 | setCentralWidget( vbox ); | 66 | setCentralWidget( vbox ); |
68 | } | 67 | } |
@@ -107,8 +106,9 @@ void ODict::loadConfig() | |||
107 | */ | 106 | */ |
108 | 107 | ||
109 | lookupLanguageNames( lastname ); | 108 | lookupLanguageNames( lastname ); |
110 | ding->loadDict( lastname ); | 109 | ding->loadDict( lastname ); |
110 | ding->loadValues(); | ||
111 | 111 | ||
112 | query_co->setCurrentItem( e ); | 112 | query_co->setCurrentItem( e ); |
113 | top_name->setText( top_name_content ); | 113 | top_name->setText( top_name_content ); |
114 | bottom_name->setText( bottom_name_content ); | 114 | bottom_name->setText( bottom_name_content ); |
@@ -198,12 +198,8 @@ void ODict::slotSetParameter( int count ) | |||
198 | void ODict::slotMethodChanged( const QString& methodnumber ) | 198 | void ODict::slotMethodChanged( const QString& methodnumber ) |
199 | { | 199 | { |
200 | activated_name = methodnumber; | 200 | activated_name = methodnumber; |
201 | 201 | ||
202 | qDebug( "activated_name in slotMethodChanged() ist:" ); | ||
203 | qDebug( activated_name ); | ||
204 | qDebug( ding->loadedDict() ); | ||
205 | |||
206 | if ( activated_name != ding->loadedDict() ) | 202 | if ( activated_name != ding->loadedDict() ) |
207 | { | 203 | { |
208 | ding->loadDict(activated_name); | 204 | ding->loadDict(activated_name); |
209 | 205 | ||