Skip to content

Commit

Permalink
m2k: change instrument top button style
Browse files Browse the repository at this point in the history 
Signed-off-by: Andrei Popa <andrei.popa@analog.com>
  • Loading branch information
@andrei47w
andrei47w committed Feb 5, 2025
1 parent bfa38fe commit 39d9f63
Show file tree
Hide file tree
Showing 17 changed files with 237 additions and 149 deletions.
70 changes: 64 additions & 6 deletions gui/res/icons/printer.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 63 additions & 4 deletions gui/res/icons/scopy-default/icons/info.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 63 additions & 4 deletions gui/res/icons/scopy-light/icons/info.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion gui/style/json/Scopy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"sba_cmb_box_arrow": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow.svg",
"sba_cmb_box_arrow_up": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow_up.svg",
"font_family": "Arial",
"radius_1": "2",
"radius_2": "6",
"padding_1": "6",
"padding_2": "10",
Expand Down
24 changes: 24 additions & 0 deletions gui/style/qss/properties/button/basicButtonBig.qss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
QPushButton[&&property&&=true] {
font-size: &font_size&;
height: 40px;
text-align: center;
font-weight: bold;
padding-left: &unit_1&;
padding-right: &unit_1&;
border-radius: &radius_1&;
background-color: &interactive_primary_idle&;
color: &content_inverse&;
font-weight: bold;
}
QPushButton[&&property&&=true]:hover {
background-color: &interactive_primary_hover&;
color: &content_inverse&;
}

QPushButton[&&property&&=true]:pressed {
background-color: &interactive_primary_pressed&;
color: &content_inverse&;
}
QPushButton[&&property&&=true]:disabled {
background-color: &interactive_subtle_disabled&;
}
27 changes: 0 additions & 27 deletions gui/style/qss/properties/button/darkGrayButton.qss
View file

This file was deleted.

6 changes: 4 additions & 2 deletions plugins/m2k/m2k-gui/src/linked_button.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ using namespace scopy;
LinkedButton::LinkedButton(QWidget *parent)
: QPushButton(parent)
{
Style::setStyle(this, style::properties::button::darkGrayButton, true, true);
Style::setStyle(this, style::properties::button::basicButtonBig, true, true);
setFixedWidth(40);
this->setIcon(Style::getPixmap(":/gui/icons/" + Style::getAttribute(json::theme::icon_theme_folder) +
"/icons/info.svg"));
"/icons/info.svg",
Style::getColor(json::theme::content_inverse)));
this->setIconSize(QSize(40, 40));

this->setToolTip("See more info");
Expand Down
9 changes: 4 additions & 5 deletions plugins/m2k/src/old/logicanalyzer/logic_analyzer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1766,11 +1766,10 @@ void LogicAnalyzer::connectSignalsAndSlots()
updateStackDecoderButton();
});

Style::setStyle(ui->btnGroupChannels, style::properties::button::darkGrayButton, true, true);
ui->btnGroupChannels->setFixedHeight(40);

Style::setStyle(ui->printBtn, style::properties::button::darkGrayButton, true, true);
ui->printBtn->setFixedHeight(40);
Style::setStyle(ui->btnGroupChannels, style::properties::button::basicButtonBig, true, true);
Style::setStyle(ui->printBtn, style::properties::button::basicButtonBig, true, true);
ui->printBtn->setIcon(
Style::getPixmap(":/gui/icons/printer.svg", Style::getColor(json::theme::content_inverse)));
connect(ui->printBtn, &QPushButton::clicked, [=]() { m_plot.printWithNoBackground("Logic Analyzer"); });

connect(ui->decoderTableView, &DecoderTable::clicked, [=](const QModelIndex &index) {
Expand Down
5 changes: 3 additions & 2 deletions plugins/m2k/src/old/network_analyzer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,8 +600,9 @@ NetworkAnalyzer::NetworkAnalyzer(libm2k::context::M2k *m2k, QString uri, Filter

wheelEventGuard->installEventRecursively(ui->mainWidget);

Style::setStyle(ui->btnPrint, style::properties::button::darkGrayButton, true, true);
ui->btnPrint->setFixedHeight(40);
Style::setStyle(ui->btnPrint, style::properties::button::basicButtonBig, true, true);
ui->btnPrint->setIcon(
Style::getPixmap(":/gui/icons/printer.svg", Style::getColor(json::theme::content_inverse)));
connect(ui->btnPrint, &QPushButton::clicked, [=]() {
QWidget *widget = ui->stackedWidget->currentWidget();
QImage img(widget->width(), widget->height(), QImage::Format_ARGB32);
Expand Down
8 changes: 4 additions & 4 deletions plugins/m2k/src/old/oscilloscope.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,9 @@ Oscilloscope::Oscilloscope(libm2k::context::M2k *m2k, QString uri, Filter *filt,

readPreferences();

Style::setStyle(ui->printBtn, style::properties::button::darkGrayButton, true, true);
ui->printBtn->setFixedHeight(40);
Style::setStyle(ui->printBtn, style::properties::button::basicButtonBig, true, true);
ui->printBtn->setIcon(
Style::getPixmap(":/gui/icons/printer.svg", Style::getColor(json::theme::content_inverse)));
connect(ui->printBtn, &QPushButton::clicked, [=]() { plot.printWithNoBackground(api->objectName()); });

// workaround for a bug that selected channel settings for disabled channels
Expand Down Expand Up @@ -2094,8 +2095,7 @@ void Oscilloscope::create_add_channel_panel()

tabWidget->addTab(logic, tr("Logic"));

Style::setStyle(ui->mixedSignalBtn, style::properties::button::darkGrayButton, true, true);
ui->mixedSignalBtn->setFixedHeight(40);
Style::setStyle(ui->mixedSignalBtn, style::properties::button::basicButtonBig, true, true);
connect(ui->mixedSignalBtn, &QPushButton::clicked, [=]() {
if(!m_mixedSignalViewEnabled) {
ui->btnAddMath->click();
Expand Down
9 changes: 4 additions & 5 deletions plugins/m2k/src/old/patterngenerator/pattern_generator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -918,11 +918,10 @@ void PatternGenerator::connectSignalsAndSlots()
m_plotCurves[m_selectedChannel]->setName(text);
});

Style::setStyle(m_ui->btnGroupChannels, style::properties::button::darkGrayButton, true, true);
m_ui->btnGroupChannels->setFixedHeight(40);

Style::setStyle(m_ui->printBtn, style::properties::button::darkGrayButton, true, true);
m_ui->printBtn->setFixedHeight(40);
Style::setStyle(m_ui->btnGroupChannels, style::properties::button::basicButtonBig, true, true);
Style::setStyle(m_ui->printBtn, style::properties::button::basicButtonBig, true, true);
m_ui->printBtn->setIcon(
Style::getPixmap(":/gui/icons/printer.svg", Style::getColor(json::theme::content_inverse)));

connect(m_ui->printBtn, &QPushButton::clicked, [=]() { m_plot.printWithNoBackground("Pattern Generator"); });

Expand Down
4 changes: 3 additions & 1 deletion plugins/m2k/src/old/spectrum_analyzer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,9 @@ SpectrumAnalyzer::SpectrumAnalyzer(libm2k::context::M2k *m2k, QString uri, Filte
connect(ui->rightMenu, &MenuHAnim::finished, this, &SpectrumAnalyzer::rightMenuFinished);
menuOrder.push_back(ui->btnSweep);

Style::setStyle(ui->btnPrint, style::properties::button::darkGrayButton, true, true);
Style::setStyle(ui->btnPrint, style::properties::button::basicButtonBig, true, true);
ui->btnPrint->setIcon(
Style::getPixmap(":/gui/icons/printer.svg", Style::getColor(json::theme::content_inverse)));
connect(ui->btnPrint, &QPushButton::clicked,
[=]() { fft_plot->printWithNoBackground(api->objectName(), false); });

Expand Down
15 changes: 0 additions & 15 deletions plugins/m2k/ui/logic_analyzer.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,24 +97,9 @@
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="styleSheet">
<string notr="true">QPushButton{
width: 80px;
height: 40px;

text-align: left;
font-weight: bold;
padding-left: 15px;
padding-right: 15px;
}</string>
</property>
<property name="text">
<string>Print</string>
</property>
<property name="icon">
<iconset resource="../../../gui/res/resources.qrc">
<normaloff>:/gui/icons/printer.svg</normaloff>:/gui/icons/printer.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>10</width>
Expand Down
Loading

0 comments on commit 39d9f63

Please sign in to comment.