diff options
Diffstat (limited to 'kcontrol/hwmanager')
| -rw-r--r-- | kcontrol/hwmanager/cryptpassworddlg.cpp | 12 | ||||
| -rw-r--r-- | kcontrol/hwmanager/cryptpassworddlg.h | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/cryptpassworddlgbase.ui | 4 | ||||
| -rw-r--r-- | kcontrol/hwmanager/deviceiconview.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/hwmanager/deviceiconview.h | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlg.cpp | 42 | ||||
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlg.h | 8 | ||||
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlgbase.ui | 4 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray.cpp | 808 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray.h | 87 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray_app.h | 6 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray_bindings.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray_configdialog.h | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.cpp | 56 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.h | 8 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanagerbase.ui | 4 | ||||
| -rw-r--r-- | kcontrol/hwmanager/passworddlg.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/passworddlg.h | 2 |
18 files changed, 498 insertions, 559 deletions
diff --git a/kcontrol/hwmanager/cryptpassworddlg.cpp b/kcontrol/hwmanager/cryptpassworddlg.cpp index b0f0e1cd8..eb9d23090 100644 --- a/kcontrol/hwmanager/cryptpassworddlg.cpp +++ b/kcontrol/hwmanager/cryptpassworddlg.cpp @@ -31,7 +31,7 @@ #include <tqpainter.h> #include <tqstyle.h> #include <tqfile.h> -#include <tqinternal_p.h> +#include <private/tqinternal_p.h> #undef Unsorted // Required for --enable-final (tqdir.h) #include <tqfiledialog.h> @@ -73,11 +73,11 @@ CryptPasswordDialog::CryptPasswordDialog(TQWidget *parent, TQString passwordProm } } - connect(m_base->textPasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->filePasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->cardKeyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->textPasswordEntry, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts())); - connect(m_base->filePasswordURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts())); + connect(m_base->textPasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->filePasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->cardKeyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->textPasswordEntry, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts())); + connect(m_base->filePasswordURL, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts())); m_base->textPasswordEntry->setFocus(); diff --git a/kcontrol/hwmanager/cryptpassworddlg.h b/kcontrol/hwmanager/cryptpassworddlg.h index d595c4a73..f155df968 100644 --- a/kcontrol/hwmanager/cryptpassworddlg.h +++ b/kcontrol/hwmanager/cryptpassworddlg.h @@ -35,7 +35,7 @@ class KSSLCertificate; class TDEUI_EXPORT CryptPasswordDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Create a dialog that allows a user to enter LUKS passwords or password files diff --git a/kcontrol/hwmanager/cryptpassworddlgbase.ui b/kcontrol/hwmanager/cryptpassworddlgbase.ui index f7a6a70a7..2c3a425a8 100644 --- a/kcontrol/hwmanager/cryptpassworddlgbase.ui +++ b/kcontrol/hwmanager/cryptpassworddlgbase.ui @@ -137,9 +137,9 @@ <includes> <include location="local" impldecl="in implementation">CryptPasswordDialogBase.ui.h</include> </includes> - <Q_SLOTS> + <slots> <slot>enableSupport_toggled(bool)</slot> - </Q_SLOTS> + </slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kpassdlg.h</include> diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp index 44a71b3a3..3ad111378 100644 --- a/kcontrol/hwmanager/deviceiconview.cpp +++ b/kcontrol/hwmanager/deviceiconview.cpp @@ -22,7 +22,7 @@ #include <tqcursor.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kiconloader.h> #include <tdemessagebox.h> @@ -43,8 +43,8 @@ DeviceIconView::DeviceIconView(TQWidget * parent, const char * name) header()->hide(); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); } void DeviceIconView::slotItemSelected(TQListViewItem* item) diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h index 746fb2253..6460beb0a 100644 --- a/kcontrol/hwmanager/deviceiconview.h +++ b/kcontrol/hwmanager/deviceiconview.h @@ -55,7 +55,7 @@ private: class DeviceIconView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DeviceIconView(TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 89a7e867f..5770c8d97 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -28,8 +28,8 @@ #include <tqslider.h> #include <tqpainter.h> #include <tqstyle.h> -#include <tqinternal_p.h> -#include <kprocess.h> +#include <private/tqinternal_p.h> +#include <tdeprocess.h> #include <dcopclient.h> #include <dcopref.h> #undef Unsorted // Required for --enable-final (tqdir.h) @@ -299,20 +299,20 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge } if (m_device->type() == TDEGenericDeviceType::CPU) { - connect(base->comboCPUGovernor, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setCPUGovernor(const TQString &))); + connect(base->comboCPUGovernor, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setCPUGovernor(const TQString &))); } if (m_device->type() == TDEGenericDeviceType::Disk) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device); - connect(base->buttonDiskMount, TQT_SIGNAL(clicked()), this, TQT_SLOT(mountDisk())); - connect(base->buttonDiskUnmount, TQT_SIGNAL(clicked()), this, TQT_SLOT(unmountDisk())); - connect(base->buttonDiskUnlock, TQT_SIGNAL(clicked()), this, TQT_SLOT(unlockDisk())); - connect(base->buttonDiskLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(lockDisk())); - connect(base->buttonDiskEject, TQT_SIGNAL(clicked()), this, TQT_SLOT(ejectDisk())); - connect(base->buttonDiskSafeRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(safeRemoveDisk())); + connect(base->buttonDiskMount, TQ_SIGNAL(clicked()), this, TQ_SLOT(mountDisk())); + connect(base->buttonDiskUnmount, TQ_SIGNAL(clicked()), this, TQ_SLOT(unmountDisk())); + connect(base->buttonDiskUnlock, TQ_SIGNAL(clicked()), this, TQ_SLOT(unlockDisk())); + connect(base->buttonDiskLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(lockDisk())); + connect(base->buttonDiskEject, TQ_SIGNAL(clicked()), this, TQ_SLOT(ejectDisk())); + connect(base->buttonDiskSafeRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(safeRemoveDisk())); if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) { - connect(base->cryptLUKSAddKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSAddKey())); - connect(base->cryptLUKSDelKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSDelKey())); - connect(base->cryptLUKSKeySlotList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processLockouts())); + connect(base->cryptLUKSAddKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSAddKey())); + connect(base->cryptLUKSDelKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSDelKey())); + connect(base->cryptLUKSKeySlotList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(processLockouts())); base->cryptLUKSKeySlotList->setAllColumnsShowFocus(true); base->cryptLUKSKeySlotList->setFullWidth(true); cryptLUKSPopulateList(); @@ -332,10 +332,10 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge m_sensorDataGridWidgets.setAutoDelete(true); } if (m_device->type() == TDEGenericDeviceType::Backlight) { - connect(base->sliderBacklightBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setBacklightBrightness(int))); + connect(base->sliderBacklightBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setBacklightBrightness(int))); } if (m_device->type() == TDEGenericDeviceType::RootSystem) { - connect(base->comboSystemHibernationMethod, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setHibernationMethod(int))); + connect(base->comboSystemHibernationMethod, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setHibernationMethod(int))); } TQGridLayout *mainGrid = new TQGridLayout(plainPage(), 1, 1, 0, spacingHint()); @@ -345,8 +345,8 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(processHardwareRemoved(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(processHardwareUpdated(TDEGenericDevice*))); populateDeviceInformation(); } @@ -493,9 +493,6 @@ void DevicePropertiesDialog::populateDeviceInformation() if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem)) { status_text += i18n("Contains a filesystem") + "<br>"; } - if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { - status_text += i18n("Hotpluggable") + "<br>"; - } if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) { status_text += i18n("Hidden") + "<br>"; } @@ -537,8 +534,7 @@ void DevicePropertiesDialog::populateDeviceInformation() showGroup = true; } if (isMonitoredDevice(sdevice) && - (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) || - sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable))) + sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) { base->buttonDiskEject->setEnabled(true); base->buttonDiskSafeRemove->setEnabled(true); @@ -885,8 +881,8 @@ void DevicePropertiesDialog::populateDeviceInformation() if (m_device->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(m_device); - connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted())); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved())); + connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted())); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved())); updateCryptographicCardStatusDisplay(); } diff --git a/kcontrol/hwmanager/devicepropsdlg.h b/kcontrol/hwmanager/devicepropsdlg.h index aabda590f..e961e689f 100644 --- a/kcontrol/hwmanager/devicepropsdlg.h +++ b/kcontrol/hwmanager/devicepropsdlg.h @@ -37,7 +37,7 @@ class PasswordDlg; class TDEUI_EXPORT SensorDisplayLabelsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Create a simple sensor name and value display widget @@ -65,7 +65,7 @@ private: class TDEUI_EXPORT SensorBar : public TQProgressBar { - Q_OBJECT + TQ_OBJECT public: SensorBar(TQWidget* parent=0, const char* name=0, WFlags f=0) : TQProgressBar(parent, name, f) {} SensorBar(int totalSteps, TQWidget* parent=0, const char* name=0, WFlags f=0): TQProgressBar(totalSteps, parent, name, f) {} @@ -93,7 +93,7 @@ public: class TDEUI_EXPORT SensorDisplayWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Simple sensor information display widget @@ -167,7 +167,7 @@ typedef TQMap<TDESystemHibernationMethod::TDESystemHibernationMethod, int> Hiber class TDEUI_EXPORT DevicePropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Create a dialog that allows a user to view and edit hardware device properties diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui index e7d7cee22..dce403fe7 100644 --- a/kcontrol/hwmanager/devicepropsdlgbase.ui +++ b/kcontrol/hwmanager/devicepropsdlgbase.ui @@ -1759,9 +1759,9 @@ <includes> <include location="local" impldecl="in implementation">DevicePropertiesDialogBase.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>enableSupport_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp index 509fe2835..f1726a2a1 100644 --- a/kcontrol/hwmanager/hwdevicetray.cpp +++ b/kcontrol/hwmanager/hwdevicetray.cpp @@ -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 @@ -21,58 +21,144 @@ #include <config.h> #endif -#include <tqtimer.h> +#include <cstdlib> +#include <unistd.h> + +#include <tqfileinfo.h> #include <tqimage.h> +#include <tqtimer.h> #include <tqtooltip.h> -#include <tqfileinfo.h> +#include <tqvaluevector.h> +#include <kcmultidialog.h> +#include <tdeglobalaccel.h> +#include <khelpmenu.h> +#include "tdeprocess.h" +#include <kpropertiesdialog.h> #include <krun.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> + #include <tdeaction.h> #include <tdeapplication.h> -#include <kcmultidialog.h> -#include <kdebug.h> -#include <khelpmenu.h> -#include <kiconloader.h> -#include "kprocess.h" -#include <tdelocale.h> -#include <tdepopupmenu.h> -#include <kstdaction.h> -#include <kstdguiitem.h> #include <tdeglobal.h> +#include <tdehardwaredevices.h> +#include <tdelocale.h> #include <tdemessagebox.h> -#include <kpassivepopup.h> -#include <kstandarddirs.h> -#include <kpropertiesdialog.h> -#include "passworddlg.h" +#include "tdepassivepopupstack.h" +#include <tdepopupmenu.h> #include <dcopclient.h> #include <dcopref.h> -#include <cstdlib> -#include <unistd.h> - -#include "hwdevicetray_configdialog.h" #include "hwdevicetray.h" +#include "hwdevicetray_configdialog.h" -HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name) - : KSystemTray(parent, name) + +// Storage Device Action +namespace SDActions +{ + // use 'int' as underlying type to avoid exposing a bunch of unnecessary + // enums/structs in the class header file private methods' signature + // Note: must start from 0 because the Type value is also used as index + // of a TQValueVector + enum Type : int + { + Open = 0, + Mount, + Unmount, + Unlock, + Lock, + Eject, + SafeRemove, + Properties + }; + + struct Details + { + const char *iconName; + const char *actionName; + const char *collectionName; + }; + + // Allows to use a for loop to iterate over all action types + static const Type All[] = { Open, Mount, Unmount, Unlock, Lock, Eject, SafeRemove, Properties }; + + static const TQMap<Type, Details> populateMap() + { + TQMap<Type, Details> map; + map[Open] = { "window-new", I18N_NOOP("Open"), "open_menu" }; + map[Mount] = { "drive-harddisk-mounted", I18N_NOOP("Mount"), "mount_menu" }; + map[Unmount] = { "drive-harddisk-unmounted", I18N_NOOP("Unmount"), "unmount_menu" }; + map[Unlock] = { "decrypted", I18N_NOOP("Unlock"), "unlock_menu" }; + map[Lock] = { "encrypted", I18N_NOOP("Lock"), "lock_menu" }; + map[Eject] = { "player_eject", I18N_NOOP("Eject"), "eject_menu" }; + map[SafeRemove] = { "player_safe_removal", I18N_NOOP("Safe remove"), "safe_remove_menu" }; + map[Properties] = { "edit", I18N_NOOP("Properties"), "properties_menu" }; + return map; + } + + static const TQMap<Type, Details> Data = populateMap(); +} + +// Storage Device Action Menu Entry, representing an action +// and the storage device on which to perform it +struct SDActionMenuEntry +{ + SDActions::Type actionType; + TQString uuid; +}; + +struct KnownDiskDeviceInfo +{ + TQString deviceLabel; + TQString node; +}; + + +class HwDeviceSystemTrayPrivate +{ +public: + HwDeviceSystemTrayPrivate() + { + } + + ~HwDeviceSystemTrayPrivate() + { + } + + // Members + TDEAction *m_deviceManagerAction; + TDEAction *m_quitAction; + TDEAction *m_shortcutKeysAction; + KHelpMenu *m_helpMenu; + TDEPopupMenu *m_LMBMenu; + TDEPopupMenu *m_RMBMenu; + + TQMap<int, SDActionMenuEntry> m_actionMenuEntryMap; + TQMap<SDActions::Type, TDEActionMenu*> m_RMBActionMenuMap; + + TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices; + + TDEPassivePopupStackContainer *m_hardwareNotifierContainer; +}; + + +HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name) + : KSystemTray(parent, name), d(new HwDeviceSystemTrayPrivate()) { // Create notifier - m_hardwareNotifierContainer = new TDEPassivePopupStackContainer(); - connect(m_hardwareNotifierContainer, TQT_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQT_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString))); + d->m_hardwareNotifierContainer = new TDEPassivePopupStackContainer(); + connect(d->m_hardwareNotifierContainer, TQ_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQ_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString))); - // Create help submenu - m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()); - TDEPopupMenu *help = m_help->menu(); - help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents())); + initMenus(); setPixmap(KSystemTray::loadIcon("hwinfo")); - setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); + setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitApp())); TQToolTip::add(this, i18n("Device monitor")); - m_parent = parent; - globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); + globalKeys = new TDEGlobalAccel(this); TDEGlobalAccel* keys = globalKeys; #include "hwdevicetray_bindings.cpp" // the keys need to be read from tdeglobals, not kickerrc @@ -80,42 +166,35 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - - new TDEActionMenu(i18n("Open"), SmallIcon("window-new", TQIconSet::Automatic), actionCollection(), "open_menu"); - new TDEActionMenu(i18n("Mount"), SmallIcon("drive-harddisk-mounted", TQIconSet::Automatic), actionCollection(), "mount_menu"); - new TDEActionMenu(i18n("Unmount"), SmallIcon("drive-harddisk-unmounted", TQIconSet::Automatic), actionCollection(), "unmount_menu"); - new TDEActionMenu(i18n("Unlock"), SmallIcon("decrypted", TQIconSet::Automatic), actionCollection(), "unlock_menu"); - new TDEActionMenu(i18n("Lock"), SmallIcon("encrypted", TQIconSet::Automatic), actionCollection(), "lock_menu"); - new TDEActionMenu(i18n("Eject"), SmallIcon("player_eject", TQIconSet::Automatic), actionCollection(), "eject_menu"); - new TDEActionMenu(i18n("Safe remove"), SmallIcon("player_safe_removal", TQIconSet::Automatic), actionCollection(), "safe_remove_menu"); - new TDEActionMenu(i18n("Properties"), SmallIcon("edit", TQIconSet::Automatic), actionCollection(), "properties_menu"); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); doDiskNotifications(true); - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(deviceAdded(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(deviceRemoved(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(deviceAdded(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(deviceRemoved(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); } HwDeviceSystemTray::~HwDeviceSystemTray() { - delete m_hardwareNotifierContainer; + delete d->m_hardwareNotifierContainer; + delete d; } /*! - * \b TQT_SLOT which called if hwdevicetray is exited by the user. In this case the user + * \b TQ_SLOT which called if hwdevicetray is exited by the user. In this case the user * is asked through a yes/no box if "HwDeviceTray should start automatically on log in" and the * result is written to the KDE configfile. */ -void HwDeviceSystemTray::_quit () { - r_config = new KSimpleConfig("tdehwdevicetrayrc"); +void HwDeviceSystemTray::quitApp() +{ + TDESimpleConfig *config = new TDESimpleConfig("tdehwdevicetrayrc"); - 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")); - r_config->setGroup("General"); - r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes); - r_config->sync (); + 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")); + config->setGroup("General"); + config->writeEntry("Autostart", tmp2 == KMessageBox::Yes); + config->sync(); exit(0); } @@ -142,16 +221,28 @@ void HwDeviceSystemTray::showEvent (TQShowEvent *) { resizeTrayIcon(); } -void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e) { - // Popup the context menu with left-click - if (e->button() == Qt::LeftButton) { - contextMenuAboutToShow(contextMenu()); - contextMenu()->popup(e->globalPos()); - e->accept(); - return; +void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e) +{ + switch (e->button()) + { + case TQt::LeftButton: + populateLMBMenu(); + d->m_LMBMenu->popup(e->globalPos()); + break; + + case TQt::MidButton: + TQTimer::singleShot(0, this, TQ_SLOT(slotHardwareConfig())); + break; + + case TQt::RightButton: + contextMenuAboutToShow(d->m_RMBMenu); + d->m_RMBMenu->popup(e->globalPos()); + break; + + default: + // do nothing + break; } - - KSystemTray::mousePressEvent(e); } bool HwDeviceSystemTray::isMonitoredDevice(TDEStorageDevice* sdevice) @@ -195,107 +286,128 @@ bool HwDeviceSystemTray::isMonitoredDevice(TDEStorageDevice* sdevice) sdevice->isDiskOfType(TDEDiskDeviceType::Camera))); } -void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) { - menu->clear(); - menu->setCheckable(true); +void HwDeviceSystemTray::initMenus() +{ + // RMB menu + d->m_RMBMenu = contextMenu(); - populateMenu(menu); + // Device actions + for (const SDActions::Type &actionType : SDActions::All) + { + SDActions::Details ad = SDActions::Data[actionType]; + d->m_RMBActionMenuMap.insert(actionType, new TDEActionMenu(i18n(ad.actionName), + SmallIcon(ad.iconName, TQIconSet::Automatic), actionCollection(), ad.collectionName)); + } - menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration")); + // Global Configuration + d->m_deviceManagerAction = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"), + TDEShortcut(), this, TQ_SLOT(slotHardwareConfig()), actionCollection()); + d->m_shortcutKeysAction = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), + TDEShortcut(), this, TQ_SLOT(slotEditShortcutKeys()), actionCollection()); - TDEAction *actHardwareConfig = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection()); - actHardwareConfig->plug(menu); + // Help & Quit + d->m_helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()); + d->m_helpMenu->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents())); + d->m_quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); - TDEAction *actShortcutKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditShortcutKeys()), actionCollection()); - actShortcutKeys->plug(menu); + // LMB menu + d->m_LMBMenu = new TDEPopupMenu(this); +} - menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), m_help->menu()); - TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); - quitAction->plug(menu); +TQString HwDeviceSystemTray::getDeviceLabel(TDEStorageDevice *sdevice) +{ + if (!sdevice) + { + return TQString::null; + } + + DCOPRef mediamanager("kded", "mediamanager"); + DCOPReply reply = mediamanager.call("properties", sdevice->deviceNode()); + TQString deviceLabel = TQString::null; + if (reply.isValid()) + { + // TODO R14.2.0: make sure the reply is a valid Medium + // once the media library is part of tdelibs + TQStringList properties = reply; + if (properties.size() >= 4) + { + deviceLabel = properties[3]; // medium label + } + } + + if (deviceLabel.isEmpty()) + { + deviceLabel = !sdevice->diskLabel().isEmpty() ? sdevice->diskLabel() : sdevice->friendlyName(); + deviceLabel += " (" + sdevice->deviceNode() + ")"; + } - m_menu = menu; + return deviceLabel; } -void HwDeviceSystemTray::configChanged() { - // +void HwDeviceSystemTray::addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int type, + TDEActionMenu *actionMenu, int &actionMenuIdx) +{ + TQString uuid = !sdevice->diskUUID().isEmpty() ? sdevice->diskUUID() : sdevice->systemPath(); + SDActions::Type actionType = (SDActions::Type)type; + SDActions::Details ad = SDActions::Data[actionType]; + actionMenu->popupMenu()->insertItem(SmallIcon(ad.iconName), i18n(ad.actionName), actionMenuIdx); + actionMenu->popupMenu()->connectItem(actionMenuIdx, this, + TQ_SLOT(slotExecuteDeviceAction(int))); + d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid }; } -void HwDeviceSystemTray::populateMenu(TDEPopupMenu* menu) { - menu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices")); - - TDEActionMenu *openDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("open_menu")); - TDEActionMenu *mountDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("mount_menu")); - TDEActionMenu *unmountDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("unmount_menu")); - TDEActionMenu *unlockDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("unlock_menu")); - TDEActionMenu *lockDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("lock_menu")); - TDEActionMenu *ejectDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("eject_menu")); - TDEActionMenu *safeRemoveDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("safe_remove_menu")); - TDEActionMenu *propertiesDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("properties_menu")); - - openDeviceActionMenu->popupMenu()->clear(); - mountDeviceActionMenu->popupMenu()->clear(); - unmountDeviceActionMenu->popupMenu()->clear(); - unlockDeviceActionMenu->popupMenu()->clear(); - lockDeviceActionMenu->popupMenu()->clear(); - ejectDeviceActionMenu->popupMenu()->clear(); - safeRemoveDeviceActionMenu->popupMenu()->clear(); - propertiesDeviceActionMenu->popupMenu()->clear(); - - m_openMenuIndexMap.clear(); - m_mountMenuIndexMap.clear(); - m_unmountMenuIndexMap.clear(); - m_unlockMenuIndexMap.clear(); - m_lockMenuIndexMap.clear(); - m_ejectMenuIndexMap.clear(); - m_safeRemoveMenuIndexMap.clear(); - m_propertiesMenuIndexMap.clear(); +void HwDeviceSystemTray::addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int type, int &actionMenuIdx) +{ + TQString uuid = !sdevice->diskUUID().isEmpty() ? sdevice->diskUUID() : sdevice->systemPath(); + SDActions::Type actionType = (SDActions::Type)type; + TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType]; + actionMenu->popupMenu()->insertItem(sdevice->icon(TDEIcon::SizeSmall), + getDeviceLabel(sdevice), actionMenuIdx); + actionMenu->popupMenu()->connectItem(actionMenuIdx, this, + TQ_SLOT(slotExecuteDeviceAction(int))); + actionMenu->setEnabled(true); + d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid }; +} - // Find all storage devices and add them to the popup menus - int lastOpenIndex = -1; - int lastMountIndex = -1; - int lastUnmountIndex = -1; - int lastUnlockIndex = -1; - int lastLockIndex = -1; - int lastEjectIndex = -1; - int lastSafeRemoveIndex = -1; - int lastPropertiesIndex = -1; +void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu) +{ + d->m_RMBMenu = menu; + menu->clear(); + for (const SDActions::Type &actionType : SDActions::All) + { + TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType]; + actionMenu->popupMenu()->clear(); + actionMenu->setEnabled(false); + actionMenu->unplug(d->m_RMBMenu); + } + + d->m_actionMenuEntryMap.clear(); + + // Find all storage devices, sort them by label and add them to the popup menus + TQValueVector<TQMap<TQString, TDEStorageDevice*>*> rmbMenuEntries(sizeof(SDActions::All) / sizeof(SDActions::Type), nullptr); + for (size_t idx = 0; idx < rmbMenuEntries.size(); ++idx) + { + rmbMenuEntries[idx] = new TQMap<TQString, TDEStorageDevice*>(); + } TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) { - TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); + TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); if (isMonitoredDevice(sdevice)) { - TQString friendlyName = sdevice->diskLabel(); - if (friendlyName.isEmpty()) - { - friendlyName = sdevice->friendlyName(); - } - - if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) + TQString deviceLabel = getDeviceLabel(sdevice); + if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || + sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt)) { - lastLockIndex = lockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - lockDeviceActionMenu->popupMenu()->connectItem(lastLockIndex, this, TQT_SLOT(slotLockDevice(int))); - m_lockMenuIndexMap[lastLockIndex] = sdevice->diskUUID(); - if (m_lockMenuIndexMap[lastLockIndex] == "") - { - m_lockMenuIndexMap[lastLockIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Lock])[deviceLabel] = sdevice; } else { - lastUnlockIndex = unlockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - unlockDeviceActionMenu->popupMenu()->connectItem(lastUnlockIndex, this, TQT_SLOT(slotUnlockDevice(int))); - m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->diskUUID(); - if (m_unlockMenuIndexMap[lastUnlockIndex] == "") - { - m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Unlock])[deviceLabel] = sdevice; } } @@ -303,245 +415,135 @@ void HwDeviceSystemTray::populateMenu(TDEPopupMenu* menu) { { if (sdevice->mountPath().isEmpty()) { - lastMountIndex = mountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - mountDeviceActionMenu->popupMenu()->connectItem(lastMountIndex, this, TQT_SLOT(slotMountDevice(int))); - m_mountMenuIndexMap[lastMountIndex] = sdevice->diskUUID(); - if (m_mountMenuIndexMap[lastMountIndex] == "") - { - m_mountMenuIndexMap[lastMountIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Mount])[deviceLabel] = sdevice; } else { - lastUnmountIndex = unmountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - unmountDeviceActionMenu->popupMenu()->connectItem(lastUnmountIndex, this, TQT_SLOT(slotUnmountDevice(int))); - m_unmountMenuIndexMap[lastUnmountIndex] = sdevice->diskUUID(); - if (m_unmountMenuIndexMap[lastMountIndex] == "") - { - m_unmountMenuIndexMap[lastMountIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Unmount])[deviceLabel] = sdevice; } - // Both mounted and unmounted disks can be opened - lastOpenIndex = openDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - openDeviceActionMenu->popupMenu()->connectItem(lastOpenIndex, this, TQT_SLOT(slotOpenDevice(int))); - m_openMenuIndexMap[lastOpenIndex] = sdevice->diskUUID(); - if (m_openMenuIndexMap[lastOpenIndex] == "") - { - m_openMenuIndexMap[lastOpenIndex] = sdevice->systemPath(); - } + // Mounted and unmounted disks can also be opened + (*rmbMenuEntries[SDActions::Open])[deviceLabel] = sdevice; } - if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) || - sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) { - lastEjectIndex = ejectDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - ejectDeviceActionMenu->popupMenu()->connectItem(lastEjectIndex, this, TQT_SLOT(slotEjectDevice(int))); - m_ejectMenuIndexMap[lastEjectIndex] = sdevice->diskUUID(); - if (m_ejectMenuIndexMap[lastEjectIndex] == "") - { - m_ejectMenuIndexMap[lastEjectIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Eject])[deviceLabel] = sdevice; - lastSafeRemoveIndex = safeRemoveDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - safeRemoveDeviceActionMenu->popupMenu()->connectItem(lastSafeRemoveIndex, this, TQT_SLOT(slotSafeRemoveDevice(int))); - m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->diskUUID(); - if (m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] == "") - { - m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::SafeRemove])[deviceLabel] = sdevice; } - lastPropertiesIndex = propertiesDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode())); - propertiesDeviceActionMenu->popupMenu()->connectItem(lastPropertiesIndex, this, TQT_SLOT(slotPropertiesDevice(int))); - m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->diskUUID(); - if (m_propertiesMenuIndexMap[lastPropertiesIndex] == "") - { - m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->systemPath(); - } + (*rmbMenuEntries[SDActions::Properties])[deviceLabel] = sdevice; } } - openDeviceActionMenu->setEnabled(lastOpenIndex != -1); - mountDeviceActionMenu->setEnabled(lastMountIndex != -1); - unmountDeviceActionMenu->setEnabled(lastUnmountIndex != -1); - unlockDeviceActionMenu->setEnabled(lastUnlockIndex != -1); - lockDeviceActionMenu->setEnabled(lastLockIndex != -1); - ejectDeviceActionMenu->setEnabled(lastEjectIndex != -1); - safeRemoveDeviceActionMenu->setEnabled(lastSafeRemoveIndex != -1); - propertiesDeviceActionMenu->setEnabled(lastPropertiesIndex != -1); - - if (lastOpenIndex != -1) - { - openDeviceActionMenu->plug(menu); - } - if (lastMountIndex != -1) - { - mountDeviceActionMenu->plug(menu); - } - if (lastUnmountIndex != -1) - { - unmountDeviceActionMenu->plug(menu); - } - if (lastUnlockIndex != -1) - { - unlockDeviceActionMenu->plug(menu); - } - if (lastLockIndex != -1) - { - lockDeviceActionMenu->plug(menu); - } - if (lastEjectIndex != -1) - { - ejectDeviceActionMenu->plug(menu); - } - if (lastSafeRemoveIndex != -1) - { - safeRemoveDeviceActionMenu->plug(menu); - } - if (lastPropertiesIndex != -1) + // Plug in meaningful action menus + d->m_RMBMenu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Device Actions"), 0); + int actionMenuIdx = 0; + for (const SDActions::Type &actionType : SDActions::All) { - propertiesDeviceActionMenu->plug(menu); + TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType]; + for (TDEStorageDevice *sdevice : *rmbMenuEntries[actionType]) + { + addDeviceToRMBMenu(sdevice, actionType, actionMenuIdx); + } + if (actionMenu->isEnabled()) + { + actionMenu->plug(d->m_RMBMenu); + } + delete rmbMenuEntries[actionType]; + rmbMenuEntries[actionType] = nullptr; } + + // Global Configuration + menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration")); + + d->m_deviceManagerAction->plug(menu); + d->m_shortcutKeysAction->plug(menu); + + // Help & Quit + menu->insertSeparator(); + menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), d->m_helpMenu->menu()); + d->m_quitAction->plug(menu); } -void HwDeviceSystemTray::slotOpenDevice(int parameter) +void HwDeviceSystemTray::populateLMBMenu() { - TQString uuid = m_openMenuIndexMap[parameter]; - if (!uuid.isEmpty()) + d->m_LMBMenu->clear(); + d->m_LMBMenu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices"), 0); + + d->m_actionMenuEntryMap.clear(); + int actionMenuIdx = 0; + + // Find all storage devices and add them to the popup menus + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); + TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); + TQMap<TQString, TDEActionMenu*> lmbMenuEntries; + for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) + TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); + if (isMonitoredDevice(sdevice) && + (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || + sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) || + sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable) || + sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))) { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) + TQString deviceLabel = getDeviceLabel(sdevice); + TDEActionMenu *actionMenu = new TDEActionMenu(deviceLabel, + sdevice->icon(TDEIcon::SizeSmall)); + + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable)) { - if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera)) + // Mounted and unmounted disks can also be opened + addDeviceToLMBMenu(sdevice, SDActions::Open, actionMenu, actionMenuIdx); + + if (sdevice->mountPath().isEmpty()) { - new KRun(TQString("media:/%1").arg(sdevice->friendlyName())); + addDeviceToLMBMenu(sdevice, SDActions::Mount, actionMenu, actionMenuIdx); } else { - new KRun(TQString("system:/media/%1").arg(TQFileInfo(sdevice->deviceNode()).baseName(true))); + addDeviceToLMBMenu(sdevice, SDActions::Unmount, actionMenu, actionMenuIdx); } - return; } - } - } -} -void HwDeviceSystemTray::slotMountDevice(int parameter) -{ - TQString uuid = m_mountMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) + if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || + sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) { - if (sdevice->mountPath().isEmpty()) + if (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt)) { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-m" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) - { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); - } + addDeviceToLMBMenu(sdevice, SDActions::Lock, actionMenu, actionMenuIdx); } - } - } - } -} - -void HwDeviceSystemTray::slotUnmountDevice(int parameter) -{ - TQString uuid = m_unmountMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) - { - if (!sdevice->mountPath().isEmpty()) + else { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-u" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) - { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); - } + addDeviceToLMBMenu(sdevice, SDActions::Unlock, actionMenu, actionMenuIdx); } } - } - } -} -void HwDeviceSystemTray::slotUnlockDevice(int parameter) -{ - TQString uuid = m_unlockMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) + + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-k" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) - { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); - } + addDeviceToLMBMenu(sdevice, SDActions::Eject, actionMenu, actionMenuIdx); + + addDeviceToLMBMenu(sdevice, SDActions::SafeRemove, actionMenu, actionMenuIdx); } + + addDeviceToLMBMenu(sdevice, SDActions::Properties, actionMenu, actionMenuIdx); + + lmbMenuEntries[deviceLabel] = actionMenu; } } -} - -void HwDeviceSystemTray::slotLockDevice(int parameter) -{ - TDEGenericDevice *hwdevice; - TQString uuid = m_lockMenuIndexMap[parameter]; - if (!uuid.isEmpty()) + // Insert menu entries in sorted order + for (TDEActionMenu *am : lmbMenuEntries) { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) - { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-l" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) - { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); - } - } - } + am->plug(d->m_LMBMenu); } } -void HwDeviceSystemTray::slotEjectDevice(int parameter) +void HwDeviceSystemTray::slotExecuteDeviceAction(int parameter) { - TQString uuid = m_ejectMenuIndexMap[parameter]; + TQString uuid = d->m_actionMenuEntryMap[parameter].uuid; + int actionType = d->m_actionMenuEntryMap[parameter].actionType; if (!uuid.isEmpty()) { TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -551,56 +553,42 @@ void HwDeviceSystemTray::slotEjectDevice(int parameter) TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-e" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) + if (actionType == SDActions::Open) { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); + if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera)) + { + new KRun(TQString("media:/%1").arg(sdevice->friendlyName())); + } + else + { + new KRun(TQString("system:/media/%1").arg(TQFileInfo(sdevice->deviceNode()).baseName(true))); + } } - } - } - } -} - -void HwDeviceSystemTray::slotSafeRemoveDevice(int parameter) -{ - TQString uuid = m_safeRemoveMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) - { - TDEProcess proc; - proc << "tdeio_media_mounthelper" << "-s" << sdevice->deviceNode(); - if (!proc.start(TDEProcess::DontCare)) + else if (actionType == SDActions::Properties) { - KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), - i18n("Device monitor")); + new KPropertiesDialog(KURL(TQString("media:/%1").arg(sdevice->deviceNode()))); + } + else + { + TQString opType = TQString::null; + if (actionType == SDActions::Mount) { opType = "-m"; } + else if (actionType == SDActions::Unmount) { opType = "-u"; } + else if (actionType == SDActions::Unlock) { opType = "-k"; } + else if (actionType == SDActions::Lock) { opType = "-l"; } + else if (actionType == SDActions::Eject) { opType = "-e"; } + else if (actionType == SDActions::SafeRemove) { opType = "-s"; } + + if (!opType.isEmpty()) + { + TDEProcess proc; + proc << "tdeio_media_mounthelper" << opType << sdevice->deviceNode(); + if (!proc.start(TDEProcess::DontCare)) + { + KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."), + i18n("Device monitor")); + } + } } - } - } - } -} - -void HwDeviceSystemTray::slotPropertiesDevice(int parameter) -{ - TQString uuid = m_propertiesMenuIndexMap[parameter]; - if (!uuid.isEmpty()) - { - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); - for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) - { - TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice); - if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) - { - new KPropertiesDialog(KURL(TQString("media:/%1").arg(sdevice->deviceNode()))); - return; } } } @@ -642,8 +630,8 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly) // Scan devices for changes and notify new devices if needed. // This is necessary because the device information may not be available // at the time the hardwareAdded signal is emitted - TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = m_knownDiskDevices; - m_knownDiskDevices.clear(); + TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = d->m_knownDiskDevices; + d->m_knownDiskDevices.clear(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk); for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) @@ -654,22 +642,17 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly) TQString sysPath = sdevice->systemPath(); if (oldKnownDevices.contains(sysPath)) { - m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath]; + d->m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath]; oldKnownDevices.remove(sysPath); } else { - TQString friendlyName = sdevice->diskLabel(); - if (friendlyName.isEmpty()) - { - friendlyName = sdevice->friendlyName(); - } - m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() }; + TQString deviceLabel = getDeviceLabel(sdevice); + d->m_knownDiskDevices[sysPath] = { deviceLabel, sdevice->deviceNode() }; if (!scanOnly && popupEnable) { - m_hardwareNotifierContainer->displayMessage( - i18n("A disk device has been added!"), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()), + d->m_hardwareNotifierContainer->displayMessage( + i18n("A disk device has been added!"), deviceLabel, SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath); } } @@ -681,9 +664,8 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly) TQMap<TQString, KnownDiskDeviceInfo>::ConstIterator delIt; for (delIt = oldKnownDevices.begin(); delIt != oldKnownDevices.end(); delIt++) { - m_hardwareNotifierContainer->displayMessage( - i18n("A disk device has been removed!"), - i18n("%1 (%2)").arg(delIt.data().friendlyName, delIt.data().node), + d->m_hardwareNotifierContainer->displayMessage( + i18n("A disk device has been removed!"), delIt.data().deviceLabel, SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + delIt.key()); } } @@ -697,21 +679,16 @@ void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) // 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. TQString sysPath = sdevice->systemPath(); - if (isMonitoredDevice(sdevice) && !m_knownDiskDevices.contains(sysPath)) + if (isMonitoredDevice(sdevice) && !d->m_knownDiskDevices.contains(sysPath)) { - TQString friendlyName = sdevice->diskLabel(); - if (friendlyName.isEmpty()) - { - friendlyName = sdevice->friendlyName(); - } - m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() }; + TQString deviceLabel = getDeviceLabel(sdevice); + d->m_knownDiskDevices[sysPath] = { deviceLabel, sdevice->deviceNode() }; TDEConfig config("mediamanagerrc"); config.setGroup("Global"); if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) { - m_hardwareNotifierContainer->displayMessage( - i18n("A disk device has been added!"), - i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()), + d->m_hardwareNotifierContainer->displayMessage( + i18n("A disk device has been added!"), deviceLabel, SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath); } } @@ -724,18 +701,18 @@ void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) { TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(device); TQString sysPath = sdevice->systemPath(); - if (isMonitoredDevice(sdevice) && m_knownDiskDevices.contains(sysPath)) + if (isMonitoredDevice(sdevice) && d->m_knownDiskDevices.contains(sysPath)) { TDEConfig config("mediamanagerrc"); config.setGroup("Global"); if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true)) { - m_hardwareNotifierContainer->displayMessage( - i18n("A disk device has been removed!"), - i18n("%1 (%2)").arg(m_knownDiskDevices[sysPath].friendlyName, m_knownDiskDevices[sysPath].node), + TQString deviceLabel = getDeviceLabel(sdevice); + d->m_hardwareNotifierContainer->displayMessage( + i18n("A disk device has been removed!"), deviceLabel, SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + sysPath); } - m_knownDiskDevices.remove(sysPath); + d->m_knownDiskDevices.remove(sysPath); } } } @@ -748,6 +725,13 @@ void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device) void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point, TQString uuid) { TDEGenericDevice *hwdevice; if (uuid.startsWith("ADD: ")) { + TDEConfig config("mediamanagerrc"); + config.setGroup("Global"); + if (config.readBoolEntry("NotificationPopupsEnabled", true)) + { + return; + } + uuid = uuid.right(uuid.length() - strlen("ADD: ")); if (uuid != "") { TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -776,7 +760,7 @@ void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point, } void HwDeviceSystemTray::slotHelpContents() { - kapp->invokeHelp(TQString::null, "hwdevicetray"); + tdeApp->invokeHelp(TQString::null, "hwdevicetray"); } #include "hwdevicetray.moc" diff --git a/kcontrol/hwmanager/hwdevicetray.h b/kcontrol/hwmanager/hwdevicetray.h index c0465f2bf..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 slotSafeRemoveDevice(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 doDiskNotifications(bool scanOnly); -private: - static 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_safeRemoveMenuIndexMap; - TQStringMap m_propertiesMenuIndexMap; - TDEPopupMenu* m_menu; - KSimpleConfig *r_config; + 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 diff --git a/kcontrol/hwmanager/hwdevicetray_app.h b/kcontrol/hwmanager/hwdevicetray_app.h index fae4d6cd9..b4e03973f 100644 --- a/kcontrol/hwmanager/hwdevicetray_app.h +++ b/kcontrol/hwmanager/hwdevicetray_app.h @@ -21,13 +21,13 @@ #define TDEHWDEVICEAPP_H #include <tqtimer.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class HwDeviceSystemTray; -class HwDeviceApp : public KUniqueApplication +class HwDeviceApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: HwDeviceApp(); diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp index bcbbbda1b..09974ac68 100644 --- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp +++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp @@ -18,7 +18,7 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kcontrol/hwmanager/hwdevicetray_configdialog.h b/kcontrol/hwmanager/hwdevicetray_configdialog.h index 657b3ee43..823931757 100644 --- a/kcontrol/hwmanager/hwdevicetray_configdialog.h +++ b/kcontrol/hwmanager/hwdevicetray_configdialog.h @@ -42,7 +42,7 @@ class ConfigDialog; class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(TDEGlobalAccel *accel, bool isApplet ); diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 265901003..662844ec3 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -44,7 +44,7 @@ #include <unistd.h> #include <kpassdlg.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <string> #include <stdio.h> #include <tqstring.h> @@ -59,8 +59,8 @@ using namespace std; typedef KGenericFactory<TDEHWManager, TQWidget> TDEHWManagerFactory; K_EXPORT_COMPONENT_FACTORY( kcm_hwmanager, TDEHWManagerFactory("kcmhwmanager") ) -KSimpleConfig *config; -KSimpleConfig *systemconfig; +TDESimpleConfig *config; +TDESimpleConfig *systemconfig; /**** TDEHWManager ****/ @@ -68,8 +68,8 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis : TDECModule(TDEHWManagerFactory::instance(), parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" )); - systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" )); + config = new TDESimpleConfig( TQString::fromLatin1( "hwmanagerrc" )); + systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" )); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Device Manager"), 0, @@ -87,18 +87,19 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis base->deviceFilter->setListView(base->deviceTree); + deviceUpdateScheduled = false; + setRootOnlyMsg(i18n("<b>Device settings are system wide, and therefore require administrator access</b><br>To alter the system's device settings, click on the \"Administrator Mode\" button below.")); setUseRootOnlyMsg(true); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); hwdevices->setTriggerlessHardwareUpdatesEnabled(true); - connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView())); + connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate())); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate())); load(); @@ -132,8 +133,19 @@ void TDEHWManager::defaults() load( true ); } +void TDEHWManager::scheduleDeviceUpdate() +{ + if (!deviceUpdateScheduled) + { + deviceUpdateScheduled = true; + TQTimer::singleShot(1000, this, TQ_SLOT(populateTreeView())); + } +} + void TDEHWManager::populateTreeView() { + deviceUpdateScheduled = false; + bool show_by_connection = base->showByConnection->isChecked(); // Figure out which device, if any, was selected @@ -154,7 +166,7 @@ void TDEHWManager::populateTreeView() for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -176,7 +188,7 @@ void TDEHWManager::populateTreeView() for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -199,7 +211,7 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -215,24 +227,6 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con } } -void TDEHWManager::deviceChanged(TDEGenericDevice* device) { - TQListViewItemIterator it(base->deviceTree); - while (it.current()) { - DeviceIconItem* item = dynamic_cast<DeviceIconItem*>(it.current()); - if (item) { - TDEGenericDevice* candidate = item->device(); - if (candidate) { - if (candidate->systemPath() == device->systemPath()) { - if (item->text(0) != device->detailedFriendlyName()) { - item->setText(0, device->detailedFriendlyName()); - } - } - } - } - ++it; - } -} - void TDEHWManager::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) { TQString password; int result = KPasswordDialog::getPassword(password, prompt); diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h index abc05fa54..020a51f22 100644 --- a/kcontrol/hwmanager/hwmanager.h +++ b/kcontrol/hwmanager/hwmanager.h @@ -41,7 +41,7 @@ class TDEListViewItem; class TDEHWManager : public TDECModule, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: //TDEHWManager(TQWidget *parent = 0L, const char *name = 0L); @@ -58,15 +58,15 @@ public: k_dcop: private slots: + void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice); void populateTreeView(); void populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath); - void deviceChanged(TDEGenericDevice*); - void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice); + void scheduleDeviceUpdate(); private: TDEHWManagerBase *base; - TDEConfig *config; + bool deviceUpdateScheduled; }; #endif diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui index 6c785921d..ee84b81c3 100644 --- a/kcontrol/hwmanager/hwmanagerbase.ui +++ b/kcontrol/hwmanager/hwmanagerbase.ui @@ -74,9 +74,9 @@ <include location="local" impldecl="in implementation">TDEHWManagerBase.ui.h</include> <include location="local" impldecl="in implementation">deviceiconview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>enableSupport_toggled(bool)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include> diff --git a/kcontrol/hwmanager/passworddlg.cpp b/kcontrol/hwmanager/passworddlg.cpp index 07b6027ae..22b82648f 100644 --- a/kcontrol/hwmanager/passworddlg.cpp +++ b/kcontrol/hwmanager/passworddlg.cpp @@ -30,7 +30,7 @@ PasswordDlg::PasswordDlg() : enableButton( User1, false ); unlockDialog->encryptedIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("drive-harddisk-locked", TDEIcon::NoGroup, TDEIcon::SizeLarge)); - connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &))); + connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &))); setMainWidget(unlockDialog); } diff --git a/kcontrol/hwmanager/passworddlg.h b/kcontrol/hwmanager/passworddlg.h index bee1431cc..091b5aa5f 100644 --- a/kcontrol/hwmanager/passworddlg.h +++ b/kcontrol/hwmanager/passworddlg.h @@ -39,7 +39,7 @@ class PasswordDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PasswordDlg(); |