arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-15 22:59:57 +00:00
Code Issues Projects Releases Wiki Activity

some part of refactoring

Browse Source 
move plugin from private
fix translation issue (#50)
This commit is contained in:
arcan1s
2015-05-12 00:19:08 +03:00
parent daa362fc16
commit c6cadba4b6
41 changed files with 166 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/extsysmon/extquotes.cpp
View File

@ -206,7 +206,7 @@ void ExtQuotes::readConfiguration()
for (int i=m_dirs.count()-1; i>=0; i--) {
if (!QDir(m_dirs[i]).entryList(QDir::Files).contains(m_fileName)) continue;
QSettings settings(m_dirs[i] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setName(settings.value(QString("Name"), m_name).toString());
@ -277,18 +277,18 @@ int ExtQuotes::showConfiguration()
}
int ExtQuotes::tryDelete()
bool ExtQuotes::tryDelete()
{
if (debug) qDebug() << PDEBUG;
for (int i=0; i<m_dirs.count(); i++)
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << m_dirs[i] + QDir::separator() + m_fileName <<
QFile::remove(m_dirs[i] + QDir::separator() + m_fileName);
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << QString("%1/%2").arg(m_dirs[i]).arg(m_fileName) <<
QFile::remove(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName));
// check if exists
for (int i=0; i<m_dirs.count(); i++)
if (QFile::exists(m_dirs[i] + QDir::separator() + m_fileName)) return 0;
return 1;
if (QFile::exists(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName))) return false;
return true;
}
@ -296,7 +296,7 @@ void ExtQuotes::writeConfiguration()
{
if (debug) qDebug() << PDEBUG;
QSettings settings(m_dirs[0] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[0]).arg(m_fileName), QSettings::IniFormat);
if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));

4
sources/extsysmon/extquotes.h
View File

@ -42,7 +42,7 @@ class ExtQuotes : public QDialog
Q_PROPERTY(QString ticker READ ticker WRITE setTicker)
public:
explicit ExtQuotes(QWidget *parent = 0, const QString quotesName = QString(),
explicit ExtQuotes(QWidget *parent = nullptr, const QString quotesName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
~ExtQuotes();
// get methods
@ -68,7 +68,7 @@ public slots:
void readConfiguration();
QMap<QString, float> run();
int showConfiguration();
int tryDelete();
bool tryDelete();
void writeConfiguration();
private slots:

20
sources/extsysmon/extscript.cpp
View File

@ -285,7 +285,7 @@ void ExtScript::readConfiguration()
for (int i=m_dirs.count()-1; i>=0; i--) {
if (!QDir(m_dirs[i]).entryList(QDir::Files).contains(m_fileName)) continue;
QSettings settings(m_dirs[i] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setName(settings.value(QString("Name"), m_name).toString());
@ -329,8 +329,8 @@ QString ExtScript::run()
if (process.exitCode != 0)
if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
QString info = QString::number(process.exitCode) + QString(":") +
QTextCodec::codecForMib(106)->toUnicode(process.error).trimmed();
QString info = QString("%1 : %2").arg(process.exitCode)
.arg(QTextCodec::codecForMib(106)->toUnicode(process.error).trimmed());
QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
switch (m_redirect) {
case stdout2stderr:
@ -338,7 +338,7 @@ QString ExtScript::run()
if (debug) qDebug() << PDEBUG << ":" << "Output" << qoutput;
break;
case stderr2stdout:
value = info + QString("\t") + qoutput;
value = QString("%1\t%2").arg(info).arg(qoutput);
break;
default:
if (debug) qDebug() << PDEBUG << ":" << "Debug" << info;
@ -393,18 +393,18 @@ int ExtScript::showConfiguration()
}
int ExtScript::tryDelete()
bool ExtScript::tryDelete()
{
if (debug) qDebug() << PDEBUG;
for (int i=0; i<m_dirs.count(); i++)
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << m_dirs[i] + QDir::separator() + m_fileName <<
QFile::remove(m_dirs[i] + QDir::separator() + m_fileName);
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << QString("%1/%2").arg(m_dirs[i]).arg(m_fileName) <<
QFile::remove(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName));
// check if exists
for (int i=0; i<m_dirs.count(); i++)
if (QFile::exists(m_dirs[i] + QDir::separator() + m_fileName)) return 0;
return 1;
if (QFile::exists(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName))) return false;
return true;
}
@ -412,7 +412,7 @@ void ExtScript::writeConfiguration()
{
if (debug) qDebug() << PDEBUG;
QSettings settings(m_dirs[0] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[0]).arg(m_fileName), QSettings::IniFormat);
if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));

4
sources/extsysmon/extscript.h
View File

