TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

hwmanager: use a private class 'd' to store internal members of HwDeviceSystemTray.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/308/head
Michele Calgaro 1 year ago
parent 8410f6bd00
commit b1d5dab80d
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 141 additions and 129 deletions
Show Stats Download Patch File Download Diff File

226
kcontrol/hwmanager/hwdevicetray.cpp
Unescape View File

@ -21,56 +21,94 @@
#include <config.h> #include <config.h>
#endif #endif
#include <tqtimer.h> #include <cstdlib>
#include <unistd.h>
#include <tqfileinfo.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqtimer.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqfileinfo.h>
#include <krun.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kcmultidialog.h> #include <kcmultidialog.h>
#include <kdebug.h> #include <kglobalaccel.h>
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kiconloader.h>
#include "kprocess.h" #include "kprocess.h"
#include <tdelocale.h> #include <kpropertiesdialog.h>
#include <tdepopupmenu.h> #include <krun.h>
#include <kstdaction.h> #include <ksimpleconfig.h>
#include <kstdguiitem.h> #include <kstandarddirs.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <tdehardwaredevices.h>
#include <tdelocale.h>
#include <tdemessagebox.h> #include <tdemessagebox.h>
#include <kpassivepopup.h> #include "tdepassivepopupstack.h"
#include <kstandarddirs.h> #include <tdepopupmenu.h>
#include <kpropertiesdialog.h>
#include "passworddlg.h"
#include <dcopclient.h> #include <dcopclient.h>
#include <dcopref.h> #include <dcopref.h>
#include <cstdlib>
#include <unistd.h>
#include "hwdevicetray_configdialog.h"
#include "hwdevicetray.h" #include "hwdevicetray.h"
#include "hwdevicetray_configdialog.h"
typedef TQMap<int, TQString> TQStringMap;
struct KnownDiskDeviceInfo
{
TQString friendlyName;
TQString node;
};
class HwDeviceSystemTrayPrivate
{
public:
HwDeviceSystemTrayPrivate()
{
}
~HwDeviceSystemTrayPrivate()
{
}
// Members
KHelpMenu *m_help;
TDEPopupMenu *m_RMBMenu;
TQStringMap m_openMenuIndexMap;
TQStringMap m_mountMenuIndexMap;
TQStringMap m_unmountMenuIndexMap;
TQStringMap m_unlockMenuIndexMap;
TQStringMap m_lockMenuIndexMap;
TQStringMap m_ejectMenuIndexMap;
TQStringMap m_safeRemoveMenuIndexMap;
TQStringMap m_propertiesMenuIndexMap;
HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name) TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices;
: KSystemTray(parent, name), m_RMBMenu(contextMenu())
TDEPassivePopupStackContainer *m_hardwareNotifierContainer;
};
HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
: KSystemTray(parent, name), d(new HwDeviceSystemTrayPrivate())
{ {
// Create notifier // Create notifier
m_hardwareNotifierContainer = new TDEPassivePopupStackContainer(); d->m_hardwareNotifierContainer = new TDEPassivePopupStackContainer();
connect(m_hardwareNotifierContainer, TQT_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQT_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString))); connect(d->m_hardwareNotifierContainer, TQT_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQT_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString)));
// Create help submenu // Create menus
m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()); d->m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection());
TDEPopupMenu *help = m_help->menu(); d->m_help->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
d->m_RMBMenu = contextMenu();
setPixmap(KSystemTray::loadIcon("hwinfo")); setPixmap(KSystemTray::loadIcon("hwinfo"));
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitApp()));
TQToolTip::add(this, i18n("Device monitor")); TQToolTip::add(this, i18n("Device monitor"));
m_parent = parent;
globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
TDEGlobalAccel* keys = globalKeys; TDEGlobalAccel* keys = globalKeys;
@ -100,7 +138,8 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name)
HwDeviceSystemTray::~HwDeviceSystemTray() HwDeviceSystemTray::~HwDeviceSystemTray()
{ {
delete m_hardwareNotifierContainer; delete d->m_hardwareNotifierContainer;
delete d;
} }
/*! /*!
@ -108,14 +147,15 @@ HwDeviceSystemTray::~HwDeviceSystemTray()
* is asked through a yes/no box if "HwDeviceTray should start automatically on log in" and the * is asked through a yes/no box if "HwDeviceTray should start automatically on log in" and the
* result is written to the KDE configfile. * result is written to the KDE configfile.
*/ */
void HwDeviceSystemTray::_quit () { void HwDeviceSystemTray::quitApp()
r_config = new KSimpleConfig("tdehwdevicetrayrc"); {
KSimpleConfig *config = new KSimpleConfig("tdehwdevicetrayrc");
TQString tmp1 = i18n ("Start device monitor automatically when you log in?"); TQString tmp1 = i18n("Start device monitor automatically when you log in?");
int tmp2 = KMessageBox::questionYesNo (0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); int tmp2 = KMessageBox::questionYesNo(0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
r_config->setGroup("General"); config->setGroup("General");
r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes); config->writeEntry("Autostart", tmp2 == KMessageBox::Yes);
r_config->sync (); config->sync();
exit(0); exit(0);
} }
@ -155,8 +195,8 @@ void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e)
break; break;
case Qt::RightButton: case Qt::RightButton:
contextMenuAboutToShow(m_RMBMenu); contextMenuAboutToShow(d->m_RMBMenu);
m_RMBMenu->popup(e->globalPos()); d->m_RMBMenu->popup(e->globalPos());
break; break;
default: default:
@ -236,14 +276,14 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
safeRemoveDeviceActionMenu->popupMenu()->clear(); safeRemoveDeviceActionMenu->popupMenu()->clear();
propertiesDeviceActionMenu->popupMenu()->clear(); propertiesDeviceActionMenu->popupMenu()->clear();
m_openMenuIndexMap.clear(); d->m_openMenuIndexMap.clear();
m_mountMenuIndexMap.clear(); d->m_mountMenuIndexMap.clear();
m_unmountMenuIndexMap.clear(); d->m_unmountMenuIndexMap.clear();
m_unlockMenuIndexMap.clear(); d->m_unlockMenuIndexMap.clear();
m_lockMenuIndexMap.clear(); d->m_lockMenuIndexMap.clear();
m_ejectMenuIndexMap.clear(); d->m_ejectMenuIndexMap.clear();
m_safeRemoveMenuIndexMap.clear(); d->m_safeRemoveMenuIndexMap.clear();
m_propertiesMenuIndexMap.clear(); d->m_propertiesMenuIndexMap.clear();
// Find all storage devices and add them to the popup menus // Find all storage devices and add them to the popup menus
int lastOpenIndex = -1; int lastOpenIndex = -1;
@ -275,10 +315,10 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
lastLockIndex = lockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), lastLockIndex = lockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
lockDeviceActionMenu->popupMenu()->connectItem(lastLockIndex, this, TQT_SLOT(slotLockDevice(int))); lockDeviceActionMenu->popupMenu()->connectItem(lastLockIndex, this, TQT_SLOT(slotLockDevice(int)));
m_lockMenuIndexMap[lastLockIndex] = sdevice->diskUUID(); d->m_lockMenuIndexMap[lastLockIndex] = sdevice->diskUUID();
if (m_lockMenuIndexMap[lastLockIndex] == "") if (d->m_lockMenuIndexMap[lastLockIndex] == "")
{ {
m_lockMenuIndexMap[lastLockIndex] = sdevice->systemPath(); d->m_lockMenuIndexMap[lastLockIndex] = sdevice->systemPath();
} }
} }
else else
@ -286,10 +326,10 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
lastUnlockIndex = unlockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), lastUnlockIndex = unlockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
unlockDeviceActionMenu->popupMenu()->connectItem(lastUnlockIndex, this, TQT_SLOT(slotUnlockDevice(int))); unlockDeviceActionMenu->popupMenu()->connectItem(lastUnlockIndex, this, TQT_SLOT(slotUnlockDevice(int)));
m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->diskUUID(); d->m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->diskUUID();
if (m_unlockMenuIndexMap[lastUnlockIndex] == "") if (d->m_unlockMenuIndexMap[lastUnlockIndex] == "")
{ {
m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->systemPath(); d->m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->systemPath();
} }
} }
} }
@ -301,10 +341,10 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
lastMountIndex = mountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), lastMountIndex = mountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
mountDeviceActionMenu->popupMenu()->connectItem(lastMountIndex, this, TQT_SLOT(slotMountDevice(int))); mountDeviceActionMenu->popupMenu()->connectItem(lastMountIndex, this, TQT_SLOT(slotMountDevice(int)));
m_mountMenuIndexMap[lastMountIndex] = sdevice->diskUUID(); d->m_mountMenuIndexMap[lastMountIndex] = sdevice->diskUUID();
if (m_mountMenuIndexMap[lastMountIndex] == "") if (d->m_mountMenuIndexMap[lastMountIndex] == "")
{ {
m_mountMenuIndexMap[lastMountIndex] = sdevice->systemPath(); d->m_mountMenuIndexMap[lastMountIndex] = sdevice->systemPath();
} }
} }
else else
@ -312,10 +352,10 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
lastUnmountIndex = unmountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), lastUnmountIndex = unmountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
unmountDeviceActionMenu->popupMenu()->connectItem(lastUnmountIndex, this, TQT_SLOT(slotUnmountDevice(int))); unmountDeviceActionMenu->popupMenu()->connectItem(lastUnmountIndex, this, TQT_SLOT(slotUnmountDevice(int)));
m_unmountMenuIndexMap[lastUnmountIndex] = sdevice->diskUUID(); d->m_unmountMenuIndexMap[lastUnmountIndex] = sdevice->diskUUID();
if (m_unmountMenuIndexMap[lastMountIndex] == "") if (d->m_unmountMenuIndexMap[lastMountIndex] == "")
{ {
m_unmountMenuIndexMap[lastMountIndex] = sdevice->systemPath(); d->m_unmountMenuIndexMap[lastMountIndex] = sdevice->systemPath();
} }
} }
@ -323,10 +363,10 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
lastOpenIndex = openDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), lastOpenIndex = openDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
openDeviceActionMenu->popupMenu()->connectItem(lastOpenIndex, this, TQT_SLOT(slotOpenDevice(int))); openDeviceActionMenu->popupMenu()->connectItem(lastOpenIndex, this, TQT_SLOT(slotOpenDevice(int)));
m_openMenuIndexMap[lastOpenIndex] = sdevice->diskUUID(); d->m_openMenuIndexMap[lastOpenIndex] = sdevice->diskUUID();
if (m_openMenuIndexMap[lastOpenIndex] == "") if (d->m_openMenuIndexMap[lastOpenIndex] == "")
{ {
m_openMenuIndexMap[lastOpenIndex] = sdevice->systemPath(); d->m_openMenuIndexMap[lastOpenIndex] = sdevice->systemPath();
} }
} }
@ -336,29 +376,29 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
lastEjectIndex = ejectDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), lastEjectIndex = ejectDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
ejectDeviceActionMenu->popupMenu()->connectItem(lastEjectIndex, this, TQT_SLOT(slotEjectDevice(int))); ejectDeviceActionMenu->popupMenu()->connectItem(lastEjectIndex, this, TQT_SLOT(slotEjectDevice(int)));
m_ejectMenuIndexMap[lastEjectIndex] = sdevice->diskUUID(); d->m_ejectMenuIndexMap[lastEjectIndex] = sdevice->diskUUID();
if (m_ejectMenuIndexMap[lastEjectIndex] == "") if (d->m_ejectMenuIndexMap[lastEjectIndex] == "")
{ {
m_ejectMenuIndexMap[lastEjectIndex] = sdevice->systemPath(); d->m_ejectMenuIndexMap[lastEjectIndex] = sdevice->systemPath();
} }
lastSafeRemoveIndex = safeRemoveDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), lastSafeRemoveIndex = safeRemoveDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
safeRemoveDeviceActionMenu->popupMenu()->connectItem(lastSafeRemoveIndex, this, TQT_SLOT(slotSafeRemoveDevice(int))); safeRemoveDeviceActionMenu->popupMenu()->connectItem(lastSafeRemoveIndex, this, TQT_SLOT(slotSafeRemoveDevice(int)));
m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->diskUUID(); d->m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->diskUUID();
if (m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] == "") if (d->m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] == "")
{ {
m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->systemPath(); d->m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->systemPath();
} }
} }
lastPropertiesIndex = propertiesDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), lastPropertiesIndex = propertiesDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
propertiesDeviceActionMenu->popupMenu()->connectItem(lastPropertiesIndex, this, TQT_SLOT(slotPropertiesDevice(int))); propertiesDeviceActionMenu->popupMenu()->connectItem(lastPropertiesIndex, this, TQT_SLOT(slotPropertiesDevice(int)));
m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->diskUUID(); d->m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->diskUUID();
if (m_propertiesMenuIndexMap[lastPropertiesIndex] == "") if (d->m_propertiesMenuIndexMap[lastPropertiesIndex] == "")
{ {
m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->systemPath(); d->m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->systemPath();
} }
} }
} }
@ -416,14 +456,14 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
// Help & Quit // Help & Quit
menu->insertSeparator(); menu->insertSeparator();
menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), m_help->menu()); menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), d->m_help->menu());
TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
quitAction->plug(menu); quitAction->plug(menu);
} }
void HwDeviceSystemTray::slotOpenDevice(int parameter) void HwDeviceSystemTray::slotOpenDevice(int parameter)
{ {
TQString uuid = m_openMenuIndexMap[parameter]; TQString uuid = d->m_openMenuIndexMap[parameter];
if (!uuid.isEmpty()) if (!uuid.isEmpty())
{ {
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -449,7 +489,7 @@ void HwDeviceSystemTray::slotOpenDevice(int parameter)
void HwDeviceSystemTray::slotMountDevice(int parameter) void HwDeviceSystemTray::slotMountDevice(int parameter)
{ {
TQString uuid = m_mountMenuIndexMap[parameter]; TQString uuid = d->m_mountMenuIndexMap[parameter];
if (!uuid.isEmpty()) if (!uuid.isEmpty())
{ {
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -476,7 +516,7 @@ void HwDeviceSystemTray::slotMountDevice(int parameter)
void HwDeviceSystemTray::slotUnmountDevice(int parameter) void HwDeviceSystemTray::slotUnmountDevice(int parameter)
{ {
TQString uuid = m_unmountMenuIndexMap[parameter]; TQString uuid = d->m_unmountMenuIndexMap[parameter];
if (!uuid.isEmpty()) if (!uuid.isEmpty())
{ {
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -503,7 +543,7 @@ void HwDeviceSystemTray::slotUnmountDevice(int parameter)
void HwDeviceSystemTray::slotUnlockDevice(int parameter) void HwDeviceSystemTray::slotUnlockDevice(int parameter)
{ {
TQString uuid = m_unlockMenuIndexMap[parameter]; TQString uuid = d->m_unlockMenuIndexMap[parameter];
if (!uuid.isEmpty()) if (!uuid.isEmpty())
{ {
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -528,7 +568,7 @@ void HwDeviceSystemTray::slotUnlockDevice(int parameter)
void HwDeviceSystemTray::slotLockDevice(int parameter) void HwDeviceSystemTray::slotLockDevice(int parameter)
{ {
TDEGenericDevice *hwdevice; TDEGenericDevice *hwdevice;
TQString uuid = m_lockMenuIndexMap[parameter]; TQString uuid = d->m_lockMenuIndexMap[parameter];
if (!uuid.isEmpty()) if (!uuid.isEmpty())
{ {
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -551,7 +591,7 @@ void HwDeviceSystemTray::slotLockDevice(int parameter)
void HwDeviceSystemTray::slotEjectDevice(int parameter) void HwDeviceSystemTray::slotEjectDevice(int parameter)
{ {
TQString uuid = m_ejectMenuIndexMap[parameter]; TQString uuid = d->m_ejectMenuIndexMap[parameter];
if (!uuid.isEmpty()) if (!uuid.isEmpty())
{ {
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -575,7 +615,7 @@ void HwDeviceSystemTray::slotEjectDevice(int parameter)
void HwDeviceSystemTray::slotSafeRemoveDevice(int parameter) void HwDeviceSystemTray::slotSafeRemoveDevice(int parameter)
{ {
TQString uuid = m_safeRemoveMenuIndexMap[parameter]; TQString uuid = d->m_safeRemoveMenuIndexMap[parameter];
if (!uuid.isEmpty()) if (!uuid.isEmpty())
{ {
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -599,7 +639,7 @@ void HwDeviceSystemTray::slotSafeRemoveDevice(int parameter)
void HwDeviceSystemTray::slotPropertiesDevice(int parameter) void HwDeviceSystemTray::slotPropertiesDevice(int parameter)
{ {
TQString uuid = m_propertiesMenuIndexMap[parameter]; TQString uuid = d->m_propertiesMenuIndexMap[parameter];
if (!uuid.isEmpty()) if (!uuid.isEmpty())
{ {
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -652,8 +692,8 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly)
// Scan devices for changes and notify new devices if needed. // Scan devices for changes and notify new devices if needed.
// This is necessary because the device information may not be available // This is necessary because the device information may not be available
// at the time the hardwareAdded signal is emitted // at the time the hardwareAdded signal is emitted
TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = m_knownDiskDevices; TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = d->m_knownDiskDevices;
m_knownDiskDevices.clear(); d->m_knownDiskDevices.clear();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
@ -664,7 +704,7 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly)
TQString sysPath = sdevice->systemPath(); TQString sysPath = sdevice->systemPath();
if (oldKnownDevices.contains(sysPath)) if (oldKnownDevices.contains(sysPath))
{ {
m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath]; d->m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath];
oldKnownDevices.remove(sysPath); oldKnownDevices.remove(sysPath);
} }
else else
@ -674,10 +714,10 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly)
{ {
friendlyName = sdevice->friendlyName(); friendlyName = sdevice->friendlyName();
} }
m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() }; d->m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() };
if (!scanOnly && popupEnable) if (!scanOnly && popupEnable)
{ {
m_hardwareNotifierContainer->displayMessage( d->m_hardwareNotifierContainer->displayMessage(
i18n("A disk device has been added!"), i18n("A disk device has been added!"),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()), i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()),
SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath); SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath);
@ -691,7 +731,7 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly)
TQMap<TQString, KnownDiskDeviceInfo>::ConstIterator delIt; TQMap<TQString, KnownDiskDeviceInfo>::ConstIterator delIt;
for (delIt = oldKnownDevices.begin(); delIt != oldKnownDevices.end(); delIt++) for (delIt = oldKnownDevices.begin(); delIt != oldKnownDevices.end(); delIt++)
{ {
m_hardwareNotifierContainer->displayMessage( d->m_hardwareNotifierContainer->displayMessage(
i18n("A disk device has been removed!"), i18n("A disk device has been removed!"),
i18n("%1 (%2)").arg(delIt.data().friendlyName, delIt.data().node), i18n("%1 (%2)").arg(delIt.data().friendlyName, delIt.data().node),
SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + delIt.key()); SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + delIt.key());
@ -707,19 +747,19 @@ void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device)
// The device information may not be available at the time the hardwareAdded signal is emitted. // The device information may not be available at the time the hardwareAdded signal is emitted.
// In such case ignore the event and handle that at the subsequent hardwareUpdate signal emission. // In such case ignore the event and handle that at the subsequent hardwareUpdate signal emission.
TQString sysPath = sdevice->systemPath(); TQString sysPath = sdevice->systemPath();
if (isMonitoredDevice(sdevice) && !m_knownDiskDevices.contains(sysPath)) if (isMonitoredDevice(sdevice) && !d->m_knownDiskDevices.contains(sysPath))
{ {
TQString friendlyName = sdevice->diskLabel(); TQString friendlyName = sdevice->diskLabel();
if (friendlyName.isEmpty()) if (friendlyName.isEmpty())
{ {
friendlyName = sdevice->friendlyName(); friendlyName = sdevice->friendlyName();
} }
m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() }; d->m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() };
TDEConfig config("mediamanagerrc"); TDEConfig config("mediamanagerrc");
config.setGroup("Global"); config.setGroup("Global");
if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
{ {
m_hardwareNotifierContainer->displayMessage( d->m_hardwareNotifierContainer->displayMessage(
i18n("A disk device has been added!"), i18n("A disk device has been added!"),
i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()), i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()),
SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath); SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath);
@ -734,18 +774,18 @@ void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device)
{ {
TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(device); TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(device);
TQString sysPath = sdevice->systemPath(); TQString sysPath = sdevice->systemPath();
if (isMonitoredDevice(sdevice) && m_knownDiskDevices.contains(sysPath)) if (isMonitoredDevice(sdevice) && d->m_knownDiskDevices.contains(sysPath))
{ {
TDEConfig config("mediamanagerrc"); TDEConfig config("mediamanagerrc");
config.setGroup("Global"); config.setGroup("Global");
if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
{ {
m_hardwareNotifierContainer->displayMessage( d->m_hardwareNotifierContainer->displayMessage(
i18n("A disk device has been removed!"), i18n("A disk device has been removed!"),
i18n("%1 (%2)").arg(m_knownDiskDevices[sysPath].friendlyName, m_knownDiskDevices[sysPath].node), i18n("%1 (%2)").arg(d->m_knownDiskDevices[sysPath].friendlyName, d->m_knownDiskDevices[sysPath].node),
SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + sysPath); SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + sysPath);
} }
m_knownDiskDevices.remove(sysPath); d->m_knownDiskDevices.remove(sysPath);
} }
} }
} }

44
kcontrol/hwmanager/hwdevicetray.h
Unescape View File

@ -20,21 +20,14 @@
#ifndef TDEHWDEVICETRAY_H #ifndef TDEHWDEVICETRAY_H
#define TDEHWDEVICETRAY_H #define TDEHWDEVICETRAY_H
#include <tqptrlist.h>
#include <ksystemtray.h> #include <ksystemtray.h>
#include <kglobalaccel.h>
#include <ksimpleconfig.h>
#include <tdepassivepopupstack.h>
#include <tdehardwaredevices.h>
#include <tdestoragedevice.h>
class KHelpMenu; class HwDeviceSystemTrayPrivate;
class PasswordDlg; class KPassivePopup;
class TDEGenericDevice;
class TDEGlobalAccel;
class TDEPopupMenu; class TDEPopupMenu;
class TDEStorageDevice;
typedef TQMap<int, TQString> TQStringMap;
class HwDeviceSystemTray : public KSystemTray class HwDeviceSystemTray : public KSystemTray
{ {
@ -43,6 +36,7 @@ class HwDeviceSystemTray : public KSystemTray
public: public:
HwDeviceSystemTray(TQWidget* parent = 0, const char *name = 0); HwDeviceSystemTray(TQWidget* parent = 0, const char *name = 0);
~HwDeviceSystemTray(); ~HwDeviceSystemTray();
TDEGlobalAccel *globalKeys; TDEGlobalAccel *globalKeys;
virtual void contextMenuAboutToShow(TDEPopupMenu *menu); virtual void contextMenuAboutToShow(TDEPopupMenu *menu);
@ -70,7 +64,7 @@ protected:
void showEvent(TQShowEvent *); void showEvent(TQShowEvent *);
private slots: private slots:
void _quit(); void quitApp();
void deviceAdded(TDEGenericDevice*); void deviceAdded(TDEGenericDevice*);
void deviceRemoved(TDEGenericDevice*); void deviceRemoved(TDEGenericDevice*);
void deviceChanged(TDEGenericDevice*); void deviceChanged(TDEGenericDevice*);
@ -82,29 +76,7 @@ private:
void resizeTrayIcon(); void resizeTrayIcon();
bool m_popupUp; HwDeviceSystemTrayPrivate *d;
KHelpMenu* m_help;
TQWidget* m_parent;
TDEPassivePopupStackContainer* m_hardwareNotifierContainer;
TQStringMap m_openMenuIndexMap;
TQStringMap m_mountMenuIndexMap;
TQStringMap m_unmountMenuIndexMap;
TQStringMap m_unlockMenuIndexMap;
TQStringMap m_lockMenuIndexMap;
TQStringMap m_ejectMenuIndexMap;
TQStringMap m_safeRemoveMenuIndexMap;
TQStringMap m_propertiesMenuIndexMap;
TDEPopupMenu* m_RMBMenu;
KSimpleConfig *r_config;
struct KnownDiskDeviceInfo
{
TQString friendlyName;
TQString node;
};
TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices;
}; };
#endif #endif

Write Preview
Loading…
Cancel
Save