1 files changed, 26 insertions, 61 deletions

diff --git a/kcontrol/hwmanager/hwdevicetray.h b/kcontrol/hwmanager/hwdevicetray.h
index 1300ac6ec..4f019ae58 100644
--- a/kcontrol/hwmanager/hwdevicetray.h
+++ b/kcontrol/hwmanager/hwdevicetray.h
@@ -1,8 +1,8 @@
 /*
  * Copyright 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- * 
+ *
  * This file is part of hwdevicetray, the TDE Hardware Device Monitor System Tray Application
- * 
+ *
  * hwdevicetray is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3
@@ -20,93 +20,58 @@
 #ifndef TDEHWDEVICETRAY_H
 #define TDEHWDEVICETRAY_H
 
-#include <tqptrlist.h>
-
 #include <ksystemtray.h>
-#include <kglobalaccel.h>
-#include <ksimpleconfig.h>
-#include <tdepassivepopupstack.h>
 
-#include <tdehardwaredevices.h>
-#include <tdestoragedevice.h>
-
-class KHelpMenu;
-class PasswordDlg;
+class HwDeviceSystemTrayPrivate;
+class KPassivePopup;
+class TDEActionMenu;
+class TDEGenericDevice;
+class TDEGlobalAccel;
 class TDEPopupMenu;
+class TDEStorageDevice;
 
-typedef TQMap<int, TQString> TQStringMap;
-
-class HwDeviceSystemTray :  public KSystemTray
+class HwDeviceSystemTray : public KSystemTray
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	HwDeviceSystemTray(TQWidget* parent = 0, const char *name = 0);
 	~HwDeviceSystemTray();
-	TDEGlobalAccel *globalKeys;
 
-	virtual void contextMenuAboutToShow(TDEPopupMenu* menu);
+	TDEGlobalAccel *globalKeys;
 
-	void configChanged();
+	virtual void contextMenuAboutToShow(TDEPopupMenu *menu);
 
 protected slots:
 	void slotHardwareConfig();
 	void slotEditShortcutKeys();
 	void slotSettingsChanged(int category);
 	void slotHelpContents();
+	void slotExecuteDeviceAction(int parameter);
 
-	void slotOpenDevice(int parameter);
-	void slotMountDevice(int parameter);
-	void slotUnmountDevice(int parameter);
-	void slotUnlockDevice(int parameter);
-	void slotLockDevice(int parameter);
-	void slotEjectDevice(int parameter);
-	void slotPropertiesDevice(int parameter);
-
-protected:
-	void mousePressEvent(TQMouseEvent *e);
-	void resizeEvent(TQResizeEvent *);
-	void showEvent(TQShowEvent *);
-
-private slots:
-	void _quit();
+	void quitApp();
 	void deviceAdded(TDEGenericDevice*);
 	void deviceRemoved(TDEGenericDevice*);
 	void deviceChanged(TDEGenericDevice*);
 	void devicePopupClicked(KPassivePopup*, TQPoint, TQString);
-	void doUnlockDisk();
 	void doDiskNotifications(bool scanOnly);
 
-private:
-	bool isMonitoredDevice(TDEStorageDevice* sdevice);
-
-private:
-	void populateMenu(TDEPopupMenu* menu);
+protected:
+	void initMenus();
+	void mousePressEvent(TQMouseEvent *e);
+	void populateLMBMenu();
+	void resizeEvent(TQResizeEvent *);
 	void resizeTrayIcon();
+	void showEvent(TQShowEvent *);
 
-	bool m_popupUp;
-	KHelpMenu* m_help;
-
-	TQWidget* m_parent;
-	TDEPassivePopupStackContainer* m_hardwareNotifierContainer;
+	static bool isMonitoredDevice(TDEStorageDevice *sdevice);
+	static TQString getDeviceLabel(TDEStorageDevice *sdevice);
 
-	TQStringMap m_openMenuIndexMap;
-	TQStringMap m_mountMenuIndexMap;
-	TQStringMap m_unmountMenuIndexMap;
-	TQStringMap m_unlockMenuIndexMap;
-	TQStringMap m_lockMenuIndexMap;
-	TQStringMap m_ejectMenuIndexMap;
-	TQStringMap m_propertiesMenuIndexMap;
-	TDEPopupMenu* m_menu;
-	KSimpleConfig *r_config;
-	PasswordDlg *m_passDlg;
+	void addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int type, TDEActionMenu *actionMenu,
+	        int &actionMenuIdx);
+	void addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int type, int &actionMenuIdx);
 
-	struct KnownDiskDeviceInfo
-	{
-		TQString friendlyName;
-		TQString node;
-	};
-	TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices;
+	HwDeviceSystemTrayPrivate *d;
 };
 
 #endif