@ -46,7 +46,7 @@ public:
stderr2stdout
};
explicit ExtScript(QWidget *parent = 0, const QString scriptName = QString(),
explicit ExtScript(QWidget *parent = nullptr, const QString scriptName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
~ExtScript();
// get methods
@ -80,7 +80,7 @@ public slots:
void readConfiguration();
QString run();
int showConfiguration();
int tryDelete();
bool tryDelete();
void writeConfiguration();
private:

20
sources/extsysmon/extsysmon.cpp
View File

@ -76,7 +76,7 @@ QString ExtendedSysMon::getAllHdd()
QStringList allDevices = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
QStringList devices = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
for (int i=0; i<devices.count(); i++)
devices[i] = QString("/dev/") + devices[i];
devices[i] = QString("/dev/%1").arg(devices[i]);
if (debug) qDebug() << PDEBUG << ":" << "Device list" << devices;
return devices.join(QChar(','));
@ -107,7 +107,7 @@ QString ExtendedSysMon::getAutoMpris()
if (debug) qDebug() << PDEBUG;
QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, QString("ListNames"));
if (listServices.arguments().count() == 0) return QString();
if (listServices.arguments().isEmpty()) return QString();
QStringList arguments = listServices.arguments()[0].toStringList();
for (int i=0; i<arguments.count(); i++) {
@ -136,8 +136,8 @@ void ExtendedSysMon::initQuotes()
dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/quotes");
#else
localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
QString("/awesomewidgets/quotes");
localDir = QString("%1/awesomewidgets/quotes")
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
QDir localDirectory;
if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir)))
if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir;
@ -175,8 +175,8 @@ void ExtendedSysMon::initScripts()
dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/scripts");
#else
localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
QString("/awesomewidgets/scripts");
localDir = QString("%1/awesomewidgets/scripts")
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
QDir localDirectory;
if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir)))
if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir;
@ -214,8 +214,8 @@ void ExtendedSysMon::initUpgrade()
dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/upgrade");
#else
localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
QString("/awesomewidgets/upgrade");
localDir = QString("%1/awesomewidgets/upgrade")
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
QDir localDirectory;
if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir)))
if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir;
@ -356,9 +356,9 @@ QMap<QString, QVariant> ExtendedSysMon::getBattery(const QString acpiPath)
if (allDevices[i].contains(batRegexp))
batDevices.append(allDevices[i]);
for (int i=0; i<batDevices.count(); i++) {
QFile batFile(acpiPath + QString("/") + batDevices[i] + QString("/capacity"));
QFile batFile(QString("%1/%2/capacity").arg(acpiPath).arg(batDevices[i]));
if (batFile.open(QIODevice::ReadOnly))
battery[QString("bat") + QString::number(i)] = QString(batFile.readLine()).trimmed().toInt();
battery[QString("bat%1").arg(i)] = QString(batFile.readLine()).trimmed().toInt();
batFile.close();
}
float number = 0.0;

12
sources/extsysmon/extsysmon.h
View File

@ -40,12 +40,12 @@ public:
float getHddTemp(const QString cmd, const QString device);
QString getNetworkDevice();
QMap<QString, QVariant> getPlayerInfo(const QString playerName,
const QString mpdAddress = 0,
const QString mpdPort = 0,
const QString mpris = 0);
QMap<QString, QVariant> getPlayerMpdInfo(const QString mpdAddress = 0,
const QString mpdPort = 0);
QMap<QString, QVariant> getPlayerMprisInfo(const QString mpris = 0);
const QString mpdAddress = QString(),
const QString mpdPort = QString(),
const QString mpris = QString());
QMap<QString, QVariant> getPlayerMpdInfo(const QString mpdAddress = QString(),
const QString mpdPort = QString());
QMap<QString, QVariant> getPlayerMprisInfo(const QString mpris = QString());
QMap<QString, QVariant> getPsStats();
protected:

16
sources/extsysmon/extupgrade.cpp
View File

@ -216,7 +216,7 @@ void ExtUpgrade::readConfiguration()
for (int i=m_dirs.count()-1; i>=0; i--) {
if (!QDir(m_dirs[i]).entryList(QDir::Files).contains(m_fileName)) continue;
QSettings settings(m_dirs[i] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setName(settings.value(QString("Name"), m_name).toString());
@ -245,7 +245,7 @@ int ExtUpgrade::run()
if (!m_active) return value;
if (times == 1) {
TaskResult process = runTask(QString("bash -c \"") + m_executable + QString("\""));
TaskResult process = runTask(QString("bash -c \"%1\"").arg(m_executable));
if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
if (process.exitCode != 0)
if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
@ -293,18 +293,18 @@ int ExtUpgrade::showConfiguration()
}
int ExtUpgrade::tryDelete()
bool ExtUpgrade::tryDelete()
{
if (debug) qDebug() << PDEBUG;
for (int i=0; i<m_dirs.count(); i++)
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << m_dirs[i] + QDir::separator() + m_fileName <<
QFile::remove(m_dirs[i] + QDir::separator() + m_fileName);
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << QString("%1/%2").arg(m_dirs[i]).arg(m_fileName) <<
QFile::remove(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName));
// check if exists
for (int i=0; i<m_dirs.count(); i++)
if (QFile::exists(m_dirs[i] + QDir::separator() + m_fileName)) return 0;
return 1;
if (QFile::exists(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName))) return false;
return true;
}
@ -312,7 +312,7 @@ void ExtUpgrade::writeConfiguration()
{
if (debug) qDebug() << PDEBUG;
QSettings settings(m_dirs[0] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[0]).arg(m_fileName), QSettings::IniFormat);
if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));

4
sources/extsysmon/extupgrade.h
View File

@ -38,7 +38,7 @@ class ExtUpgrade : public QDialog
Q_PROPERTY(int interval READ interval WRITE setInterval)
public:
explicit ExtUpgrade(QWidget *parent = 0, const QString upgradeName = QString(),
explicit ExtUpgrade(QWidget *parent = nullptr, const QString upgradeName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
~ExtUpgrade();
// get methods
@ -66,7 +66,7 @@ public slots:
void readConfiguration();
int run();
int showConfiguration();
int tryDelete();
bool tryDelete();
void writeConfiguration();
private: