arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 23:47:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:arcan1s/awesome-widgets

Browse Source
This commit is contained in:
arcan1s 2014-10-01 02:02:13 +04:00
commit 952fa97fcc
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,5 +1,5 @@
Ver.2.0.5:
+ add tooltip bottom (#20)
+ add tooltip bottom (#30)
* fix battery tooltip bug
Ver.2.0.4:

2
CHANGELOG-RU
View File

@ -1,5 +1,5 @@
Вер.2.0.5:
+ добавлен нижний край к тултипу (#20)
+ добавлен нижний край к тултипу (#30)
* исправлен баг с тултипом батареи
Вер.2.0.4:

2
sources/awesome-widget/awesome-widget.cpp
View File

@ -83,9 +83,9 @@ void AwesomeWidget::createActions()
connect(contextMenu[1], SIGNAL(triggered(bool)), this, SLOT(showReadme()));
contextMenu.append(new QAction(QIcon::fromTheme(QString("stock-refresh")),
i18n("Update text"), this));
connect(contextMenu[2], SIGNAL(triggered(bool)), this, SLOT(updateNetworkDevice()));
connect(contextMenu[2], SIGNAL(triggered(bool)), extsysmonEngine, SLOT(updateAllSources()));
connect(contextMenu[2], SIGNAL(triggered(bool)), sysmonEngine, SLOT(updateAllSources()));
connect(contextMenu[2], SIGNAL(triggered(bool)), this, SLOT(updateNetworkDevice()));
}

2
sources/awesome-widget/awesome-widget.h
View File

@ -65,7 +65,7 @@ public slots:
void configChanged();
// update events
void sendNotification(const QString eventId, const QString message);
void updateNetworkDevice();
void updateNetworkDevice(const bool delay = true);
void updateText(const bool clear = false);
void updateTooltip();

4
sources/awesome-widget/deinteraction.cpp
View File

@ -340,12 +340,12 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng
tooltipValues[QString("down")].append(data[QString("value")].toFloat());
}
networkDeviceUpdate++;
if (networkDeviceUpdate == 30) {
if (networkDeviceUpdate >= 30) {
networkDeviceUpdate = 0;
if (configuration[QString("useCustomNetdev")].toInt() == 0) {
sysmonEngine->disconnectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/transmitter/data"), this);
sysmonEngine->disconnectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/receiver/data"), this);
updateNetworkDevice();
updateNetworkDevice(false);
sysmonEngine->connectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/transmitter/data"),
this, configuration[QString("interval")].toInt());
sysmonEngine->connectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/receiver/data"),

7
sources/awesome-widget/reinit.cpp
View File

@ -43,7 +43,7 @@ void AwesomeWidget::reinit()
keys = getKeys();
foundKeys = findKeys();
updateNetworkDevice();
updateNetworkDevice(false);
connectToEngine();
}
@ -63,10 +63,13 @@ void AwesomeWidget::sendNotification(const QString eventId, const QString messag
}
void AwesomeWidget::updateNetworkDevice()
void AwesomeWidget::updateNetworkDevice(const bool delay)
{
if (debug) qDebug() << PDEBUG;
if (delay)
networkDeviceUpdate = 30;
else
values[QString("netdev")] = getNetworkDevice();
}