summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -32,5 +32,8 @@
-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");
@@ -52,4 +55,3 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top,
QString top, bottom;
-
- parseInfo( lines, top , bottom );
+ //parseInfo( lines, top , bottom );
browser_top->setText( top );
@@ -58,2 +60,9 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top,
+void DingWidget::loadValues()
+{
+ Config cfg( "odict" );
+ cfg.setGroup( "Method_"+methodname );
+ trenner = cfg.readEntry( "Seperator" );
+}
+
void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
@@ -70,2 +79,3 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
QRegExp reg_div( "\\" );
+ //QRegExp reg_div( trenner );
QRegExp reg_word( queryword );
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
@@ -21,3 +21,3 @@ class DingWidget : public QWidget
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);
@@ -27,2 +27,5 @@ class DingWidget : public QWidget
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
@@ -41,2 +41,4 @@ ODict::ODict() : QMainWindow()
{
+
+ activated_name = QString::null;
vbox = new QVBox( this );
@@ -49,2 +51,3 @@ ODict::ODict() : QMainWindow()
query_co = new QComboBox( hbox );
+ connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );
ok_button = new QPushButton( tr( "&Ok" ), hbox );
@@ -94,3 +97,3 @@ 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);
}
@@ -138,2 +141,7 @@ void ODict::slotSetParameter( int count )
+void ODict::slotMethodChanged( int methodnumber )
+{
+ activated_name = query_co->currentText();
+}
+
void ODict::setupMenus()
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
@@ -46,3 +46,3 @@ class ODict : public QMainWindow
- //DingWidget *ding;
+ DingWidget *ding;
@@ -55,2 +55,4 @@ class ODict : public QMainWindow
void saveConfig();
+
+ QString activated_name;
@@ -62,2 +64,3 @@ class ODict : public QMainWindow
void slotSetParameter( int );
+ void slotMethodChanged( int );
};