1 files changed, 16 insertions, 5 deletions
diff --git a/core/launcher/startmenu.h b/core/launcher/startmenu.h
index 99df0f0..7218035 100644
--- a/core/launcher/startmenu.h
+++ b/core/launcher/startmenu.h
@@ -22,23 +22,28 @@
 #define __START_MENU_H__
 
 #include <qtopia/applnk.h>
 #include <qintdict.h>
 #include <qstring.h>
 #include <qlist.h>
+#include <qmap.h>
+#include <qdir.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 
 #include <qtopia/menuappletinterface.h>
 
 class StartPopupMenu : public QPopupMenu
 {
+
 public:
     StartPopupMenu( QWidget *parent ) : QPopupMenu( parent ) {}
+    
 protected:
     void keyPressEvent( QKeyEvent *e );
+
 };
 
 class QLibrary;
 
 
 struct MenuApplet {
@@ -46,13 +51,15 @@ struct MenuApplet {
     MenuAppletInterface *iface;
     int id;
     QPopupMenu *popup;
 };
 
 class StartMenu : public QLabel {
+    
     Q_OBJECT
+        
 public:
     StartMenu( QWidget * );
     ~StartMenu();
 
     void refreshMenu();
 
@@ -74,22 +81,26 @@ protected:
 
 private:
     void loadApplets();
     void clearApplets();
     void addApplets( QPopupMenu* menu );
     bool loadMenu( QPopupMenu *menu );
+    void createMenuEntries( QPopupMenu *menu, QDir dir, bool ltabs, bool lot );
+    void createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool lot );
+    void createAppEntry( QPopupMenu *menu, QDir dir, QString file );
 
 private:
     bool useWidePopupMenu;
     QString popupMenuSidePixmap;
 
     bool startButtonIsFlat;
     QString startButtonPixmap;
 
-    QStringList tabs;
-    QList<AppLnk> other;
-    QIntDict<MenuApplet> m_applets;
-    int ntabs;
-    int nother;
+    int currentItem;
+
+    QIntDict<AppLnk> appLnks;
+    QIntDict<QString> tabNames;
+    QIntDict<MenuApplet> menuApplets;
+    
 };
 
 #endif // __START_MENU_H__