summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp9
-rw-r--r--noncore/apps/odict/dingwidget.h3
-rw-r--r--noncore/apps/odict/odict.cpp6
3 files changed, 8 insertions, 10 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 55a716d..c804385 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -34,7 +34,6 @@ void DingWidget::loadDict( QString name )
{
lines.clear(); //as we will load a new list we have to
//remove the old one
- qDebug( "DingWidget::loadDict( ... )" );
Config cfg( "odict" );
cfg.setGroup( "Method_" + name );
@@ -49,6 +48,9 @@ void DingWidget::loadDict( QString name )
}
file.close();
}
+
+ setDict( name );
+
loadValues();
}
@@ -79,6 +81,7 @@ void DingWidget::loadValues()
Config cfg( "odict" );
cfg.setGroup( "Method_" + methodname );
trenner = cfg.readEntry( "Seperator" );
+
lang1_name = cfg.readEntry( "Lang1" );
lang2_name = cfg.readEntry( "Lang2" );
}
@@ -107,7 +110,7 @@ BroswerContent DingWidget::parseInfo()
{
current = *it;
left = current.left( current.find( trenner ) );
-
+
right = current.right( current.length() - current.find(trenner) - trenner.length() );
if ( left.contains( queryword , isCaseSensitive ) )
@@ -116,7 +119,7 @@ BroswerContent DingWidget::parseInfo()
left = left + " --> " + right;
toplist.append( left );
}
- else
+ else if( right.contains( queryword , isCaseSensitive ) )
{
right.replace( queryword, substitute );
right = right + " --> " + left;
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index dbb55e2..9163a43 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -24,7 +24,6 @@ class DingWidget
BroswerContent setText( QString );
QStringList lines;
void setCaseSensitive( bool );
- void setCompleteWord( bool );
void loadDict( QString );
QString loadedDict() const;
void setQueryWord( QString );
@@ -35,11 +34,11 @@ class DingWidget
lang2_name;
bool isCaseSensitive;
+
private:
BroswerContent parseInfo();
BroswerContent s_strings;
- bool isCompleteWord;
QString dictName;
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index c1de6ac..2028701 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -61,7 +61,6 @@ ODict::ODict() : QMainWindow()
browser_bottom = new QTextBrowser( vbox );
ding = new DingWidget();
- ding->loadValues();
loadConfig();
setCentralWidget( vbox );
@@ -108,6 +107,7 @@ void ODict::loadConfig()
lookupLanguageNames( lastname );
ding->loadDict( lastname );
+ ding->loadValues();
query_co->setCurrentItem( e );
top_name->setText( top_name_content );
@@ -199,10 +199,6 @@ void ODict::slotMethodChanged( const QString& methodnumber )
{
activated_name = methodnumber;
- qDebug( "activated_name in slotMethodChanged() ist:" );
- qDebug( activated_name );
- qDebug( ding->loadedDict() );
-
if ( activated_name != ding->loadedDict() )
{
ding->loadDict(activated_name);