iiowidgets: add info icon for iiowidgets

Signed-off-by: IonutMuthi <[email protected]>

Author: IonutMuthi

gui/include/gui/widgets/menucombo.h

@@ -22,6 +22,8 @@
 #ifndef MENUCOMBO_H
 #define MENUCOMBO_H
 
+#include "infoiconwidget.h"
+
 #include <QComboBox>
 #include <QLabel>
 #include <QPen>
@@ -45,9 +47,11 @@ class SCOPY_GUI_EXPORT MenuCombo : public QWidget
 
 	QString title() const;
 	void setTitle(const QString &newTitle);
+	void setInfoMessage(QString infoMessage);
 
 private:
 	QLabel *m_label;
+	InfoIconWidget *m_infoIcon;
 	QComboBox *m_combo;
 	MouseWheelWidgetGuard *m_mouseWheelGuard;
 };
@@ -64,6 +68,7 @@ class SCOPY_GUI_EXPORT MenuComboWidget : public QWidget
 
 	QString title() const;
 	void setTitle(const QString &newTitle);
+	void setInfoMessage(QString infoMessage);
 
 private:
 	MenuCombo *m_combo;

gui/include/gui/widgets/menuspinbox.h

@@ -33,6 +33,7 @@
 #include <QPushButton>
 #include <QLabel>
 #include <QBoxLayout>
+#include <infoiconwidget.h>
 
 namespace scopy {
 namespace gui {
@@ -161,6 +162,7 @@ class SCOPY_GUI_EXPORT MenuSpinbox : public QWidget
 
 public Q_SLOTS:
 	void setName(const QString &newName);
+	void setInfoMessage(QString infoMessage);
 	void setUnit(const QString &newUnit);
 	void setMinValue(double);
 	void setMaxValue(double);
@@ -186,6 +188,7 @@ private Q_SLOTS:
 	double clamp(double val, double min, double max);
 
 	QLabel *m_label;
+	InfoIconWidget *m_infoIcon;
 	QLineEdit *m_edit;
 	QComboBox *m_scaleCb;
 	QPushButton *m_plus;

gui/src/widgets/menucombo.cpp

@@ -49,6 +49,8 @@ QString MenuComboWidget::title() const { return m_combo->title(); }
 
 void MenuComboWidget::setTitle(const QString &newTitle) { m_combo->setTitle(newTitle); }
 
+void MenuComboWidget::setInfoMessage(QString infoMessage) { m_combo->setInfoMessage(infoMessage); }
+
 MenuCombo::MenuCombo(QString title, QWidget *parent)
 	: QWidget(parent)
 {
@@ -63,9 +65,19 @@ MenuCombo::MenuCombo(QString title, QWidget *parent)
 	m_label = new QLabel(title, this);
 	Style::setStyle(m_label, style::properties::label::subtle);
 
+	m_infoIcon = new InfoIconWidget("", parent);
+
 	m_combo = new QComboBox(this);
 
-	lay->addWidget(m_label);
+	QHBoxLayout *labelLayout = new QHBoxLayout();
+	labelLayout->setContentsMargins(0, 0, 0, 0);
+	labelLayout->setSpacing(5);
+
+	labelLayout->addWidget(m_label);
+	labelLayout->addWidget(m_infoIcon);
+	labelLayout->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Preferred));
+
+	lay->addLayout(labelLayout);
 	lay->addWidget(m_combo);
 	m_mouseWheelGuard->installEventRecursively(this);
 }
@@ -77,4 +89,6 @@ QString MenuCombo::title() const { return m_label->text(); }
 
 void MenuCombo::setTitle(const QString &newTitle) { m_label->setText(newTitle); }
 
+void MenuCombo::setInfoMessage(QString infoMessage) { m_infoIcon->setInfoMessage(infoMessage); }
+
 #include "moc_menucombo.cpp"

gui/src/widgets/menuspinbox.cpp

@@ -34,6 +34,8 @@ MenuSpinbox::MenuSpinbox(QString name, double val, QString unit, double min, dou
 	m_label = new QLabel(name, parent);
 	Style::setStyle(m_label, style::properties::label::subtle);
 
+	m_infoIcon = new InfoIconWidget("", parent);
+
 	m_edit = new QLineEdit("0", parent);
 	m_scaleCb = new QComboBox(parent);
 	m_plus = new QPushButton("", parent);
@@ -110,7 +112,14 @@ void MenuSpinbox::layoutVertically(bool left)
 	btnLay->addWidget(m_plus);
 	btnLay->addWidget(m_minus);
 
-	editLay->addWidget(m_label);
+	QHBoxLayout *labelLayout = new QHBoxLayout();
+	labelLayout->setContentsMargins(0, 0, 0, 0);
+	labelLayout->setSpacing(2);
+	labelLayout->addWidget(m_label);
+	labelLayout->addWidget(m_infoIcon);
+	labelLayout->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Preferred));
+
+	editLay->addItem(labelLayout);
 	editLay->addWidget(m_edit);
 
 	editLay->addWidget(m_scaleCb);
