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

Enhance device manager module

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 520b27baef
commit 5f27e3ead5
6 changed files with 262 additions and 61 deletions
Show Stats Download Patch File Download Diff File

2
kcontrol/hwmanager/CMakeLists.txt
Unescape View File

@ -33,7 +33,7 @@ set_source_files_properties( hwmanager.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI
tde_add_kpart( kcm_hwmanager AUTOMOC tde_add_kpart( kcm_hwmanager AUTOMOC
SOURCES SOURCES
hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp hwmanagerbase.ui hwmanager.skel hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp devicepropsdlgbase.ui hwmanagerbase.ui hwmanager.skel
LINK kio-shared LINK kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

66
kcontrol/hwmanager/devicepropsdlg.cpp
Unescape View File

@ -42,62 +42,28 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
enableButtonOK( false ); enableButtonOK( false );
if (m_device) { if (m_device) {
base = new DevicePropertiesDialogBase(plainPage());
TQGridLayout *mainGrid = new TQGridLayout(plainPage(), 1, 1, 0, spacingHint()); TQGridLayout *mainGrid = new TQGridLayout(plainPage(), 1, 1, 0, spacingHint());
mainGrid->setRowStretch(1, 1); mainGrid->setRowStretch(1, 1);
mainGrid->setRowStretch(1, 1); mainGrid->setRowStretch(1, 1);
mainGrid->addWidget(base, 0, 0);
TQTabWidget *mainTabs = new TQTabWidget(plainPage());
TQWidget *genericPropertiesTab = new TQWidget(this);
TQGridLayout *generalTabLayout = new TQGridLayout(genericPropertiesTab, 4, 2, 0, spacingHint() );
int row = 0; base->labelDeviceType->setText(m_device->friendlyDeviceType());
TQLabel *label; base->iconDeviceType->setPixmap(m_device->icon(KIcon::SizeSmall));
label = new TQLabel(i18n("Device Name:"), genericPropertiesTab); base->labelDeviceName->setText(m_device->friendlyName());
generalTabLayout->addWidget(label, row, 0); base->labelDeviceNode->setText((m_device->deviceNode().isNull())?i18n("<none>"):m_device->deviceNode());
label = new TQLabel(m_device->friendlyName(), genericPropertiesTab); base->labelSystemPath->setText(m_device->systemPath());
generalTabLayout->addWidget(label, row, 1); base->labelSubsytemType->setText(m_device->subsystem());
row++; base->labelDeviceDriver->setText((m_device->deviceDriver().isNull())?i18n("<none>"):m_device->deviceDriver());
label = new TQLabel(i18n("Device Node:"), genericPropertiesTab); base->labelDeviceClass->setText((m_device->PCIClass().isNull())?i18n("<n/a>"):m_device->PCIClass());
generalTabLayout->addWidget(label, row, 0);
label = new TQLabel(m_device->deviceNode(), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 1);
row++;
label = new TQLabel(i18n("System Path:"), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 0);
label = new TQLabel(m_device->systemPath(), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 1);
row++;
label = new TQLabel(i18n("Subsystem Type:"), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 0);
label = new TQLabel(m_device->subsystem(), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 1);
row++;
label = new TQLabel(i18n("Device Driver:"), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 0);
label = new TQLabel((m_device->deviceDriver().isNull())?i18n("<none>"):m_device->deviceDriver(), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 1);
row++;
label = new TQLabel(i18n("Device Class:"), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 0);
label = new TQLabel((m_device->PCIClass().isNull())?i18n("<n/a>"):m_device->PCIClass(), genericPropertiesTab);
generalTabLayout->addWidget(label, row, 1);
row++;
if (m_device->subsystem() == "pci") { if (m_device->subsystem() == "pci") {
TQString busid = m_device->systemPath(); base->labelBusID->setText(m_device->busID());
busid = busid.remove(0, busid.findRev("/")+1); }
busid = busid.remove(0, busid.find(":")+1); else {
label = new TQLabel(i18n("Bus ID:"), genericPropertiesTab); base->labelBusID->hide();
generalTabLayout->addWidget(label, row, 0); base->stocklabelBusID->hide();
label = new TQLabel(busid, genericPropertiesTab);
generalTabLayout->addWidget(label, row, 1);
row++;
} }
mainTabs->addTab(genericPropertiesTab, i18n("&General"));
mainGrid->addWidget(mainTabs, 0, 0);
} }
} }

5
kcontrol/hwmanager/devicepropsdlg.h
Unescape View File

@ -19,12 +19,12 @@
#ifndef __devicepropsdlg_h__ #ifndef __devicepropsdlg_h__
#define __devicepropsdlg_h__ #define __devicepropsdlg_h__
// #include <tqt.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <tdehardwaredevices.h> #include <tdehardwaredevices.h>
#include "devicepropsdlgbase.h"
/** /**
* *
* Dialog to view and edit hardware device properties * Dialog to view and edit hardware device properties
@ -49,6 +49,7 @@ protected:
private: private:
TDEGenericDevice* m_device; TDEGenericDevice* m_device;
DevicePropertiesDialogBase* base;
class DevicePropertiesDialogPrivate; class DevicePropertiesDialogPrivate;
DevicePropertiesDialogPrivate* d; DevicePropertiesDialogPrivate* d;

209
kcontrol/hwmanager/devicepropsdlgbase.ui
Unescape View File

@ -0,0 +1,209 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>DevicePropertiesDialogBase</class>
<widget class="TQWidget">
<property name="name">
<cstring>DevicePropertiesDialogBase</cstring>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>519</width>
<height>356</height>
</rect>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>TabWidget2</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
<attribute name="title">
<string>General</string>
</attribute>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>groupProps</cstring>
</property>
<property name="title">
<string>Properties</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQLabel" row="0" column="0" colspan="1">
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="text">
<string>Device Type:</string>
</property>
</widget>
<widget class="TQLabel" row="0" column="1" colspan="1">
<property name="name">
<cstring>iconDeviceType</cstring>
</property>
</widget>
<widget class="TQLabel" row="0" column="2" colspan="1">
<property name="name">
<cstring>labelDeviceType</cstring>
</property>
</widget>
<spacer row="0" column="3">
<property name="name" stdset="0">
<cstring>Spacer1</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>1</height>
</size>
</property>
</spacer>
<widget class="TQLabel" row="1" column="0" colspan="1">
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="text">
<string>Device Name:</string>
</property>
</widget>
<widget class="TQLabel" row="1" column="1" colspan="3">
<property name="name">
<cstring>labelDeviceName</cstring>
</property>
</widget>
<widget class="TQLabel" row="2" column="0" colspan="1">
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="text">
<string>Device Node:</string>
</property>
</widget>
<widget class="TQLabel" row="2" column="1" colspan="3">
<property name="name">
<cstring>labelDeviceNode</cstring>
</property>
</widget>
<widget class="TQLabel" row="3" column="0" colspan="1">
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="text">
<string>System Path:</string>
</property>
</widget>
<widget class="TQLabel" row="3" column="1" colspan="3">
<property name="name">
<cstring>labelSystemPath</cstring>
</property>
</widget>
<widget class="TQLabel" row="4" column="0" colspan="1">
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="text">
<string>Subsystem Type:</string>
</property>
</widget>
<widget class="TQLabel" row="4" column="1" colspan="3">
<property name="name">
<cstring>labelSubsytemType</cstring>
</property>
</widget>
<widget class="TQLabel" row="5" column="0" colspan="1">
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="text">
<string>Device Driver:</string>
</property>
</widget>
<widget class="TQLabel" row="5" column="1" colspan="3">
<property name="name">
<cstring>labelDeviceDriver</cstring>
</property>
</widget>
<widget class="TQLabel" row="6" column="0" colspan="1">
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="text">
<string>Device Class:</string>
</property>
</widget>
<widget class="TQLabel" row="6" column="1" colspan="3">
<property name="name">
<cstring>labelDeviceClass</cstring>
</property>
</widget>
<widget class="TQLabel" row="7" column="0" colspan="1">
<property name="name">
<cstring>stocklabelBusID</cstring>
</property>
<property name="text">
<string>Bus ID:</string>
</property>
</widget>
<widget class="TQLabel" row="7" column="1" colspan="3">
<property name="name">
<cstring>labelBusID</cstring>
</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>
<includes>
<include location="local" impldecl="in implementation">DevicePropertiesDialogBase.ui.h</include>
</includes>
<Q_SLOTS>
<slot>enableSupport_toggled(bool)</slot>
</Q_SLOTS>
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>

35
kcontrol/hwmanager/hwmanager.cpp
Unescape View File

@ -125,6 +125,15 @@ void TDEHWManager::populateTreeView()
{ {
bool show_by_connection = base->showByConnection->isChecked(); bool show_by_connection = base->showByConnection->isChecked();
// Figure out which device, if any, was selected
TQString selected_syspath;
DeviceIconItem* selItem = dynamic_cast<DeviceIconItem*>(base->deviceTree->selectedItem());
if (selItem) {
if (selItem->device()) {
selected_syspath = selItem->device()->systemPath();
}
}
base->deviceTree->clear(); base->deviceTree->clear();
if (show_by_connection) { if (show_by_connection) {
@ -135,25 +144,37 @@ void TDEHWManager::populateTreeView()
TDEGenericDevice *hwdevice; TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
DeviceIconItem* item = new DeviceIconItem(rootitem, hwdevice->friendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice); DeviceIconItem* item = new DeviceIconItem(rootitem, hwdevice->friendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice);
populateTreeViewLeaf(item, show_by_connection); if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {
base->deviceTree->ensureItemVisible(item);
base->deviceTree->setSelected(item, true);
}
populateTreeViewLeaf(item, show_by_connection, selected_syspath);
} }
} }
else { else {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
for (int i=0;i<=TDEGenericDeviceType::Last;i++) { for (int i=0;i<=TDEGenericDeviceType::Last;i++) {
if (i != TDEGenericDeviceType::Root) { if (i != TDEGenericDeviceType::Root) {
DeviceIconItem* item = new DeviceIconItem(base->deviceTree, hwdevices->getFriendlyDeviceTypeStringFromType((TDEGenericDeviceType::TDEGenericDeviceType)i), hwdevices->getDeviceTypeIconFromType((TDEGenericDeviceType::TDEGenericDeviceType)i, base->deviceTree->iconSize()), 0); DeviceIconItem* rootitem = new DeviceIconItem(base->deviceTree, hwdevices->getFriendlyDeviceTypeStringFromType((TDEGenericDeviceType::TDEGenericDeviceType)i), hwdevices->getDeviceTypeIconFromType((TDEGenericDeviceType::TDEGenericDeviceType)i, base->deviceTree->iconSize()), 0);
TDEGenericDevice *hwdevice; TDEGenericDevice *hwdevice;
TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass((TDEGenericDeviceType::TDEGenericDeviceType)i); TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass((TDEGenericDeviceType::TDEGenericDeviceType)i);
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
new DeviceIconItem(item, hwdevice->friendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice); DeviceIconItem* item = new DeviceIconItem(rootitem, hwdevice->friendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice);
if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {
base->deviceTree->ensureItemVisible(item);
base->deviceTree->setSelected(item, true);
}
} }
} }
} }
} }
if (!selected_syspath.isNull()) {
}
} }
void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection) { void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath) {
if (show_by_connection) { if (show_by_connection) {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices(); TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
@ -161,7 +182,11 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
if (hwdevice->parentDevice() == parent->device()) { if (hwdevice->parentDevice() == parent->device()) {
DeviceIconItem* item = new DeviceIconItem(parent, hwdevice->friendlyName(), hwdevices->getDeviceTypeIconFromType(hwdevice->type(), base->deviceTree->iconSize()), hwdevice); DeviceIconItem* item = new DeviceIconItem(parent, hwdevice->friendlyName(), hwdevices->getDeviceTypeIconFromType(hwdevice->type(), base->deviceTree->iconSize()), hwdevice);
populateTreeViewLeaf(item, show_by_connection); if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {
base->deviceTree->ensureItemVisible(item);
base->deviceTree->setSelected(item, true);
}
populateTreeViewLeaf(item, show_by_connection, selected_syspath);
} }
} }
} }

6
kcontrol/hwmanager/hwmanager.h
Unescape View File

@ -47,8 +47,6 @@ public:
TDEHWManager(TQWidget *parent, const char *name, const TQStringList &); TDEHWManager(TQWidget *parent, const char *name, const TQStringList &);
virtual ~TDEHWManager(); virtual ~TDEHWManager();
TDEHWManagerBase *base;
void load(); void load();
void load( bool useDefaults); void load( bool useDefaults);
void save(); void save();
@ -61,9 +59,11 @@ k_dcop:
private slots: private slots:
void populateTreeView(); void populateTreeView();
void populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection); void populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath);
private: private:
TDEHWManagerBase *base;
KConfig *config; KConfig *config;
}; };

Write Preview
Loading…
Cancel
Save