core: hw access "led" in TME

core/include/core/browsemenu.h

@@ -55,6 +55,7 @@ class SCOPY_CORE_EXPORT BrowseMenu : public QWidget
 private:
 	void add(QWidget *w, QString name, MenuAlignment position);
 	void toggleCollapsed();
+	void hideBtnText(QPushButton *btn, QString name, bool hide);
 	QPushButton *createBtn(QString name, QString iconPath, QWidget *parent = nullptr);
 	QFrame *createHLine(QWidget *parent = nullptr);
 	QWidget *createHeader(QWidget *parent = nullptr);

core/include/core/device.h

@@ -48,8 +48,10 @@ class SCOPY_CORE_EXPORT Device
 	virtual QString param() = 0;
 	virtual QString displayParam() = 0;
 	virtual QWidget *icon() = 0;
+	virtual QPixmap iconPixmap() = 0;
 
 	virtual QWidget *page() = 0;
+	virtual QWidget *configPage() = 0;
 
 	virtual QList<ToolMenuEntry *> toolList() = 0;
 	virtual void init() = 0;

core/include/core/devicebrowser.h

@@ -64,6 +64,8 @@ private Q_SLOTS:
 	void updateSelectedDeviceIdx(QString);
 	void forwardRequestDeviceWithDirection();
 
+	void onScrollRangeChanged(int min, int max);
+
 private:
 	void initBtns();
 	DeviceIcon *buildDeviceIcon(Device *d, QWidget *parent = nullptr);

core/include/core/deviceimpl.h

@@ -30,6 +30,7 @@
 #include <QCheckBox>
 #include <QObject>
 #include <QPushButton>
+#include <QTabWidget>
 
 namespace scopy {
 
@@ -48,7 +49,9 @@ class SCOPY_CORE_EXPORT DeviceImpl : public QObject, public Device
 	QString category() override;
 	QString param() override;
 	QWidget *icon() override;
+	QPixmap iconPixmap() override;
 	QWidget *page() override;
+	QWidget *configPage() override;
 	QList<ToolMenuEntry *> toolList() override;
 	virtual void init() override;
 	virtual void preload() override;
@@ -84,6 +87,7 @@ public Q_SLOTS:
 	void loadName();
 	void loadIcons();
 	void loadPages();
+	void loadConfigPage();
 	void loadToolList();
 	void loadBadges();
 	void setPingPlugin(Plugin *plugin);
@@ -102,6 +106,7 @@ public Q_SLOTS:
 	QString m_param;
 	QWidget *m_icon;
 	QWidget *m_page;
+	QTabWidget *m_configPage;
 	QPushButton *connbtn, *discbtn;
 	Plugin *m_pingPlugin = nullptr;
 };

core/include/core/scopymainwindow.h

@@ -108,6 +108,7 @@ public Q_SLOTS:
 	void handleScanner();
 	void enableScanner();
 	void deviceAutoconnect();
+	void collapseToolMenu(bool collapse);
 
 protected:
 	void closeEvent(QCloseEvent *event) override;

core/include/core/toolmenuitem.h

@@ -49,13 +49,13 @@ class ToolMenuItem : public QPushButton
 public Q_SLOTS:
 	void setDisabled(bool disabled);
 	void updateItem();
+	void onCollapsed(bool collapsed);
 
 protected:
 	void enterEvent(QEvent *event);
 	void leaveEvent(QEvent *event);
 
 private:
-	// QPushButton *m_toolBtn;
 	CustomPushButton *m_toolRunBtn;
 
 	QString m_uuid;

core/include/core/toolmenumanager.h

