Minor changes

[evaf] / src / plugins / LogView / logview.h

diff --git a/src/plugins/LogView/logview.h b/src/plugins/LogView/logview.h
index 18000181a5b2dfe28c431c976c35fcc516286a43..e652f619b7d3e4aec5a1a1b10608ec50231449b1 100644 (file)
--- a/src/plugins/LogView/logview.h
+++ b/src/plugins/LogView/logview.h
@@ -22,6 +22,7 @@
 
 #include <Plugins/iPlugin>
 #include <Common/iLogger>
+#include <Gui/Panel>
 
 #include <QObject>
 #include <QString>
@@ -30,6 +31,11 @@
 #include <QQueue>
 #include <QDateTime>
 
+class QListView;
+class QLabel;
+class QTabWidget;
+class QStatusBar;
+class QEvent;
 
 namespace eVaf {
 
@@ -62,20 +68,22 @@ public:
             : dt(QDateTime::currentDateTime())
             , severity(s)
             , text(t)
+            , simplified(t.simplified())
             , where(w)
         {}
 
         QDateTime dt;
         Common::iLogger::Severity severity;
         QString text;
+        QString simplified;
         QString where;
     };
 
-    Model(QObject * parent = 0);
+    Model(QObject * parent = nullptr);
 
     Message const & messageAt(int idx) const { return mData.at(idx); }
 
-    virtual int rowCount(QModelIndex const & parent = QModelIndex()) const { return mData.size(); }
+    virtual int rowCount(QModelIndex const & = QModelIndex()) const { return mData.size(); }
 
     virtual QVariant data(QModelIndex const & index, int role = Qt::DisplayRole) const;
 
@@ -118,6 +126,8 @@ private: // Methods
 
 /**
  * The log view widget
+ *
+ * The Widget class implements a widget that shows messages from one logger source.
  */
 class Widget : public QWidget
 {
@@ -125,9 +135,59 @@ class Widget : public QWidget
 
 public:
 
-    Widget(QWidget * parent = 0, Qt::WindowFlags flags = 0);
+    Widget(QString const & source, QWidget * parent = nullptr);
+
+    QString const & source() const { return mSource; }
+
+    inline void addMessage(Common::iLogger::Severity severity, QString const & text, QString const & where)
+    {
+        mModel->addMessage(severity, text, where);
+    }
+
+
+private slots:
+
+    void messageAdded(QModelIndex const & index);
+
+    void currentChanged(QModelIndex const &, QModelIndex const &);
+
+    void copyToClipboard();
+
+    void saveToFile();
+
+
+private:
+
+    QString mSource;
+
+    Model * mModel;
+
+    bool mAutoScroll;
+
+    QListView * wList;
+    QLabel * wDetails;
+
+};
+
+/**
+ * The log view window
+ */
+class Window : public Gui::Panel
+{
+    Q_OBJECT
+
+public:
+
+    Window(QString const & args, QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
 
-    virtual ~Widget();
+    virtual ~Window();
+
+    virtual bool event(QEvent * e);
+
+
+public slots:
+
+    void loggerEvent(Common::iLogger::Severity severity, QString const & text, QString const & source, QString const & where);
 
 
 private: // Methods
@@ -136,6 +196,16 @@ private: // Methods
 
     void restoreSettings();
 
+    QString getPanelName(QString const & args) const;
+
+
+private: // Members
+
+    QString mDefSource;
+    QTabWidget * wTabs;
+    QHash<QString, Widget *> mLogViews;
+    QStatusBar * wStatusBar;
+
 };
 
 /**
@@ -144,6 +214,7 @@ private: // Methods
 class Module : public Plugins::iPlugin
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPlugin)
 
 public:
 
@@ -155,11 +226,11 @@ public:
 
     virtual void done();
 
-    virtual bool isReady() const { return wWidget != 0; }
+    virtual bool isReady() const { return wWindow != nullptr; }
 
 private: // Members
 
-    Widget * wWidget;
+    Window * wWindow;
 
 };