diff --git a/qt/OpenRGBDevicePage.cpp b/qt/OpenRGBDevicePage.cpp index 644d7135..d77db0b1 100644 --- a/qt/OpenRGBDevicePage.cpp +++ b/qt/OpenRGBDevicePage.cpp @@ -84,7 +84,7 @@ OpenRGBDevicePage::OpenRGBDevicePage(RGBController *dev, QWidget *parent) : } ui->DeviceViewBox->setController(device); - ui->DeviceViewBox->hide(); + ui->DeviceViewBoxFrame->hide(); /*-----------------------------------------------------*\ | Fill in the mode selection box | @@ -1124,12 +1124,12 @@ void Ui::OpenRGBDevicePage::on_ResizeButton_clicked() void Ui::OpenRGBDevicePage::ShowDeviceView() { - ui->DeviceViewBox->show(); + ui->DeviceViewBoxFrame->show(); } void Ui::OpenRGBDevicePage::HideDeviceView() { - ui->DeviceViewBox->hide(); + ui->DeviceViewBoxFrame->hide(); } void Ui::OpenRGBDevicePage::on_ApplyColorsButton_clicked() diff --git a/qt/OpenRGBDevicePage.ui b/qt/OpenRGBDevicePage.ui index d85542fc..147d72df 100644 --- a/qt/OpenRGBDevicePage.ui +++ b/qt/OpenRGBDevicePage.ui @@ -13,173 +13,312 @@ Device page - - - - - G: + + + + + + 0 + 0 + - - - - - - H: + + QFrame::StyledPanel - - - - - - Speed: - - - - - - - Qt::Horizontal - - - - - - - 255 - - - - - - - Random - - - - - - - B: - - - - - - - LED: - - - - - - - Mode-Specific - - - - - - - 255 - - - - - - - R: - - - - - - - - - - Dir: - - - - - - - 255 - - - - - - - 359 - - - - - - - S: - - - - - - - 255 - - - - - - - - - - - - - Select All - - - - - - - Per-LED - - - - - - - 255 + + QFrame::Sunken + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + R: + + + + + + + 255 + + + + + + + H: + + + + + + + 359 + + + + + + + G: + + + + + + + 255 + + + + + + + S: + + + + + + + 255 + + + + + + + B: + + + + + + + 255 + + + + + + + V: + + + + + + + 255 + + + + + + + + + + Save To Device + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + - - - Zone: - - - - - - - - - - <html><head/><body><p align="justify">Sets all devices to<br/><b>Static</b> mode and<br/>applies the selected color.</p></body></html> - - - Apply All Devices - - - - - + - + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + + + Speed: + + + + + + + + + + + + + Random + + + + + + + Mode: + + + + + + + Dir: + + + + + + + Qt::Horizontal + + + + + + + Colors: + + + + + + + Per-LED + + + + + + + Zone: + + + + + + + + + + <html><head/><body><p align="justify">Sets all devices to<br/><b>Static</b> mode and<br/>applies the selected color.</p></body></html> + + + Apply All Devices + + + + + + + LED: + + + + + + + Resize + + + + + + + Mode-Specific + + + + + + + Apply Colors To Selection + + + + + + + Select All + + + + + + + Qt::Horizontal + + + + + + + + + + Brightness: + + + + + + + + + + 0 0 @@ -190,75 +329,30 @@ 0 - - - - - - Colors: + + QFrame::StyledPanel - - - - - - V: - - - - - - - - 0 - 0 - - - - - - - - Apply Colors To Selection - - - - - - - Resize - - - - - - - Mode: - - - - - - - - - - Qt::Horizontal - - - - - - - Brightness: - - - - - - - Save To Device + + QFrame::Sunken + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + @@ -291,7 +385,11 @@ + ZoneBox + ResizeButton LEDBox + SelectAllLEDsButton + ApplyColorsButton SetAllButton ModeBox PerLEDCheck @@ -299,12 +397,14 @@ RandomCheck SpeedSlider DirectionBox + BrightnessSlider RedSpinBox - GreenSpinBox - BlueSpinBox HueSpinBox + GreenSpinBox SatSpinBox + BlueSpinBox ValSpinBox + DeviceSaveButton