Skip to content

chore: uniform some arm model code #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-lvs merged 1 commit into from
Nov 26, 2024
Merged

chore: uniform some arm model code #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions deepin-devicemanager/assets/oeminfo_sampleAnduseGuideLine_zh_CN.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ GPU vendor ="toml_GPU vendor" #29 : GPU
GPU type ="toml_GPU type" #30 : GPU类型
SubVendor ="toml_SubVendor" #31 : 子制造商
SubDevice ="toml_SubDevice" #32 : 子设备
latency ="toml_latency" #33 : 延迟
Latency ="toml_latency" #33 : 延迟
Device ="toml_Device" #34 : 设备
Config Status ="toml_Config Status" #35 : 配置状态
Driver Modules ="toml_Driver Modules" #36 : 驱动模块
Expand All @@ -263,6 +263,7 @@ Display Ratio ="toml_Display Ratio" #9 : 显
Current Resolution ="toml_Current Resolution" #10 : 当前分辨率
Support Resolution ="toml_Support Resolution" #11 : 支持分辨率
Date ="toml_Date" #12 : 日期
Refresh Rate ="toml_Refresh Rate" #13 : 支持的屏幕刷新率

[NetWork.flagLabel] #(网络适配器)
Name ="toml_Name" #1 : 名称
Expand Down Expand Up @@ -311,7 +312,7 @@ Sysfs ="toml_Sysfs" #16 : Sysfs
Handlers ="toml_Handlers" #17 : 处理程序
SubVendor ="toml_SubVendor" #18 : 子制造商
SubDevice ="toml_SubDevice" #19 : 子设备
latency ="toml_latency" #20 : 延迟
Latency ="toml_latency" #20 : 延迟
Bus ="toml_Bus" #21 : 总线
Version ="toml_Version" #22 : 版本
Config Status ="toml_Config Status" #23 : 配置状态
Expand Down
60 changes: 30 additions & 30 deletions deepin-devicemanager/src/DeviceManager/DeviceAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,53 +304,53 @@ const QString DeviceAudio::getOverviewInfo()
void DeviceAudio::initFilterKey()
{
// 添加可显示的属性
addFilterKey(tr("Device Name"));
addFilterKey(QObject::tr("SubVendor"));
addFilterKey(QObject::tr("SubDevice"));
addFilterKey(QObject::tr("Driver Status"));
addFilterKey(QObject::tr("Driver Activation Cmd"));
addFilterKey(QObject::tr("Config Status"));
addFilterKey(QObject::tr("latency"));
addFilterKey(QObject::tr("Phys"));
addFilterKey(QObject::tr("Sysfs"));
addFilterKey(QObject::tr("Handlers"));
addFilterKey(QObject::tr("PROP"));
addFilterKey(QObject::tr("EV"));
addFilterKey(QObject::tr("KEY"));
addFilterKey(QObject::tr("Bus"));
addFilterKey(QObject::tr("Version"));
addFilterKey(QObject::tr("Driver"));
addFilterKey("Device Name");
addFilterKey("SubVendor");
addFilterKey("SubDevice");
addFilterKey("Driver Status");
addFilterKey("Driver Activation Cmd");
addFilterKey("Config Status");
addFilterKey("latency");
addFilterKey("Phys");
addFilterKey("Sysfs");
addFilterKey("Handlers");
addFilterKey("PROP");
addFilterKey("EV");
addFilterKey("KEY");
addFilterKey("Bus");
addFilterKey("Version");
addFilterKey("Driver");
}

void DeviceAudio::loadBaseDeviceInfo()
{
// 添加基本信息
addBaseDeviceInfo(tr("Name"), m_Name);
addBaseDeviceInfo(tr("Vendor"), m_Vendor);
addBaseDeviceInfo(tr("SysFS_Path"), m_SysPath);
addBaseDeviceInfo(tr("Description"), m_Description);
addBaseDeviceInfo(tr("Revision"), m_Version);
addBaseDeviceInfo(tr("KernelModeDriver"), m_Driver);
addBaseDeviceInfo(("Name"), m_Name);
addBaseDeviceInfo(("Vendor"), m_Vendor);
addBaseDeviceInfo(("SysFS_Path"), m_SysPath);
addBaseDeviceInfo(("Description"), m_Description);
addBaseDeviceInfo(("Revision"), m_Version);
addBaseDeviceInfo(("KernelModeDriver"), m_Driver);
}