@@ -34,14 +34,24 @@
 #include "scopy-core_export.h"
 
 namespace scopy {
+
+typedef struct
+{
+	QString id;
+	QString name;
+	QString param;
+	QPixmap icon;
+	QList<ToolMenuEntry *> tools;
+} DeviceInfo;
+
 class SCOPY_CORE_EXPORT ToolMenuManager : public QObject
 {
 	Q_OBJECT
 public:
 	ToolMenuManager(ToolStack *ts, DetachedToolWindowManager *dtm, ToolMenu *toolMenu, QObject *parent = nullptr);
 	~ToolMenuManager();
 
-	void addMenuItem(QString deviceId, QString devName, QList<ToolMenuEntry *> tools, int itemIndex = -1);
+	void addMenuItem(DeviceInfo dInfo, int itemIndex = -1);
 	void removeMenuItem(QString deviceId);
 	void changeToolListContents(QString deviceId, QList<ToolMenuEntry *> tools);
 
@@ -52,13 +62,17 @@ public Q_SLOTS:
 	void deviceConnected(QString id);
 	void deviceDisconnected(QString id);
 	void onDisplayNameChanged(QString id, QString devName);
+	void onIioEvent(QString id, int retCode, IIOCallType type);
 
 Q_SIGNALS:
 	void requestToolSelect(QString id);
+	void connState(QString id, bool isConnected);
+	void menuCollapsed(bool collapsed);
 
 private Q_SLOTS:
 	void updateTool(QWidget *old);
 	void updateToolAttached(bool oldAttach, ToolMenuItem *toolMenuItem);
+	void setCollapsed(bool collapse);
 
 private:
 	void loadToolAttachedState(ToolMenuEntry *tme);
@@ -68,15 +82,22 @@ private Q_SLOTS:
 	void showTool(ToolMenuItem *toolMenuItem);
 	void selectTool(ToolMenuItem *toolMenuItem, bool on);
 	void setTmeAttached(ToolMenuEntry *tme);
-	MenuSectionCollapseWidget *createMenuSectionItem(QString deviceName, QString uri = "");
+	MenuSectionCollapseWidget *createMenuSectionItem(const DeviceInfo &dInfo);
 	ToolMenuItem *createToolMenuItem(ToolMenuEntry *tme, QWidget *parent = nullptr);
+	MenuCollapseHeader *getCollapseSectionHeader(MenuSectionCollapseWidget *section);
+	void initHeaderWidget(MenuCollapseSection::MenuHeaderWidgetType type, MenuCollapseHeader *header,
+			      const DeviceInfo &dInfo);
+	void initToolMenuHeaderWidget(MenuCollapseHeader *header, const DeviceInfo &dInfo);
+	void initCompositeHeaderWidget(MenuCollapseHeader *header, const DeviceInfo &dInfo);
 
+	bool m_collapsed;
 	QString m_prevItem;
 	QStringList m_connectedDev;
 	ToolStack *m_ts;
 	DetachedToolWindowManager *m_dtm;
 	ToolMenu *m_toolMenu;
 	QMap<QString, MenuSectionCollapseWidget *> m_itemMap;
+	QMap<QString, DeviceInfo> m_dInfoMap;
 };
 } // namespace scopy
 

core/src/browsemenu.cpp

@@ -63,6 +63,8 @@ BrowseMenu::BrowseMenu(QWidget *parent)
 	homeBtn->setIconSize(QSize(32, 32));
 	homeBtn->setStyleSheet("text-align: left");
 	connect(homeBtn, &QPushButton::clicked, this, [=]() { Q_EMIT requestTool("home"); });
+	connect(this, &BrowseMenu::collapsed, homeBtn,
+		[this, homeBtn](bool collapsed) { hideBtnText(homeBtn, tr("Home"), collapsed); });
 
 	QWidget *saveLoadWidget = new QWidget(m_content);
 	saveLoadWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
@@ -93,6 +95,8 @@ BrowseMenu::BrowseMenu(QWidget *parent)
 	QPushButton *aboutBtn = createBtn(
 		"About", ":/gui/icons/" + Style::getAttribute(json::theme::icon_theme_folder) + "/icons/info.svg",
 		m_content);
+	aboutBtn->setIconSize(
+		QSize(Style::getDimension(json::global::unit_2), Style::getDimension(json::global::unit_2)));
 	connect(aboutBtn, &QPushButton::clicked, this, [=]() { Q_EMIT requestTool("about"); });
 	aboutBtn->setCheckable(true);
 
@@ -139,16 +143,26 @@ void BrowseMenu::toggleCollapsed()
 {
 	m_collapsed = !m_collapsed;
 	m_btnCollapse->setHidden(m_collapsed);
-	m_content->setHidden(m_collapsed);
 	Q_EMIT collapsed(m_collapsed);
 }
 
