summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/configdlg.cpp5
-rw-r--r--noncore/apps/odict/configdlg.h3
-rw-r--r--noncore/apps/odict/dingwidget.cpp19
-rw-r--r--noncore/apps/odict/dingwidget.h4
-rw-r--r--noncore/apps/odict/odict.cpp106
-rw-r--r--noncore/apps/odict/odict.h8
-rw-r--r--noncore/apps/odict/searchmethoddlg.cpp2
-rw-r--r--noncore/apps/odict/searchmethoddlg.h1
8 files changed, 86 insertions, 62 deletions
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index 1608486..400298d 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -68,7 +68,2 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
-void ConfigDlg::writeEntries()
-{
- //XXX wozu gibt es diese Methode?
-}
-
void ConfigDlg::slotNewMethod()
diff --git a/noncore/apps/odict/configdlg.h b/noncore/apps/odict/configdlg.h
index 2b7d0a1..e3ef3ce 100644
--- a/noncore/apps/odict/configdlg.h
+++ b/noncore/apps/odict/configdlg.h
@@ -16,3 +16,2 @@ class QPushButton;
-
class ConfigDlg : public QDialog
@@ -24,4 +23,2 @@ class ConfigDlg : public QDialog
- void writeEntries();
-
private:
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 0707bfb..ed67abf 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -20,7 +20,2 @@
#include <qpe/config.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qmainwindow.h>
#include <qstring.h>
@@ -29,4 +24,2 @@
#include <qregexp.h>
-#include <qtextbrowser.h>
-//#include <stdlib.h> // for getenv
@@ -41,7 +34,12 @@ void DingWidget::loadDict( QString name )
{
+ qDebug( "bin in DingWidget::loadDict(). name ist:" );
+ qDebug( name );
+
dictName = name;
Config cfg( "odict" );
- if ( !methodname ) return;
+ if ( !methodname ) { return; }
cfg.setGroup( "Method_" + methodname );
QFile file( cfg.readEntry( "file" ) );
+
+ qDebug( cfg.readEntry( "file" ) );
@@ -57,5 +55,6 @@ void DingWidget::loadDict( QString name )
loadValues();
+
}
-QString DingWidget::loadedDict()
+QString DingWidget::loadedDict() const
{
@@ -104,2 +103,4 @@ BroswerContent DingWidget::parseInfo()
{
+ qDebug( "bin in DingWidget::parseInfo()" );
+
if ( isCompleteWord )
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index d8466cb..dbb55e2 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -28,3 +28,3 @@ class DingWidget
void loadDict( QString );
- QString loadedDict();
+ QString loadedDict() const;
void setQueryWord( QString );
@@ -36,2 +36,3 @@ class DingWidget
+ bool isCaseSensitive;
private:
@@ -41,3 +42,2 @@ class DingWidget
bool isCompleteWord;
- bool isCaseSensitive;
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index cb9c4e0..0745f53 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -55,5 +55,8 @@ ODict::ODict() : QMainWindow()
connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
+
top_name = new QLabel( vbox );
+ top_name->setAlignment( AlignHCenter );
browser_top = new QTextBrowser( vbox );
bottom_name = new QLabel( vbox );
+ bottom_name->setAlignment( AlignHCenter );
browser_bottom = new QTextBrowser( vbox );
@@ -69,5 +72,9 @@ void ODict::loadConfig()
{
+ /*
+ * the name of the last used dictionary
+ */
+ QString lastname;
+
Config cfg ( "odict" );
cfg.setGroup( "generalsettings" );
- errorTol = cfg.readEntry( "errtol" ).toInt();
casesens = cfg.readEntry( "casesens" ).toInt();
@@ -76,2 +83,5 @@ void ODict::loadConfig()
+ QString lastDict = cfg.readEntry( "lastdict" );
+ int i = 0, e = 0;
+
QStringList groupListCfg = cfg.groupList().grep( "Method_" );
@@ -80,8 +90,36 @@ void ODict::loadConfig()
{
+ QString name;
cfg.setGroup( *it );
- query_co->insertItem( cfg.readEntry( "Name" ) );
+ name = cfg.readEntry( "Name" );
+ query_co->insertItem( name );
+
+ /*
+ * this check is to look up what dictionary has been used the
+ * last time
+ */
+ if ( lastDict == name )
+ {
+ e = i;
+ lastname = name;
+ }
+ i++;
}
-//XXX slotMethodChanged( "1" ); //FIXME: this line should not contain a integer
+ /*
+ * now set the two names of the dictionary and the correct QComboBox-Entry
+ */
+
+ lookupLanguageNames( lastname );
+
+ query_co->setCurrentItem( e );
+ top_name->setText( top_name_content );
+ bottom_name->setText( bottom_name_content );
}
+void ODict::lookupLanguageNames( QString dictname )
+{
+ Config cfg ( "odict" );
+ cfg.setGroup( "Method_"+dictname );
+ top_name_content = cfg.readEntry( "Lang1" );
+ bottom_name_content = cfg.readEntry( "Lang2" );
+}
@@ -91,3 +129,2 @@ void ODict::saveConfig()
cfg.setGroup( "generalsettings" );
- cfg.writeEntry( "errtol" , errorTol );
cfg.writeEntry( "casesens" , casesens );
@@ -95,2 +132,3 @@ void ODict::saveConfig()
cfg.writeEntry( "completewords" , completewords );
+ cfg.writeEntry( "lastdict" , query_co->currentText() );
}
@@ -99,3 +137,6 @@ void ODict::slotStartQuery()
{
- if ( !query_le->text( ).isEmpty() )
+ qDebug( "bin in slotStartQuery()" );
+
+ QString querystring = query_le->text();
+ if ( !querystring.isEmpty() )
{
@@ -113,3 +154,2 @@ void ODict::slotStartQuery()
{
-
case 0:
@@ -125,10 +165,11 @@ void ODict::slotStartQuery()
*/
- QString querystring = query_le->text();
ding->setCaseSensitive( casesens );
ding->setCompleteWord( completewords );
+
+ qDebug( "activated_name ist:" );
+ qDebug( activated_name );
+
ding->setDict( activated_name );
- top_name->setText( ding->lang1_name );
- bottom_name->setText( ding->lang2_name );
- if ( activated_name != ding->loadedDict() )
+//X if ( activated_name != ding->loadedDict() )
ding->loadDict(activated_name);
@@ -137,2 +178,7 @@ void ODict::slotStartQuery()
+ qDebug( querystring );
+ if ( ding->isCaseSensitive )
+ qDebug( "ist CS");
+ else qDebug( "kein CS" );
+
browser_top->setText( test.top );
@@ -142,8 +188,2 @@ void ODict::slotStartQuery()
-
-void ODict::slotSetErrorcount( int count )
-{
- errorTol = count;
-}
-
void ODict::slotSettings()
@@ -152,6 +192,3 @@ void ODict::slotSettings()
if ( dlg.exec() == QDialog::Accepted )
- {
- dlg.writeEntries();
- loadConfig();
- }
+ saveConfig();
}
@@ -182,3 +219,3 @@ void ODict::slotSetParameter( int count )
}
- else qWarning( "ERROR" );
+ saveConfig();
}
@@ -189,9 +226,13 @@ void ODict::slotMethodChanged( const QString& methodnumber )
- if ( activated_name != ding->loadedDict() )
- ding->loadDict(activated_name);
+ qDebug( "activated_name in slotMethodChanged() ist:" );
+ qDebug( activated_name );
- top_name->setText( ding->lang1_name );
- top_name->setAlignment( AlignHCenter );
- bottom_name->setText( ding->lang2_name );
- bottom_name->setAlignment( AlignHCenter );
+//X if ( activated_name != ding->loadedDict() )
+ {
+ ding->loadDict(activated_name);
+
+ lookupLanguageNames( activated_name );
+ top_name->setText( top_name_content );
+ bottom_name->setText( bottom_name_content );
+ }
}
@@ -214,13 +255,2 @@ void ODict::setupMenus()
parameter->insertSeparator();
- error_tol_menu = new QPopupMenu( menu );
- error_tol_menu->setCheckable( TRUE );
- connect( error_tol_menu, SIGNAL( activated( int ) ), this, SLOT( slotSetErrorcount( int ) ) );
-
- error_tol_menu->insertItem( tr( "0 Errors" ), 0 );
- error_tol_menu->insertItem( tr( "1 Errors" ), 1 );
- error_tol_menu->insertItem( tr( "2 Errors" ), 2 );
- error_tol_menu->insertItem( tr( "3 Errors" ), 3 );
- error_tol_menu->insertItem( tr( "4 Errors" ), 4 );
- error_tol_menu->insertItem( tr( "Until Hit" ), 5 );
- parameter->insertItem( tr( "&Error tolerance" ), error_tol_menu );
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index b9a0778..9c037ea 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -38,3 +38,3 @@ class ODict : public QMainWindow
private:
- QPopupMenu *help, *settings, *parameter, *error_tol_menu;
+ QPopupMenu *help, *settings, *parameter;
QMenuBar *menu;
@@ -51,3 +51,2 @@ class ODict : public QMainWindow
- int errorTol;
bool casesens, completewords, regexp;
@@ -60,2 +59,6 @@ class ODict : public QMainWindow
*top_name;
+
+ QString top_name_content, bottom_name_content;
+
+ void lookupLanguageNames( QString );
@@ -63,3 +66,2 @@ class ODict : public QMainWindow
void slotStartQuery();
- void slotSetErrorcount( int );
void slotSettings();
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp
index 8a14703..99cd8db 100644
--- a/noncore/apps/odict/searchmethoddlg.cpp
+++ b/noncore/apps/odict/searchmethoddlg.cpp
@@ -93,3 +93,3 @@ void SearchMethodDlg::slotBrowse()
{
- itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,QDir::homeDirPath());
+ itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,QDir::homeDirPath());
dictFileLE->setText( itemName );
diff --git a/noncore/apps/odict/searchmethoddlg.h b/noncore/apps/odict/searchmethoddlg.h
index d98842f..706bbc1 100644
--- a/noncore/apps/odict/searchmethoddlg.h
+++ b/noncore/apps/odict/searchmethoddlg.h
@@ -19,3 +19,2 @@ class QString;
-
class SearchMethodDlg : public QDialog