diff --git a/interface/resources/styles/log_dialog.qss b/interface/resources/styles/log_dialog.qss index 85fac5560f..c235c5735a 100644 --- a/interface/resources/styles/log_dialog.qss +++ b/interface/resources/styles/log_dialog.qss @@ -67,6 +67,16 @@ QPushButton#revealLogButton { font-size: 11px; } +QPushButton#showAllButton { + font-family: Helvetica, Arial, sans-serif; + padding-left: 10px; + background-color: #333333; + color: #BBBBBB; + border-width: 0; + border-radius: 9px; + font-size: 11px; +} + QCheckBox { font-family: Helvetica, Arial, sans-serif; text-align: center; diff --git a/interface/src/ui/BaseLogDialog.cpp b/interface/src/ui/BaseLogDialog.cpp index 5762c0caa3..aacf93a2c1 100644 --- a/interface/src/ui/BaseLogDialog.cpp +++ b/interface/src/ui/BaseLogDialog.cpp @@ -95,7 +95,7 @@ void BaseLogDialog::initControls() { connect(_logTextBox, SIGNAL(selectionChanged()), SLOT(updateSelection())); } -void BaseLogDialog::showEvent(QShowEvent* event) { +void BaseLogDialog::showEvent(QShowEvent* event) { showLogData(); } @@ -124,7 +124,7 @@ void BaseLogDialog::handleSearchTextChanged(QString searchText) { if (cursor.hasSelection()) { QString selectedTerm = cursor.selectedText(); if (selectedTerm == searchText) { - return; + return; } } @@ -147,7 +147,8 @@ void BaseLogDialog::toggleSearchPrev() { if (searchCursor.hasSelection()) { QString selectedTerm = searchCursor.selectedText(); _logTextBox->find(selectedTerm, QTextDocument::FindBackward); - } else { + } + else { handleSearchTextChanged(_searchTextBox->text()); } } @@ -157,7 +158,8 @@ void BaseLogDialog::toggleSearchNext() { if (searchCursor.hasSelection()) { QString selectedTerm = searchCursor.selectedText(); _logTextBox->find(selectedTerm); - } else { + } + else { handleSearchTextChanged(_searchTextBox->text()); } } diff --git a/interface/src/ui/BaseLogDialog.h b/interface/src/ui/BaseLogDialog.h index 9ffa563cd7..cd097751c9 100644 --- a/interface/src/ui/BaseLogDialog.h +++ b/interface/src/ui/BaseLogDialog.h @@ -48,10 +48,10 @@ public: BaseLogDialog(QWidget* parent); ~BaseLogDialog(); -public slots: + public slots: virtual void appendLogLine(QString logLine); -private slots: + private slots: void updateSelection(); void handleSearchButton(); void handleSearchTextChanged(QString text); @@ -59,7 +59,7 @@ private slots: void toggleSearchNext(); protected: - int _leftPad { 0 }; + int _leftPad{ 0 }; QString _searchTerm; QPlainTextEdit* _logTextBox{ nullptr }; Highlighter* _highlighter{ nullptr }; @@ -69,11 +69,11 @@ protected: virtual QString getCurrentLog() = 0; private: - QPushButton* _searchButton { nullptr }; - QLineEdit* _searchTextBox { nullptr }; - QPushButton* _searchPrevButton { nullptr }; - QPushButton* _searchNextButton { nullptr }; - + QPushButton* _searchButton{ nullptr }; + QLineEdit* _searchTextBox{ nullptr }; + QPushButton* _searchPrevButton{ nullptr }; + QPushButton* _searchNextButton{ nullptr }; + void initControls(); void showLogData(); }; diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp index aae1b3141e..6a3a2fc0eb 100644 --- a/interface/src/ui/LogDialog.cpp +++ b/interface/src/ui/LogDialog.cpp @@ -106,7 +106,7 @@ LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLog _filterDropdown->addItem("hifi.ui"); _filterDropdown->addItem("hifi.avatars"); - connect(_filterDropdown, SIGNAL(currentIndexChanged(int)),this, SLOT(handleFilterDropdownChanged(int))); + connect(_filterDropdown, SIGNAL(currentIndexChanged(int)), this, SLOT(handleFilterDropdownChanged(int))); } void LogDialog::resizeEvent(QResizeEvent* event) { @@ -178,11 +178,13 @@ void LogDialog::appendLogLine(QString logLine) { if (_logger->debugPrint()) { _logTextBox->appendPlainText(logLine.trimmed()); } - } else if (logLine.contains(INFO, Qt::CaseSensitive)) { + } + else if (logLine.contains(INFO, Qt::CaseSensitive)) { if (_logger->infoPrint()) { _logTextBox->appendPlainText(logLine.trimmed()); } - } else { + } + else { if (_logger->criticalPrint()) { _logTextBox->appendPlainText(logLine.trimmed()); } diff --git a/interface/src/ui/LogDialog.h b/interface/src/ui/LogDialog.h index 01cb37336f..1856c18f92 100644 --- a/interface/src/ui/LogDialog.h +++ b/interface/src/ui/LogDialog.h @@ -26,10 +26,10 @@ class LogDialog : public BaseLogDialog { public: LogDialog(QWidget* parent, AbstractLoggerInterface* logger); -public slots: + public slots: void appendLogLine(QString logLine) override; -private slots: + private slots: void handleRevealButton(); void handleExtraDebuggingCheckbox(int); void handleDebugPrintBox(int);