+void BrowseMenu::hideBtnText(QPushButton *btn, QString name, bool hide)
+{
+	if(hide) {
+		btn->setText("");
+	} else {
+		btn->setText(name);
+	}
+}
+
 QPushButton *BrowseMenu::createBtn(QString name, QString iconPath, QWidget *parent)
 {
 	QPushButton *btn = new QPushButton(parent);
 	btn->setIcon(QIcon(iconPath));
 	btn->setText(tr(name.toStdString().c_str()));
-	Style::setStyle(btn, style::properties::button::toolButton);
+	Style::setStyle(btn, style::properties::button::toolButton, true);
+	connect(this, &BrowseMenu::collapsed, btn,
+		[this, btn, name](bool collapsed) { hideBtnText(btn, tr(name.toStdString().c_str()), collapsed); });
 	return btn;
 }
 
@@ -172,7 +186,7 @@ QWidget *BrowseMenu::createHeader(QWidget *parent)
 	Style::setStyle(btnCollapseMini, style::properties::widget::toolMenu);
 	Style::setStyle(btnCollapseMini, style::properties::button::toolButton);
 	btnCollapseMini->setCheckable(true);
-	btnCollapseMini->setFixedSize(Style::getDimension(json::global::unit_4),
+	btnCollapseMini->setFixedSize(Style::getDimension(json::global::unit_4_5),
 				      Style::getDimension(json::global::unit_4));
 	headerLay->addWidget(btnCollapseMini);
 
@@ -190,6 +204,7 @@ QLabel *BrowseMenu::createScopyLogo(QWidget *parent)
 {
 	QLabel *logo = new QLabel(m_content);
 	Style::setStyle(logo, style::properties::widget::logo);
+	connect(this, &BrowseMenu::collapsed, logo, &QWidget::setHidden);
 	return logo;
 }
 

core/src/devicebrowser.cpp

@@ -31,6 +31,7 @@
 
 #include <QDebug>
 #include <QLoggingCategory>
+#include <qscrollbar.h>
 #include <style.h>
 
 Q_LOGGING_CATEGORY(CAT_DEVBROWSER, "DeviceBrowser")
@@ -45,13 +46,19 @@ DeviceBrowser::DeviceBrowser(QWidget *parent)
 	this->setFixedHeight(185);
 
 	auto dbm = ui->wDeviceBrowserMenu;
-	layout = new QHBoxLayout(dbm);
+	layout = dynamic_cast<QHBoxLayout *>(dbm->layout());
+
+	auto scrollArea = ui->scrollArea;
+	scrollArea->horizontalScrollBar()->setVisible(false);
 
 	initBtns();
 
 	connect(ui->btnHome, SIGNAL(clicked()), this, SLOT(forwardRequestDeviceWithDirection()));
 	connect(ui->btnAdd, SIGNAL(clicked()), this, SLOT(forwardRequestDeviceWithDirection()));
 	connect(this, SIGNAL(requestDevice(QString, int)), this, SLOT(updateSelectedDeviceIdx(QString)));
+
+	connect(scrollArea->horizontalScrollBar(), &QScrollBar::rangeChanged, this,
+		&DeviceBrowser::onScrollRangeChanged);
 }
 
 DeviceBrowser::~DeviceBrowser()
@@ -96,13 +103,16 @@ void DeviceBrowser::addDevice(QString id, Device *d, int position)
 {
 	qInfo(CAT_DEVBROWSER) << "adding device " << id;
 	auto w = dynamic_cast<QAbstractButton *>(buildDeviceIcon(d, this));
+	int spacerIndex = layout->indexOf(ui->hSpacer);
 	w->setProperty(devBrowserId, id);
-	layout->insertWidget(position, w);
 	bg->addButton(w);
-	if(position == -1)
+	if(position == -1) {
+		layout->insertWidget(spacerIndex, w);
 		list.append(w);
-	else
+	} else {
+		layout->insertWidget(position, w);
 		list.insert(position, w);
+	}
 
 	connect(w, &QAbstractButton::clicked, this, &DeviceBrowser::forwardRequestDeviceWithDirection);
 }
