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
@@ -8,82 +8,72 @@
 
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU General Public License as published by    *
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 #include "configdlg.h"
 #include "searchmethoddlg.h"
 
 #include <qdialog.h>
 #include <qpe/config.h>
 #include <qlayout.h>
 
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qstringlist.h>
 
-#include <opie/otabwidget.h>
-
 ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal)
 {
         setCaption( tr( "Options" ) );
         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" );
         
         QHBox *hbox = new QHBox( search_tab );
         list = new QListView( hbox );
         list->addColumn( tr( "Searchmethod" ) );
         loadSearchMethodNames();
         
         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() ) );
         connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() ));
         connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() ));
         
         vbox_layout_searchtab->addWidget( hbox );
 
-        /*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();
 }
 
 void ConfigDlg::slotNewMethod()
 {
         SearchMethodDlg dlg( this, "SearchMethodDlg", true );
         if ( dlg.exec() == QDialog::Accepted )
         {
                 dlg.saveItem();
                 QListViewItem *item = new QListViewItem( list );
                 item->setText( 0 , dlg.nameLE->text() );
         }
 }
 
 void ConfigDlg::slotChangeMethod()
 {
         if ( list->selectedItem() )
         {
                 SearchMethodDlg dlg( this, "SearchMethodDlg", true, list->selectedItem()->text( 0 ) );
                 if ( dlg.exec() == QDialog::Accepted )
                 {
                         dlg.saveItem();
                         QListViewItem *item = list->selectedItem();
                         item->setText( 0 , dlg.nameLE->text() );
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
@@ -1,36 +1,34 @@
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU General Public License as published by    *
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 
 class QWidget;
-class OTabWidget;
 class QListView;
 class QPushButton;
 
 #include <qdialog.h>
 
 class ConfigDlg : public QDialog
 {
         Q_OBJECT
         
     public:
                 ConfigDlg(QWidget *parent, const char *name, bool modal=FALSE );
 
         private:
-                OTabWidget *tab;
                 QWidget *settings_tab, *search_tab;
                 QListView *list;
                 QPushButton *new_button, *change_button, *delete_button;
 
                 void loadSearchMethodNames();
 
         private slots:
                 void slotNewMethod();
                 void slotChangeMethod();
                 void slotDeleteMethod();
 };
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
@@ -20,84 +20,83 @@
 
 #include <qlayout.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmainwindow.h>
 #include <qstring.h>
 #include <qaction.h>
 #include <qtextbrowser.h>
 #include <qcombobox.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 ODict::ODict() : QMainWindow()
 {
         activated_name = QString::null;
         
         vbox = new QVBox( this );
-        setCaption( tr( "OPIE-Dictionary" ) );
+        setCaption( tr( "Opie-Dictionary" ) );
         setupMenus();
 
         QHBox *hbox = new QHBox( vbox );
         QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); 
         query_label->show();
         query_le = new QLineEdit( hbox );
         query_co = new QComboBox( hbox );
         connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) );
         ok_button = new QPushButton( tr( "&Ok" ), hbox );
         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 );
 
         ding = new DingWidget();
 
         loadConfig();
         setCentralWidget( vbox );
 }
 
 void ODict::loadConfig()
 {
         /*
          * the name of the last used dictionary
          */
         QString lastname;
         
         Config cfg ( "odict" );
         cfg.setGroup( "generalsettings" );
         casesens = cfg.readEntry( "casesens" ).toInt();
-        regexp = cfg.readEntry( "regexp" ).toInt();
 
         QString lastDict = cfg.readEntry( "lastdict" );
         int i = 0, e = 0;
         
         QStringList groupListCfg = cfg.groupList().grep( "Method_" );
         query_co->clear();
         for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
         {
                 QString name;
                 cfg.setGroup( *it );
                 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++;
         }
