1 files changed, 0 insertions, 31 deletions

diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 6921ee8..b5c03c8 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -40,63 +40,51 @@
 #include <qheader.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
 
 #include <stdlib.h>
 
 
 TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
 	: QWidget ( parent, name )
 {
 	m_applets_changed = false;
 
 	QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
 
 	QLabel *l = new QLabel ( tr( "Load applets:" ), this );
 	lay-> addWidget ( l );
 
 	m_list = new QListView ( this );
 	m_list-> addColumn ( "foobar" );
 	m_list-> header ( )-> hide ( );
 
 	lay-> addWidget ( m_list );
 
-	m_omenu = new QCheckBox ( tr( "Show O-Menu" ), this );
-	lay-> addWidget ( m_omenu );
-
-	m_omenu_tabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this );
-	lay-> addWidget ( m_omenu_tabs );
-
 	QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." ));
-	QWhatsThis::add(  m_omenu_tabs, tr( "Adds the contents of the Launcher as menus in the O-Menu." ));
-	QWhatsThis::add(  m_omenu, tr( "Check if you want the O-Menu in the taskbar." ));
 
 	connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
-	connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_tabs, SLOT( setEnabled ( bool )));
-
-	// This option does not make sense ! (sandman)
-	m_omenu_tabs-> hide ( );
 
 	init ( );
 }
 
 void TaskbarSettings::init ( )
 {
 	Config cfg ( "Taskbar" );
 	cfg. setGroup ( "Applets" );
 	QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
 
 	QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
 	QStringList list = QDir ( path, "lib*.so" ). entryList ( );
 
 	for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
 		QString name;
 		QPixmap icon;
 		TaskbarNamedAppletInterface *iface = 0;
 
 		QLibrary *lib = new QLibrary ( path + "/" + *it );
 		lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
                 if ( iface ) {
 
                     QString lang = getenv( "LANG" );
                     QTranslator *trans = new QTranslator ( qApp );
@@ -107,72 +95,53 @@ void TaskbarSettings::init ( )
 		    else
                         delete trans;
                     name = iface-> name ( );
                     icon = iface-> icon ( );
 			iface-> release ( );
 			lib-> unload ( );
 		} else {
 			delete lib;
 			name = (*it). mid ( 3 );
 			int sep = name. find( ".so" );
 			if ( sep > 0 )
                             name. truncate ( sep );
 			sep = name. find ( "applet" );
 			if ( sep == (int) name.length ( ) - 6 )
 				name. truncate ( sep );
 			name[0] = name[0]. upper ( );
 		}
 		QCheckListItem *item;
 		item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
 		if ( !icon. isNull ( ))
 			item-> setPixmap ( 0, icon );
 		item-> setOn ( exclude. find ( *it ) == exclude. end ( ));
 		m_applets [*it] = item;
 	}
-
-	cfg. setGroup ( "Menu" );
-
-	m_omenu_tabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true ));
-	m_omenu-> setChecked ( cfg. readBoolEntry ( "ShowMenu", true ));
-
-	m_omenu_tabs-> setEnabled ( m_omenu-> isChecked ( ));
 }
 
 void TaskbarSettings::appletChanged()
 {
 	m_applets_changed = true;
 }
 
 void TaskbarSettings::accept ( )
 {
 	Config cfg ( "Taskbar" );
 	cfg. setGroup ( "Applets" );
 	if ( m_applets_changed ) {
 		QStringList exclude;
 		QMap <QString, QCheckListItem *>::Iterator it;
 		for ( it = m_applets. begin ( ); it != m_applets. end ( ); ++it ) {
 			if ( !(*it)-> isOn ( ))
 				exclude << it. key ( );
 		}
 		cfg. writeEntry ( "ExcludeApplets", exclude, ',' );
 	}
 	cfg. writeEntry ( "SafeMode", false );
-
-	cfg. setGroup ( "Menu" );
-
-	if ( m_omenu_tabs-> isChecked ( ) != cfg. readBoolEntry ( "LauncherTabs", true )) {
-		m_applets_changed = true;
-		cfg. writeEntry ( "LauncherTabs", m_omenu_tabs-> isChecked ( ));
-	}
-
-	if ( m_omenu-> isChecked ( ) != cfg. readBoolEntry ( "ShowMenu", true )) {
-		m_applets_changed = true;
-		cfg. writeEntry ( "ShowMenu", m_omenu-> isChecked ( ));
-	}
 	cfg. write ( );
 
 	if ( m_applets_changed ) {
 		QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" );
 		m_applets_changed = false;
 	}
 }