author | cniehaus <cniehaus> | 2003-01-04 12:57:25 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-01-04 12:57:25 (UTC) |
commit | 69f08fb67ec7e92c4b3c573d6a1ce374aaa97cee (patch) (unidiff) | |
tree | dba2a9fd1bcb38841227bda4b29fa625fc02169e | |
parent | 969924a9d896b70141758b734d898b4423dac357 (diff) | |
download | opie-69f08fb67ec7e92c4b3c573d6a1ce374aaa97cee.zip opie-69f08fb67ec7e92c4b3c573d6a1ce374aaa97cee.tar.gz opie-69f08fb67ec7e92c4b3c573d6a1ce374aaa97cee.tar.bz2 |
- qWarning("emphty querysting");
+ qWarning("empty querysting");
- DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom, activated_name);
+ DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );
That with some more changes even works
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.h | 13 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 4 |
3 files changed, 9 insertions, 12 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index b69a803..6154d68 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp | |||
@@ -21,48 +21,48 @@ | |||
21 | #include <qhbox.h> | 21 | #include <qhbox.h> |
22 | #include <qlabel.h> | 22 | #include <qlabel.h> |
23 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
25 | #include <qmainwindow.h> | 25 | #include <qmainwindow.h> |
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <qtextstream.h> | 27 | #include <qtextstream.h> |
28 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | #include <qregexp.h> | 29 | #include <qregexp.h> |
30 | #include <qtextbrowser.h> | 30 | #include <qtextbrowser.h> |
31 | #include <stdlib.h> // for getenv | 31 | #include <stdlib.h> // for getenv |
32 | 32 | ||
33 | DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) : QWidget(parent) | 33 | DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) |
34 | { | 34 | { |
35 | methodname = activated_name; | 35 | methodname = activated_name; |
36 | queryword = word; | 36 | queryword = word; |
37 | trenner = QString::null; | 37 | trenner = QString::null; |
38 | loadValues(); | 38 | loadValues(); |
39 | QString opie_dir = getenv("OPIEDIR"); | 39 | QString opie_dir = getenv("OPIEDIR"); |
40 | QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" ); | 40 | QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" ); |
41 | QStringList lines; | 41 | QStringList lines; |
42 | 42 | ||
43 | if( file.open( IO_ReadOnly ) ) | 43 | if( file.open( IO_ReadOnly ) ) |
44 | { | 44 | { |
45 | QTextStream stream( &file ); | 45 | QTextStream stream( &file ); |
46 | while ( !stream.eof() ) | 46 | while ( !stream.eof() ) |
47 | { | 47 | { |
48 | lines.append( stream.readLine() ); | 48 | lines.append( stream.readLine() ); |
49 | } | 49 | } |
50 | file.close(); | 50 | file.close(); |
51 | } | 51 | } |
52 | 52 | ||
53 | lines = lines.grep( queryword ); | 53 | lines = lines.grep( queryword ); |
54 | 54 | ||
55 | QString top, bottom; | 55 | QString top, bottom; |
56 | //parseInfo( lines, top , bottom ); | 56 | parseInfo( lines, top , bottom ); |
57 | browser_top->setText( top ); | 57 | browser_top->setText( top ); |
58 | browser_bottom->setText( bottom ); | 58 | browser_bottom->setText( bottom ); |
59 | } | 59 | } |
60 | 60 | ||
61 | void DingWidget::loadValues() | 61 | void DingWidget::loadValues() |
62 | { | 62 | { |
63 | Config cfg( "odict" ); | 63 | Config cfg( "odict" ); |
64 | cfg.setGroup( "Method_"+methodname ); | 64 | cfg.setGroup( "Method_"+methodname ); |
65 | trenner = cfg.readEntry( "Seperator" ); | 65 | trenner = cfg.readEntry( "Seperator" ); |
66 | } | 66 | } |
67 | 67 | ||
68 | void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) | 68 | void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) |
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index 66379fe..1cedb4e 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h | |||
@@ -1,31 +1,28 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * This program is free software; you can redistribute it and/or modify * | 3 | * This program is free software; you can redistribute it and/or modify * |
4 | * it under the terms of the GNU General Public License as published by * | 4 | * it under the terms of the GNU General Public License as published by * |
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * ( at your option ) any later version. * | 6 | * ( at your option ) any later version. * |
7 | * * | 7 | * * |
8 | **************************************************************************/ | 8 | **************************************************************************/ |
9 | 9 | ||
10 | #include <qwidget.h> | ||
11 | |||
12 | class QString; | 10 | class QString; |
13 | class QTextBrowser; | 11 | class QTextBrowser; |
14 | class QString; | ||
15 | class QStringList; | 12 | class QStringList; |
16 | 13 | ||
17 | class DingWidget : public QWidget | 14 | #include <qstring.h> |
15 | |||
16 | class DingWidget | ||
18 | { | 17 | { |
19 | Q_OBJECT | ||
20 | |||
21 | public: | 18 | public: |
22 | DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0); | 19 | DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0); |
23 | 20 | ||
24 | private: | 21 | private: |
25 | QString search_word; | 22 | QString search_word; |
26 | void parseInfo( QStringList& , QString&, QString& ); | 23 | void parseInfo( QStringList& , QString&, QString& ); |
27 | QString queryword; | 24 | QString queryword; |
28 | void loadValues(); | 25 | void loadValues(); |
29 | QString methodname; | 26 | QString methodname; |
30 | QString trenner; | 27 | QString trenner; |
31 | }; | 28 | }; |
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index e2d1d7b..1fbdb85 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp | |||
@@ -88,31 +88,31 @@ void ODict::saveConfig() | |||
88 | } | 88 | } |
89 | 89 | ||
90 | void ODict::slotDisplayAbout() | 90 | void ODict::slotDisplayAbout() |
91 | { | 91 | { |
92 | QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030103" ) ); | 92 | QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030103" ) ); |
93 | } | 93 | } |
94 | 94 | ||
95 | void ODict::slotStartQuery() | 95 | void ODict::slotStartQuery() |
96 | { | 96 | { |
97 | QString querystring = query_le->text(); | 97 | QString querystring = query_le->text(); |
98 | qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1()); | 98 | qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1()); |
99 | if (querystring.isEmpty()){ | 99 | if (querystring.isEmpty()){ |
100 | qWarning("emphty querysting"); | 100 | qWarning("empty querysting"); |
101 | return; | 101 | return; |
102 | } | 102 | } |
103 | if (!activated_name || activated_name.isEmpty()) | 103 | if (!activated_name || activated_name.isEmpty()) |
104 | QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); | 104 | QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); |
105 | else | 105 | else |
106 | DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom, activated_name); | 106 | DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name ); |
107 | } | 107 | } |
108 | 108 | ||
109 | 109 | ||
110 | void ODict::slotSetErrorcount( int count ) | 110 | void ODict::slotSetErrorcount( int count ) |
111 | { | 111 | { |
112 | errorTol = count; | 112 | errorTol = count; |
113 | } | 113 | } |
114 | 114 | ||
115 | void ODict::slotSettings() | 115 | void ODict::slotSettings() |
116 | { | 116 | { |
117 | ConfigDlg dlg( this, "Config" , true); | 117 | ConfigDlg dlg( this, "Config" , true); |
118 | if ( dlg.exec() == QDialog::Accepted ) | 118 | if ( dlg.exec() == QDialog::Accepted ) |