matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Device Emulation (contd.): Hide Device Detail view when Escape pressed or Refresh clicked

Browse Source
This commit is contained in:
Srivats P 2016-03-14 21:39:01 +05:30
parent 7561b09c1e
commit 26ceb2f9df
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/deviceswidget.cpp
View File

@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
#include "portgrouplist.h" #include "portgrouplist.h"
#include <QHeaderView> #include <QHeaderView>
#include <QKeyEvent>
DevicesWidget::DevicesWidget(QWidget *parent) DevicesWidget::DevicesWidget(QWidget *parent)
: QWidget(parent), portGroups_(NULL) : QWidget(parent), portGroups_(NULL)
@ -87,6 +88,16 @@ void DevicesWidget::setPortGroupList(PortGroupList *portGroups)
updateDeviceViewActions(); updateDeviceViewActions();
} }
void DevicesWidget::keyPressEvent(QKeyEvent *event)
{
if (event->key() == Qt::Key_Escape) {
deviceDetail->hide();
event->accept();
}
else
event->ignore();
}
void DevicesWidget::setCurrentPortIndex(const QModelIndex &portIndex) void DevicesWidget::setCurrentPortIndex(const QModelIndex &portIndex)
{ {
Port *port = NULL; Port *port = NULL;
@ -220,6 +231,7 @@ void DevicesWidget::on_refresh_clicked()
Q_ASSERT(curPortGroup.isValid()); Q_ASSERT(curPortGroup.isValid());
Q_ASSERT(portGroups_->isPortGroup(curPortGroup)); Q_ASSERT(portGroups_->isPortGroup(curPortGroup));
deviceDetail->hide();
portGroups_->portGroup(curPortGroup) portGroups_->portGroup(curPortGroup)
.getDeviceInfo(portGroups_->port(currentPortIndex_).id()); .getDeviceInfo(portGroups_->port(currentPortIndex_).id());
} }

2
client/deviceswidget.h
View File

@ -33,6 +33,8 @@ public:
DevicesWidget(QWidget *parent = NULL); DevicesWidget(QWidget *parent = NULL);
void setPortGroupList(PortGroupList *portGroups); void setPortGroupList(PortGroupList *portGroups);
virtual void keyPressEvent(QKeyEvent *event);
public slots: public slots:
void setCurrentPortIndex(const QModelIndex &portIndex); void setCurrentPortIndex(const QModelIndex &portIndex);