From e16d333ec2e8509fc665921ca106c25325bae9e0 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 16:24:58 +0000
Subject: Merge from BRANCH_1_0

---
(limited to 'noncore/apps/odict')

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
@@ -29,20 +29,11 @@
 #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 );
@@ -51,18 +42,17 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
 	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();
 }
 
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
@@ -8,7 +8,6 @@
  **************************************************************************/
 
 class QWidget;
-class OTabWidget;
 class QListView;
 class QPushButton;
 
@@ -22,7 +21,6 @@ class ConfigDlg : public QDialog
 		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;
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
@@ -41,7 +41,7 @@ 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 );
@@ -76,7 +76,6 @@ void ODict::loadConfig()
 	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;
@@ -127,7 +126,6 @@ void ODict::saveConfig()
 	Config cfg ( "odict" );
 	cfg.setGroup( "generalsettings" );
 	cfg.writeEntry( "casesens" , casesens );
-	cfg.writeEntry( "regexp" , regexp );
 	cfg.writeEntry( "lastdict" , query_co->currentText() );
 }
 
@@ -185,13 +183,6 @@ void ODict::slotSetParameter( int count )
 			casesens = true;
 	}
 
- 	if ( count == 1 )
-	{
-		if ( regexp )
-			regexp = false;
-		else
-			regexp = true;
-	}
 	saveConfig();
 }
 
@@ -222,7 +213,6 @@ void ODict::setupMenus()
 	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 );
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
@@ -49,7 +49,7 @@ class ODict : public QMainWindow
 		
 		void setupMenus();
 
-		bool casesens, completewords, regexp;
+		bool casesens, completewords;
 		
 		void loadConfig();
 		void saveConfig();
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
@@ -4,7 +4,7 @@ CONFIG		= qt warn_on debug
 HEADERS		= odict.h \
 				searchmethoddlg.h \
 				configdlg.h \
-				dingwidget.h \
+				dingwidget.h 
 
 SOURCES		= main.cpp \
 		  odict.cpp \
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
@@ -4,7 +4,7 @@ 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
--
cgit v0.9.0.2