add click event, remove button

TODO: refactoring (including removal of unneeded pointers) and normal resize event

sources/plasmoid/netctl.cpp

@@ -28,13 +28,36 @@
 #include <plasma/theme.h>
 
 #include <QDebug>
-#include <QGraphicsLinearLayout>
+#include <QGraphicsSceneMouseEvent>
 #include <QMenu>
 #include <QProcessEnvironment>
 
 #include <version.h>
 
 
+IconLabel::IconLabel(Netctl *wid, const bool debugCmd)
+    : QLabel(),
+      debug(debugCmd),
+      widget(wid)
+{
+}
+
+
+IconLabel::~IconLabel()
+{
+    if (debug) qDebug() << "[PLASMOID]" << "[IconLabel]";
+}
+
+
+void IconLabel::mousePressEvent(QMouseEvent *event)
+{
+    if (debug) qDebug() << "[PLASMOID]" << "[mousePressEvent]";
+
+    if (event->button() == Qt::LeftButton)
+        widget->showGui();
+}
+
+
 Netctl::Netctl(QObject *parent, const QVariantList &args)
     : Plasma::PopupApplet(parent, args)
 {
@@ -48,6 +71,7 @@ Netctl::Netctl(QObject *parent, const QVariantList &args)
 
     this->setBackgroundHints(DefaultBackground);
     this->setHasConfigurationInterface(true);
+    connect(this, SIGNAL(activate()), this, SLOT(showGui()));
     // text format init
     formatLine.append(QString(""));
     formatLine.append(QString(""));
@@ -81,23 +105,15 @@ void Netctl::init()
     netctlEngine = dataEngine(QString("netctl"));
     createActions();
     // generate ui
-    graphicsWidget = new QGraphicsWidget();
+    graphicsWidget = new QWidget();
-    this->setGraphicsWidget(graphicsWidget);
+    graphicsWidget->setAttribute(Qt::WA_TranslucentBackground, true);
-    // main layout
+    this->setWidget(graphicsWidget);
-    fullSpaceLayout = new QGraphicsLinearLayout(graphicsWidget);
+    // layouts
-    fullSpaceLayout->setContentsMargins(1, 1, 1, 1);
+    layout = new QHBoxLayout(graphicsWidget);
-    graphicsWidget->setLayout(fullSpaceLayout);
+    layout->setContentsMargins(1, 1, 1, 1);
-
+    iconLabel = new IconLabel(this, debug);
-    // frames
+    layout->addWidget(iconLabel);
-    // icon
+    layout->addWidget(&textLabel);
-    iconWidget = new Plasma::IconWidget(KIcon(""), QString(), this);
-    iconWidget->setPreferredSize(30, 30);
-    connect(iconWidget, SIGNAL(clicked()), this, SLOT(showGui()));
-    fullSpaceLayout->addItem(iconWidget);
-    // text
-    textLabel = new Plasma::Label();
-    textLabel->setPreferredHeight(30);
-    fullSpaceLayout->addItem(textLabel);
 
     // read variables
     configChanged();
@@ -198,8 +214,10 @@ void Netctl::updateIcon()
     else
         icon = paths[QString("inactive")];
 
-    iconWidget->setIcon(icon);
     this->setPopupIcon(KIcon(icon));
+    QPixmap iconPixmap;
+    iconPixmap.load(icon);
+    iconLabel->setPixmap(iconPixmap);
 }
 
 
@@ -208,16 +226,9 @@ void Netctl::updateInterface(bool setShown)
     if (debug) qDebug() << "[PLASMOID]" << "[updateInterface]";
     if (debug) qDebug() << "[PLASMOID]" << "[updateInterface]" << ":" << "State" << setShown;
 
-    if (setShown) {
+    textLabel.setHidden(!setShown);
-        textLabel->show();
+    layout->setSizeConstraint(QLayout::SetMinimumSize);
-        fullSpaceLayout->updateGeometry();
+    graphicsWidget->resize(1, 1);
-        updateGeometry();
-    }
-    else {
-        textLabel->hide();
-        fullSpaceLayout->updateGeometry();
-        updateGeometry();
-    }
 }
 
 
@@ -523,7 +534,7 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
         if (bigInterface[QString("netDev")])
             text.append(info[QString("interfaces")]);
         if (bigInterface[QString("main")])
-            textLabel->setText(formatLine[0] + text.join(QString("<br>")) + formatLine[1]);
+            textLabel.setText(formatLine[0] + text.join(QString("<br>")) + formatLine[1]);
     }
     else if (sourceName == QString("extIp")) {
         info[QString("extIp")] = value;

sources/plasmoid/netctl.h

@@ -18,11 +18,7 @@
 #ifndef NETCTL_PLASMOID_H
 #define NETCTL_PLASMOID_H
 
-#include <Plasma/Applet>
 #include <Plasma/DataEngine>
-#include <Plasma/Frame>
-#include <Plasma/IconWidget>
-#include <Plasma/Label>
 #include <Plasma/PopupApplet>
 #include <QProcess>
 
@@ -33,6 +29,23 @@
 
 
 class QGraphicsLinearLayout;
+class Netctl;
+
+class IconLabel : public QLabel
+{
+    Q_OBJECT
+
+public:
+    IconLabel(Netctl *wid, const bool debugCmd);
+    ~IconLabel();
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+
+private:
+    bool debug;
+    Netctl *widget;
+};
 
 class Netctl : public Plasma::PopupApplet
 {
@@ -92,12 +105,11 @@ protected:
 
 private:
     // ui
-    QGraphicsWidget *graphicsWidget;
+    QWidget *graphicsWidget;
-    QGraphicsLinearLayout *fullSpaceLayout;
+    QHBoxLayout *layout;
-    // icon
+    IconLabel *iconLabel;
-    Plasma::IconWidget *iconWidget;
+    QLabel textLabel;
-    // text
+    // information
-    Plasma::Label *textLabel;
     bool status;
     QMap<QString, QString> info;
     QStringList profileList;

sources/plasmoid/widget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>480</width>
-    <height>339</height>
+    <height>337</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -20,16 +20,6 @@
    <string notr="true">Configuration Window</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label_info">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
    <item>
     <layout class="QHBoxLayout" name="layout_autoUpdate">
      <item>