diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index 2c1d31bc..007acba3 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -115,30 +115,40 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec switch(control[dev_idx]->type) { case DEVICE_TYPE_MOTHERBOARD: - NewLabelString += ":/motherboard.svg"; + NewLabelString += ":/motherboard.png"; break; case DEVICE_TYPE_DRAM: - NewLabelString += ":/ram.svg"; + NewLabelString += ":/dram.png"; break; case DEVICE_TYPE_GPU: - NewLabelString += ":/graphics-card.svg"; + NewLabelString += ":/gpu.png"; break; case DEVICE_TYPE_COOLER: - NewLabelString += ":/fan.svg"; + NewLabelString += ":/fan.png"; break; case DEVICE_TYPE_LEDSTRIP: - //break; + NewLabelString += ":/ledstrip.png"; + break; case DEVICE_TYPE_KEYBOARD: - //break; + NewLabelString += ":/keyboard.png"; + break; case DEVICE_TYPE_MOUSE: - //break; + NewLabelString += ":/mouse.png"; + break; + case DEVICE_TYPE_MOUSEMAT: + NewLabelString += ":/mousemat.png"; + break; case DEVICE_TYPE_HEADSET: - //break; + NewLabelString += ":/headset.png"; + break; + case DEVICE_TYPE_HEADSET_STAND: + NewLabelString += ":/headsetstand.png"; + break; case DEVICE_TYPE_UNKNOWN: - NewLabelString += ":/keyboard.svg"; + NewLabelString += ":/unknown.png"; break; } - NewLabelString += "' height='15' width='15'>" + QString::fromStdString(control[dev_idx]->name) + ""; + NewLabelString += "' height='16' width='16'>" + QString::fromStdString(control[dev_idx]->name) + ""; QLabel *NewTabLabel = new QLabel(); NewTabLabel->setText(NewLabelString); @@ -167,30 +177,40 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec switch(control[dev_idx]->type) { case DEVICE_TYPE_MOTHERBOARD: - NewLabelString += ":/motherboard.svg"; + NewLabelString += ":/motherboard.png"; break; case DEVICE_TYPE_DRAM: - NewLabelString += ":/ram.svg"; + NewLabelString += ":/dram.png"; break; case DEVICE_TYPE_GPU: - NewLabelString += ":/graphics-card.svg"; + NewLabelString += ":/gpu.png"; break; case DEVICE_TYPE_COOLER: - NewLabelString += ":/fan.svg"; + NewLabelString += ":/fan.png"; break; case DEVICE_TYPE_LEDSTRIP: - //break; + NewLabelString += ":/ledstrip.png"; + break; case DEVICE_TYPE_KEYBOARD: - //break; + NewLabelString += ":/keyboard.png"; + break; case DEVICE_TYPE_MOUSE: - //break; + NewLabelString += ":/mouse.png"; + break; + case DEVICE_TYPE_MOUSEMAT: + NewLabelString += ":/mousemat.png"; + break; case DEVICE_TYPE_HEADSET: - //break; + NewLabelString += ":/headset.png"; + break; + case DEVICE_TYPE_HEADSET_STAND: + NewLabelString += ":/headsetstand.png"; + break; case DEVICE_TYPE_UNKNOWN: - NewLabelString += ":/keyboard.svg"; + NewLabelString += ":/unknown.png"; break; } - NewLabelString += "' height='15' width='15'>" + QString::fromStdString(control[dev_idx]->name) + ""; + NewLabelString += "' height='16 width='16'>" + QString::fromStdString(control[dev_idx]->name) + ""; QLabel *NewTabLabel = new QLabel(); NewTabLabel->setText(NewLabelString); @@ -209,8 +229,8 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec ui->InformationTabBar->addTab(SMBusToolsPage, ""); QString SMBusToolsLabelString = "
SMBus Tools
"; + SMBusToolsLabelString += ":/tools.png"; + SMBusToolsLabelString += "' height='16' width='16'>SMBus Tools"; QLabel *SMBusToolsTabLabel = new QLabel(); SMBusToolsTabLabel->setText(SMBusToolsLabelString); @@ -227,8 +247,8 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec ui->InformationTabBar->addTab(SoftInfoPage, ""); QString SoftwareLabelString = "
Software
"; + SoftwareLabelString += ":/software.png"; + SoftwareLabelString += "' height='16' width='16'>Software"; QLabel *SoftwareTabLabel = new QLabel(); SoftwareTabLabel->setText(SoftwareLabelString); diff --git a/qt/dram.png b/qt/dram.png new file mode 100644 index 00000000..9fdeb2fd Binary files /dev/null and b/qt/dram.png differ diff --git a/qt/fan.png b/qt/fan.png new file mode 100644 index 00000000..678b4e6a Binary files /dev/null and b/qt/fan.png differ diff --git a/qt/fan.svg b/qt/fan.svg deleted file mode 100644 index afb97805..00000000 --- a/qt/fan.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/qt/gpu.png b/qt/gpu.png new file mode 100644 index 00000000..46c499b6 Binary files /dev/null and b/qt/gpu.png differ diff --git a/qt/graphics-card.svg b/qt/graphics-card.svg deleted file mode 100644 index f9b2f7db..00000000 --- a/qt/graphics-card.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/qt/headset.png b/qt/headset.png new file mode 100644 index 00000000..ee2044fe Binary files /dev/null and b/qt/headset.png differ diff --git a/qt/headsetstand.png b/qt/headsetstand.png new file mode 100644 index 00000000..eff6c3d1 Binary files /dev/null and b/qt/headsetstand.png differ diff --git a/qt/keyboard.png b/qt/keyboard.png new file mode 100644 index 00000000..913f019d Binary files /dev/null and b/qt/keyboard.png differ diff --git a/qt/keyboard.svg b/qt/keyboard.svg deleted file mode 100644 index e8cfc7a1..00000000 --- a/qt/keyboard.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qt/ledstrip.png b/qt/ledstrip.png new file mode 100644 index 00000000..943cb3e7 Binary files /dev/null and b/qt/ledstrip.png differ diff --git a/qt/motherboard.png b/qt/motherboard.png new file mode 100644 index 00000000..e95b114b Binary files /dev/null and b/qt/motherboard.png differ diff --git a/qt/motherboard.svg b/qt/motherboard.svg deleted file mode 100644 index f56b1f8d..00000000 --- a/qt/motherboard.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qt/mouse.png b/qt/mouse.png new file mode 100644 index 00000000..7727a588 Binary files /dev/null and b/qt/mouse.png differ diff --git a/qt/mouse.svg b/qt/mouse.svg deleted file mode 100644 index 8bdb6065..00000000 --- a/qt/mouse.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/qt/mousemat.png b/qt/mousemat.png new file mode 100644 index 00000000..fc6cc1cf Binary files /dev/null and b/qt/mousemat.png differ diff --git a/qt/ram.svg b/qt/ram.svg deleted file mode 100644 index 83df533a..00000000 --- a/qt/ram.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/qt/resources.qrc b/qt/resources.qrc index 4e7697c2..955c16ae 100644 --- a/qt/resources.qrc +++ b/qt/resources.qrc @@ -1,11 +1,17 @@ OpenRGB.png - motherboard.svg - ram.svg - graphics-card.svg - fan.svg - keyboard.svg - mouse.svg + motherboard.png + dram.png + gpu.png + fan.png + ledstrip.png + keyboard.png + mouse.png + mousemat.png + headset.png + headsetstand.png + tools.png + software.png diff --git a/qt/software.png b/qt/software.png new file mode 100644 index 00000000..54c99262 Binary files /dev/null and b/qt/software.png differ diff --git a/qt/tools.png b/qt/tools.png new file mode 100644 index 00000000..9e14ed05 Binary files /dev/null and b/qt/tools.png differ