[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [pimcommon] /: Continue to implement logactivities
From:       Montel Laurent <null () kde ! org>
Date:       2017-01-31 20:05:03
Message-ID: E1cYefn-0000i0-MJ () code ! kde ! org
[Download RAW message or body]

Git commit fd1a0982122557af4795da807c95207daba99d52 by Montel Laurent.
Committed on 31/01/2017 at 20:04.
Pushed by mlaurent into branch 'master'.

Continue to implement logactivities

M  +1    -1    CMakeLists.txt
M  +5    -0    src/logactivities/autotests/logactivitieswidgettest.cpp
M  +35   -3    src/logactivities/logactivitiesmanager.cpp
M  +6    -1    src/logactivities/logactivitiesmanager.h
M  +6    -0    src/logactivities/logactivitieswidget.cpp
M  +3    -0    src/logactivities/logactivitieswidget.h

https://commits.kde.org/pimcommon/fd1a0982122557af4795da807c95207daba99d52

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8718980..4777352 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.4.40")
+set(PIM_VERSION "5.4.41")
 
 project(pimcommon VERSION ${PIM_VERSION})
 
diff --git a/src/logactivities/autotests/logactivitieswidgettest.cpp \
b/src/logactivities/autotests/logactivitieswidgettest.cpp index 1326ed9..25564a9 \
                100644
--- a/src/logactivities/autotests/logactivitieswidgettest.cpp
+++ b/src/logactivities/autotests/logactivitieswidgettest.cpp
@@ -17,6 +17,7 @@
 
 #include "logactivitieswidgettest.h"
 #include "../logactivitieswidget.h"
+#include <QPlainTextEdit>
 #include <QTest>
 #include <QVBoxLayout>
 
@@ -37,6 +38,10 @@ void LogActivitiesWidgetTest::shouldHaveDefaultValue()
     QVBoxLayout *mainLayout = w.findChild<QVBoxLayout \
*>(QStringLiteral("mainLayout"));  QVERIFY(mainLayout);
     QCOMPARE(mainLayout->margin(), 0);
+
+    QPlainTextEdit *mLog = w.findChild<QPlainTextEdit *>(QStringLiteral("log"));
+    QVERIFY(mLog);
+    QVERIFY(mLog->isReadOnly());
 }
 
 QTEST_MAIN(LogActivitiesWidgetTest)
diff --git a/src/logactivities/logactivitiesmanager.cpp \
b/src/logactivities/logactivitiesmanager.cpp index 0b6a661..42cda34 100644
--- a/src/logactivities/logactivitiesmanager.cpp
+++ b/src/logactivities/logactivitiesmanager.cpp
@@ -17,21 +17,40 @@
 
 
 #include "logactivitiesmanager.h"
+#include "logactivitiesdialog.h"
 #include <QtGlobal>
 
 using namespace PimCommon;
 
 Q_GLOBAL_STATIC(LogActivitiesManager, s_pLogActivitiesSelf)
 
+class PimCommon::LogActivitiesManagerPrivate
+{
+public:
+    LogActivitiesManagerPrivate()
+        : mDialog{nullptr}
+    {
+
+    }
+    ~LogActivitiesManagerPrivate()
+    {
+        delete mDialog;
+    }
+
+    QString mLog;
+    PimCommon::LogActivitiesDialog *mDialog;
+};
+
 LogActivitiesManager::LogActivitiesManager(QObject *parent)
-    : QObject(parent)
+    : QObject(parent),
+      d(new LogActivitiesManagerPrivate)
 {
 
 }
 
 LogActivitiesManager::~LogActivitiesManager()
 {
-
+    delete d;
 }
 
 LogActivitiesManager *LogActivitiesManager::self()
@@ -46,5 +65,18 @@ void LogActivitiesManager::appendLog(const QString &str)
 
 QString LogActivitiesManager::log() const
 {
-    return mLog;
+    return d->mLog;
+}
+
+void LogActivitiesManager::clear()
+{
+    d->mLog.clear();
+}
+
+void LogActivitiesManager::showLogActivitiesDialog()
+{
+    if (!d->mDialog) {
+        d->mDialog = new PimCommon::LogActivitiesDialog();
+    }
+    d->mDialog->show();
 }
diff --git a/src/logactivities/logactivitiesmanager.h \
b/src/logactivities/logactivitiesmanager.h index 207963a..b67c8f2 100644
--- a/src/logactivities/logactivitiesmanager.h
+++ b/src/logactivities/logactivitiesmanager.h
@@ -22,6 +22,7 @@
 #include "pimcommon_export.h"
 namespace PimCommon
 {
+class LogActivitiesManagerPrivate;
 class PIMCOMMON_EXPORT LogActivitiesManager : public QObject
 {
     Q_OBJECT
@@ -35,8 +36,12 @@ public:
 
     QString log() const;
 
+    void clear();
+
+    void showLogActivitiesDialog();
+
 private:
-    QString mLog;
+    LogActivitiesManagerPrivate *const d;
 };
 }
 #endif // LOGACTIVITIESMANAGER_H
diff --git a/src/logactivities/logactivitieswidget.cpp \
b/src/logactivities/logactivitieswidget.cpp index 9116f99..3687448 100644
--- a/src/logactivities/logactivitieswidget.cpp
+++ b/src/logactivities/logactivitieswidget.cpp
@@ -17,6 +17,7 @@
 
 #include "logactivitieswidget.h"
 #include <KLocalizedString>
+#include <QPlainTextEdit>
 #include <QVBoxLayout>
 
 using namespace PimCommon;
@@ -27,6 +28,11 @@ LogActivitiesWidget::LogActivitiesWidget(QWidget *parent)
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setMargin(0);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
+
+    mLog = new QPlainTextEdit(this);
+    mLog->setObjectName(QStringLiteral("log"));
+    mLog->setReadOnly(true);
+    mainLayout->addWidget(mLog);
 }
 
 LogActivitiesWidget::~LogActivitiesWidget()
diff --git a/src/logactivities/logactivitieswidget.h \
b/src/logactivities/logactivitieswidget.h index ee174a5..a56b76f 100644
--- a/src/logactivities/logactivitieswidget.h
+++ b/src/logactivities/logactivitieswidget.h
@@ -20,6 +20,7 @@
 
 #include <QWidget>
 #include "pimcommon_export.h"
+class QPlainTextEdit;
 namespace PimCommon
 {
 class PIMCOMMON_EXPORT LogActivitiesWidget : public QWidget
@@ -28,6 +29,8 @@ class PIMCOMMON_EXPORT LogActivitiesWidget : public QWidget
 public:
     explicit LogActivitiesWidget(QWidget *parent = nullptr);
     ~LogActivitiesWidget();
+private:
+    QPlainTextEdit *mLog;
 };
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]