summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-01-03 23:21:47 (UTC)
committer cniehaus <cniehaus>2003-01-03 23:21:47 (UTC)
commit004a8ac1b25530801f68d4a041b4355ecc60c9eb (patch) (side-by-side diff)
treed850779620bf96977c68721ff1964762860df802
parent28b06247aaa55f80d91be1f8591e2cc30bac29d3 (diff)
downloadopie-004a8ac1b25530801f68d4a041b4355ecc60c9eb.zip
opie-004a8ac1b25530801f68d4a041b4355ecc60c9eb.tar.gz
opie-004a8ac1b25530801f68d4a041b4355ecc60c9eb.tar.bz2
update tille
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp16
-rw-r--r--noncore/apps/odict/dingwidget.h5
-rw-r--r--noncore/apps/odict/odict.cpp10
-rw-r--r--noncore/apps/odict/odict.h5
4 files changed, 30 insertions, 6 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 8f5a7ae..b69a803 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -27,15 +27,18 @@
#include <qtextstream.h>
#include <qstringlist.h>
#include <qregexp.h>
#include <qtextbrowser.h>
#include <stdlib.h> // for getenv
-DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom) : QWidget(parent)
+DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) : QWidget(parent)
{
+ methodname = activated_name;
queryword = word;
+ trenner = QString::null;
+ loadValues();
QString opie_dir = getenv("OPIEDIR");
QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
QStringList lines;
if( file.open( IO_ReadOnly ) )
{
@@ -47,30 +50,37 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top,
file.close();
}
lines = lines.grep( queryword );
QString top, bottom;
-
- parseInfo( lines, top , bottom );
+ //parseInfo( lines, top , bottom );
browser_top->setText( top );
browser_bottom->setText( bottom );
}
+void DingWidget::loadValues()
+{
+ Config cfg( "odict" );
+ cfg.setGroup( "Method_"+methodname );
+ trenner = cfg.readEntry( "Seperator" );
+}
+
void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
{
QString current;
QString left;
QString right;
QString html_header = "<html><table>";
QString html_footer = "</table></html>";
QString html_table_left = "<tr><td width='50'>";
QString html_table_sep = "</td><td>";
QString html_table_right = "</td></tr>";
QRegExp reg_div( "\\" );
+ //QRegExp reg_div( trenner );
QRegExp reg_word( queryword );
//QString substitute = "<font color=red>"+queryword+"</font>";
QString substitute = "<a href=''>"+queryword+"</a>";
QStringList toplist, bottomlist;
for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )
{
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index cba1edf..66379fe 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -16,13 +16,16 @@ class QStringList;
class DingWidget : public QWidget
{
Q_OBJECT
public:
- DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0);
+ DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0);
private:
QString search_word;
void parseInfo( QStringList& , QString&, QString& );
QString queryword;
+ void loadValues();
+ QString methodname;
+ QString trenner;
};
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 7de9169..2857c65 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -36,20 +36,23 @@
#include <qpe/resource.h>
ODict::ODict() : QMainWindow()
{
+
+ activated_name = QString::null;
vbox = new QVBox( this );
setCaption( tr( "OPIE-Dictionary" ) );
setupMenus();
QHBox *hbox = new QHBox( vbox );
QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();
query_le = new QLineEdit( hbox );
query_co = new QComboBox( hbox );
+ connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );
ok_button = new QPushButton( tr( "&Ok" ), hbox );
connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
browser_top = new QTextBrowser( vbox );
browser_bottom = new QTextBrowser( vbox );
loadConfig();
@@ -89,13 +92,13 @@ 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 20030103" ) );
}
void ODict::slotStartQuery()
{
QString querystring = query_le->text();
- DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom);
+ DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom, activated_name);
}
void ODict::slotSetErrorcount( int count )
{
errorTol = count;
@@ -133,12 +136,17 @@ void ODict::slotSetParameter( int count )
else
regexp = true;
}
else qWarning( "ERROR" );
}
+void ODict::slotMethodChanged( int methodnumber )
+{
+ activated_name = query_co->currentText();
+}
+
void ODict::setupMenus()
{
menu = new QMenuBar( this );
settings = new QPopupMenu( menu );
setting_a = new QAction(tr( "Config" ), Resource::loadPixmap( "today/config" ), QString::null, 0, this, 0 );
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index 7c1f32f..5096c5e 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -41,23 +41,26 @@ class ODict : public QMainWindow
QPushButton *ok_button;
QVBoxLayout *vbox_layout;
QAction *setting_a, *setting_b;
- //DingWidget *ding;
+ DingWidget *ding;
void setupMenus();
int errorTol;
bool casesens, completewords, regexp;
void loadConfig();
void saveConfig();
+
+ QString activated_name;
private slots:
void slotDisplayAbout();
void slotStartQuery();
void slotSetErrorcount( int );
void slotSettings();
void slotSetParameter( int );
+ void slotMethodChanged( int );
};