TDE
/
tdebase
9
4
Fork 1
Code Issues 115 Pull Requests 10 Releases Wiki Activity

Add preliminary cryptographic card support to the TDE hardware device manager

Browse Source
pull/2/head
Timothy Pearson 9 years ago
parent da7215ff52
commit ae35100db0
4 changed files with 104 additions and 0 deletions
Show Stats Download Patch File Download Diff File

35
kcontrol/hwmanager/devicepropsdlg.cpp
Unescape View File

@ -283,6 +283,9 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
if (m_device->type() != TDEGenericDeviceType::Event) {
base->tabBarWidget->removePage(base->tabEvent);
}
if (m_device->type() != TDEGenericDeviceType::CryptographicCard) {
base->tabBarWidget->removePage(base->tabCryptographicCard);
}
if (m_device->type() == TDEGenericDeviceType::CPU) {
connect(base->comboCPUGovernor, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setCPUGovernor(const TQString &)));
@ -753,6 +756,38 @@ void DevicePropertiesDialog::populateDeviceInformation() {
}
base->labelEventSwitchActive->setText(activeSwitches);
}
if (m_device->type() == TDEGenericDeviceType::CryptographicCard) {
TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(m_device);
connect(cdevice, TQT_SIGNAL(cardInserted()), this, TQT_SLOT(cryptographicCardInserted()));
connect(cdevice, TQT_SIGNAL(cardRemoved()), this, TQT_SLOT(cryptographicCardRemoved()));
updateCryptographicCardStatusDisplay();
}
}
}
void DevicePropertiesDialog::cryptographicCardInserted() {
updateCryptographicCardStatusDisplay();
}
void DevicePropertiesDialog::cryptographicCardRemoved() {
updateCryptographicCardStatusDisplay();
}
void DevicePropertiesDialog::updateCryptographicCardStatusDisplay() {
TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(m_device);
int status = cdevice->cardPresent();
if ((status < 0) ||(status > 1)) {
base->labelCardStatus->setText(i18n("Unknown"));
}
else if (status == 0) {
base->labelCardStatus->setText(i18n("Empty"));
}
else if (status == 1) {
base->labelCardStatus->setText(i18n("Inserted") + TQString("<br>") + i18n("ATR: %1").arg(cdevice->cardATR()));
}
}

4
kcontrol/hwmanager/devicepropsdlg.h
Unescape View File

@ -191,6 +191,10 @@ private slots:
void mountDisk();
void unmountDisk();
void cryptographicCardInserted();
void cryptographicCardRemoved();
void updateCryptographicCardStatusDisplay();
private:
TDEGenericDevice* m_device;
DevicePropertiesDialogBase* base;

54
kcontrol/hwmanager/devicepropsdlgbase.ui
Unescape View File

@ -1528,6 +1528,60 @@
</spacer>
</grid>
</widget>
<widget class="TQWidget">
<property name="name">
<cstring>tabCryptographicCard</cstring>
</property>
<attribute name="title">
<string>Cryptographic Card</string>
</attribute>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>groupInput</cstring>
</property>
<property name="title">
<string>Card Status</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQLabel" row="0" column="0" colspan="1">
<property name="name">
<cstring>labelCardStatus</cstring>
</property>
<property name="text">
<string></string>
</property>
<property name="alignment">
<set>AlignTop|AlignLeft</set>
</property>
</widget>
</grid>
</widget>
<spacer row="8" column="0">
<property name="name" stdset="0">
<cstring>Spacer4</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</grid>
</widget>
</widget>
</grid>
</widget>

11
kcontrol/hwmanager/hwmanager.cpp
Unescape View File

@ -47,6 +47,8 @@
#include <stdio.h>
#include <tqstring.h>
#include <tdecryptographiccarddevice.h>
#include "hwmanager.h"
using namespace std;
@ -144,6 +146,9 @@ void TDEHWManager::populateTreeView()
TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass(TDEGenericDeviceType::RootSystem);
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
static_cast<TDECryptographicCardDevice*>(hwdevice)->enableCardMonitoring(true);
}
DeviceIconItem* item = new DeviceIconItem(base->deviceTree, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice);
if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {
base->deviceTree->ensureItemVisible(item);
@ -160,6 +165,9 @@ void TDEHWManager::populateTreeView()
TDEGenericDevice *hwdevice;
TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass((TDEGenericDeviceType::TDEGenericDeviceType)i);
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
static_cast<TDECryptographicCardDevice*>(hwdevice)->enableCardMonitoring(true);
}
DeviceIconItem* item = new DeviceIconItem(rootitem, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice);
if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {
base->deviceTree->ensureItemVisible(item);
@ -177,6 +185,9 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
static_cast<TDECryptographicCardDevice*>(hwdevice)->enableCardMonitoring(true);
}
if (hwdevice->parentDevice() == parent->device()) {
DeviceIconItem* item = new DeviceIconItem(parent, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice);
if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {

Write Preview
Loading…
Cancel
Save