@@ -106,49 +105,48 @@ void ODict::loadConfig()
          */
 
         lookupLanguageNames( lastname );
         ding->loadDict( lastname );
         ding->loadValues();
 
         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" ); 
 }
 
 void ODict::saveConfig()
 {
         Config cfg ( "odict" );
         cfg.setGroup( "generalsettings" );
         cfg.writeEntry( "casesens" , casesens );
-        cfg.writeEntry( "regexp" , regexp );
         cfg.writeEntry( "lastdict" , query_co->currentText() );
 }
 
 void ODict::slotStartQuery()
 {
         QString querystring = query_le->text();
         if ( !querystring.isEmpty() )
         {
                 /*
                  * if the user has not yet defined a dictionary
                  */
                 if ( !query_co->currentText() )
                 {
                         switch (  QMessageBox::information(  this, tr( "OPIE-Dictionary" ),
                                                 tr( "No dictionary defined" ),
                                                 tr( "&Define one" ), 
                                                 tr( "&Cancel" ),
                                                 0,      // Define a dict
                                                 1 ) )   // Cancel choosen
                         { 
                                 case 0:
                                         slotSettings();
                                         break;
                                 case 1: // stop here
@@ -164,67 +162,59 @@ void ODict::slotStartQuery()
                 BroswerContent test = ding->setText( querystring );
 
                 browser_top->setText( test.top );
                 browser_bottom->setText( test.bottom );
         }
 }
 
 void ODict::slotSettings()
 {
         ConfigDlg dlg( this, "Config" , true);
         if ( dlg.exec() == QDialog::Accepted )
                 saveConfig();
 }
 
 void ODict::slotSetParameter( int count )
 {
          if ( count == 0 )
         {
                 if ( casesens )
                         casesens = false;
                 else
                         casesens = true;
         }
 
-         if ( count == 1 )
-        {
-                if ( regexp )
-                        regexp = false;
-                else
-                        regexp = true;
-        }
         saveConfig();
 }
 
 void ODict::slotMethodChanged( const QString& methodnumber )
 {
         activated_name =  methodnumber;
         
         if ( activated_name != ding->loadedDict() )
         {
                 ding->loadDict(activated_name);
                 
                 lookupLanguageNames( activated_name );
                 top_name->setText( top_name_content );
                 bottom_name->setText( bottom_name_content );
         }
 }
 
 void ODict::setupMenus()
 {
         menu = new QMenuBar( this );
         
         settings = new QPopupMenu( menu );
         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( "edit" ), QString::null, 0, this, 0 );
         
         parameter = new QPopupMenu( menu );
         connect(  parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) );
         parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 );
-        parameter->insertItem( tr( "Allow &reg. expressions" ), 2 );
         parameter->insertSeparator();
         
         menu->insertItem( tr( "Settings" ) , settings );
         menu->insertItem( tr( "Parameter" ) , parameter );
 }
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
@@ -28,43 +28,43 @@ class ODict : public QMainWindow
 {
         Q_OBJECT
         
     public:
                 ODict();
                 QVBox *vbox;
                 QTextBrowser *browser_top,
                                          *browser_bottom;
                 DingWidget *ding;
 
         private:
                 QPopupMenu *help, *settings, *parameter;
                 QMenuBar *menu;
                 QHBox *hbox;
                 QLineEdit *query_le;
                 QComboBox *query_co;
                 QPushButton *ok_button;
 
                 QVBoxLayout *vbox_layout;
 
                 QAction *setting_a, *setting_b;
                 
                 void setupMenus();
 
-                bool casesens, completewords, regexp;
+                bool casesens, completewords;
                 
                 void loadConfig();
                 void saveConfig();
 
                 QString activated_name;
                 QLabel  *bottom_name,
                                 *top_name;
 
                 QString top_name_content, bottom_name_content;
 
                 void lookupLanguageNames( QString );
         
         private slots:
                 void slotStartQuery();
                 void slotSettings();
                 void slotSetParameter( int );
                 void slotMethodChanged( const QString& );
 };
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
@@ -1,31 +1,31 @@
         TEMPLATE= app
         CONFIG  = qt warn_on debug
         #CONFIG         = qt warn_on release
         HEADERS         = odict.h \
                                 searchmethoddlg.h \
                                 configdlg.h \
-                                dingwidget.h \
+                                dingwidget.h 
 
         SOURCES         = main.cpp \
                   odict.cpp \
                   searchmethoddlg.cpp \
                   configdlg.cpp \
                   dingwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
         LIBS    += -lqpe -lstdc++ -lopie
         TARGET          = odict
         DESTDIR         = $(OPIEDIR)/bin
 
 TRANSLATIONS = ../../../i18n/de/odict.ts \
          ../../../i18n/nl/odict.ts \
          ../../../i18n/xx/odict.ts \
          ../../../i18n/en/odict.ts \
          ../../../i18n/es/odict.ts \
          ../../../i18n/fr/odict.ts \
          ../../../i18n/hu/odict.ts \
          ../../../i18n/ja/odict.ts \
          ../../../i18n/ko/odict.ts \
          ../../../i18n/no/odict.ts \
          ../../../i18n/pl/odict.ts \
          ../../../i18n/pt/odict.ts \
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
@@ -1,10 +1,10 @@
 Package: opie-odict
 Files: bin/odict apps/Applications/odict.desktop pics/odict/odict.png
 Priority: optional
 Section: applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Dictionarylookupprogram
  Look up words :)
+Version: $QPE_VERSION$EXTRAVERSION