From 95d94e1c8f658355e7ac57dc69407188a39913f6 Mon Sep 17 00:00:00 2001 From: RebeccaStankus Date: Wed, 20 Dec 2017 16:52:56 -0800 Subject: [PATCH] UI Done --- interface/resources/qml/js/Utils.jsc | Bin 6596 -> 6564 bytes interface/resources/styles/filter.png | Bin 0 -> 244 bytes interface/resources/styles/log_dialog.qss | 26 +++++++ interface/src/ui/BaseLogDialog.cpp | 2 +- interface/src/ui/BaseLogDialog.h | 3 +- interface/src/ui/LogDialog.cpp | 84 +++++++++++++++++++--- interface/src/ui/LogDialog.h | 9 ++- 7 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 interface/resources/styles/filter.png diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc index ab20e996b9469915ac6a89901da175143e6b5024..c4fe261851ea4fd2d8db3b2954a5a5d1be3b6d0f 100644 GIT binary patch delta 590 zcmZ9JL1+_E5QhKR?n)YrZ&T8y6+t9H1Os`}iXIeO3A(|w2GKTx!lpG#i!`Y=k)C9Q z99nW|or5_^58_EdSwRsmieQiRW-rx)PB~c}N<>`cG1~^FL)Zjc#1hXNu z-?Lr(hR%@5-P-f;XC3&a1G)i33?SpZ*RB&~`J_H@>=Nctz)j2}iAfYNgCfdEB83vB zP{Aw;ZKC{H%%BVl6-;_pbyFwl6$2lMq&F5k(d8UU*EFj(Y^Rq}@%m`3Z?ty7N7D)| z??7`3E$%=I3c3Fx*9DMXs>T;ut(Gsi5$ex$`nt=$p8l)b8Qi)r?El58FLE6*^6s?c zi+f)8Kho8pRJ?Az=xh*hEKzLm6Jb$?e+bF<0ttrfn zrpRqNmbks1Ir2rdTWt#S>-O5Oc6v2zFP8!_Z_At`lAPekVh!%k!PxeLOr+{S7a@w4eY0 delta 626 zcmZ2te8gC%u*@VmC9xz?kb!}Lfs>VC&A*2iV;C72bXXY}mb_f{tI)LMb*EnX9J{G= zWhd&iFd9tU7|!&7eKHqg7~_G-iHzY~3cMh#3=G`tlMgYvF&a$fWZEvcg@u9P2nz$l z6&41DCoBvMGMg_lWiv8bOtxi_WOruBXGmd4-Q3F}z`|&;c^=1oMn;RxbzC;gX$GF% zOdj1137(xUDl>e$#eBPiph6iSp$RBL1t6gg6rl=`Py@11LjwZ?gJ)-pO2z;G|Dh6- z75F54Am%nqfJ$c|q`_`zm;seYK$lnmm56{yI39PhnB2m5kdv7eWRZ)?jLGl$J(xDJ zOnxV*JUK>yZ}JU(VaC6c-|%}gDZm7I_&)Iq-167~3AzvVlLG|A>IEKu;*Wdiv18Uu z5cp`H=E0wLB8^|~A%B}T0|Nt0^#lj7#3%l^n=qjd5VfE9BQCyN`v3p`G!Oo|8$O0F zK+ak4iC^H;OMWB+7#KhXeDLiCyIl$-)BHwZ*W~3K(wh$m6o8`1P$*Fx8V(>gg3JMh zJ;<+{R|+LCP8JYpX0qU&T+gLEd54Gvqs8WrA}<+1BJ(+vC;u1YXSCSNFaC{@)dG|{ NCU4{so2($&0sz0f&b$Bs diff --git a/interface/resources/styles/filter.png b/interface/resources/styles/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..867cfe19bc55ec729d7092a371187e6491ed7249 GIT binary patch literal 244 zcmVUS(W*#730>rIA ze3}tS!Wf9_poV -const int TOP_BAR_HEIGHT = 46; +const int TOP_BAR_HEIGHT = 85; const int INITIAL_WIDTH = 720; const int INITIAL_HEIGHT = 480; const int MINIMAL_WIDTH = 700; diff --git a/interface/src/ui/BaseLogDialog.h b/interface/src/ui/BaseLogDialog.h index e18d23937f..899e99c0ab 100644 --- a/interface/src/ui/BaseLogDialog.h +++ b/interface/src/ui/BaseLogDialog.h @@ -17,7 +17,8 @@ const int ELEMENT_MARGIN = 7; const int ELEMENT_HEIGHT = 32; const int CHECKBOX_MARGIN = 12; -const int CHECKBOX_WIDTH = 140; +const int CHECKBOX_WIDTH = 110; +const int COMBOBOX_WIDTH = 160; const int BUTTON_MARGIN = 8; class QPushButton; diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp index cce7879e94..c38ad4e1de 100644 --- a/interface/src/ui/LogDialog.cpp +++ b/interface/src/ui/LogDialog.cpp @@ -13,23 +13,20 @@ #include #include +#include #include const int REVEAL_BUTTON_WIDTH = 122; +const int DEBUG_CHECKBOX_LEFT = 25; +const int DEBUG_CHECKBOX_WIDTH = 70; +const int INFO_CHECKBOX_WIDTH = 65; +const int CRITICAL_CHECKBOX_WIDTH = 85; LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLogDialog(parent) { _logger = logger; setWindowTitle("Log"); - _extraDebuggingBox = new QCheckBox("Extra debugging", this); - _extraDebuggingBox->setGeometry(_leftPad, ELEMENT_MARGIN, CHECKBOX_WIDTH, ELEMENT_HEIGHT); - if (_logger->extraDebugging()) { - _extraDebuggingBox->setCheckState(Qt::Checked); - } - _extraDebuggingBox->show(); - connect(_extraDebuggingBox, SIGNAL(stateChanged(int)), SLOT(handleExtraDebuggingCheckbox(int))); - _revealLogButton = new QPushButton("Reveal log file", this); // set object name for css styling _revealLogButton->setObjectName("revealLogButton"); @@ -37,14 +34,79 @@ LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLog connect(_revealLogButton, SIGNAL(clicked()), SLOT(handleRevealButton())); connect(_logger, SIGNAL(logReceived(QString)), this, SLOT(appendLogLine(QString)), Qt::QueuedConnection); + + _leftPad = DEBUG_CHECKBOX_LEFT; + + _debugPrintBox = new QCheckBox("DEBUG", this); + _debugPrintBox->setGeometry(_leftPad, ELEMENT_MARGIN + ELEMENT_MARGIN + ELEMENT_HEIGHT, DEBUG_CHECKBOX_WIDTH, ELEMENT_HEIGHT); + /*if (_logger->extraDebugging()) { + _extraDebuggingBox->setCheckState(Qt::Checked); + }*/ + _debugPrintBox->show(); + //connect(_extraDebuggingBox, SIGNAL(stateChanged(int)), SLOT(handleExtraDebuggingCheckbox(int))); + + _leftPad += DEBUG_CHECKBOX_WIDTH + BUTTON_MARGIN; + + _infoPrintBox = new QCheckBox("INFO", this); + _infoPrintBox->setGeometry(_leftPad, ELEMENT_MARGIN + ELEMENT_MARGIN + ELEMENT_HEIGHT, INFO_CHECKBOX_WIDTH, ELEMENT_HEIGHT); + /*if (_logger->extraDebugging()) { + _extraDebuggingBox->setCheckState(Qt::Checked); + }*/ + _infoPrintBox->show(); + //connect(_infoPrintBox, SIGNAL(stateChanged(int)), SLOT(handleExtraDebuggingCheckbox(int))); + + _leftPad += INFO_CHECKBOX_WIDTH + BUTTON_MARGIN; + + _criticalPrintBox = new QCheckBox("CRITICAL", this); + _criticalPrintBox->setGeometry(_leftPad, ELEMENT_MARGIN + ELEMENT_MARGIN + ELEMENT_HEIGHT, CRITICAL_CHECKBOX_WIDTH, ELEMENT_HEIGHT); + /*if (_logger->extraDebugging()) { + _extraDebuggingBox->setCheckState(Qt::Checked); + }*/ + _criticalPrintBox->show(); + //connect(_criticalPrintBox, SIGNAL(stateChanged(int)), SLOT(handleExtraDebuggingCheckbox(int))); + + _leftPad += CRITICAL_CHECKBOX_WIDTH + BUTTON_MARGIN; + + _extraDebuggingBox = new QCheckBox("Extra debugging", this); + _extraDebuggingBox->setGeometry(_leftPad, ELEMENT_MARGIN + ELEMENT_MARGIN + ELEMENT_HEIGHT, CHECKBOX_WIDTH, ELEMENT_HEIGHT); + if (_logger->extraDebugging()) { + _extraDebuggingBox->setCheckState(Qt::Checked); + } + _extraDebuggingBox->show(); + connect(_extraDebuggingBox, SIGNAL(stateChanged(int)), SLOT(handleExtraDebuggingCheckbox(int))); + + _leftPad += CHECKBOX_WIDTH + BUTTON_MARGIN; + + _filterDropdown = new QComboBox(this); + _filterDropdown->setGeometry(_leftPad, ELEMENT_MARGIN + ELEMENT_MARGIN + ELEMENT_HEIGHT, COMBOBOX_WIDTH, ELEMENT_HEIGHT); + _filterDropdown->addItem("Select filter..."); + _filterDropdown->addItem("hifi.scriptengine"); + _filterDropdown->addItem("hifi.scriptengine.module"); + _filterDropdown->addItem("hifi.shared"); + _filterDropdown->addItem("hifi.interface.deadlock"); + _filterDropdown->addItem("hifi.scriptengine.script"); + _filterDropdown->addItem("hifi.audioclient"); + _filterDropdown->addItem("hifi.networking"); + _filterDropdown->addItem("hifi.networking.resource"); + _filterDropdown->addItem("hifi.modelformat"); + _filterDropdown->addItem("default"); + _filterDropdown->addItem("qml"); + _filterDropdown->addItem("hifi.ui"); + _filterDropdown->addItem("hifi.avatars"); + + } void LogDialog::resizeEvent(QResizeEvent* event) { BaseLogDialog::resizeEvent(event); _revealLogButton->setGeometry(width() - ELEMENT_MARGIN - REVEAL_BUTTON_WIDTH, - ELEMENT_MARGIN, - REVEAL_BUTTON_WIDTH, - ELEMENT_HEIGHT); + ELEMENT_MARGIN, + REVEAL_BUTTON_WIDTH, + ELEMENT_HEIGHT); + _filterDropdown->setGeometry(width() - ELEMENT_MARGIN - COMBOBOX_WIDTH, + ELEMENT_MARGIN + ELEMENT_MARGIN + ELEMENT_HEIGHT, + COMBOBOX_WIDTH, + ELEMENT_HEIGHT); } void LogDialog::handleRevealButton() { diff --git a/interface/src/ui/LogDialog.h b/interface/src/ui/LogDialog.h index c8794b57ea..59c7ee7bc9 100644 --- a/interface/src/ui/LogDialog.h +++ b/interface/src/ui/LogDialog.h @@ -16,6 +16,7 @@ class QCheckBox; class QPushButton; +class QComboBox; class QResizeEvent; class AbstractLoggerInterface; @@ -25,17 +26,21 @@ class LogDialog : public BaseLogDialog { public: LogDialog(QWidget* parent, AbstractLoggerInterface* logger); -private slots: + private slots: void handleRevealButton(); void handleExtraDebuggingCheckbox(int); protected: void resizeEvent(QResizeEvent* event) override; QString getCurrentLog() override; - + private: QCheckBox* _extraDebuggingBox; QPushButton* _revealLogButton; + QCheckBox* _debugPrintBox; + QCheckBox* _infoPrintBox; + QCheckBox* _criticalPrintBox; + QComboBox* _filterDropdown; AbstractLoggerInterface* _logger; };