diff --git a/PKGBUILD b/PKGBUILD index 55c6754..6d70e98 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,7 +19,7 @@ optdepends=("hddtemp: for HDD temperature monitor" makedepends=('automoc4' 'cmake') source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('5941cde214f5f93c3ec8963622ef1fdf') +md5sums=('c6a411dc069aedeb628fdf243983869e') backup=('usr/share/config/extsysmon.conf') build () { diff --git a/sources/ext-sysmon/extsysmon.cpp b/sources/ext-sysmon/extsysmon.cpp index 708e635..7c97bf0 100644 --- a/sources/ext-sysmon/extsysmon.cpp +++ b/sources/ext-sysmon/extsysmon.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -91,15 +92,15 @@ bool ExtendedSysMon::readConfiguration() if (fileStr[0] != '#') { if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 2) { if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("GPUDEV")) { - if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] == QString("ati")) - gpuDev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0]; - else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] == QString("nvidia")) - gpuDev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0]; - else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] != QString("auto")) + if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed() == QString("ati")) + gpuDev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed(); + else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed() == QString("nvidia")) + gpuDev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed(); + else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed() != QString("auto")) gpuDev = QString("ignore"); } else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("HDDDEV")) { - if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] != QString("all")) { + if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed() != QString("all")) { hddDev.clear(); for (int i=0; itoUnicode(player.readAllStandardOutput()); for (int i=0; itoUnicode(player.readAllStandardOutput()); for (int i=0; itoUnicode(player.readAllStandardOutput()); for (int i=0; i 0) or (self.parent.gpuBool > 0) or (self.parent.hddtempBool > 0) or (self.parent.playerBool > 0)): - self.parent.extsysmon = self.parent.dataEngine("ext-sysmon") + self.parent.extsysmon = self.parent.dataEngine("ext-sysmon") if (self.parent.timeBool > 0): self.parent.timemon = self.parent.dataEngine("time") @@ -271,23 +270,23 @@ class DataEngine: self.parent.label_hddtemp.setText(text) elif (sourceName == "player"): if (self.parent.player_name == 0): - album = str(data[QString(u'amarok_album')]) - artist = str(data[QString(u'amarok_artist')]) - progress = str(data[QString(u'amarok_progress')]) - time = str(data[QString(u'amarok_duration')]) - title = str(data[QString(u'amarok_title')]) + album = str(data[QString(u'amarok_album')].toUtf8()).decode("utf-8") + artist = str(data[QString(u'amarok_artist')].toUtf8()).decode("utf-8") + progress = str(data[QString(u'amarok_progress')].toUtf8()).decode("utf-8") + time = str(data[QString(u'amarok_duration')].toUtf8()).decode("utf-8") + title = str(data[QString(u'amarok_title')].toUtf8()).decode("utf-8") elif (self.parent.player_name == 1): - album = str(data[QString(u'mpd_album')]) - artist = str(data[QString(u'mpd_artist')]) - progress = str(data[QString(u'mpd_progress')]) - time = str(data[QString(u'mpd_duration')]) - title = str(data[QString(u'mpd_title')]) + album = str(data[QString(u'mpd_album')].toUtf8()).decode("utf-8") + artist = str(data[QString(u'mpd_artist')].toUtf8()).decode("utf-8") + progress = str(data[QString(u'mpd_progress')].toUtf8()).decode("utf-8") + time = str(data[QString(u'mpd_duration')].toUtf8()).decode("utf-8") + title = str(data[QString(u'mpd_title')].toUtf8()).decode("utf-8") elif (self.parent.player_name == 2): - album = str(data[QString(u'qmmp_album')]) - artist = str(data[QString(u'qmmp_artist')]) - progress = str(data[QString(u'qmmp_progress')]) - time = str(data[QString(u'qmmp_duration')]) - title = str(data[QString(u'qmmp_title')]) + album = str(data[QString(u'qmmp_album')].toUtf8()).decode("utf-8") + artist = str(data[QString(u'qmmp_artist')].toUtf8()).decode("utf-8") + progress = str(data[QString(u'qmmp_progress')].toUtf8()).decode("utf-8") + time = str(data[QString(u'qmmp_duration')].toUtf8()).decode("utf-8") + title = str(data[QString(u'qmmp_title')].toUtf8()).decode("utf-8") line = self.parent.playerFormat if (line.split('$album')[0] != line): line = line.split('$album')[0] + album + line.split('$album')[1] diff --git a/sources/ptm/contents/code/reinit.py b/sources/ptm/contents/code/reinit.py index ad6ebd4..3c68b48 100644 --- a/sources/ptm/contents/code/reinit.py +++ b/sources/ptm/contents/code/reinit.py @@ -305,9 +305,9 @@ class Reinit(): line = line.split('$artist')[0] + 'N\\A' + line.split('$artist')[1] if (line.split('$progress')[0] != line): line = line.split('$progress')[0] + '00:00' + line.split('$progress')[1] - if (line.split('$title') != line): + if (line.split('$title')[0] != line): line = line.split('$title')[0] + 'N\\A' + line.split('$title')[1] - if (line.split('$time') != line): + if (line.split('$time')[0] != line): line = line.split('$time')[0] + '00:00' + line.split('$time')[1] text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] self.parent.label_player.setText(text) diff --git a/sources/ptm/po/CMakeLists.txt b/sources/ptm/po/CMakeLists.txt index 808e520..f20acee 100644 --- a/sources/ptm/po/CMakeLists.txt +++ b/sources/ptm/po/CMakeLists.txt @@ -20,7 +20,7 @@ foreach (_current_PO_FILE ${_po_files}) WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DEPENDS ${_current_PO_FILE}) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION "share/apps/plasma/plasmoids/${SUBPROJECT}/locale/${_lang}/LC_MESSAGES" RENAME ${SUBPROJECT}.mo) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION "share/apps/plasma/plasmoids/${SUBPROJECT}/contents/locale/${_lang}/LC_MESSAGES" RENAME ${SUBPROJECT}.mo) list (APPEND _gmoFiles ${_gmoFile}) endforeach (_current_PO_FILE) add_custom_target (pofiles ALL DEPENDS ${_gmoFiles})