author | cniehaus <cniehaus> | 2003-05-02 13:41:37 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-05-02 13:41:37 (UTC) |
commit | b40991b25dd22c55cc80a9a9c4ae0adec103d575 (patch) (side-by-side diff) | |
tree | a5d0ba564cf7809bdb603e0fcefac899f301c16c /noncore/apps | |
parent | 6ba2bb2dde0c69ffeba860a9375bab82521e9304 (diff) | |
download | opie-b40991b25dd22c55cc80a9a9c4ae0adec103d575.zip opie-b40991b25dd22c55cc80a9a9c4ae0adec103d575.tar.gz opie-b40991b25dd22c55cc80a9a9c4ae0adec103d575.tar.bz2 |
bugfix
-rw-r--r-- | noncore/apps/odict/configdlg.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 40 |
3 files changed, 18 insertions, 30 deletions
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp index 89bc6f6..eba7dec 100644 --- a/noncore/apps/odict/configdlg.cpp +++ b/noncore/apps/odict/configdlg.cpp @@ -78,2 +78,3 @@ void ConfigDlg::slotNewMethod() { + //if ( !dlg.nameLE->text() ) return; //XXX dlg.saveItem(); @@ -92,2 +93,3 @@ void ConfigDlg::slotChangeMethod() { + //if ( !dlg.nameLE->text() ) return; //XXX geht vielleich nicht dlg.saveItem(); diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 5c4b13b..abb5e75 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp @@ -30,3 +30,3 @@ #include <qtextbrowser.h> -#include <stdlib.h> // for getenv +//#include <stdlib.h> // for getenv @@ -42,5 +42,4 @@ void DingWidget::loadDict( QString name ) dictName = name; - QString opie_dir = getenv("OPIEDIR"); - Config cfg( "odict" ); + if ( !methodname ) return; cfg.setGroup( "Method_" + methodname ); @@ -88,2 +87,3 @@ void DingWidget::loadValues() { + if ( !methodname ) return; Config cfg( "odict" ); diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index a404e89..cc3148a 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp @@ -46,3 +46,2 @@ ODict::ODict() : QMainWindow() setupMenus(); - @@ -98,26 +97,13 @@ void ODict::slotStartQuery() QString querystring = query_le->text(); -//X qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1()); -//X if (querystring.isEmpty()){ -//X qWarning("empty querystring"); -//X return; -//X } -//X if (!activated_name || activated_name.isEmpty()) -//X QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); -//X else -//X { - - ding->setCaseSensitive( casesens ); - ding->setCompleteWord( completewords ); - ding->setDict( activated_name ); - - if ( activated_name != ding->loadedDict() ) - ding->loadDict(activated_name); - - BroswerContent test = ding->setText( querystring ); - - browser_top->setText( test.top ); - browser_bottom->setText( test.bottom ); - - qDebug( "Text sollte gesetzt sein..." ); -//X } + ding->setCaseSensitive( casesens ); + ding->setCompleteWord( completewords ); + ding->setDict( activated_name ); + + if ( activated_name != ding->loadedDict() ) + ding->loadDict(activated_name); + + BroswerContent test = ding->setText( querystring ); + + browser_top->setText( test.top ); + browser_bottom->setText( test.bottom ); } @@ -178,6 +164,6 @@ void ODict::setupMenus() settings = new QPopupMenu( menu ); - setting_a = new QAction(tr( "Config" ), Resource::loadPixmap( "today/config" ), QString::null, 0, this, 0 ); + setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); setting_a->addTo( settings ); - setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "today/config" ), QString::null, 0, this, 0 ); + setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); |