Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

initial changes...ready for feedback

Browse source
This commit is contained in:
RebeccaStankus 2018-01-02 13:04:52 -08:00
parent 0117750757
commit fe69498976
5 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/styles/log_dialog.qss
View file

@ -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;

10
interface/src/ui/BaseLogDialog.cpp
View file

@ -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());
}
}

16
interface/src/ui/BaseLogDialog.h
View file

@ -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();
};

8
interface/src/ui/LogDialog.cpp
View file

@ -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());
}

4
interface/src/ui/LogDialog.h
View file

@ -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);