void DeviceAudio::loadOtherDeviceInfo()
{
// 添加其他信息,成员变量
addOtherDeviceInfo(tr("Module Alias"), m_Modalias);
addOtherDeviceInfo(tr("Physical ID"), m_PhysID);
addOtherDeviceInfo(tr("Chip"), m_Chip);
addOtherDeviceInfo(tr("Capabilities"), m_Capabilities);
addOtherDeviceInfo(tr("Memory Address"), m_Memory); // 1050需求 内存改为内存地址
addOtherDeviceInfo(tr("IRQ"), m_Irq);
addOtherDeviceInfo(("Module Alias"), m_Modalias);
addOtherDeviceInfo(("Physical ID"), m_PhysID);
addOtherDeviceInfo(("Chip"), m_Chip);
addOtherDeviceInfo(("Capabilities"), m_Capabilities);
addOtherDeviceInfo(("Memory Address"), m_Memory); // 1050需求 内存改为内存地址
addOtherDeviceInfo(("IRQ"), m_Irq);
// 将QMap<QString, QString>内容转存为QList<QPair<QString, QString>>
mapInfoToList();
}

void DeviceAudio::loadTableHeader()
{
// 表头信息
m_TableHeader.append(tr("Name"));
m_TableHeader.append(tr("Vendor"));
m_TableHeader.append("Name");
m_TableHeader.append("Vendor");
}

void DeviceAudio::loadTableData()
Expand Down
140 changes: 70 additions & 70 deletions deepin-devicemanager/src/DeviceManager/DeviceBios.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ bool DeviceBios::setBiosInfo(const QMap<QString, QString> &mapInfo)
return false;

// 获取BIOS信息
m_Name = QObject::tr("BIOS Information");
m_Name = ("BIOS Information");
m_tomlName = ("BIOS Information");
setAttribute(mapInfo, "Vendor", m_Vendor);
setAttribute(mapInfo, "Version", m_Version);
Expand All @@ -61,7 +61,7 @@ bool DeviceBios::setBaseBoardInfo(const QMap<QString, QString> &mapInfo)
return false;

// 获取主板信息
m_Name = QObject::tr("Base Board Information");
m_Name = ("Base Board Information");
m_tomlName = ("Base Board Information");
setAttribute(mapInfo, "Manufacturer", m_Vendor);
setAttribute(mapInfo, "Version", m_Version);
Expand All @@ -83,7 +83,7 @@ bool DeviceBios::setSystemInfo(const QMap<QString, QString> &mapInfo)
return false;

// 获取系统信息
m_Name = QObject::tr("System Information");
m_Name = ("System Information");
m_tomlName = ("System Information");
setAttribute(mapInfo, "Manufacturer", m_Vendor);
setAttribute(mapInfo, "Version", m_Version);
Expand All @@ -99,7 +99,7 @@ bool DeviceBios::setChassisInfo(const QMap<QString, QString> &mapInfo)
return false;

// 获取机箱信息
m_Name = QObject::tr("Chassis Information");
m_Name = ("Chassis Information");
m_tomlName = ("Chassis Information");
setAttribute(mapInfo, "Manufacturer", m_Vendor);
setAttribute(mapInfo, "Version", m_Version);
Expand All @@ -115,7 +115,7 @@ bool DeviceBios::setMemoryInfo(const QMap<QString, QString> &mapInfo)
return false;

// 获取内存插槽信息
m_Name = QObject::tr("Physical Memory Array");
m_Name = ("Physical Memory Array");
m_tomlName = ("Physical Memory Array");
setAttribute(mapInfo, "Manufacturer", m_Vendor);
setAttribute(mapInfo, "Version", m_Version);
Expand Down Expand Up @@ -157,7 +157,7 @@ bool DeviceBios::isBoard()const

QString DeviceBios::subTitle()
{
return m_Name;
return QObject::tr(m_Name.toLatin1());
}

