From 7e864eb22b5663ad9771b562fbe901042dc68657 Mon Sep 17 00:00:00 2001
From: sandman <sandman>
Date: Wed, 02 Oct 2002 22:15:33 +0000
Subject: Launcher settings now also supports the new menu applets interface

---
(limited to 'core/settings/launcher/launchersettings.cpp')

diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp
index 22bf1d1..c32d998 100644
--- a/core/settings/launcher/launchersettings.cpp
+++ b/core/settings/launcher/launchersettings.cpp
@@ -26,13 +26,14 @@
 */
 
 #include <qlayout.h>
+#include <qapplication.h>
 
 #include <opie/otabwidget.h>
 
 #include "launchersettings.h"
 #include "tabssettings.h"
+#include "menusettings.h"
 #include "taskbarsettings.h"
-#include "guisettings.h"
 
 
 LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false )
@@ -46,11 +47,11 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false
 
 	m_tabs = new TabsSettings ( tw );
 	m_taskbar = new TaskbarSettings ( tw );
-	m_gui = new GuiSettings ( tw );
+	m_menu = new MenuSettings ( tw );
 
 	tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" ));
+	tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" ));
 	tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" ));
-	tw-> addTab ( m_gui, "launchersettings/guitab.png", tr( "GUI" ));
 	
 	tw-> setCurrentTab ( m_taskbar );
 }
@@ -58,8 +59,8 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false
 void LauncherSettings::accept ( )
 {
 	m_taskbar-> accept ( );
+	m_menu-> accept ( );
 	m_tabs-> accept ( );
-	m_gui-> accept ( );
 
 	QDialog::accept ( );
 }
--
cgit v0.9.0.2