Skip to content

Commit

Permalink
Move and colourise online column in universe view
Browse files Browse the repository at this point in the history
  • Loading branch information
marcusbirkin committed May 19, 2020
1 parent 35a79a5 commit 88aa47a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
22 changes: 12 additions & 10 deletions src/universeview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@

#include <QMessageBox>

QString onlineToString(bool value)
{
if(value)
return QObject::tr("Online");
return QObject::tr("Offline");
}

QString protocolVerToString(int value)
{
switch(value)
Expand Down Expand Up @@ -171,11 +164,20 @@ void UniverseView::sourceChanged(sACNSource *source)
ui->twSources->cellWidget(row,COL_JUMPS)->layout()->itemAt(0)->widget());
lbl_SEQ_ERR->setText(QString::number(source->jumps));
}
if (source->doing_dmx) {
ui->twSources->item(row,COL_ONLINE)->setText(onlineToString(source->src_valid));

if (source->src_valid) {
if (source->doing_dmx) {
ui->twSources->item(row,COL_ONLINE)->setBackgroundColor(Qt::green);
ui->twSources->item(row,COL_ONLINE)->setText(tr("Online"));
} else {
ui->twSources->item(row,COL_ONLINE)->setBackgroundColor(Qt::yellow);
ui->twSources->item(row,COL_ONLINE)->setText(tr("No DMX"));
}
} else {
ui->twSources->item(row,COL_ONLINE)->setText(source->src_valid ? tr("No DMX") : onlineToString(source->src_valid));
ui->twSources->item(row,COL_ONLINE)->setBackgroundColor(Qt::red);
ui->twSources->item(row,COL_ONLINE)->setText(tr("Offline"));
}

ui->twSources->item(row,COL_VER)->setText(protocolVerToString(source->protocol_version));
ui->twSources->item(row,COL_DD)->setText(source->doing_per_channel ? tr("Yes") : tr("No"));
ui->twSources->item(row,COL_SLOTS)->setText(QString::number(source->slot_count));
Expand Down
2 changes: 1 addition & 1 deletion src/universeview.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ protected slots:
enum m_SC_ROWS
{
COL_NAME,
COL_ONLINE,
COL_CID,
COL_PRIO,
COL_SYNC,
Expand All @@ -65,7 +66,6 @@ protected slots:
COL_FPS,
COL_SEQ_ERR,
COL_JUMPS,
COL_ONLINE,
COL_VER,
COL_DD,
COL_SLOTS,
Expand Down
10 changes: 5 additions & 5 deletions ui/universeview.ui
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,11 @@
<property name="text">
<string>Name</string>
</property>
</column>
<column>
<property name="text">
<string>Online</string>
</property>
</column>
<column>
<property name="text">
Expand Down Expand Up @@ -269,11 +274,6 @@
<string>Jumps</string>
</property>
</column>
<column>
<property name="text">
<string>Online</string>
</property>
</column>
<column>
<property name="text">
<string>Ver</string>
Expand Down

0 comments on commit 88aa47a

Please sign in to comment.