1 files changed, 12 insertions, 0 deletions

diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 6fca621..faa7cf4 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -55,24 +55,27 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
 	QLabel *l = new QLabel ( tr( "Load applets in O-Menu:" ), this );
 	lay-> addWidget ( l );
 
 	m_list = new QListView ( this );
 	m_list-> addColumn ( "foobar" );
 	m_list-> header ( )-> hide ( );
 
 	lay-> addWidget ( m_list );
 	
 	m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this );
 	lay-> addWidget ( m_menutabs );
 
+	m_menusubpopup = new QCheckBox ( tr( "Show Applications in subpopups" ), this );
+	lay-> addWidget ( m_menusubpopup );
+
 	QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." ));
 	QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." ));
 
 	connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
 
 	init ( );
 }
 
 void MenuSettings::init ( )
 {
 	Config cfg ( "StartMenu" );
 	cfg. setGroup ( "Applets" );
@@ -110,24 +113,25 @@ void MenuSettings::init ( )
 			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;
 		} else {
 			delete lib;
 		}
 	}
 
 	cfg. setGroup ( "Menu" );
 	m_menutabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true ));
+                m_menusubpopup-> setChecked ( cfg. readBoolEntry ( "LauncherSubPopup", true ));
 }
 
 void MenuSettings::appletChanged()
 {
 	m_applets_changed = true;
 }
 
 void MenuSettings::accept ( )
 {
 	bool apps_changed = false;
 
 	Config cfg ( "StartMenu" );
@@ -141,23 +145,31 @@ void MenuSettings::accept ( )
 		}
 		cfg. writeEntry ( "ExcludeApplets", exclude, ',' );
 	}
 	cfg. writeEntry ( "SafeMode", false );
 
 	cfg. setGroup ( "Menu" );
 
 	if ( m_menutabs-> isChecked ( ) != cfg. readBoolEntry ( "LauncherTabs", true )) {
 		apps_changed = true;
 		cfg. writeEntry ( "LauncherTabs", m_menutabs-> isChecked ( ));
 	}
         
+                if ( m_menusubpopup-> isChecked ( ) != cfg. readBoolEntry ( "LauncherSubPopup", true )) {
+		 apps_changed = true;
+		cfg. writeEntry ( "LauncherSubPopup", m_menusubpopup-> isChecked ( ));
+	}
+
 	cfg. write ( );
 
 	if ( m_applets_changed ) {
 		QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" );
 		m_applets_changed = false;
 	}
 	if ( apps_changed ) {
+                                 // currently use reloadApplets() since reloadApps is now used exclusive for server
+                                 // to refresh the tabs. But what we want here is also a refresh of the startmenu entries
 		QCopEnvelope ( "QPE/TaskBar", "reloadApps()" );
+                                QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" );
 	}
 }