Merge from BRANCH_1_0

6 files changed, 10 insertions, 32 deletions

diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index 400298d..2103df9 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -31,4 +31,2 @@
 
-#include <opie/otabwidget.h>
-
 ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal)
@@ -37,10 +35,3 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
         QVBoxLayout *vbox_layout = new QVBoxLayout( this );
-        tab = new OTabWidget( this, "OTabWidget_tab", OTabWidget::Global, OTabWidget::Bottom );
-        vbox_layout->addWidget( tab );
-
-        /*general settings*/
-        settings_tab = new QWidget( tab , "settings_tab" );
-
-        /*searchmethods*/
-        search_tab = new QWidget( tab , "search_tab" );
+        search_tab = new QWidget( this , "search_tab" );
         QVBoxLayout *vbox_layout_searchtab = new QVBoxLayout( search_tab, 4 , 4 ,"blah" );
@@ -53,5 +44,5 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
         QVBox *vbox = new QVBox( hbox );
-        new_button = new QPushButton( "New" , vbox );
-        change_button = new QPushButton( "Change" , vbox );
-        delete_button = new QPushButton( "Delete" , vbox );
+        new_button = new QPushButton( tr( "New" ) , vbox );
+        change_button = new QPushButton( tr( "Change" ) , vbox );
+        delete_button = new QPushButton( tr( "Delete" ) , vbox );
         connect( new_button, SIGNAL( clicked() ), this, SLOT( slotNewMethod() ) );
@@ -62,5 +53,4 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
 
-        /*add the tabs and maximize*/
-        tab->addTab( settings_tab, "pass", tr( "General Settings" ) );
-        tab->addTab( search_tab, "zoom", tr( "Searchmethods" ) );
+        vbox_layout->addWidget( search_tab );
+
         showMaximized();
diff --git a/noncore/apps/odict/configdlg.h b/noncore/apps/odict/configdlg.h
index e3ef3ce..6c85989 100644
--- a/noncore/apps/odict/configdlg.h
+++ b/noncore/apps/odict/configdlg.h
@@ -10,3 +10,2 @@
 class QWidget;
-class OTabWidget;
 class QListView;
@@ -24,3 +23,2 @@ class ConfigDlg : public QDialog
         private:
-                OTabWidget *tab;
                 QWidget *settings_tab, *search_tab;
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 2028701..010545e 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -43,3 +43,3 @@ ODict::ODict() : QMainWindow()
         vbox = new QVBox( this );
-        setCaption( tr( "OPIE-Dictionary" ) );
+        setCaption( tr( "Opie-Dictionary" ) );
         setupMenus();
@@ -78,3 +78,2 @@ void ODict::loadConfig()
         casesens = cfg.readEntry( "casesens" ).toInt();
-        regexp = cfg.readEntry( "regexp" ).toInt();
 
@@ -129,3 +128,2 @@ void ODict::saveConfig()
         cfg.writeEntry( "casesens" , casesens );
-        cfg.writeEntry( "regexp" , regexp );
         cfg.writeEntry( "lastdict" , query_co->currentText() );
@@ -187,9 +185,2 @@ void ODict::slotSetParameter( int count )
 
-         if ( count == 1 )
-        {
-                if ( regexp )
-                        regexp = false;
-                else
-                        regexp = true;
-        }
         saveConfig();
@@ -224,3 +215,2 @@ void ODict::setupMenus()
         parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 );
-        parameter->insertItem( tr( "Allow &reg. expressions" ), 2 );
         parameter->insertSeparator();
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index 9c037ea..be2a532 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -51,3 +51,3 @@ class ODict : public QMainWindow
 
-                bool casesens, completewords, regexp;
+                bool casesens, completewords;
                 
diff --git a/noncore/apps/odict/odict.pro b/noncore/apps/odict/odict.pro
index 427a5c6..82f6a41 100644
--- a/noncore/apps/odict/odict.pro
+++ b/noncore/apps/odict/odict.pro
@@ -6,3 +6,3 @@ HEADERS		= odict.h \
                                 configdlg.h \
-                                dingwidget.h \
+                                dingwidget.h 
 
diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control
index 2fa731f..f684716 100644
--- a/noncore/apps/odict/opie-odict.control
+++ b/noncore/apps/odict/opie-odict.control
@@ -6,3 +6,2 @@ Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Dictionarylookupprogram
  Look up words :)
+Version: $QPE_VERSION$EXTRAVERSION