Merge pull request #1 from Bollos00/dev

Upgrade to version 1.1

Author: Bollos00

QtMessageFilter/QtMessageFilter.pri

@@ -1,7 +1,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2020 Bollos00
+# Copyright (c) 2020-2021  Bruno Bollos Correa
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

QtMessageFilter/src/QtMessageFilter/qtmessagefilter.cpp

@@ -1,7 +1,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2020 Bollos00
+// Copyright (c) 2020-2021  Bruno Bollos Correa
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -31,16 +31,17 @@
 #include <QTimer>
 #include <QApplication>
 #include <QMutex>
+#include <QScrollBar>
 
 QtMessageFilter* QtMessageFilter::m_singleton_instance = nullptr;
 
 // For multi-thread safe
-QMutex mutex;
+QMutex qtMessageFilterMutex;
 
-void QtMessageFilter::resetInstance(QWidget* parent, bool hide)
+void QtMessageFilter::resetInstance(QWidget* parent, bool hide, const ulong maximumItensSize, const ulong maximumMessageDetailsSize)
 {
     delete QtMessageFilter::m_singleton_instance;
-    QtMessageFilter::m_singleton_instance = new QtMessageFilter(parent);
+    QtMessageFilter::m_singleton_instance = new QtMessageFilter(parent, maximumItensSize, maximumMessageDetailsSize);
 
     if(!hide)
         QtMessageFilter::showDialog();
@@ -130,7 +131,7 @@ void QtMessageFilter::reject()
     this->hide();
 }
 
-QtMessageFilter::QtMessageFilter(QWidget *parent)
+QtMessageFilter::QtMessageFilter(QWidget *parent, const ulong maximumItensSize, const ulong maximumMessageDetailsSize)
     : QDialog(parent),
       m_debug(),
       m_info(),
@@ -152,8 +153,8 @@ QtMessageFilter::QtMessageFilter(QWidget *parent)
       m_current_dialog_vertical_layout(new QVBoxLayout(m_current_dialog)),
       m_current_dialog_text(new QPlainTextEdit(m_current_dialog)),
       m_log_file(new QFile()),
