summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/odict/configdlg.cpp8
-rw-r--r--noncore/apps/odict/dingwidget.cpp2
-rw-r--r--noncore/apps/odict/dingwidget.h3
-rw-r--r--noncore/apps/odict/odict.cpp27
-rw-r--r--noncore/apps/odict/odict.h5
5 files changed, 31 insertions, 14 deletions
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index eba7dec..1608486 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -70,3 +70,3 @@ void ConfigDlg::writeEntries()
{
- qDebug( "richtig beendet" );
+ //XXX wozu gibt es diese Methode?
}
@@ -78,3 +78,2 @@ void ConfigDlg::slotNewMethod()
{
- //if ( !dlg.nameLE->text() ) return; //XXX
dlg.saveItem();
@@ -83,3 +82,2 @@ void ConfigDlg::slotNewMethod()
}
- else qDebug( "SearchMethodDlg abgebrochen" );
}
@@ -93,3 +91,2 @@ void ConfigDlg::slotChangeMethod()
{
- //if ( !dlg.nameLE->text() ) return; //XXX geht vielleich nicht
dlg.saveItem();
@@ -98,5 +95,3 @@ void ConfigDlg::slotChangeMethod()
}
- else qDebug( "SearchMethodDlg abgebrochen" );
}
- else qDebug( "kein item angewählt" );
}
@@ -114,3 +109,2 @@ void ConfigDlg::slotDeleteMethod()
}
- else qDebug("no item selected");
}
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index abb5e75..0707bfb 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -91,2 +91,4 @@ void DingWidget::loadValues()
trenner = cfg.readEntry( "Seperator" );
+ lang1_name = cfg.readEntry( "Lang1" );
+ lang2_name = cfg.readEntry( "Lang2" );
}
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index 74f40c9..d8466cb 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -33,2 +33,5 @@ class DingWidget
+ QString lang1_name,
+ lang2_name;
+
private:
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 9f9a8d9..cb9c4e0 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -48,9 +48,12 @@ ODict::ODict() : QMainWindow()
QHBox *hbox = new QHBox( vbox );
- QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();
+ 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) ) );
+ connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) );
ok_button = new QPushButton( tr( "&Ok" ), hbox );
connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
+ top_name = new QLabel( vbox );
browser_top = new QTextBrowser( vbox );
+ bottom_name = new QLabel( vbox );
browser_bottom = new QTextBrowser( vbox );
@@ -80,3 +83,3 @@ void ODict::loadConfig()
}
- slotMethodChanged( 1 ); //FIXME: this line should not contain a integer
+//XXX slotMethodChanged( "1" ); //FIXME: this line should not contain a integer
}
@@ -96,2 +99,4 @@ void ODict::slotStartQuery()
{
+ if ( !query_le->text( ).isEmpty() )
+ {
/*
@@ -124,2 +129,4 @@ void ODict::slotStartQuery()
ding->setDict( activated_name );
+ top_name->setText( ding->lang1_name );
+ bottom_name->setText( ding->lang2_name );
@@ -133,2 +140,3 @@ void ODict::slotStartQuery()
}
+}
@@ -148,3 +156,2 @@ void ODict::slotSettings()
}
- else qDebug( "abgebrochen" );
}
@@ -178,5 +185,13 @@ void ODict::slotSetParameter( int count )
-void ODict::slotMethodChanged( int /*methodnumber*/ )
+void ODict::slotMethodChanged( const QString& methodnumber )
{
- activated_name = query_co->currentText();
+ activated_name = methodnumber;
+
+ if ( activated_name != ding->loadedDict() )
+ ding->loadDict(activated_name);
+
+ top_name->setText( ding->lang1_name );
+ top_name->setAlignment( AlignHCenter );
+ bottom_name->setText( ding->lang2_name );
+ bottom_name->setAlignment( AlignHCenter );
}
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index 3065feb..b9a0778 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -11,2 +11,3 @@
+class QLabel;
class QVBox;
@@ -57,2 +58,4 @@ class ODict : public QMainWindow
QString activated_name;
+ QLabel *bottom_name,
+ *top_name;
@@ -63,3 +66,3 @@ class ODict : public QMainWindow
void slotSetParameter( int );
- void slotMethodChanged( int );
+ void slotMethodChanged( const QString& );
};