aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop/desktop-plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src-qt5/core/lumina-desktop/desktop-plugins')
-rw-r--r--src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.h11
-rw-r--r--src-qt5/core/lumina-desktop/desktop-plugins/systemmonitor/MonitorWidget.cpp7
2 files changed, 13 insertions, 5 deletions
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.h b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.h
index 34a75ce8..c8e3a475 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.h
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.h
@@ -30,7 +30,7 @@ public:
~AppLauncherPlugin(){}
void Cleanup(); //special function for final cleanup
-
+
private:
QToolButton *button;
QFileSystemWatcher *watcher;
@@ -45,7 +45,7 @@ private slots:
void iconLoaded(QString);
//void openContextMenu();
-
+
//void increaseIconSize();
//void decreaseIconSize();
//void deleteFile();
@@ -63,11 +63,16 @@ public slots:
void LocaleChange(){
loadButton(); //force reload
}
-
+
protected:
void resizeEvent(QResizeEvent *ev){
LDPlugin::resizeEvent(ev);
QTimer::singleShot(100, this, SLOT(loadButton()) );
}
+ void changeEvent(QEvent *ev){
+ LDPlugin::changeEvent(ev);
+ QEvent::Type tmp = ev->type();
+ if(tmp == QEvent::StyleChange || tmp==QEvent::ThemeChange || tmp==QEvent::LanguageChange || tmp==QEvent::LocaleChange){ loadButton(); }
+ }
};
#endif
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/systemmonitor/MonitorWidget.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/systemmonitor/MonitorWidget.cpp
index 951bcc98..7097e2a9 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/systemmonitor/MonitorWidget.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/systemmonitor/MonitorWidget.cpp
@@ -17,6 +17,9 @@ MonitorWidget::MonitorWidget(QWidget *parent) : QWidget(parent), ui(new Ui::Moni
upTimer->setInterval(2000); //update every 2 seconds
connect(upTimer, SIGNAL(timeout()), this, SLOT(UpdateStats()) );
LoadIcons();
+ ui->label->setText( tr("CPU Temp:") );
+ ui->label_2->setText( tr("CPU Usage:") );
+ ui->label_3->setText( tr("Mem Usage:") );
upTimer->start();
}
@@ -25,7 +28,7 @@ MonitorWidget::~MonitorWidget(){
}
void MonitorWidget::LoadIcons(){
- ui->tabWidget->setTabIcon(0,LXDG::findIcon("appointment-recurring","") ); //Summary
+ ui->tabWidget->setTabIcon(0,LXDG::findIcon("appointment-blank","") ); //Summary
ui->tabWidget->setTabIcon(1,LXDG::findIcon("drive-harddisk","") ); //Disk Usage
//ui->tabWidget->setTabIcon(1,LXDG::findIcon("cpu","") ); //CPU Log
//ui->tabWidget->setTabIcon(2,LXDG::findIcon("media-flash-memory-stick","") ); //Mem Log
@@ -60,4 +63,4 @@ SysMonitorPlugin::SysMonitorPlugin(QWidget *parent, QString ID) : LDPlugin(paren
SysMonitorPlugin::~SysMonitorPlugin(){
//qDebug() << "Remove SysMonitorPlugin";
-} \ No newline at end of file
+}
bgstack15