jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adds segments support for all LINEAR zones

Browse source
This commit is contained in:
morg 2023-03-22 14:39:27 +01:00
parent 2ab7013faa
commit 9f8e33b1e8
3 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

31
qt/OpenRGBDevicePage.cpp
View file

@ -263,10 +263,10 @@ void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index)
}
/*-------------------------------------*\
| Resizing is not allowed when all |
| Editing is not allowed when all |
| zones are selected at once |
\*-------------------------------------*/
ui->ResizeButton->setEnabled(false);
ui->EditZoneButton->setEnabled(false);
if(!ui->ZoneBox->signalsBlocked())
{
@ -307,17 +307,10 @@ void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index)
}
/*-------------------------------------*\
| Enable resizing if zone has variable |
| LED count (min != max) |
| Enable resizing if zone is LINEAR |
\*-------------------------------------*/
if(device->zones[selected_zone].leds_min == device->zones[selected_zone].leds_max)
{
ui->ResizeButton->setEnabled(false);
}
else
{
ui->ResizeButton->setEnabled(true);
}
bool zone_is_editable = (device->zones[selected_zone].type == ZONE_TYPE_LINEAR);
ui->EditZoneButton->setEnabled(zone_is_editable);
if(!ui->ZoneBox->signalsBlocked())
{
@ -358,10 +351,10 @@ void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index)
}
/*-------------------------------------*\
| Resizing is not allowed when a |
| Editing is not allowed when a |
| segment is selected |
\*-------------------------------------*/
ui->ResizeButton->setEnabled(false);
ui->EditZoneButton->setEnabled(false);
if(!ui->ZoneBox->signalsBlocked())
{
@ -998,7 +991,7 @@ void Ui::OpenRGBDevicePage::UpdateModeUi()
ui->LEDBox->clear();
ui->LEDBox->blockSignals(false);
ui->ResizeButton->setEnabled(false);
ui->EditZoneButton->setEnabled(false);
ui->ApplyColorsButton->setEnabled(false);
//ui->AutoFillCheck->setEnabled(false);
break;
@ -1019,7 +1012,7 @@ void Ui::OpenRGBDevicePage::UpdateModeUi()
else
{
ui->ZoneBox->setDisabled(1);
ui->ResizeButton->setEnabled(false);
ui->EditZoneButton->setEnabled(false);
}
for(std::size_t zone_idx = 0; zone_idx < device->zones.size(); zone_idx++)
@ -1059,11 +1052,11 @@ void Ui::OpenRGBDevicePage::UpdateModeUi()
if(device->modes[selected_mode].colors_min == device->modes[selected_mode].colors_max)
{
ui->ResizeButton->setEnabled(false);
ui->EditZoneButton->setEnabled(false);
}
else
{
ui->ResizeButton->setEnabled(true);
ui->EditZoneButton->setEnabled(true);
}
for(unsigned int i = 0; i < device->modes[selected_mode].colors.size(); i++)
@ -1395,7 +1388,7 @@ void Ui::OpenRGBDevicePage::on_SetAllButton_clicked()
emit SetAllDevices(current_color.red(), current_color.green(), current_color.blue());
}
void Ui::OpenRGBDevicePage::on_ResizeButton_clicked()
void Ui::OpenRGBDevicePage::on_EditZoneButton_clicked()
{
switch(device->modes[device->active_mode].color_mode)
{

2
qt/OpenRGBDevicePage.h
View file

@ -52,7 +52,7 @@ private slots:
void on_RandomCheck_clicked();
void on_PerLEDCheck_clicked();
void on_ModeSpecificCheck_clicked();
void on_ResizeButton_clicked();
void on_EditZoneButton_clicked();
void on_ApplyColorsButton_clicked();

4
qt/OpenRGBDevicePage.ui
View file

@ -274,7 +274,7 @@
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="ResizeButton">
<widget class="QPushButton" name="EditZoneButton">
<property name="text">
<string>Edit</string>
</property>
@ -400,7 +400,7 @@
</customwidgets>
<tabstops>
<tabstop>ZoneBox</tabstop>
<tabstop>ResizeButton</tabstop>
<tabstop>EditZoneButton</tabstop>
<tabstop>LEDBox</tabstop>
<tabstop>SelectAllLEDsButton</tabstop>
<tabstop>ApplyColorsButton</tabstop>