@@ -170,6 +179,7 @@ void MenuSpinbox::layoutHorizontally(bool left)
 	btnLay->addWidget(m_plus);
 
 	editLay->addWidget(m_label);
+	editLay->addWidget(m_infoIcon);
 	editLay->addWidget(m_edit);
 
 	editLay->addWidget(m_scaleCb);
@@ -376,6 +386,8 @@ void MenuSpinbox::setName(const QString &newName)
 	Q_EMIT nameChanged(newName);
 }
 
+void MenuSpinbox::setInfoMessage(QString infoMessage) { m_infoIcon->setInfoMessage(infoMessage); }
+
 double MenuSpinbox::getScaleForPrefix(QString prefix, Qt::CaseSensitivity s)
 {
 	for(int i = 0; i < m_scales.count(); i++) {

iio-widgets/include/iio-widgets/guistrategy/checkboxguistrategy.h

@@ -48,6 +48,7 @@ class SCOPY_IIO_WIDGETS_EXPORT CheckBoxAttrUi : public QObject, public GuiStrate
 	bool isValid() final;
 
 	void setCustomTitle(QString title) override;
+	void setInfoMessage(QString infoMessage) { m_infoIcon->setInfoMessage(infoMessage); }
 
 public Q_SLOTS:
 	void receiveData(QString currentData, QString optionalData) override;
@@ -62,6 +63,7 @@ public Q_SLOTS:
 	MenuOnOffSwitch *m_menuOnOffSwitch;
 	bool m_isCompact;
 	QLabel *m_title;
+	InfoIconWidget *m_infoIcon;
 };
 } // namespace scopy
 

iio-widgets/include/iio-widgets/guistrategy/editableguistrategy.h

@@ -50,7 +50,7 @@ class SCOPY_IIO_WIDGETS_EXPORT EditableGuiStrategy : public QObject, public GuiS
 	bool isValid() override;
 
 	void setCustomTitle(QString title) override;
-	void setInfoMessage(QString infoMessage);
+	void setInfoMessage(QString infoMessage) { m_infoIcon->setInfoMessage(infoMessage); }
 
 public Q_SLOTS:
 	void receiveData(QString currentData, QString optionalData) override;

iio-widgets/include/iio-widgets/guistrategy/rangeguistrategy.h

@@ -52,6 +52,8 @@ class SCOPY_IIO_WIDGETS_EXPORT RangeAttrUi : public QObject, public GuiStrategyI
 
 	void setCustomTitle(QString title) override;
 
+	void setInfoMessage(QString infoMessage);
+
 public Q_SLOTS:
 	void receiveData(QString currentData, QString optionalData) override;
 

iio-widgets/src/guistrategy/checkboxguistrategy.cpp

@@ -39,10 +39,12 @@ CheckBoxAttrUi::CheckBoxAttrUi(IIOWidgetFactoryRecipe recipe, bool isCompact, QW
 	if(!m_isCompact) {
 		m_title = new QLabel(recipe.data, m_ui);
 		m_title->setWordWrap(true);
-		m_title->setFixedWidth(m_menuOnOffSwitch->width());
 		Style::setStyle(m_title, style::properties::label::subtle);
 		m_ui->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 		m_ui->layout()->addWidget(m_title);
+
+		m_infoIcon = new InfoIconWidget(recipe.infoMessage, m_ui);
+		m_ui->layout()->addWidget(m_infoIcon);
 	}
 	m_ui->layout()->addWidget(m_menuOnOffSwitch);
 

iio-widgets/src/guistrategy/comboguistrategy.cpp

@@ -54,6 +54,7 @@ ComboAttrUi::ComboAttrUi(IIOWidgetFactoryRecipe recipe, bool isCompact, QWidget
 
 		m_comboMenuWidget = new MenuCombo(recipe.data, m_ui);
 		m_comboWidget = m_comboMenuWidget->combo();
+		m_comboMenuWidget->setInfoMessage(recipe.infoMessage);
 
 		m_ui->layout()->addWidget(m_comboMenuWidget);
 	}
@@ -93,6 +94,8 @@ void ComboAttrUi::setInfoMessage(QString infoMessage)
 {
 	if(!m_isCompact) {
 		m_infoIcon->setInfoMessage(infoMessage);
+	} else {
+		m_comboMenuWidget->setInfoMessage(infoMessage);
 	}
 }
 

iio-widgets/src/guistrategy/editableguistrategy.cpp

@@ -83,8 +83,6 @@ bool EditableGuiStrategy::isValid()
 
 void EditableGuiStrategy::setCustomTitle(QString title) { m_title->setText(title); }
 
-void EditableGuiStrategy::setInfoMessage(QString infoMessage) { m_infoIcon->setInfoMessage(infoMessage); }
-
 void EditableGuiStrategy::receiveData(QString currentData, QString optionalData)
 {
 	QSignalBlocker blocker(m_lineEdit);