From 97fbb4acc1e9386ef11bafdc037a9f0931d88343 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Sun, 7 Sep 2014 19:40:12 +0400
Subject: [PATCH] update install scripts

---
 PKGBUILD                                            |  2 +-
 kdeplasma-applets-awesome-widgets.install           | 13 +++----------
 sources/awesome-widget/awesome-widget.h             |  4 ++--
 sources/awesome-widget/customlabel.cpp              |  1 +
 .../plasma_applet_awesome-widget.notifyrc           |  2 +-
 sources/awesome-widget/reinit.cpp                   |  7 ++++++-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 51b970d..82effbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=kdeplasma-applets-awesome-widgets
 _pkgname=awesome-widgets
 pkgver=1.11.0
 pkgrel=1
-pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets"
+pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
 url="http://arcanis.name/projects/awesome-widgets"
 license=('GPL3')
diff --git a/kdeplasma-applets-awesome-widgets.install b/kdeplasma-applets-awesome-widgets.install
index 5bcc549..8a30fde 100644
--- a/kdeplasma-applets-awesome-widgets.install
+++ b/kdeplasma-applets-awesome-widgets.install
@@ -1,18 +1,11 @@
-func_update() {
-  cat << EOF
-Update plasmoids...
-EOF
+post_install() {
   kbuildsycoca4 > /dev/null 2>&1
 }
 
-post_install() {
-  func_update
-}
-
 post_upgrade() {
-  func_update
+  post_install "$1"
 }
 
 post_remove() {
-  func_update
+  post_install "$1"
 }
diff --git a/sources/awesome-widget/awesome-widget.h b/sources/awesome-widget/awesome-widget.h
index 9ee45ce..77ebcdd 100644
--- a/sources/awesome-widget/awesome-widget.h
+++ b/sources/awesome-widget/awesome-widget.h
@@ -94,8 +94,8 @@ private:
     QStringList findKeys();
     QStringList getKeys();
     // ui
-    QGraphicsLinearLayout *mainLayout;
-    CustomLabel *textLabel;
+    QGraphicsLinearLayout *mainLayout = nullptr;
+    CustomLabel *textLabel = nullptr;
     QTimer *timer;
     QList<QAction *> contextMenu;
     // tooltip
diff --git a/sources/awesome-widget/customlabel.cpp b/sources/awesome-widget/customlabel.cpp
index fbff87f..bfa43f2 100644
--- a/sources/awesome-widget/customlabel.cpp
+++ b/sources/awesome-widget/customlabel.cpp
@@ -30,6 +30,7 @@ CustomLabel::CustomLabel(AwesomeWidget *wid, const bool debugCmd)
       widget(wid),
       debug(debugCmd)
 {
+    setWordWrap(false);
 }
 
 
diff --git a/sources/awesome-widget/plasma_applet_awesome-widget.notifyrc b/sources/awesome-widget/plasma_applet_awesome-widget.notifyrc
index 1739713..676cc62 100644
--- a/sources/awesome-widget/plasma_applet_awesome-widget.notifyrc
+++ b/sources/awesome-widget/plasma_applet_awesome-widget.notifyrc
@@ -1,6 +1,6 @@
 [Global]
 IconName=system
-Name=awesome-widget
+Name=Awesome Widget
 Comment=Awesome widget information
 
 [Event/system]
diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp
index de95435..a3efdfe 100644
--- a/sources/awesome-widget/reinit.cpp
+++ b/sources/awesome-widget/reinit.cpp
@@ -37,6 +37,10 @@ void AwesomeWidget::reinit()
 {
     if (debug) qDebug() << PDEBUG;
 
+    mainLayout->removeItem(textLabel);
+    if (textLabel != nullptr) delete textLabel;
+    setLayout(0);
+
     mainLayout = new QGraphicsLinearLayout();
     mainLayout->setContentsMargins(1, 1, 1, 1);
     if (configuration[QString("layout")].toInt() == 0)
@@ -51,12 +55,13 @@ void AwesomeWidget::reinit()
         setBackgroundHints(DefaultBackground);
     if (configuration[QString("leftStretch")].toInt() == 2)
         mainLayout->addStretch(1);
+    textLabel = new CustomLabel(this, debug);
     if (configuration[QString("popup")].toInt() == 0)
         textLabel->setPopupEnabled(false);
     else
         textLabel->setPopupEnabled(true);
-    updateText(true);
     mainLayout->addItem(textLabel);
+    updateText(true);
     if (configuration[QString("rightStretch")].toInt() == 2)
         mainLayout->addStretch(1);
     resize(10, 10);