summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp4
-rw-r--r--noncore/apps/odict/dingwidget.h13
-rw-r--r--noncore/apps/odict/odict.cpp4
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
@@ -9,72 +9,72 @@
9/*************************************************************************** 9/***************************************************************************
10 * * 10 * *
11 * This program is free software; you can redistribute it and/or modify * 11 * This program is free software; you can redistribute it and/or modify *
12 * it under the terms of the GNU General Public License as published by * 12 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation; either version 2 of the License, or * 13 * the Free Software Foundation; either version 2 of the License, or *
14 * ( at your option ) any later version. * 14 * ( at your option ) any later version. *
15 * * 15 * *
16 **************************************************************************/ 16 **************************************************************************/
17#include "dingwidget.h" 17#include "dingwidget.h"
18 18
19#include <qfile.h> 19#include <qfile.h>
20#include <qpe/config.h> 20#include <qpe/config.h>
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
33DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) : QWidget(parent) 33DingWidget::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
61void DingWidget::loadValues() 61void 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
68void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) 68void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
69{ 69{
70 70
71 QString current; 71 QString current;
72 QString left; 72 QString left;
73 QString right; 73 QString right;
74 QString html_header = "<html><table>"; 74 QString html_header = "<html><table>";
75 QString html_footer = "</table></html>"; 75 QString html_footer = "</table></html>";
76 QString html_table_left = "<tr><td width='50'>"; 76 QString html_table_left = "<tr><td width='50'>";
77 QString html_table_sep = "</td><td>"; 77 QString html_table_sep = "</td><td>";
78 QString html_table_right = "</td></tr>"; 78 QString html_table_right = "</td></tr>";
79 QRegExp reg_div( "\\" ); 79 QRegExp reg_div( "\\" );
80 //QRegExp reg_div( trenner ); 80 //QRegExp reg_div( trenner );
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
12class QString; 10class QString;
13class QTextBrowser; 11class QTextBrowser;
14class QString;
15class QStringList; 12class QStringList;
16 13
17class DingWidget : public QWidget 14#include <qstring.h>
15
16class 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
@@ -76,55 +76,55 @@ void ODict::loadConfig()
76 } 76 }
77} 77}
78 78
79 79
80void ODict::saveConfig() 80void ODict::saveConfig()
81{ 81{
82 Config cfg ( "odict" ); 82 Config cfg ( "odict" );
83 cfg.setGroup( "generalsettings" ); 83 cfg.setGroup( "generalsettings" );
84 cfg.writeEntry( "errtol" , errorTol ); 84 cfg.writeEntry( "errtol" , errorTol );
85 cfg.writeEntry( "casesens" , casesens ); 85 cfg.writeEntry( "casesens" , casesens );
86 cfg.writeEntry( "regexp" , regexp ); 86 cfg.writeEntry( "regexp" , regexp );
87 cfg.writeEntry( "completewords" , completewords ); 87 cfg.writeEntry( "completewords" , completewords );
88} 88}
89 89
90void ODict::slotDisplayAbout() 90void 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
95void ODict::slotStartQuery() 95void 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
110void ODict::slotSetErrorcount( int count ) 110void ODict::slotSetErrorcount( int count )
111{ 111{
112 errorTol = count; 112 errorTol = count;
113} 113}
114 114
115void ODict::slotSettings() 115void 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 )
119 dlg.writeEntries(); 119 dlg.writeEntries();
120 else qDebug( "abgebrochen" ); 120 else qDebug( "abgebrochen" );
121} 121}
122 122
123void ODict::slotSetParameter( int count ) 123void ODict::slotSetParameter( int count )
124{ 124{
125 if ( count == 0 ) 125 if ( count == 0 )
126 { 126 {
127 if ( casesens ) 127 if ( casesens )
128 casesens = false; 128 casesens = false;
129 else 129 else
130 casesens = true; 130 casesens = true;