From 65fed04dc1ce0a92a0b06e845d093a3455f6519e Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Thu, 2 Dec 2021 17:58:27 -0500 Subject: [PATCH] 2021-12-02 Fred Gleason * Fixed a regression in rdadmin(1) that caused IP address settings to fail to be saved when creating a new 'Logicek vGuest' matrix entry. Signed-off-by: Fred Gleason --- ChangeLog | 6 +++++- rdadmin/edit_matrix.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77b533b1..88494001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22585,4 +22585,8 @@ * Modified caed(8) to use promisucous mode when starting jackd(8). 2021-12-02 Fred Gleason * Added a check to rdservice(8) to ensure that the 'rivendell' - service is run as 'root'. + service is run as 'root' +2021-12-02 Fred Gleason + * Fixed a regression in rdadmin(1) that caused IP address settings + to fail to be saved when creating a new 'Logicek vGuest' matrix + entry. diff --git a/rdadmin/edit_matrix.cpp b/rdadmin/edit_matrix.cpp index c8db03a3..03cd4c53 100644 --- a/rdadmin/edit_matrix.cpp +++ b/rdadmin/edit_matrix.cpp @@ -113,9 +113,9 @@ EditMatrix::EditMatrix(RDMatrix *matrix,QWidget *parent) edit_porttype_label->setGeometry(15,96,70,19); edit_porttype_label->setFont(labelFont()); edit_porttype_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_porttype_box->insertItem(0,tr("Serial")); - edit_porttype_box->insertItem(1,tr("TCP/IP")); - edit_porttype_box->insertItem(1,tr("None")); + edit_porttype_box->insertItem(RDMatrix::TtyPort,tr("Serial")); + edit_porttype_box->insertItem(RDMatrix::TcpPort,tr("TCP/IP")); + edit_porttype_box->insertItem(RDMatrix::NoPort,tr("None")); connect(edit_porttype_box,SIGNAL(activated(int)), this,SLOT(portTypeActivatedData(int))); @@ -217,9 +217,9 @@ EditMatrix::EditMatrix(RDMatrix *matrix,QWidget *parent) edit_porttype2_label->setGeometry(15,243,70,19); edit_porttype2_label->setFont(labelFont()); edit_porttype2_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_porttype2_box->insertItem(0,tr("Serial")); - edit_porttype2_box->insertItem(1,tr("TCP/IP")); - edit_porttype2_box->insertItem(2,tr("None")); + edit_porttype2_box->insertItem(RDMatrix::TtyPort,tr("Serial")); + edit_porttype2_box->insertItem(RDMatrix::TcpPort,tr("TCP/IP")); + edit_porttype2_box->insertItem(RDMatrix::NoPort,tr("None")); connect(edit_porttype2_box,SIGNAL(activated(int)), this,SLOT(portType2ActivatedData(int)));