Skip to content
Open
Changes from all commits
Commits
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
32 changes: 30 additions & 2 deletions Code/Editor/Controls/ConsoleSCB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,14 @@ CConsoleSCB::CConsoleSCB(QWidget* parent)
setMinimumHeight(120);

ui->findBar->setVisible(false);
ui->label->setBuddy(ui->lineEditFind);
ui->lineEditFind->setPlaceholderText(QObject::tr("Search..."));
ui->lineEditFind->setClearButtonEnabled(true);
ui->lineEditFind->setAccessibleName(tr("Search"));
AzQtComponents::LineEdit::applySearchStyle(ui->lineEditFind);

ui->lineEdit->setAccessibleName(tr("Console Input"));

SetupOptionsMenu();

// Setup the color table for the default (light) theme
Expand Down Expand Up @@ -394,6 +398,12 @@ void CConsoleSCB::SetupOptionsMenu()
ui->optionsButton->setAutoRaise(true);
ui->optionsButton->setPopupMode(QToolButton::InstantPopup);

QAction* clearConsoleAction = new QAction(tr("Clear Console"), this);
connect(clearConsoleAction, &QAction::triggered, [this]() { ui->textEdit->clear(); });
m_optionsMenu->addAction(clearConsoleAction);

m_optionsMenu->addSeparator();

m_clearOnPlayAction = new QAction(tr("Clear On Play"), this);
m_clearOnPlayAction->setCheckable(true);
connect(m_clearOnPlayAction, &QAction::triggered, this, &CConsoleSCB::toggleClearOnPlay);
Expand Down Expand Up @@ -435,9 +445,20 @@ void CConsoleSCB::OnEditorPreferencesChanged()
void CConsoleSCB::RefreshStyle()
{
ui->button->setIcon(QIcon(ConsoleConstants::ButtonIcon));
ui->button->setToolTip(tr("Console Variables"));
ui->button->setAccessibleName(ui->button->toolTip());

ui->findButton->setIcon(QIcon(ConsoleConstants::SearchIcon));
ui->findButton->setToolTip(tr("Search"));
ui->findButton->setAccessibleName(ui->findButton->toolTip());

ui->closeButton->setIcon(QIcon(ConsoleConstants::ClearIcon));
ui->closeButton->setToolTip(tr("Close Search Bar"));
ui->closeButton->setAccessibleName(ui->closeButton->toolTip());

ui->optionsButton->setIcon(QIcon(ConsoleConstants::MenuIcon));
ui->optionsButton->setToolTip(tr("Console Options"));
ui->optionsButton->setAccessibleName(ui->optionsButton->toolTip());
// Set the debug/warning text colors appropriately for the background theme
// (e.g. not have black text on black background)
QColor textColor = Qt::black;
Expand Down Expand Up @@ -1219,10 +1240,17 @@ ConsoleVariableEditor::ConsoleVariableEditor(QWidget* parent)
// Setup a filter widget with a search label and line edit input for filtering
// the console variables
QWidget* m_filterWidget = new QWidget(this);
QLabel* label = new QLabel(tr("Search"), this);
QLineEdit* m_filterLineEdit = new QLineEdit(this);
m_filterLineEdit->setPlaceholderText(tr("Search..."));
m_filterLineEdit->setClearButtonEnabled(true);
m_filterLineEdit->setAccessibleName(tr("Search"));
AzQtComponents::LineEdit::applySearchStyle(m_filterLineEdit);

QLabel* label = new QLabel(tr("Search"), this);
label->setBuddy(m_filterLineEdit);
label->hide();

QHBoxLayout* filterlayout = new QHBoxLayout(m_filterWidget);
filterlayout->addWidget(label);
filterlayout->addWidget(m_filterLineEdit);

// Setup our model to be filterable by the name column from our line edit
Expand Down
Loading