From a65f4cb02f277581d5a5c5ee745df783bad95f37 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Mon, 1 Sep 2014 20:58:47 +0400
Subject: [PATCH] commit before tests

---
 sources/awesome-widget/awesome-widget.h  |  2 +-
 sources/awesome-widget/configuration.cpp |  6 +++---
 sources/awesome-widget/reinit.cpp        | 10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/sources/awesome-widget/awesome-widget.h b/sources/awesome-widget/awesome-widget.h
index eeff04c..47e2fda 100644
--- a/sources/awesome-widget/awesome-widget.h
+++ b/sources/awesome-widget/awesome-widget.h
@@ -60,7 +60,7 @@ public slots:
     void configAccepted();
     void configChanged();
     // update events
-    void updateText();
+    void updateText(bool clear = false);
     void updateTooltip();
 
 private slots:
diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp
index 4552a20..e7fcf4c 100644
--- a/sources/awesome-widget/configuration.cpp
+++ b/sources/awesome-widget/configuration.cpp
@@ -521,7 +521,7 @@ void AwesomeWidget::configChanged()
     configuration[QString("upColor")] = cg.readEntry("upColor", "#ff00ff");
 
     // appearance
-    configuration[QString("interval")] = cg.readEntry("interval", "100");
+    configuration[QString("interval")] = cg.readEntry("interval", "1000");
     QString fontFamily = cg.readEntry("fontFamily", "Terminus");
     int fontSize = cg.readEntry("fontSize", 10);
     QString fontColor = cg.readEntry("fontColor", "#000000");
@@ -529,13 +529,13 @@ void AwesomeWidget::configChanged()
     QString fontStyle = cg.readEntry("fontStyle", "normal");
     formatLine[0] = QString("<html><head><meta name=\"qrichtext\" content=\"1\" />\
     <style type=\"text/css\">p, li { white-space: pre-wrap; }</style>\
-    </head><body style=\"font-family:'%1'; font-size:%2pt; font-weight:%3; font-style:%4; color:%5;\"><p>")
+    </head><body style=\"font-family:'%1'; font-size:%2pt; font-weight:%3; font-style:%4; color:%5;\"><pre>")
                 .arg(fontFamily)
                 .arg(QString::number(fontSize))
                 .arg(QString::number(fontWeight))
                 .arg(fontStyle)
                 .arg(fontColor);
-    formatLine[1] = QString("</p></body></html>");
+    formatLine[1] = QString("</pre></body></html>");
 
     // counts
     QMap<QString, QString> deSettings = readDataEngineConfiguration();
diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp
index 54e2d38..92fe1d2 100644
--- a/sources/awesome-widget/reinit.cpp
+++ b/sources/awesome-widget/reinit.cpp
@@ -62,18 +62,20 @@ void AwesomeWidget::reinit()
     values[QString("netdev")] = getNetworkDevice();
 //    thread()->wait(60000);
     connectToEngine();
+    updateText(true);
     resize(10, 10);
 }
 
 
-void AwesomeWidget::updateText()
+void AwesomeWidget::updateText(bool clear)
 {
     if (debug) qDebug() << PDEBUG;
 
     QString text = configuration[QString("text")];
-    for (int i=0; i<foundKeys.count(); i++)
-        text.replace(QString("$") + foundKeys[i] + QString("$"), values[foundKeys[i]]);
-    textLabel->setText(text);
+    if (!clear)
+        for (int i=0; i<foundKeys.count(); i++)
+            text.replace(QString("$") + foundKeys[i] + QString("$"), values[foundKeys[i]]);
+    textLabel->setText(formatLine[0] + text + formatLine[1]);
 }
 
 
