From bf59697aa51dd9f019015684228a9655cb925086 Mon Sep 17 00:00:00 2001 From: RebeccaStankus Date: Tue, 2 Jan 2018 13:56:49 -0800 Subject: [PATCH] better dropdown --- interface/resources/styles/log_dialog.qss | 1 - interface/src/ui/LogDialog.cpp | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/interface/resources/styles/log_dialog.qss b/interface/resources/styles/log_dialog.qss index c235c5735a..33473d2903 100644 --- a/interface/resources/styles/log_dialog.qss +++ b/interface/resources/styles/log_dialog.qss @@ -69,7 +69,6 @@ QPushButton#revealLogButton { QPushButton#showAllButton { font-family: Helvetica, Arial, sans-serif; - padding-left: 10px; background-color: #333333; color: #BBBBBB; border-width: 0; diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp index dedf96274e..0f6dac7bc8 100644 --- a/interface/src/ui/LogDialog.cpp +++ b/interface/src/ui/LogDialog.cpp @@ -19,7 +19,7 @@ #include const int REVEAL_BUTTON_WIDTH = 122; -const int SHOW_ALL_BUTTON_WIDTH = 100; +const int SHOW_ALL_BUTTON_WIDTH = 80; const int DEBUG_CHECKBOX_LEFT = 25; const int DEBUG_CHECKBOX_WIDTH = 70; const int INFO_CHECKBOX_WIDTH = 65; @@ -89,7 +89,7 @@ LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLog _filterDropdown = new QComboBox(this); _filterDropdown->setGeometry(_leftPad, ELEMENT_MARGIN + ELEMENT_MARGIN + ELEMENT_HEIGHT, COMBOBOX_WIDTH, ELEMENT_HEIGHT); - _filterDropdown->addItem("Select secondary filter..."); + _filterDropdown->addItem("No secondary filter..."); _filterDropdown->addItem("default"); _filterDropdown->addItem("hifi.audio"); _filterDropdown->addItem("hifi.audioclient"); @@ -112,8 +112,6 @@ LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLog _filterDropdown->addItem("hifi.shared"); _filterDropdown->addItem("hifi.ui"); _filterDropdown->addItem("qml"); - _filterDropdown->addItem("hifi.ui"); - _filterDropdown->addItem("hifi.avatars"); connect(_filterDropdown, SIGNAL(currentIndexChanged(int)), this, SLOT(handleFilterDropdownChanged(int))); } @@ -166,8 +164,7 @@ void LogDialog::handleCriticalPrintBox(int state) { void LogDialog::handleFilterDropdownChanged(int selection) { if (selection != 0) { _filterSelection = "[" + _filterDropdown->currentText() + "]"; - } - else { + } else { _filterSelection = ""; } printLogFile();