@@ -230,6 +240,20 @@ DeviceIcon *DeviceBrowser::buildDeviceIcon(Device *d, QWidget *parent)
 	return devIcon;
 }
 
+// Used to display the scrollbar when needed and to maintain its size in the scroll area when not needed.
+// We chose this approach because for the Qt::ScrollBarAsNeeded policy the size of the scrollball cannot be retained
+// with Util::retainWidgetSizeWhenHidden because the resizing of the scrollbar is done dynamically (withoud using the
+// show/hide default functions).
+void DeviceBrowser::onScrollRangeChanged(int min, int max)
+{
+	auto scrollArea = ui->scrollArea;
+	if(max > min) {
+		scrollArea->horizontalScrollBar()->setVisible(true);
+	} else {
+		scrollArea->horizontalScrollBar()->setVisible(false);
+	}
+}
+
 /*
    auto &&is = ui->wInfoPageStack;
     auto &&hc = is->getHomepageControls();

core/src/deviceimpl.cpp

@@ -35,6 +35,7 @@
 #include <QTextBrowser>
 #include <QThread>
 #include <QtConcurrent/QtConcurrent>
+#include <deviceiconbuilder.h>
 #include <style.h>
 
 #include <common/scopyconfig.h>
@@ -45,6 +46,7 @@
 Q_LOGGING_CATEGORY(CAT_DEVICEIMPL, "Device")
 
 namespace scopy {
+
 DeviceImpl::DeviceImpl(QString param, PluginManager *p, QString category, QObject *parent)
 	: QObject{parent}
 	, m_param(param)
@@ -89,6 +91,7 @@ void DeviceImpl::loadPlugins()
 	loadIcons();
 	loadBadges();
 	loadPages();
+	loadConfigPage();
 	loadToolList();
 	if(m_plugins.isEmpty()) {
 		connbtn->hide();
@@ -156,17 +159,22 @@ void DeviceImpl::loadName()
 void DeviceImpl::loadIcons()
 {
 	m_icon = new QWidget();
+	QHBoxLayout *lay = new QHBoxLayout(m_icon);
 	m_icon->setFixedHeight(100);
 	m_icon->setFixedWidth(100);
-	new QHBoxLayout(m_icon);
 	for(auto &p : m_plugins) {
 		if(p->loadIcon()) {
-			m_icon->layout()->addWidget(p->icon());
+			lay->addWidget(p->icon());
 			return;
 		}
 	}
 
-	new QLabel("No PLUGIN", m_icon);
+	QLabel *header = new QLabel("No Plugin");
+	Style::setStyle(header, style::properties::label::deviceIcon, true);
+
+	QWidget *noPluginIcon =
+		DeviceIconBuilder().shape(DeviceIconBuilder::SQUARE).color("gray").headerWidget(header).build();
+	lay->addWidget(noPluginIcon);
 }
 
 void DeviceImpl::loadPages()
@@ -215,6 +223,18 @@ void DeviceImpl::loadPages()
 	}
 }
 
+void DeviceImpl::loadConfigPage()
+{
+	m_configPage = new QTabWidget();
+	m_configPage->setTabPosition(QTabWidget::South);
+
+	for(auto &&p : plugins()) {
+		if(p->loadConfigPage()) {
+			m_configPage->addTab(p->configPage(), p->name());
+		}
+	}
+}
+
 void DeviceImpl::loadToolList()
 {
 	for(auto &&p : m_plugins) {
@@ -435,6 +455,22 @@ QString DeviceImpl::param() { return m_param; }
 
 QWidget *DeviceImpl::icon() { return m_icon; }
 
+QPixmap DeviceImpl::iconPixmap()
+{
+	QPixmap pixmap;
+	QLayoutItem *item = m_icon->layout()->itemAt(0);
+	if(!item || !item->widget()) {
+		return pixmap;
+	}
+	QLabel *iconLabel = dynamic_cast<QLabel *>(item->widget());
+	if(iconLabel) {
+		pixmap = iconLabel->grab();
+	}
+	return pixmap;
+}
+
+QWidget *DeviceImpl::configPage() { return m_configPage; }
+
 QWidget *DeviceImpl::page() { return m_page; }
 
 QList<ToolMenuEntry *> DeviceImpl::toolList()