From b1fbc1deca2cee97fc62fcf3e2b88a6775b4cedd Mon Sep 17 00:00:00 2001 From: Nicu Badescu Date: Sat, 26 Jul 2014 16:07:53 +0300 Subject: [PATCH 1/2] Add a QLineEdit and a QPushButton to "Log" tab --- src/dlgdevelopertoolsdlg.ui | 47 +++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/src/dlgdevelopertoolsdlg.ui b/src/dlgdevelopertoolsdlg.ui index 14a0869167d..4149ea335f2 100644 --- a/src/dlgdevelopertoolsdlg.ui +++ b/src/dlgdevelopertoolsdlg.ui @@ -17,7 +17,7 @@ - 0 + 1 @@ -27,6 +27,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -55,8 +68,18 @@ + + + + + Log + + + + + - + Qt::Horizontal @@ -68,14 +91,14 @@ - - - - - Log - - - + + + + Search + + + + true @@ -84,8 +107,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'.Lucida Grande UI'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Lucida Grande UI'; font-size:13pt;"><br /></p></body></html> true From bc2b64053c3a7ca8e0493c8a2589c2e40d578615 Mon Sep 17 00:00:00 2001 From: Nicu Badescu Date: Sat, 26 Jul 2014 16:08:35 +0300 Subject: [PATCH 2/2] Add search functionality to Developer's Log --- src/dlgdevelopertools.cpp | 14 ++++++++++++++ src/dlgdevelopertools.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/src/dlgdevelopertools.cpp b/src/dlgdevelopertools.cpp index 2a590d12e76..a66b76ad6ee 100644 --- a/src/dlgdevelopertools.cpp +++ b/src/dlgdevelopertools.cpp @@ -51,6 +51,14 @@ DlgDeveloperTools::DlgDeveloperTools(QWidget* pParent, connect(controlSearch, SIGNAL(searchCleared()), this, SLOT(slotControlSearchClear())); + // Set up the log search box + connect(logSearch, SIGNAL(returnPressed()), + this, SLOT(slotLogSearch())); + connect(logSearchButton, SIGNAL(clicked()), + this, SLOT(slotLogSearch())); + + m_logCursor = logTextView->textCursor(); + // Update at 2FPS. startTimer(500); @@ -98,3 +106,9 @@ void DlgDeveloperTools::slotControlSearch(const QString& search) { void DlgDeveloperTools::slotControlSearchClear() { m_controlProxyModel.setFilterFixedString(QString()); } + +void DlgDeveloperTools::slotLogSearch() { + QString textToFind = logSearch->text(); + m_logCursor = logTextView->document()->find(textToFind, m_logCursor); + logTextView->setTextCursor(m_logCursor); +} diff --git a/src/dlgdevelopertools.h b/src/dlgdevelopertools.h index 3646f0ceec8..1252c9ee46c 100644 --- a/src/dlgdevelopertools.h +++ b/src/dlgdevelopertools.h @@ -24,6 +24,7 @@ class DlgDeveloperTools : public QDialog, public Ui::DlgDeveloperTools { private slots: void slotControlSearch(const QString& search); void slotControlSearchClear(); + void slotLogSearch(); private: ControlModel m_controlModel; @@ -33,6 +34,8 @@ class DlgDeveloperTools : public QDialog, public Ui::DlgDeveloperTools { QSortFilterProxyModel m_statProxyModel; QFile m_logFile; + QTextCursor m_logCursor; + }; #endif /* DLGDEVELOPERTOOLS_H */