Diffstat (limited to 'noncore/apps/odict/odict.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/odict/odict.cpp | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index 0745f53..c1de6ac 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp | |||
@@ -21,9 +21,8 @@ | |||
21 | #include <qlayout.h> | 21 | #include <qlayout.h> |
22 | #include <qpopupmenu.h> | 22 | #include <qpopupmenu.h> |
23 | #include <qmenubar.h> | 23 | #include <qmenubar.h> |
24 | #include <qmessagebox.h> | 24 | #include <qmessagebox.h> |
25 | #include <qpe/config.h> | ||
26 | #include <qhbox.h> | 25 | #include <qhbox.h> |
27 | #include <qvbox.h> | 26 | #include <qvbox.h> |
28 | #include <qlabel.h> | 27 | #include <qlabel.h> |
29 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
@@ -34,9 +33,9 @@ | |||
34 | #include <qtextbrowser.h> | 33 | #include <qtextbrowser.h> |
35 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
36 | 35 | ||
37 | #include <qpe/resource.h> | 36 | #include <qpe/resource.h> |
38 | 37 | #include <qpe/config.h> | |
39 | 38 | ||
40 | ODict::ODict() : QMainWindow() | 39 | ODict::ODict() : QMainWindow() |
41 | { | 40 | { |
42 | activated_name = QString::null; | 41 | activated_name = QString::null; |
@@ -62,9 +61,9 @@ ODict::ODict() : QMainWindow() | |||
62 | browser_bottom = new QTextBrowser( vbox ); | 61 | browser_bottom = new QTextBrowser( vbox ); |
63 | 62 | ||
64 | ding = new DingWidget(); | 63 | ding = new DingWidget(); |
65 | ding->loadValues(); | 64 | ding->loadValues(); |
66 | 65 | ||
67 | loadConfig(); | 66 | loadConfig(); |
68 | setCentralWidget( vbox ); | 67 | setCentralWidget( vbox ); |
69 | } | 68 | } |
70 | 69 | ||
@@ -78,9 +77,8 @@ void ODict::loadConfig() | |||
78 | Config cfg ( "odict" ); | 77 | Config cfg ( "odict" ); |
79 | cfg.setGroup( "generalsettings" ); | 78 | cfg.setGroup( "generalsettings" ); |
80 | casesens = cfg.readEntry( "casesens" ).toInt(); | 79 | casesens = cfg.readEntry( "casesens" ).toInt(); |
81 | regexp = cfg.readEntry( "regexp" ).toInt(); | 80 | regexp = cfg.readEntry( "regexp" ).toInt(); |
82 | completewords = cfg.readEntry( "completewords" ).toInt(); | ||
83 | 81 | ||
84 | QString lastDict = cfg.readEntry( "lastdict" ); | 82 | QString lastDict = cfg.readEntry( "lastdict" ); |
85 | int i = 0, e = 0; | 83 | int i = 0, e = 0; |
86 | 84 | ||
@@ -108,8 +106,9 @@ void ODict::loadConfig() | |||
108 | * now set the two names of the dictionary and the correct QComboBox-Entry | 106 | * now set the two names of the dictionary and the correct QComboBox-Entry |
109 | */ | 107 | */ |
110 | 108 | ||
111 | lookupLanguageNames( lastname ); | 109 | lookupLanguageNames( lastname ); |
110 | ding->loadDict( lastname ); | ||
112 | 111 | ||
113 | query_co->setCurrentItem( e ); | 112 | query_co->setCurrentItem( e ); |
114 | top_name->setText( top_name_content ); | 113 | top_name->setText( top_name_content ); |
115 | bottom_name->setText( bottom_name_content ); | 114 | bottom_name->setText( bottom_name_content ); |
@@ -128,16 +127,13 @@ void ODict::saveConfig() | |||
128 | Config cfg ( "odict" ); | 127 | Config cfg ( "odict" ); |
129 | cfg.setGroup( "generalsettings" ); | 128 | cfg.setGroup( "generalsettings" ); |
130 | cfg.writeEntry( "casesens" , casesens ); | 129 | cfg.writeEntry( "casesens" , casesens ); |
131 | cfg.writeEntry( "regexp" , regexp ); | 130 | cfg.writeEntry( "regexp" , regexp ); |
132 | cfg.writeEntry( "completewords" , completewords ); | ||
133 | cfg.writeEntry( "lastdict" , query_co->currentText() ); | 131 | cfg.writeEntry( "lastdict" , query_co->currentText() ); |
134 | } | 132 | } |
135 | 133 | ||
136 | void ODict::slotStartQuery() | 134 | void ODict::slotStartQuery() |
137 | { | 135 | { |
138 | qDebug( "bin in slotStartQuery()" ); | ||
139 | |||
140 | QString querystring = query_le->text(); | 136 | QString querystring = query_le->text(); |
141 | if ( !querystring.isEmpty() ) | 137 | if ( !querystring.isEmpty() ) |
142 | { | 138 | { |
143 | /* | 139 | /* |
@@ -148,9 +144,9 @@ void ODict::slotStartQuery() | |||
148 | switch ( QMessageBox::information( this, tr( "OPIE-Dictionary" ), | 144 | switch ( QMessageBox::information( this, tr( "OPIE-Dictionary" ), |
149 | tr( "No dictionary defined" ), | 145 | tr( "No dictionary defined" ), |
150 | tr( "&Define one" ), | 146 | tr( "&Define one" ), |
151 | tr( "&Cancel" ), | 147 | tr( "&Cancel" ), |
152 | 0, // Define a dict choosen | 148 | 0, // Define a dict |
153 | 1 ) ) // Cancel choosen | 149 | 1 ) ) // Cancel choosen |
154 | { | 150 | { |
155 | case 0: | 151 | case 0: |
156 | slotSettings(); | 152 | slotSettings(); |
@@ -163,25 +159,11 @@ void ODict::slotStartQuery() | |||
163 | /* | 159 | /* |
164 | * ok, the user has defined a dict | 160 | * ok, the user has defined a dict |
165 | */ | 161 | */ |
166 | ding->setCaseSensitive( casesens ); | 162 | ding->setCaseSensitive( casesens ); |
167 | ding->setCompleteWord( completewords ); | ||
168 | |||
169 | qDebug( "activated_name ist:" ); | ||
170 | qDebug( activated_name ); | ||
171 | |||
172 | ding->setDict( activated_name ); | ||
173 | |||
174 | //X if ( activated_name != ding->loadedDict() ) | ||
175 | ding->loadDict(activated_name); | ||
176 | 163 | ||
177 | BroswerContent test = ding->setText( querystring ); | 164 | BroswerContent test = ding->setText( querystring ); |
178 | 165 | ||
179 | qDebug( querystring ); | ||
180 | if ( ding->isCaseSensitive ) | ||
181 | qDebug( "ist CS"); | ||
182 | else qDebug( "kein CS" ); | ||
183 | |||
184 | browser_top->setText( test.top ); | 166 | browser_top->setText( test.top ); |
185 | browser_bottom->setText( test.bottom ); | 167 | browser_bottom->setText( test.bottom ); |
186 | } | 168 | } |
187 | } | 169 | } |
@@ -204,15 +186,8 @@ void ODict::slotSetParameter( int count ) | |||
204 | } | 186 | } |
205 | 187 | ||
206 | if ( count == 1 ) | 188 | if ( count == 1 ) |
207 | { | 189 | { |
208 | if ( completewords ) | ||
209 | completewords = false; | ||
210 | else | ||
211 | completewords = true; | ||
212 | } | ||
213 | if ( count == 2 ) | ||
214 | { | ||
215 | if ( regexp ) | 190 | if ( regexp ) |
216 | regexp = false; | 191 | regexp = false; |
217 | else | 192 | else |
218 | regexp = true; | 193 | regexp = true; |
@@ -225,10 +200,11 @@ void ODict::slotMethodChanged( const QString& methodnumber ) | |||
225 | activated_name = methodnumber; | 200 | activated_name = methodnumber; |
226 | 201 | ||
227 | qDebug( "activated_name in slotMethodChanged() ist:" ); | 202 | qDebug( "activated_name in slotMethodChanged() ist:" ); |
228 | qDebug( activated_name ); | 203 | qDebug( activated_name ); |
204 | qDebug( ding->loadedDict() ); | ||
229 | 205 | ||
230 | //X if ( activated_name != ding->loadedDict() ) | 206 | if ( activated_name != ding->loadedDict() ) |
231 | { | 207 | { |
232 | ding->loadDict(activated_name); | 208 | ding->loadDict(activated_name); |
233 | 209 | ||
234 | lookupLanguageNames( activated_name ); | 210 | lookupLanguageNames( activated_name ); |
@@ -249,9 +225,8 @@ void ODict::setupMenus() | |||
249 | 225 | ||
250 | parameter = new QPopupMenu( menu ); | 226 | parameter = new QPopupMenu( menu ); |
251 | connect( parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) ); | 227 | connect( parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) ); |
252 | parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); | 228 | parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); |
253 | parameter->insertItem( tr( "Only &complete Words" ), 1 , 1) ; | ||
254 | parameter->insertItem( tr( "Allow ®. expressions" ), 2 ); | 229 | parameter->insertItem( tr( "Allow ®. expressions" ), 2 ); |
255 | parameter->insertSeparator(); | 230 | parameter->insertSeparator(); |
256 | 231 | ||
257 | menu->insertItem( tr( "Settings" ) , settings ); | 232 | menu->insertItem( tr( "Settings" ) , settings ); |