-      m_maximum_itens_size(100),
-      m_maximum_message_details_size(100)
+      m_maximum_itens_size(maximumItensSize),
+      m_maximum_message_details_size(maximumMessageDetailsSize)
 {
     f_configure_ui();
 
@@ -257,7 +258,7 @@ void QtMessageFilter::f_configure_ui()
     this->setLayout(m_vertical_layout_global);
 
     // Maximum and minimum sizes of the dialog
-    this->setMaximumSize(800, 1200);
+    this->setMaximumSize(800, 1600);
     this->setMinimumSize(400, 500);
 
     // This looks unecessary, I shall investigate another option
@@ -302,12 +303,12 @@ void QtMessageFilter::f_configure_ui()
 
 void QtMessageFilter::f_message_filter(const QtMsgType type, const QMessageLogContext& context, const QString& msg)
 {
-    mutex.lock();
+    qtMessageFilterMutex.lock();
 
     if(QtMessageFilter::good())
         QtMessageFilter::f_instance()->f_message_output(type, context, msg);
 
-    mutex.unlock();
+    qtMessageFilterMutex.unlock();
 }
 
 void QtMessageFilter::f_message_output(const QtMsgType type,
@@ -553,7 +554,6 @@ void QtMessageFilter::f_remove_item_from_list(QSharedPointer<MessageDetails> mes
 
 void QtMessageFilter::slot_create_message_item(QSharedPointer<MessageDetails> messageDetails)
 {
-    MessageItem* item = new MessageItem(m_widget_scroll_area);
     QString styleSheet;
 
     switch(messageDetails->type)
@@ -578,13 +578,26 @@ void QtMessageFilter::slot_create_message_item(QSharedPointer<MessageDetails> me
             return;
     }
 
+    MessageItem* item = new MessageItem(m_widget_scroll_area);
+
     item->setText(messageDetails->message);
     item->setStyleSheet(styleSheet);
     m_list.append(QPair< QSharedPointer<MessageDetails>, MessageItem* >(messageDetails, item));
     item->adjustSize();
     m_vertical_layout_scroll_area->addWidget(item);
     item->show();
 
+    // Force update of the list of messages
+    qApp->processEvents();
+
+    // If the item further below is visible, make sure the new item continues visible as well
+    const bool lockDownertical = m_scroll_area->verticalScrollBar()->maximum() - m_scroll_area->verticalScrollBar()->value() < 50;
+
+    if(lockDownertical)
+    {
+        m_scroll_area->verticalScrollBar()->setValue(m_scroll_area->verticalScrollBar()->maximum());
+    }
+
     // Is this the best way of doing it?
     connect(item, &MessageItem::SIGNAL_leftButtonReleased,
             [this, messageDetails]{f_create_dialog_with_message_details(*messageDetails);});

QtMessageFilter/src/QtMessageFilter/qtmessagefilter.h

@@ -1,7 +1,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2020 Bollos00
+// Copyright (c) 2020-2021  Bruno Bollos Correa
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -144,7 +144,7 @@ class QtMessageFilter : public QDialog
 
 public:
 
-    static void resetInstance(QWidget* parent = nullptr, bool hideDialog = false);
+    static void resetInstance(QWidget* parent = nullptr, bool hideDialog = false, const ulong maximumItensSize = 100, const ulong maximumMessageDetailsSize = 10);
     static void releaseInstance();
     static bool good();
 
@@ -163,7 +163,7 @@ class QtMessageFilter : public QDialog
 
 private:
 
-    QtMessageFilter(QWidget *parent = nullptr);
+    QtMessageFilter(QWidget *parent = nullptr, const ulong maximumItensSize = 100, const ulong maximumMessageDetailsSize = 10);
     QtMessageFilter(const QtMessageFilter& that) = delete;
     QtMessageFilter(QtMessageFilter&& that) = delete;
     ~QtMessageFilter();

README.md

@@ -5,9 +5,11 @@ This repository implements a [Message Handler for Qt Applications](https://doc.q
 
 ![Qt Message Filter example](./share/Screenshot0.png)
 
-If you want to include this feature on your project, just get the content of `./QtMessageFilter` and include the `QtMessageFilter.pri` file on your project, something like:
+If you are using QMake and want to include this feature on your project, just get the content of `./QtMessageFilter` and include the `QtMessageFilter.pri` file on your project, something like:
 ```qmake
 include(QtMessageFilter/QtMessageFilter.pri)
 ```
 
-It can receive messages coming from multiple threads and can be initialized with `QtMessageFilter::resetInstance()`, calling this will install the message handler and make all messages to be treated on the `QtMessageFilter` class. Even tho it is expected to use it during all run time, you can reinstall the default message handler calling `QtMessageFilter::releaseInstance()`, this will also delete the instance of the class. You can omit and show the QtMessageFilter GUI calling `QtMessageFilter::hideDialog()` and `QtMessageFilter::showDialog()`. I have ~~lazily~~ documented the behaviour of this class with a little more details [here](https://github.com/Bollos00/QtMessageFilter/blob/master/QtMessageFilter/src/QtMessageFilter/qtmessagefilter.h), you may also want to see a silly implementation of on the `tests` directory.
+It can receive messages coming from multiple threads and can be initialized with `QtMessageFilter::resetInstance()`, calling this will install the message handler and make all messages to be treated on the `QtMessageFilter` class. Even tho it is expected to use it during all run time, you can reinstall the default message handler calling `QtMessageFilter::releaseInstance()`, this will also delete the instance of the class. You can omit and show the QtMessageFilter GUI calling `QtMessageFilter::hideDialog()` and `QtMessageFilter::showDialog()`. I have ~~lazily~~ documented the behaviour of this class with a little more details [here](https://github.com/Bollos00/QtMessageFilter/blob/master/QtMessageFilter/src/QtMessageFilter/qtmessagefilter.h).
+
+You may also want to see a silly implementation of on the `tests` directory, the example shows a simple gui that create messages of the four different types each 0,5 seconds. There, it is also possible to hide and show the QtMessageFilter dialog and reinstall the message handler.

tests/main.cpp

@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2020 Bollos00
+// Copyright (c) 2020-2021  Bruno Bollos Correa
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -29,6 +29,10 @@
 #include <QLabel>
 #include <QPushButton>
 
+
+// Set there the maximum number of items
+const int MAXIMUM_ITEMS_SIZE = 10;
+
 class TestWidget : public QMainWindow
 {
 public:
@@ -72,7 +76,7 @@ class TestWidget : public QMainWindow
            if(QtMessageFilter::good())
                QtMessageFilter::releaseInstance();
            else
-               QtMessageFilter::resetInstance(this);
+               QtMessageFilter::resetInstance(this, false, MAXIMUM_ITEMS_SIZE);
         });
 
     }
@@ -94,7 +98,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
 
     TestWidget* w = new TestWidget();
-    QtMessageFilter::resetInstance(w, true);
+    QtMessageFilter::resetInstance(w, true, MAXIMUM_ITEMS_SIZE);
 
     QTimer* tmr = new QTimer();
     QObject::connect(tmr, &QTimer::timeout,
@@ -103,19 +107,21 @@ int main(int argc, char *argv[])
         static int k=0;
 
         if(k%4 == 0)
+        {
             qDebug()<<"Teste "<< k;
+        }
         else if(k%4 == 1)
+        {
             qInfo()<<"Teste "<< k<<'\n'<<"A great line of text, but a big, very and very big line of text, lot of characteres in one single line";
+        }
         else if(k%4 == 2)
+        {
             qWarning()<<"Teste "<< k<<'\n'<<"Another line here";
+        }
         else
+        {
             qCritical()<<"Teste "<< k;
-
-//        if(k%20 == 9)
-//            QtMessageFilter::hideDialog();
-
-//        if(k%20 == 19)
-//            QtMessageFilter::showDialog();
+        }
 
         k++;
     });

tests/test0.pro

@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2020 Bollos00
+# Copyright (c) 2020-2021  Bruno Bollos Correa
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal