Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev debugger windows fix #1832

Merged
merged 2 commits into from
Nov 21, 2024
+19 −4
Merged

Dev debugger windows fix #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99d2a42
style/treeView: Add custom arrow icons for tree view items
Andrei-Fabian-Pop Nov 21, 2024
958b485
iioexplorer/searchbar: Remove "Filter" label
Andrei-Fabian-Pop Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions gui/res/icons/handle_right_arrow_light.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions gui/res/resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
<file>icons/checkmark_dark.svg</file>
<file>icons/handle_down_arrow_dark.svg</file>
<file>icons/handle_down_arrow_light.svg</file>
<file>icons/handle_right_arrow_light.svg</file>
<file>icons/minus.svg</file>
<file>icons/plus.svg</file>
<file>icons/unlocked.svg</file>
Expand Down
1 change: 1 addition & 0 deletions gui/style/json/Harmonic dark.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"color_inverse_hexcode": "000000",
"svg_checkmark": ":/gui/icons/checkmark_dark.svg",
"svg_arrow_down": ":/gui/icons/handle_down_arrow_dark.svg",
"svg_arrow_right": ":/gui/icons/handle_right_arrow.svg",
"sba_cmb_box_arrow_right": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow_right.svg",
"sba_cmb_box_arrow": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow.svg"
}
Expand Down
1 change: 1 addition & 0 deletions gui/style/json/Harmonic light.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"color_inverse_hexcode": "5E6773",
"svg_checkmark": ":/gui/icons/checkmark_light.svg",
"svg_arrow_down": ":/gui/icons/handle_down_arrow_light.svg",
"svg_arrow_right": ":/gui/icons/handle_right_arrow_light.svg",
"sba_cmb_box_arrow_right": ":/gui/icons/scopy-light/icons/sba_cmb_box_arrow_right.svg",
"sba_cmb_box_arrow": ":/gui/icons/scopy-light/icons/sba_cmb_box_arrow.svg"
}
Expand Down
1 change: 1 addition & 0 deletions gui/style/json/Scopy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"color_inverse_hexcode": "000000",
"svg_checkmark": ":/gui/icons/checkmark_dark.svg",
"svg_arrow_down": ":/gui/icons/handle_down_arrow_dark.svg",
"svg_arrow_right": ":/gui/icons/handle_right_arrow.svg",
"sba_cmb_box_arrow_right": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow_right.svg",
"sba_cmb_box_arrow": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow.svg",
"font_family": "Open Sans",
Expand Down
4 changes: 0 additions & 4 deletions plugins/debugger/src/iioexplorer/searchbar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,17 @@ using namespace scopy::debugger;
SearchBar::SearchBar(QSet<QString> options, QWidget *parent)
: QWidget(parent)
, m_lineEdit(new QLineEdit(this))
, m_label(new QLabel("Filter", this))
, m_completer(new QCompleter(options.values(), this))
{
Style::setStyle(m_lineEdit, style::properties::debugger::searchBar);
Style::setStyle(m_label, style::properties::label::menuSmall);
setFixedHeight(34); // Hardcoded to match similar container
m_completer->setCaseSensitivity(Qt::CaseInsensitive);
m_completer->setFilterMode(Qt::MatchContains);
m_lineEdit->setPlaceholderText("Type to filter");
m_lineEdit->setCompleter(m_completer);
m_lineEdit->setMinimumHeight(31);
m_label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);

setLayout(new QHBoxLayout(this));
layout()->addWidget(m_label);
layout()->addWidget(m_lineEdit);
layout()->setMargin(0);
}
Expand Down
11 changes: 11 additions & 0 deletions plugins/debugger/style/qss/properties/debugger/treeView.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,20 @@ QTreeView[&&property&&=true] {
border-radius: &radius_1&;
background-color: &background_primary&;
show-decoration-selected: 0;
color: &content_default&;
}

QTreeView::item[&&property&&=true]:selected {
background-color: &interactive_primary_idle&;
color: &content_default&;
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings {
border-image: url(&svg_arrow_down&);
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings {
border-image: url(&svg_arrow_right&);
}
Loading