4 files changed, 62 insertions, 13 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index ff83114..c54cf56 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -17,4 +17,5 @@
 #include "dingwidget.h"
 
+#include <qfile.h>
 #include <qpe/config.h>
 #include <qhbox.h>
@@ -24,7 +25,38 @@
 #include <qmainwindow.h>
 #include <qstring.h>
+#include <qtextstream.h>
+#include <qstringlist.h>
+#include <qregexp.h>
+#include <qtextbrowser.h>
 
-DingWidget::DingWidget() : QWidget()
+DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser) : QWidget(parent)
 {
+        QFile file( "/home/carsten/opie/opie/noncore/apps/odict/eng_ita.dic" );
+        QStringList lines;
+
+        if(  file.open(  IO_ReadOnly ) )
+        {
+                QTextStream stream(  &file );
+                while ( !stream.eof() )
+                {
+                        lines.append(  stream.readLine() );
+                }
+                file.close();
+        }
+
+        lines = lines.grep( word );
+
+        //X for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )
+        //X {
+        //X     qDebug( *it );
+        //X }
+        browser->setText( parseInfo( lines ) );
 }
 
+QString DingWidget::parseInfo( QStringList &lines )
+{
+        QString parsed = 0;
+        QStringList temp = lines;
+        parsed = temp.first();
+        return parsed;
+}
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index 68841d0..54e16ab 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -10,9 +10,8 @@
 #include <qwidget.h>
 
-class QPopupMenu;
-class QMenuBar;
-class QHBox;
-class QPushButton;
-class QLineEdit;
+class QString;
+class QTextBrowser;
+class QString;
+class QStringList;
 
 class DingWidget : public QWidget
@@ -21,4 +20,7 @@ class DingWidget : public QWidget
         
     public:
-                DingWidget();
+                DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0);
+
+        private:
+                QString parseInfo( QStringList& );
 };
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 0412807..6c03ce3 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -17,7 +17,7 @@
 #include "odict.h"
 #include "configdlg.h"
+#include "dingwidget.h"
 
-#include <opie/otabwidget.h>
-
+#include <qlayout.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
@@ -25,4 +25,5 @@
 #include <qpe/config.h>
 #include <qhbox.h>
+#include <qvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
@@ -31,4 +32,5 @@
 #include <qstring.h>
 #include <qaction.h>
+#include <qtextbrowser.h>
 
 #include <qpe/resource.h>
@@ -37,15 +39,17 @@
 ODict::ODict() : QMainWindow()
 {
+        vbox = new QVBox( this );
         setCaption( tr( "OPIE-Dictionary" ) );
         setupMenus();
 
-        QHBox *hbox = new QHBox( this );
+        QHBox *hbox = new QHBox( vbox );
         QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();
         query_le = new QLineEdit( hbox );
         ok_button = new QPushButton( tr( "&Ok" ), hbox );
         connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
-        
-        setCentralWidget( hbox );
+        browser = new QTextBrowser( vbox );
+
         loadConfig();
+        setCentralWidget( vbox );
 }
 
@@ -73,5 +77,5 @@ void ODict::saveConfig()
 void ODict::slotDisplayAbout()
 {
-        QMessageBox::about(  this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten  Niehaus \n cniehaus@handhelds.org \n Version 20021230" ) );
+        QMessageBox::about(  this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten  Niehaus \n cniehaus@handhelds.org \n Version 20030103" ) );
 }
 
@@ -79,4 +83,5 @@ void ODict::slotStartQuery()
 {
         QString querystring = query_le->text();
+        DingWidget *ding = new DingWidget( vbox , querystring , browser);
 }
 
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index 014e488..d7e57e8 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -10,4 +10,5 @@
 #include <qmainwindow.h>
 
+class QVBox;
 class QPopupMenu;
 class QMenuBar;
@@ -16,5 +17,8 @@ class QPushButton;
 class QLineEdit;
 class QAction;
+class QVBoxLayout;
 class QActionGroup;
+class DingWidget;
+class QTextBrowser;
 
 class ODict : public QMainWindow
@@ -24,4 +28,6 @@ class ODict : public QMainWindow
     public:
                 ODict();
+                QVBox *vbox;
+                QTextBrowser *browser;
 
         private:
@@ -32,5 +38,9 @@ class ODict : public QMainWindow
                 QPushButton *ok_button;
 
+                QVBoxLayout *vbox_layout;
+
                 QAction *setting_a, *setting_b;
+
+                //DingWidget *ding;
                 
                 void setupMenus();