author | cniehaus <cniehaus> | 2003-05-02 13:41:37 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-05-02 13:41:37 (UTC) |
commit | b40991b25dd22c55cc80a9a9c4ae0adec103d575 (patch) (unidiff) | |
tree | a5d0ba564cf7809bdb603e0fcefac899f301c16c | |
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() | |||
78 | { | 78 | { |
79 | //if ( !dlg.nameLE->text() ) return; //XXX | ||
79 | dlg.saveItem(); | 80 | dlg.saveItem(); |
@@ -92,2 +93,3 @@ void ConfigDlg::slotChangeMethod() | |||
92 | { | 93 | { |
94 | //if ( !dlg.nameLE->text() ) return; //XXX geht vielleich nicht | ||
93 | dlg.saveItem(); | 95 | 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 @@ | |||
30 | #include <qtextbrowser.h> | 30 | #include <qtextbrowser.h> |
31 | #include <stdlib.h> // for getenv | 31 | //#include <stdlib.h> // for getenv |
32 | 32 | ||
@@ -42,5 +42,4 @@ void DingWidget::loadDict( QString name ) | |||
42 | dictName = name; | 42 | dictName = name; |
43 | QString opie_dir = getenv("OPIEDIR"); | ||
44 | |||
45 | Config cfg( "odict" ); | 43 | Config cfg( "odict" ); |
44 | if ( !methodname ) return; | ||
46 | cfg.setGroup( "Method_" + methodname ); | 45 | cfg.setGroup( "Method_" + methodname ); |
@@ -88,2 +87,3 @@ void DingWidget::loadValues() | |||
88 | { | 87 | { |
88 | if ( !methodname ) return; | ||
89 | Config cfg( "odict" ); | 89 | 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() | |||
46 | setupMenus(); | 46 | setupMenus(); |
47 | |||
48 | 47 | ||
@@ -98,26 +97,13 @@ void ODict::slotStartQuery() | |||
98 | QString querystring = query_le->text(); | 97 | QString querystring = query_le->text(); |
99 | //X qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1()); | 98 | ding->setCaseSensitive( casesens ); |
100 | //X if (querystring.isEmpty()){ | 99 | ding->setCompleteWord( completewords ); |
101 | //X qWarning("empty querystring"); | 100 | ding->setDict( activated_name ); |
102 | //X return; | 101 | |
103 | //X } | 102 | if ( activated_name != ding->loadedDict() ) |
104 | //X if (!activated_name || activated_name.isEmpty()) | 103 | ding->loadDict(activated_name); |
105 | //X QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); | 104 | |
106 | //X else | 105 | BroswerContent test = ding->setText( querystring ); |
107 | //X { | 106 | |
108 | 107 | browser_top->setText( test.top ); | |
109 | ding->setCaseSensitive( casesens ); | 108 | browser_bottom->setText( test.bottom ); |
110 | ding->setCompleteWord( completewords ); | ||
111 | ding->setDict( activated_name ); | ||
112 | |||
113 | if ( activated_name != ding->loadedDict() ) | ||
114 | ding->loadDict(activated_name); | ||
115 | |||
116 | BroswerContent test = ding->setText( querystring ); | ||
117 | |||
118 | browser_top->setText( test.top ); | ||
119 | browser_bottom->setText( test.bottom ); | ||
120 | |||
121 | qDebug( "Text sollte gesetzt sein..." ); | ||
122 | //X } | ||
123 | } | 109 | } |
@@ -178,6 +164,6 @@ void ODict::setupMenus() | |||
178 | settings = new QPopupMenu( menu ); | 164 | settings = new QPopupMenu( menu ); |
179 | setting_a = new QAction(tr( "Config" ), Resource::loadPixmap( "today/config" ), QString::null, 0, this, 0 ); | 165 | setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); |
180 | connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); | 166 | connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); |
181 | setting_a->addTo( settings ); | 167 | setting_a->addTo( settings ); |
182 | setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "today/config" ), QString::null, 0, this, 0 ); | 168 | setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); |
183 | 169 | ||