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

Added option to enable/disable Device Monitor notification panels when

Browse Source 
disks are added/removed/changed status.
Minor tweak to menu entry in Device Monitor popup menu.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/192/head
Michele Calgaro 3 years ago
parent 5d9c673999
commit 434983acd9
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 74 additions and 33 deletions
Show Stats Download Patch File Download Diff File

44
kcontrol/hwmanager/hwdevicetray.cpp
Unescape View File

@ -206,7 +206,7 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) {
menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration"));
TDEAction *actHardwareConfig = new TDEAction(i18n("Configure Devices..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection());
TDEAction *actHardwareConfig = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection());
actHardwareConfig->plug(menu);
TDEAction *actShortcutKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditShortcutKeys()), actionCollection());
@ -637,11 +637,18 @@ void HwDeviceSystemTray::slotEditShortcutKeys() {
void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
if (device->type() == TDEGenericDeviceType::Disk) {
TDEConfig config("mediamanagerrc");
config.setGroup("Global");
if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
{
if (device->type() == TDEGenericDeviceType::Disk)
{
TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
if (isMonitoredDevice(sdevice)) {
if (isMonitoredDevice(sdevice))
{
TQString uuid = sdevice->diskUUID();
if (uuid == "") {
if (uuid == "")
{
uuid = sdevice->systemPath();
}
m_hardwareNotifierContainer->displayMessage(
@ -650,16 +657,24 @@ void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) {
0, 0, "ADD: " + uuid);
}
}
}
#endif
}
void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
if (device->type() == TDEGenericDeviceType::Disk) {
TDEConfig config("mediamanagerrc");
config.setGroup("Global");
if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
{
if (device->type() == TDEGenericDeviceType::Disk)
{
TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
if (isMonitoredDevice(sdevice)) {
if (isMonitoredDevice(sdevice))
{
TQString uuid = sdevice->diskUUID();
if (uuid == "") {
if (uuid == "")
{
uuid = sdevice->systemPath();
}
m_hardwareNotifierContainer->displayMessage(
@ -668,16 +683,24 @@ void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) {
0, 0, "REMOVE: " + uuid);
}
}
}
#endif
}
void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
if (device->type() == TDEGenericDeviceType::Disk) {
TDEConfig config("mediamanagerrc");
config.setGroup("Global");
if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
{
if (device->type() == TDEGenericDeviceType::Disk)
{
TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
if (isMonitoredDevice(sdevice)) {
if (isMonitoredDevice(sdevice))
{
TQString uuid = sdevice->diskUUID();
if (uuid == "") {
if (uuid == "")
{
uuid = sdevice->systemPath();
}
m_hardwareNotifierContainer->displayMessage(
@ -686,6 +709,7 @@ void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device) {
0, 0, "CHANGE: " + uuid);
}
}
}
#endif
}

9
tdeioslave/media/libmediacommon/mediamanagersettings.kcfg
Unescape View File

@ -25,8 +25,13 @@
<default>true</default>
</entry>
<entry name="NotificationPopupsEnabled" type="Bool">
<label>Enable notification popups</label>
<whatsthis>Deselect this if you do not want action request popups to be generated when devices are plugged in.</whatsthis>
<label>Enable notification dialogs popups</label>
<whatsthis>Deselect this if you do not want action request dialog popups to be generated when devices are plugged in.</whatsthis>
<default>true</default>
</entry>
<entry name="DeviceMonitorPopupsEnabled" type="Bool">
<label>Enable device monitor notification popups</label>
<whatsthis>Deselect this if you do not want device monitoring popups to be generated when devices are added, modified or removed.</whatsthis>
<default>true</default>
</entry>
</group>

12
tdeioslave/media/tdecmodule/managermoduleview.ui
Unescape View File

@ -63,6 +63,17 @@
<string>Deselect this if you do not want action request dialog popups to be generated when devices are plugged in.</string>
</property>
</widget>
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_DeviceMonitorPopupsEnabled</cstring>
</property>
<property name="text">
<string>Enable device monitor notification popups</string>
</property>
<property name="whatsThis" stdset="0">
<string>Deselect this if you do not want device monitoring popups to be generated when devices are added, modified or removed.</string>
</property>
</widget>
<widget class="TQGroupBox">
<property name="name">
<cstring>groupbox_mount</cstring>
@ -350,6 +361,7 @@ Display the short name as is; store a long name when the short name is not all u
<tabstop>kcfg_CdPollingEnabled</tabstop>
<tabstop>kcfg_AutostartEnabled</tabstop>
<tabstop>kcfg_NotificationPopupsEnabled</tabstop>
<tabstop>kcfg_DeviceMonitorPopupsEnabled</tabstop>
<tabstop>option_automount</tabstop>
<tabstop>option_ro</tabstop>
<tabstop>option_quiet</tabstop>

Write Preview
Loading…
Cancel
Save