minifixes to avoid clashes with tille

3 files changed, 16 insertions, 3 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 6e3179f..61ddbbf 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -74,6 +74,9 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
                 right = current.right( current.length() - current.find(reg_div) - 1 );
-                if ( left.contains( reg_word ) ){
+                if ( left.contains( reg_word ) )
+                {
                   left.replace( queryword, substitute );
                   toplist.append( left + " -> " + right);
-                }else{
+                }
+                else
+                {
                   right.replace( reg_word, substitute );
@@ -81,3 +84,2 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
                 }
-                        //      .replace( reg_word, substitute );
         }
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 166f6b9..7de9169 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -34,2 +34,3 @@
 #include <qtextbrowser.h>
+#include <qcombobox.h>
 
@@ -47,2 +48,3 @@ ODict::ODict() : QMainWindow()
         query_le = new QLineEdit( hbox );
+        query_co = new QComboBox( hbox );
         ok_button = new QPushButton( tr( "&Ok" ), hbox );
@@ -64,2 +66,9 @@ void ODict::loadConfig()
         completewords = cfg.readEntry( "completewords" ).toInt();
+
+        QStringList groupListCfg = cfg.groupList().grep( "Method_" );
+        for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
+        {
+                cfg.setGroup( *it );
+                query_co->insertItem( cfg.readEntry( "Name" ) );
+        }
 }
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index ef0822d..7c1f32f 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -22,2 +22,3 @@ class DingWidget;
 class QTextBrowser;
+class QComboBox;
 
@@ -38,2 +39,3 @@ class ODict : public QMainWindow
                 QLineEdit *query_le;
+                QComboBox *query_co;
                 QPushButton *ok_button;