Add vendor string to RGBController API and update all controllers with vendor information, add vendor to device information page

This commit is contained in:
Adam Honse 2020-12-01 19:24:52 -06:00
parent 35fd4e2aae
commit 09a9a5c257
69 changed files with 131 additions and 41 deletions

View file

@ -14,6 +14,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl
wraith = wraith_ptr;
name = "AMD Wraith Prism";
vendor = "Cooler Master";
type = DEVICE_TYPE_COOLER;
description = "AMD Wraith Prism Device";
version = wraith->GetFirmwareVersionString();

View file

@ -37,6 +37,7 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr
polychrome = polychrome_ptr;
name = polychrome->GetDeviceName();
vendor = "ASRock";
version = polychrome->GetFirmwareVersion();
type = DEVICE_TYPE_MOTHERBOARD;
description = "ASRock ASR LED/Polychrome Device";

View file

@ -13,6 +13,7 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* aura_ptr)
aura = aura_ptr;
name = "ASUS Aura Core";
vendor = "ASUS";
type = DEVICE_TYPE_KEYBOARD;
description = "ASUS Aura Core Device";

View file

@ -47,6 +47,7 @@ RGBController_AuraGPU::RGBController_AuraGPU(AuraGPUController * aura_gpu_ptr)
name = aura_gpu->GetDeviceName();
vendor = "ASUS";
type = DEVICE_TYPE_GPU;
description = "ASUS Aura GPU Device";
version = "0.00.1";

View file

@ -129,6 +129,7 @@ RGBController_AuraSMBus::RGBController_AuraSMBus(AuraSMBusController * aura_ptr)
type = DEVICE_TYPE_MOTHERBOARD;
name = "ASUS Aura Motherboard";
}
vendor = "ASUS";
description = "ASUS Aura SMBus Device";
mode Direct;

View file

@ -14,6 +14,7 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* aura_ptr)
aura = aura_ptr;
name = "ASUS Aura Mouse";
vendor = "ASUS";
type = DEVICE_TYPE_MOUSE;
description = "ASUS Aura Mouse Device";
location = aura->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_AuraUSB::RGBController_AuraUSB(AuraUSBController* aura_ptr)
aura = aura_ptr;
name = "ASUS Aura USB";
vendor = "ASUS";
version = aura->GetDeviceName();
type = DEVICE_TYPE_MOTHERBOARD;
description = "ASUS Aura USB Device";

View file

