Skip to content

Rename interface_dropdown into m_interface_dropdown #1252

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

Merged
pifopi merged 1 commit into from
May 20, 2026
Merged

Rename interface_dropdown into m_interface_dropdown #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
layout1->addLayout(m_dropdowns, CONSOLE_SETTINGS_STRETCH_L1_BODY);
layout1->addSpacing(5);

interface_dropdown = new NoWheelCompactComboBox(this);
m_dropdowns->addWidget(interface_dropdown);
m_interface_dropdown = new NoWheelCompactComboBox(this);
m_dropdowns->addWidget(m_interface_dropdown);


// Add all the supported interfaces.
Expand All @@ -61,10 +61,10 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe


for (ControllerInterface item : m_interface_list){
interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(item)));
m_interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(item)));
}

// interface_dropdown->setHidden(true);
// m_interface_dropdown->setHidden(true);

auto current = session.descriptor();
if (current == nullptr || current->interface_type == ControllerInterface::None){
Expand Down Expand Up @@ -110,7 +110,7 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
setFocusPolicy(Qt::StrongFocus);

connect(
interface_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
m_interface_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
this, [this](int index){
index = std::max(index, 0);
// index = std::min(index, (int)m_device_list.size() - 1);
Expand Down Expand Up @@ -159,7 +159,7 @@ void ControllerSelectorWidget::update_interface_dropdown(ControllerInterface int
}
for (size_t index = 0; index < m_interface_list.size(); index++){
if (interface_type == m_interface_list[index]){
interface_dropdown->setCurrentIndex((int)index);
m_interface_dropdown->setCurrentIndex((int)index);
break;
}
}
Expand Down Expand Up @@ -247,7 +247,7 @@ void ControllerSelectorWidget::post_status_text_changed(const std::string& text)
void ControllerSelectorWidget::options_locked(bool locked){
QMetaObject::invokeMethod(this, [this, locked]{
m_selector->setEnabled(!locked);
interface_dropdown->setEnabled(!locked);
m_interface_dropdown->setEnabled(!locked);
m_controllers_dropdown->setEnabled(!locked);
m_reset_button->setEnabled(!locked);
});
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/Controllers/ControllerSelectorWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class ControllerSelectorWidget : public QWidget, private ControllerSession::List

QHBoxLayout* m_dropdowns;
QWidget* m_selector = nullptr;
QComboBox* interface_dropdown = nullptr;
QComboBox* m_interface_dropdown = nullptr;
QComboBox* m_controllers_dropdown = nullptr;
QLabel* m_status_text = nullptr;
QPushButton* m_reset_button = nullptr;
Expand Down
Loading