const QString DeviceBios::getOverviewInfo()
Expand All @@ -173,76 +173,76 @@ void DeviceBios::initFilterKey()
{

// 添加可显示属性
addFilterKey(QObject::tr("Release Date"));
addFilterKey(QObject::tr("Address"));
addFilterKey(QObject::tr("Runtime Size"));
addFilterKey(QObject::tr("ROM Size"));
addFilterKey(QObject::tr("Characteristics"));
addFilterKey(QObject::tr("BIOS Revision"));
addFilterKey(QObject::tr("Firmware Revision"));

addFilterKey(QObject::tr("Product Name"));
addFilterKey(QObject::tr("Serial Number"));
addFilterKey(QObject::tr("Asset Tag"));
addFilterKey(QObject::tr("Features"));
addFilterKey(QObject::tr("Location In Chassis"));
addFilterKey(QObject::tr("Chassis Handle"));
addFilterKey(QObject::tr("Type"));
addFilterKey(QObject::tr("Contained Object Handles"));

addFilterKey(QObject::tr("Product Name"));
addFilterKey(QObject::tr("Serial Number"));
addFilterKey(QObject::tr("UUID"));
addFilterKey(QObject::tr("Wake-up Type"));
addFilterKey(QObject::tr("SKU Number"));
addFilterKey(QObject::tr("Family"));


addFilterKey(QObject::tr("Type"));
addFilterKey(QObject::tr("Lock"));
addFilterKey(QObject::tr("Serial Number"));
addFilterKey(QObject::tr("Asset Tag"));
addFilterKey(QObject::tr("Boot-up State"));
addFilterKey(QObject::tr("Power Supply State"));
addFilterKey(QObject::tr("Thermal State"));
addFilterKey(QObject::tr("Security Status"));
addFilterKey(QObject::tr("OEM Information"));
addFilterKey(QObject::tr("Height"));
addFilterKey(QObject::tr("Number Of Power Cords"));
addFilterKey(QObject::tr("Contained Elements"));
addFilterKey(QObject::tr("SKU Number"));

addFilterKey(QObject::tr("Location"));
addFilterKey(QObject::tr("Error Correction Type"));
addFilterKey(QObject::tr("Maximum Capacity"));
addFilterKey(QObject::tr("Error Information Handle"));
addFilterKey(QObject::tr("Number Of Devices"));

addFilterKey(QObject::tr("BIOS ROMSIZE"));
addFilterKey(QObject::tr("Release date"));
addFilterKey(QObject::tr("Board name"));
addFilterKey(QObject::tr("Family"));

addFilterKey(QObject::tr("BIOS Information"));
addFilterKey(QObject::tr("Base Board Information"));
addFilterKey(QObject::tr("System Information"));
addFilterKey(QObject::tr("Chassis Information"));
addFilterKey(QObject::tr("Physical Memory Array"));

addFilterKey(QObject::tr("SMBIOS Version"));

addFilterKey(QObject::tr("Language Description Format"));
addFilterKey(QObject::tr("Installable Languages"));
addFilterKey(QObject::tr("Currently Installed Language"));
addFilterKey("Release Date");
addFilterKey("Address");
addFilterKey("Runtime Size");
addFilterKey("ROM Size");
addFilterKey("Characteristics");
addFilterKey("BIOS Revision");
addFilterKey("Firmware Revision");

addFilterKey("Product Name");
addFilterKey("Serial Number");
addFilterKey("Asset Tag");
addFilterKey("Features");
addFilterKey("Location In Chassis");
addFilterKey("Chassis Handle");
addFilterKey("Type");
addFilterKey("Contained Object Handles");

addFilterKey("Product Name");
addFilterKey("Serial Number");
addFilterKey("UUID");
addFilterKey("Wake-up Type");
addFilterKey("SKU Number");
addFilterKey("Family");


addFilterKey("Type");
addFilterKey("Lock");
addFilterKey("Serial Number");
addFilterKey("Asset Tag");
addFilterKey("Boot-up State");
addFilterKey("Power Supply State");
addFilterKey("Thermal State");
addFilterKey("Security Status");
addFilterKey("OEM Information");
addFilterKey("Height");
addFilterKey("Number Of Power Cords");
addFilterKey("Contained Elements");
addFilterKey("SKU Number");

addFilterKey("Location");
addFilterKey("Error Correction Type");
addFilterKey("Maximum Capacity");
addFilterKey("Error Information Handle");
addFilterKey("Number Of Devices");

addFilterKey("BIOS ROMSIZE");
addFilterKey("Release date");
addFilterKey("Board name");
addFilterKey("Family");

addFilterKey("BIOS Information");
addFilterKey("Base Board Information");
addFilterKey("System Information");
addFilterKey("Chassis Information");
addFilterKey("Physical Memory Array");

addFilterKey("SMBIOS Version");

addFilterKey("Language Description Format");
addFilterKey("Installable Languages");
addFilterKey("Currently Installed Language");

}

void DeviceBios::loadBaseDeviceInfo()
{
// 添加基本信息
addBaseDeviceInfo(tr("Vendor"), m_Vendor);
addBaseDeviceInfo(tr("Version"), m_Version);
addBaseDeviceInfo(tr("Chipset"), m_ChipsetFamily);
addBaseDeviceInfo(("Vendor"), m_Vendor);
addBaseDeviceInfo(("Version"), m_Version);
addBaseDeviceInfo(("Chipset"), m_ChipsetFamily);
}

void DeviceBios::loadOtherDeviceInfo()
Expand Down
Loading