@ -13,6 +13,7 @@ using namespace std::chrono_literals;
RGBController_AsusTUFLaptopWMI::RGBController_AsusTUFLaptopWMI()
{
name = "ASUS TUF Keyboard";
vendor = "ASUS";
type = DEVICE_TYPE_KEYBOARD;
description = "WMI Device";
location = "\\\\.\\ATKACPI";

View file

@ -15,6 +15,7 @@ RGBController_CMARGBController::RGBController_CMARGBController(CMARGBController
unsigned char speed = cmargb->GetLedSpeed();
name = argb_header_data[cmargb->GetZoneIndex()].name;
vendor = "Cooler Master";
type = DEVICE_TYPE_LEDSTRIP;
description = cmargb->GetDeviceName();
version = "1.0";

View file

@ -15,6 +15,7 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll
unsigned char speed = cmmp750->GetLedSpeed();
name = cmmp750->GetDeviceName();
vendor = "Cooler Master";
type = DEVICE_TYPE_MOUSEMAT;
description = cmmp750->GetDeviceName();
version = "1.0";

View file

@ -13,6 +13,7 @@ RGBController_CorsairDominatorPlatinum::RGBController_CorsairDominatorPlatinum(C
corsair = corsair_ptr;
name = corsair->GetDeviceName();
vendor = "Corsair";
type = DEVICE_TYPE_DRAM;
description = "Corsair Dominator Platinum RGB Device";
location = corsair->GetDeviceLocation();

View file

@ -13,6 +13,7 @@ RGBController_CorsairHydro::RGBController_CorsairHydro(CorsairHydroController* c
{
corsair = corsair_ptr;
vendor = "Corsair";
description = "Corsair Hydro Series Device";
version = corsair->GetFirmwareString();
type = DEVICE_TYPE_COOLER;

View file

@ -15,6 +15,7 @@ RGBController_CorsairLightingNode::RGBController_CorsairLightingNode(CorsairLigh
corsair = corsair_ptr;
name = "Corsair Lighting Node Device";
vendor = "Corsair";
description = "Corsair Lighting Node Device";
type = DEVICE_TYPE_LEDSTRIP;
version = corsair->GetFirmwareString();

View file

@ -556,6 +556,7 @@ RGBController_CorsairPeripheral::RGBController_CorsairPeripheral(CorsairPeripher
corsair = corsair_ptr;
name = "Corsair RGB Peripheral Device";
vendor = "Corsair";
description = "Corsair RGB Peripheral Device";
type = corsair->GetDeviceType();
version = corsair->GetFirmwareString();

View file

@ -14,6 +14,7 @@ RGBController_CorsairVengeance::RGBController_CorsairVengeance(CorsairVengeanceC
corsair = corsair_ptr;
name = corsair->GetDeviceName();
vendor = "Corsair";
type = DEVICE_TYPE_DRAM;
description = "Corsair Vengeance RGB Device";
location = corsair->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVeng
corsair = corsair_ptr;
name = corsair->GetDeviceName();
vendor = "Corsair";
type = DEVICE_TYPE_DRAM;
description = "Corsair Vengeance Pro RGB Device";
location = corsair->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_Crucial::RGBController_Crucial(CrucialController * crucial_ptr)
crucial = crucial_ptr;
name = "Crucial DRAM";
vendor = "Crucial";
type = DEVICE_TYPE_DRAM;
description = "Crucial DRAM Device";
location = crucial->GetDeviceLocation();

View file

@ -176,6 +176,7 @@ RGBController_DuckyKeyboard::RGBController_DuckyKeyboard(DuckyKeyboardController
ducky = ducky_ptr;
name = "Ducky Keyboard Device";
vendor = "Ducky";
type = DEVICE_TYPE_KEYBOARD;
description = "Ducky Keyboard Device";
location = ducky->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_EKController::RGBController_EKController(EKController* _dev)
EK_dev = _dev;
name = EK_dev->GetDeviceName();
vendor = "EK";
type = DEVICE_TYPE_LEDSTRIP;
description = EK_dev->GetDeviceName();
version = "1.0";

View file

@ -14,6 +14,7 @@ RGBController_EVGAGPUv1::RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr)
evga = evga_ptr;
name = "EVGA GPU";
vendor = "EVGA";
description = "EVGA RGB v1 GPU Device";
location = evga->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_EVGAGPUv2::RGBController_EVGAGPUv2(EVGAGPUv2Controller* evga_ptr)
evga = evga_ptr;
name = "EVGA GPU";
vendor = "EVGA";
description = "EVGA RGB v2 GPU Device";
location = evga->GetDeviceLocation();

View file

@ -6,6 +6,7 @@
RGBController_Faustus::RGBController_Faustus(const std::string& dev_path)
{
name = "ASUS TUF Keyboard";
vendor = "ASUS";
type = DEVICE_TYPE_KEYBOARD;
description = "Faustus Device";

View file

@ -45,6 +45,7 @@ RGBController_GalaxGPU::RGBController_GalaxGPU(GalaxGPUController * galax_gpu_pt
galax_gpu = galax_gpu_ptr;
name = galax_gpu->GetDeviceName();
vendor = "GALAX";
type = DEVICE_TYPE_GPU;
description = "GALAX / KFA2 RTX GPU";
version = "1.0";

View file

@ -14,6 +14,7 @@ RGBController_AorusATC800::RGBController_AorusATC800(ATC800Controller* cooler_pt
cooler = cooler_ptr;
name = "Aorus ATC800 CPU Cooler";
vendor = "Gigabyte";
type = DEVICE_TYPE_COOLER;
description = "Aorus ATC800 CPU Cooler";
location = cooler->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_RGBFusion2DRAM::RGBController_RGBFusion2DRAM(RGBFusion2DRAMControl
rgb_fusion = rgb_fusion_ptr;
name = "RGB Fusion 2 DRAM";
vendor = "Gigabyte";
description = "RGB Fusion 2 DRAM Device";
location = rgb_fusion->GetDeviceLocation();

View file

@ -42,6 +42,7 @@ RGBController_RGBFusion2SMBus::RGBController_RGBFusion2SMBus(RGBFusion2SMBusCont
rgb_fusion = rgb_fusion_ptr;
name = rgb_fusion->GetDeviceName();
vendor = "Gigabyte";
description = "RGB Fusion 2 SMBus";
location = rgb_fusion->GetDeviceLocation();

View file

@ -108,6 +108,7 @@ RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2USBController
controller = controller_ptr;
name = controller->GetDeviceName();
vendor = "Gigabyte";
type = DEVICE_TYPE_MOTHERBOARD;
description = controller->GetDeviceDescription();
version = controller->GetFWVersion();

View file

@ -20,6 +20,7 @@ RGBController_RGBFusion::RGBController_RGBFusion(RGBFusionController* rgb_fusion
rgb_fusion = rgb_fusion_ptr;
name = rgb_fusion->GetDeviceName();
vendor = "Gigabyte";
description = "RGB Fusion 1.0";
location = rgb_fusion->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* r
rgb_fusion = rgb_fusion_ptr;
name = "Gigabyte GPU";
vendor = "Gigabyte";
description = "RGB Fusion GPU";
location = rgb_fusion->GetDeviceLocation();

View file

@ -13,6 +13,7 @@ RGBController_HoltekA070::RGBController_HoltekA070(HoltekA070Controller* holtek_
holtek = holtek_ptr;
name = "Holtek USB Gaming Mouse Device";
vendor = "Holtek";
type = DEVICE_TYPE_MOUSE;
description = "Holtek USB Gaming Mouse Device";
location = holtek->GetDeviceLocation();

View file

@ -15,6 +15,7 @@ RGBController_HyperXDRAM::RGBController_HyperXDRAM(HyperXDRAMController* hyperx_
hyperx = hyperx_ptr;
name = hyperx->GetDeviceName();
vendor = "HyperX";
type = DEVICE_TYPE_DRAM;
description = "HyperX DRAM Device";
location = hyperx->GetDeviceLocation();

View file

@ -172,6 +172,7 @@ RGBController_HyperXAlloyOrigins::RGBController_HyperXAlloyOrigins(HyperXAlloyOr
hyperx = hyperx_ptr;
name = "HyperX Alloy Origins Keyboard Device";
vendor = "HyperX";
type = DEVICE_TYPE_KEYBOARD;
description = "HyperX Alloy Origins Keyboard Device";
location = hyperx->GetDeviceLocation();

View file

@ -180,6 +180,7 @@ RGBController_HyperXKeyboard::RGBController_HyperXKeyboard(HyperXKeyboardControl
hyperx = hyperx_ptr;
name = "HyperX RGB Keyboard";
vendor = "HyperX";
type = DEVICE_TYPE_KEYBOARD;
description = "HyperX RGB Keyboard Device";
location = hyperx->GetDeviceLocation();

View file

@ -16,6 +16,7 @@ RGBController_HyperXPulsefireSurge::RGBController_HyperXPulsefireSurge(HyperXPul
hyperx = hyperx_ptr;
name = "HyperX Pulsefire Surge Device";
vendor = "HyperX";
type = DEVICE_TYPE_MOUSE;
description = "HyperX Pulsefire Surge Device";
location = hyperx->GetDeviceLocation();

View file

@ -16,6 +16,7 @@ RGBController_HyperXMousemat::RGBController_HyperXMousemat(HyperXMousematControl
hyperx = hyperx_ptr;
name = "HyperX Mousemat Device";
vendor = "HyperX";
type = DEVICE_TYPE_MOUSEMAT;
description = "HyperX Mousemat Device";
location = hyperx->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_LogitechG203::RGBController_LogitechG203(LogitechG203Controller* l
logitech = logitech_ptr;
name = "Logitech Mouse Device";
vendor = "Logitech";
type = DEVICE_TYPE_MOUSE;
description = "Logitech Mouse Device";
location = logitech->GetDeviceLocation();

View file

@ -5,6 +5,7 @@ RGBController_LogitechG203L::RGBController_LogitechG203L(LogitechG203LController
logitech = logitech_ptr;
name = "Logitech Mouse Device";
vendor = "Logitech";
type = DEVICE_TYPE_MOUSE;
description = "Logitech Mouse Device";
location = logitech->GetDeviceLocation();

View file

@ -33,6 +33,7 @@ RGBController_LogitechG213::RGBController_LogitechG213(LogitechG213Controller* l
logitechG213 = logitech_ptr;
name = "Logitech G213 Keyboard Device";
vendor = "Logitech";
type = DEVICE_TYPE_KEYBOARD;
description = "Logitech G213 Keyboard Device";

View file

@ -14,6 +14,7 @@ RGBController_LogitechG403::RGBController_LogitechG403(LogitechG403Controller* l
logitech = logitech_ptr;
name = "Logitech Mouse Device";
vendor = "Logitech";
type = DEVICE_TYPE_MOUSE;
description = "Logitech Mouse Device";
location = logitech->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_LogitechG502PS::RGBController_LogitechG502PS(LogitechG502PSControl
logitech = logitech_ptr;
name = "Logitech Mouse Device";
vendor = "Logitech";
type = DEVICE_TYPE_MOUSE;
description = "Logitech Mouse Device";
location = logitech->GetDeviceLocation();

View file

@ -170,6 +170,7 @@ RGBController_LogitechG810::RGBController_LogitechG810(LogitechG810Controller* l
logitech = logitech_ptr;
name = "Logitech Keyboard Device";
vendor = "Logitech";
type = DEVICE_TYPE_KEYBOARD;
description = "Logitech Keyboard Device";

View file

@ -14,6 +14,7 @@ RGBController_LogitechGPowerPlay::RGBController_LogitechGPowerPlay(LogitechGPowe
logitech = logitech_ptr;
name = "Logitech G PowerPlay Wireless Charging System";
vendor = "Logitech";
type = DEVICE_TYPE_MOUSEMAT;
description = "Logitech G PowerPlay Wireless Charging System";

View file

@ -14,6 +14,7 @@ RGBController_LogitechGProWireless::RGBController_LogitechGProWireless(LogitechG
logitech = logitech_ptr;
name = "Logitech G Pro Wireless Gaming Mouse";
vendor = "Logitech";
type = DEVICE_TYPE_MOUSE;
description = "Logitech G Pro Wireless Gaming Mouse";
location = logitech->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_MSI3Zone::RGBController_MSI3Zone(MSI3ZoneController* msi_ptr)
msi = msi_ptr;
name = "MSI 3-Zone Keyboard";
vendor = "MSI";
type = DEVICE_TYPE_KEYBOARD;
description = "MSI 3-Zone Keyboard Device";
location = msi->GetDeviceLocation();

View file

@ -31,6 +31,7 @@ RGBController_MSIGPU::RGBController_MSIGPU(MSIGPUController * msi_gpu_ptr)
msi_gpu = msi_gpu_ptr;
name = "MSI GPU Device";
vendor = "MSI";
type = DEVICE_TYPE_GPU;
description = "MSI GPU Device";
location = msi_gpu->GetDeviceLocation();

View file

@ -37,6 +37,7 @@ RGBController_MSIMysticLight::RGBController_MSIMysticLight(MSIMysticLightControl
controller = controller_ptr;
name = "MSI Mystic Light Controller";
vendor = "MSI";
type = DEVICE_TYPE_MOTHERBOARD;
description = controller->GetDeviceName();
version = controller->GetFWVersion();

View file

@ -13,6 +13,7 @@ RGBController_MSIRGB::RGBController_MSIRGB(MSIRGBController* msi_ptr)
msi = msi_ptr;
name = "MSI Motherboard";
vendor = "MSI";
type = DEVICE_TYPE_MOTHERBOARD;
description = "MSI-RGB Device";

View file

@ -14,6 +14,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr)
hue2 = hue2_ptr;
name = "NZXT Hue 2";
vendor = "NZXT";
type = DEVICE_TYPE_LEDSTRIP;
description = "NZXT Hue 2 Device";
version = hue2->GetFirmwareVersion();

View file

@ -14,6 +14,7 @@ RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr)
hueplus = hueplus_ptr;
name = "NZXT Hue+";
vendor = "NZXT";
type = DEVICE_TYPE_LEDSTRIP;
description = "NZXT Hue+ Device";
location = hueplus->GetLocation();

View file

@ -15,6 +15,7 @@ RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* nzxtkra
nzxtkraken = nzxtkraken_ptr;
name = "NZXT Kraken X/M";
vendor = "NZXT";
type = DEVICE_TYPE_COOLER;
description = "NZXT Kraken X42/X52/X62/X72/M22";
version = nzxtkraken->GetFirmwareVersion();

View file

@ -247,6 +247,11 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path)
\*-----------------------------------------------------------------*/
std::getline(firmware_version, version);
/*-----------------------------------------------------------------*\
| Vendor is always Razer |
\*-----------------------------------------------------------------*/
vendor = "Razer";
/*-----------------------------------------------------------------*\
| Loop through all known devices to look for a name match |
\*-----------------------------------------------------------------*/

View file

@ -177,6 +177,11 @@ RGBController_OpenRazer::RGBController_OpenRazer(device * razer_device, device_f
razer_functions->firmware_version->show(razer_device, NULL, string_buf);
version = string_buf;
/*-----------------------------------------------------------------*\
| Vendor is always Razer |
\*-----------------------------------------------------------------*/
vendor = "Razer";
/*-----------------------------------------------------------------*\
| Loop through all known devices to look for a name match |
\*-----------------------------------------------------------------*/

View file

@ -14,6 +14,7 @@ RGBController_PatriotViper::RGBController_PatriotViper(PatriotViperController* v
viper = viper_ptr;
name = viper->GetDeviceName();
vendor = "Patriot";
type = DEVICE_TYPE_DRAM;
description = "Patriot Viper Device";
location = viper->GetDeviceLocation();

View file

@ -13,6 +13,7 @@ RGBController_PhilipsWiz::RGBController_PhilipsWiz(PhilipsWizController* light_p
light = light_ptr;
name = light->GetManufacturer() + " " + light->GetName();
vendor = light->GetManufacturer();
type = DEVICE_TYPE_LIGHT;
version = light->GetVersion();
description = "Philips Wiz Device";

View file

@ -25,6 +25,7 @@ RGBController_RedragonK556::RGBController_RedragonK556(RedragonK556Controller* r
redragon = redragon_ptr;
name = "Redragon Keyboard Device";
vendor = "Redragon";
type = DEVICE_TYPE_KEYBOARD;
description = "Redragon Keyboard Device";

View file

@ -14,6 +14,7 @@ RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* r
redragon = redragon_ptr;
name = "Redragon Mouse Device";
vendor = "Redragon";
type = DEVICE_TYPE_MOUSE;
description = "Redragon Mouse Device";
location = redragon->GetDeviceLocation();

View file

@ -12,6 +12,7 @@
RGBController_RoccatKoneAimo::RGBController_RoccatKoneAimo(RoccatKoneAimoController* mouse_ptr)
{
name = "Roccat Kone Aimo";
vendor = "Roccat";
type = DEVICE_TYPE_MOUSE;
description = "Roccat Kone Aimo Mouse";
mouse = mouse_ptr;

View file

@ -14,6 +14,7 @@ RGBController_SapphireGPU::RGBController_SapphireGPU(SapphireGPUController* sapp
sapphire = sapphire_ptr;
name = "Sapphire GPU";
vendor = "Sapphire";
description = "Sapphire GPU";
location = sapphire->GetDeviceLocation();

View file

@ -15,6 +15,7 @@ RGBController_SonyDS4::RGBController_SonyDS4(SonyDS4Controller* dualshock)
this->dualshock = dualshock;
name = "Sony DualShock 4";
vendor = "Sony";
type = DEVICE_TYPE_GAMEPAD;
description = "Sony DualShock 4 Device";
location = dualshock->GetLocation();

View file

@ -258,6 +258,7 @@ RGBController_SteelSeriesApex::RGBController_SteelSeriesApex(SteelSeriesApexBase
steelseries = steelseries_ptr;
name = "SteelSeries Apex RGB Keyboard";
vendor = "SteelSeries";
type = DEVICE_TYPE_KEYBOARD;
description = "SteelSeries Apex RGB Device";
location = steelseries->GetDeviceLocation();

View file

@ -23,6 +23,7 @@ RGBController_SteelSeriesOldApex::RGBController_SteelSeriesOldApex(SteelSeriesOl
OldApex = old_apex_ptr;
name = OldApex->GetDeviceName();
vendor = "SteelSeries";
type = DEVICE_TYPE_KEYBOARD;
description = "SteelSeries old Apex device";
location = OldApex->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_SteelSeriesRival::RGBController_SteelSeriesRival(SteelSeriesRivalC
rival = rival_ptr;
name = rival->GetDeviceName();
vendor = "SteelSeries";
type = DEVICE_TYPE_MOUSE;
description = "SteelSeries Rival Device";
location = rival->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_SteelSeriesSiberia::RGBController_SteelSeriesSiberia(SteelSeriesSi
siberia = siberia_ptr;
name = siberia->GetDeviceName();
vendor = "SteelSeries";
type = DEVICE_TYPE_HEADSET;
description = "SteelSeries Siberia Device";
location = siberia->GetDeviceLocation();

View file

@ -14,6 +14,7 @@ RGBController_Tecknet::RGBController_Tecknet(TecknetController *_dev)
Tecknet_dev = _dev;
name = Tecknet_dev->GetDeviceName();
vendor = "Tecknet";
type = DEVICE_TYPE_MOUSE;
description = Tecknet_dev->GetDeviceName();
version = "1.0";

View file

@ -148,6 +148,7 @@ RGBController_PoseidonZRGB::RGBController_PoseidonZRGB(PoseidonZRGBController* p
poseidon = poseidon_ptr;
name = "Thermaltake Poseidon Z RGB";
vendor = "Thermaltake";
type = DEVICE_TYPE_KEYBOARD;
description = "Thermaltake Poseidon Z RGB Device";
location = poseidon->GetDeviceLocation();

View file

@ -15,6 +15,7 @@ RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingC
riing = riing_ptr;
name = "Thermaltake Riing";
vendor = "Thermaltake";
type = DEVICE_TYPE_COOLER;
description = "Thermaltake Riing Device";
location = riing->GetDeviceLocation();

View file

@ -148,6 +148,7 @@ class RGBController
{
public:
std::string name; /* controller name */
std::string vendor; /* controller vendor */
std::string description; /* controller description */
std::string version; /* controller version */
std::string serial; /* controller serial number */

View file

@ -13,6 +13,7 @@ OpenRGBDeviceInfoPage::OpenRGBDeviceInfoPage(RGBController *dev, QWidget *parent
ui->TypeValue->setText(device_type_to_str(dev->type).c_str());
ui->NameValue->setText(QString::fromStdString(dev->name));
ui->VendorValue->setText(QString::fromStdString(dev->vendor));
ui->DescriptionValue->setText(QString::fromStdString(dev->description));
ui->VersionValue->setText(QString::fromStdString(dev->version));
ui->LocationValue->setText(QString::fromStdString(dev->location));

View file

@ -22,41 +22,27 @@
</widget>
</item>
<item row="1" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="VendorLabel">
<property name="text">
<string>Vendor:</string>
</property>
</widget>
</item>
<item row="2" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="TypeLabel">
<property name="text">
<string>Type:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="DescriptionValue">
<property name="text">
<string>Description Value</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="VersionValue">
<property name="text">
<string>Version Value</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="LocationValue">
<property name="text">
<string>Location Value</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="TypeValue">
<property name="text">
<string>Type Value</string>
</property>
</widget>
</item>
<item row="3" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="DescriptionLabel">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item row="4" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="VersionLabel">
<property name="text">
<string>Version:</string>
@ -64,23 +50,16 @@
</widget>
</item>
<item row="5" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="SerialLabel">
<property name="text">
<string>Serial:</string>
</property>
</widget>
</item>
<item row="4" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="LocationLabel">
<property name="text">
<string>Location:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="SerialValue">
<item row="6" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="SerialLabel">
<property name="text">
<string>Serial Value</string>
<string>Serial:</string>
</property>
</widget>
</item>
@ -91,10 +70,45 @@
</property>
</widget>
</item>
<item row="2" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="DescriptionLabel">
<item row="1" column="1">
<widget class="QLabel" name="VendorValue">
<property name="text">
<string>Description:</string>
<string>Vendor Value</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="TypeValue">
<property name="text">
<string>Type Value</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="DescriptionValue">
<property name="text">
<string>Description Value</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="VersionValue">
<property name="text">
<string>Version Value</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="LocationValue">
<property name="text">
<string>Location Value</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="SerialValue">
<property name="text">
<string>Serial Value</string>
</property>
</widget>
</item>