author | cniehaus <cniehaus> | 2003-05-02 12:24:59 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-05-02 12:24:59 (UTC) |
commit | 6ba2bb2dde0c69ffeba860a9375bab82521e9304 (patch) (unidiff) | |
tree | e24a0a5c9bd411a99133dde4417502c9abdad3f0 | |
parent | 1837f8be61831812b5ab08b110c0c6e6b86d3a97 (diff) | |
download | opie-6ba2bb2dde0c69ffeba860a9375bab82521e9304.zip opie-6ba2bb2dde0c69ffeba860a9375bab82521e9304.tar.gz opie-6ba2bb2dde0c69ffeba860a9375bab82521e9304.tar.bz2 |
remove debug + now he reads the file the user told him
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 4be6e71..5c4b13b 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp | |||
@@ -26,58 +26,53 @@ | |||
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( ) | 33 | DingWidget::DingWidget( ) |
34 | { | 34 | { |
35 | methodname = QString::null; | 35 | methodname = QString::null; |
36 | trenner = QString::null; | 36 | trenner = QString::null; |
37 | lines = 0L; | 37 | lines = 0L; |
38 | } | 38 | } |
39 | 39 | ||
40 | void DingWidget::loadDict( QString name ) | 40 | void DingWidget::loadDict( QString name ) |
41 | { | 41 | { |
42 | qDebug( "MUSS ich wirklich aufgerufen werder? schreit loadDict" ); | ||
43 | qDebug( "Starte mit dem loadedDict(...)" ); | ||
44 | dictName = name; | 42 | dictName = name; |
45 | qDebug( "bin in loadedDict() und lade das Dict:" ); | ||
46 | qDebug( dictName ); | ||
47 | QString opie_dir = getenv("OPIEDIR"); | 43 | QString opie_dir = getenv("OPIEDIR"); |
48 | QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" ); | 44 | |
49 | //FIXME:this should of course be not hardcoded ;) | 45 | Config cfg( "odict" ); |
46 | cfg.setGroup( "Method_" + methodname ); | ||
47 | QFile file( cfg.readEntry( "file" ) ); | ||
50 | 48 | ||
51 | if( file.open( IO_ReadOnly ) ) | 49 | if( file.open( IO_ReadOnly ) ) |
52 | { | 50 | { |
53 | QTextStream stream( &file ); | 51 | QTextStream stream( &file ); |
54 | while ( !stream.eof() ) | 52 | while ( !stream.eof() ) |
55 | { | 53 | { |
56 | lines.append( stream.readLine() ); | 54 | lines.append( stream.readLine() ); |
57 | } | 55 | } |
58 | file.close(); | 56 | file.close(); |
59 | } | 57 | } |
60 | qDebug( "loadedDict(...) ist beended" ); | ||
61 | loadValues(); | 58 | loadValues(); |
62 | } | 59 | } |
63 | 60 | ||
64 | QString DingWidget::loadedDict() | 61 | QString DingWidget::loadedDict() |
65 | { | 62 | { |
66 | qDebug( dictName ); | ||
67 | qDebug( "^ ^ ^ ^ ^ ^ ^ war der dictName" ); | ||
68 | return dictName; | 63 | return dictName; |
69 | } | 64 | } |
70 | 65 | ||
71 | void DingWidget::setCaseSensitive( bool caseS ) | 66 | void DingWidget::setCaseSensitive( bool caseS ) |
72 | { | 67 | { |
73 | isCaseSensitive = caseS; | 68 | isCaseSensitive = caseS; |
74 | } | 69 | } |
75 | 70 | ||
76 | void DingWidget::setDict( QString dict ) | 71 | void DingWidget::setDict( QString dict ) |
77 | { | 72 | { |
78 | methodname = dict; | 73 | methodname = dict; |
79 | } | 74 | } |
80 | 75 | ||
81 | void DingWidget::setCompleteWord( bool cword ) | 76 | void DingWidget::setCompleteWord( bool cword ) |
82 | { | 77 | { |
83 | isCompleteWord = cword; | 78 | isCompleteWord = cword; |
@@ -86,34 +81,32 @@ void DingWidget::setCompleteWord( bool cword ) | |||
86 | void DingWidget::setQueryWord( QString qword ) | 81 | void DingWidget::setQueryWord( QString qword ) |
87 | { | 82 | { |
88 | queryword = qword; | 83 | queryword = qword; |
89 | } | 84 | } |
90 | 85 | ||
91 | 86 | ||
92 | void DingWidget::loadValues() | 87 | void DingWidget::loadValues() |
93 | { | 88 | { |
94 | Config cfg( "odict" ); | 89 | Config cfg( "odict" ); |
95 | cfg.setGroup( "Method_" + methodname ); | 90 | cfg.setGroup( "Method_" + methodname ); |
96 | trenner = cfg.readEntry( "Seperator" ); | 91 | trenner = cfg.readEntry( "Seperator" ); |
97 | } | 92 | } |
98 | 93 | ||
99 | BroswerContent DingWidget::setText( QString word ) | 94 | BroswerContent DingWidget::setText( QString word ) |
100 | { | 95 | { |
101 | queryword = word; | 96 | queryword = word; |
102 | qDebug( queryword ); | ||
103 | qDebug( "^ ^ ^ ^ ^ ^ ^ war das gesuchte Word"); | ||
104 | return parseInfo(); | 97 | return parseInfo(); |
105 | } | 98 | } |
106 | 99 | ||
107 | 100 | ||
108 | BroswerContent DingWidget::parseInfo() | 101 | BroswerContent DingWidget::parseInfo() |
109 | { | 102 | { |
110 | if ( isCompleteWord ) | 103 | if ( isCompleteWord ) |
111 | queryword = " " + queryword + " "; | 104 | queryword = " " + queryword + " "; |
112 | QStringList search = lines.grep( queryword , isCaseSensitive ); | 105 | QStringList search = lines.grep( queryword , isCaseSensitive ); |
113 | 106 | ||
114 | QString current; | 107 | QString current; |
115 | QString left; | 108 | QString left; |
116 | QString right; | 109 | QString right; |
117 | QRegExp reg_div( trenner ); | 110 | QRegExp reg_div( trenner ); |
118 | QRegExp reg_word( queryword ); | 111 | QRegExp reg_word( queryword ); |
119 | reg_word.setCaseSensitive( isCaseSensitive ); | 112 | reg_word.setCaseSensitive( isCaseSensitive ); |