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

some code style improvements (#67)

Browse Source
This commit is contained in:
arcan1s
2015-10-10 00:51:24 +03:00
parent 827275da3f
commit 440d180c20
14 changed files with 287 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/awesomewidgets/abstractextitem.cpp
View File

@ -161,7 +161,8 @@ void AbstractExtItem::setInterval(const int _interval)
{
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Interval" << _interval;
if (_interval <= 0) return;
if (_interval <= 0)
return;
m_interval = _interval;
}
@ -198,8 +199,10 @@ void AbstractExtItem::readConfiguration()
qCDebug(LOG_LIB);
for (int i=m_dirs.count()-1; i>=0; i--) {
if (!QDir(m_dirs.at(i)).entryList(QDir::Files).contains(m_fileName)) continue;
QSettings settings(QString("%1/%2").arg(m_dirs.at(i)).arg(m_fileName), QSettings::IniFormat);
if (!QDir(m_dirs.at(i)).entryList(QDir::Files).contains(m_fileName))
continue;
QSettings settings(QString("%1/%2").arg(m_dirs.at(i)).arg(m_fileName),
QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setName(settings.value(QString("Name"), m_name).toString());
@ -224,7 +227,8 @@ bool AbstractExtItem::tryDelete() const
// check if exists
foreach(QString dir, m_dirs)
if (QFile::exists(QString("%1/%2").arg(dir).arg(m_fileName))) return false;
if (QFile::exists(QString("%1/%2").arg(dir).arg(m_fileName)))
return false;
return true;
}

6
sources/awesomewidgets/abstractextitemaggregator.cpp
View File

@ -67,8 +67,10 @@ QString AbstractExtItemAggregator::getName()
QString name = QInputDialog::getText(this, i18n("Enter file name"),
i18n("File name"), QLineEdit::Normal,
QString(""), &ok);
if ((!ok) || (name.isEmpty())) return QString("");
if (!name.endsWith(QString(".desktop"))) name += QString(".desktop");
if ((!ok) || (name.isEmpty()))
return QString("");
if (!name.endsWith(QString(".desktop")))
name += QString(".desktop");
return name;
}

44
sources/awesomewidgets/extitemaggregator.h
View File

@ -76,7 +76,8 @@ public:
T *found = nullptr;
foreach(T *item, m_items) {
if (item->tag() != _tag) continue;
if (item->tag() != _tag)
continue;
found = item;
break;
}
@ -93,7 +94,8 @@ public:
T *found = nullptr;
foreach(T *item, m_items) {
if (item->number() != _number) continue;
if (item->number() != _number)
continue;
found = item;
break;
}
@ -108,11 +110,13 @@ public:
qCDebug(LOG_LIB);
QListWidgetItem *widgetItem = widgetDialog->currentItem();
if (widgetItem == nullptr) return nullptr;
if (widgetItem == nullptr)
return nullptr;
T *found = nullptr;
foreach(T *item, m_items) {
if (item->fileName() != widgetItem->text()) continue;
if (item->fileName() != widgetItem->text())
continue;
found = item;
break;
}
@ -136,7 +140,8 @@ public:
QList<int> tagList;
foreach(T *item, m_items) tagList.append(item->number());
int number = 0;
while (tagList.contains(number)) number++;
while (tagList.contains(number))
number++;
return number;
};
@ -152,23 +157,24 @@ private:
qCDebug(LOG_LIB);
// create directory at $HOME
QString localDir = QString("%1/awesomewidgets/%2")
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
.arg(m_type);
QString localDir = QString("%1/awesomewidgets/%2").
arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)).
arg(m_type);
QDir localDirectory;
if (localDirectory.mkpath(localDir))
qCInfo(LOG_LIB) << "Created directory" << localDir;
QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
QString("awesomewidgets/%1").arg(m_type),
QStandardPaths::LocateDirectory);
QString("awesomewidgets/%1").arg(m_type),
QStandardPaths::LocateDirectory);
QStringList names;
QList<T *> items;
foreach(QString dir, dirs) {
QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name);
foreach(QString file, files) {
if (!file.endsWith(QString(".desktop"))) continue;
if (names.contains(file)) continue;
if ((!file.endsWith(QString(".desktop")))
|| (names.contains(file)))
continue;
qCInfo(LOG_LIB) << "Found file" << file << "in" << dir;
names.append(file);
items.append(new T(this, file, dirs));
@ -190,8 +196,11 @@ private:
m_activeItems.clear();
m_items = getItems();
foreach(T *item, m_items)
if (item->isActive()) m_activeItems.append(item);
foreach(T *item, m_items) {
if (!item->isActive())
continue;
m_activeItems.append(item);
}
};
void repaint()
@ -218,7 +227,8 @@ private:
T *source = itemFromWidget();
QString fileName = getName();
int number = uniqNumber();
if ((source == nullptr) || (fileName.isEmpty())) {
if ((source == nullptr)
|| (fileName.isEmpty())) {
qCWarning(LOG_LIB) << "Nothing to copy";
return;
}
@ -237,8 +247,8 @@ private:
QString fileName = getName();
int number = uniqNumber();
QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
QString("awesomewidgets/%1").arg(m_type),
QStandardPaths::LocateDirectory);
QString("awesomewidgets/%1").arg(m_type),
QStandardPaths::LocateDirectory);
if (fileName.isEmpty()) {
qCWarning(LOG_LIB) << "Nothing to create";
return;

57
sources/awesomewidgets/extquotes.cpp
View File

@ -64,7 +64,8 @@ ExtQuotes::~ExtQuotes()
{
qCDebug(LOG_LIB);
disconnect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(quotesReplyReceived(QNetworkReply *)));
disconnect(manager, SIGNAL(finished(QNetworkReply *)),
this, SLOT(quotesReplyReceived(QNetworkReply *)));
delete manager;
delete ui;
@ -77,7 +78,8 @@ ExtQuotes *ExtQuotes::copy(const QString _fileName, const int _number)
qCDebug(LOG_LIB) << "File" << _fileName;
qCDebug(LOG_LIB) << "Number" << _number;
ExtQuotes *item = new ExtQuotes(static_cast<QWidget *>(parent()), _fileName, directories());
ExtQuotes *item = new ExtQuotes(static_cast<QWidget *>(parent()),
_fileName, directories());
item->setActive(isActive());
item->setApiVersion(apiVersion());
item->setComment(comment());
@ -121,8 +123,10 @@ void ExtQuotes::readConfiguration()
AbstractExtItem::readConfiguration();
for (int i=directories().count()-1; i>=0; i--) {
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName())) continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()), QSettings::IniFormat);
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()),
QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setTicker(settings.value(QString("X-AW-Ticker"), m_ticker).toString());
@ -141,7 +145,8 @@ void ExtQuotes::readConfiguration()
QVariantHash ExtQuotes::run()
{
qCDebug(LOG_LIB);
if ((!isActive()) || (isRunning)) return values;
if ((!isActive()) || (isRunning))
return values;
if (times == 1) {
qCInfo(LOG_LIB) << "Send request";
@ -151,7 +156,8 @@ QVariantHash ExtQuotes::run()
}
// update value
if (times >= interval()) times = 0;
if (times >= interval())
times = 0;
times++;
return values;
@ -171,7 +177,8 @@ int ExtQuotes::showConfiguration(const QVariant args)
ui->spinBox_interval->setValue(interval());
int ret = exec();
if (ret != 1) return ret;
if (ret != 1)
return ret;
setName(ui->lineEdit_name->text());
setComment(ui->lineEdit_comment->text());
setNumber(ui->label_numberValue->text().toInt());
@ -190,7 +197,8 @@ void ExtQuotes::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()), QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@ -210,8 +218,8 @@ void ExtQuotes::quotesReplyReceived(QNetworkReply *reply)
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error);
reply->deleteLater();
if ((reply->error() != QNetworkReply::NoError) ||
(error.error != QJsonParseError::NoError)) {
if ((reply->error() != QNetworkReply::NoError)
|| (error.error != QJsonParseError::NoError)) {
qCWarning(LOG_LIB) << "Parse error" << error.errorString();
return;
}
@ -221,23 +229,29 @@ void ExtQuotes::quotesReplyReceived(QNetworkReply *reply)
// ask
value = jsonQuotes[QString("Ask")].toString().toDouble();
values[tag(QString("askchg"))] = values[QString("ask")].toDouble() == 0.0 ? 0.0 :
value - values[QString("ask")].toDouble();
values[tag(QString("percaskchg"))] = 100.0 * values[QString("askchg")].toDouble() / values[QString("ask")].toDouble();
values[tag(QString("askchg"))] = values[QString("ask")].toDouble() == 0.0
? 0.0
: value - values[QString("ask")].toDouble();
values[tag(QString("percaskchg"))] = 100.0 * values[QString("askchg")].toDouble()
/ values[QString("ask")].toDouble();
values[tag(QString("ask"))] = value;
// bid
value = jsonQuotes[QString("Bid")].toString().toDouble();
values[tag(QString("bidchg"))] = values[QString("bid")].toDouble() == 0.0 ? 0.0 :
value - values[QString("bid")].toDouble();
values[tag(QString("percbidchg"))] = 100.0 * values[QString("bidchg")].toDouble() / values[QString("bid")].toDouble();
values[tag(QString("bidchg"))] = values[QString("bid")].toDouble() == 0.0
? 0.0
: value - values[QString("bid")].toDouble();
values[tag(QString("percbidchg"))] = 100.0 * values[QString("bidchg")].toDouble()
/ values[QString("bid")].toDouble();
values[tag(QString("bid"))] = value;
// last trade
value = jsonQuotes[QString("LastTradePriceOnly")].toString().toDouble();
values[tag(QString("pricechg"))] = values[QString("price")].toDouble() == 0.0 ? 0.0 :
value - values[QString("price")].toDouble();
values[tag(QString("percpricechg"))] = 100.0 * values[QString("pricechg")].toDouble() / values[QString("price")].toDouble();
values[tag(QString("pricechg"))] = values[QString("price")].toDouble() == 0.0
? 0.0
: value - values[QString("price")].toDouble();
values[tag(QString("percpricechg"))] = 100.0 * values[QString("pricechg")].toDouble()
/ values[QString("price")].toDouble();
values[tag(QString("price"))] = value;
}
@ -249,7 +263,10 @@ void ExtQuotes::translate()
ui->label_name->setText(i18n("Name"));
ui->label_comment->setText(i18n("Comment"));
ui->label_number->setText(i18n("Tag"));
ui->label->setText(i18n("<html><head/><body><p>Use YAHOO! finance ticker to get quotes for the instrument. Refer to <a href=\"http://finance.yahoo.com/\"><span style=\" text-decoration: underline; color:#0057ae;\">http://finance.yahoo.com/</span></a></p></body></html>"));
ui->label->setText(i18n("<html><head/><body><p>Use YAHOO! finance ticker to \
get quotes for the instrument. Refer to <a href=\"http://finance.yahoo.com/\">\
<span style=\" text-decoration: underline; color:#0057ae;\">http://finance.yahoo.com/\
</span></a></p></body></html>"));
ui->label_ticker->setText(i18n("Ticker"));
ui->checkBox_active->setText(i18n("Active"));
ui->label_interval->setText(i18n("Interval"));

40
sources/awesomewidgets/extscript.cpp
View File

@ -67,7 +67,8 @@ ExtScript *ExtScript::copy(const QString _fileName, const int _number)
qCDebug(LOG_LIB) << "File" << _fileName;
qCDebug(LOG_LIB) << "Number" << _number;
ExtScript *item = new ExtScript(static_cast<QWidget *>(parent()), _fileName, directories());
ExtScript *item = new ExtScript(static_cast<QWidget *>(parent()),
_fileName, directories());
item->setActive(isActive());
item->setApiVersion(apiVersion());
item->setComment(comment());
@ -228,7 +229,8 @@ void ExtScript::updateFilter(const QString _filter, const bool _add)
qCDebug(LOG_LIB) << "Should be added" << _add;
if (_add) {
if (m_filters.contains(_filter)) return;
if (m_filters.contains(_filter))
return;
m_filters.append(_filter);
} else {
m_filters.removeOne(_filter);
@ -242,7 +244,8 @@ void ExtScript::readConfiguration()
AbstractExtItem::readConfiguration();
for (int i=directories().count()-1; i>=0; i--) {
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName())) continue;
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
@ -250,8 +253,8 @@ void ExtScript::readConfiguration()
setPrefix(settings.value(QString("X-AW-Prefix"), m_prefix).toString());
setStrRedirect(settings.value(QString("X-AW-Redirect"), strRedirect()).toString());
// api == 3
setFilters(settings.value(QString("X-AW-Filters"), m_filters).toString()
.split(QChar(','), QString::SkipEmptyParts));
setFilters(settings.value(QString("X-AW-Filters"), m_filters).toString().
split(QChar(','), QString::SkipEmptyParts));
settings.endGroup();
}
@ -294,16 +297,19 @@ void ExtScript::readJsonFilters()
QVariantHash ExtScript::run()
{
qCDebug(LOG_LIB);
if (!isActive()) return value;
if (!isActive())
return value;
if ((times == 1) && (process->state() == QProcess::NotRunning)) {
QStringList cmdList;
if (!m_prefix.isEmpty()) cmdList.append(m_prefix);
if (!m_prefix.isEmpty())
cmdList.append(m_prefix);
cmdList.append(m_executable);
qCInfo(LOG_LIB) << "Run cmd" << cmdList.join(QChar(' '));
process->start(cmdList.join(QChar(' ')));
} else if (times >= interval())
} else if (times >= interval()) {
times = 0;
}
times++;
return value;
@ -324,12 +330,19 @@ int ExtScript::showConfiguration(const QVariant args)
ui->comboBox_redirect->setCurrentIndex(static_cast<int>(m_redirect));
ui->spinBox_interval->setValue(interval());
// filters
ui->checkBox_colorFilter->setCheckState(m_filters.contains(QString("color")) ? Qt::Checked : Qt::Unchecked);
ui->checkBox_linesFilter->setCheckState(m_filters.contains(QString("newline")) ? Qt::Checked : Qt::Unchecked);
ui->checkBox_spaceFilter->setCheckState(m_filters.contains(QString("space")) ? Qt::Checked : Qt::Unchecked);
ui->checkBox_colorFilter->setCheckState(m_filters.contains(QString("color"))
? Qt::Checked
: Qt::Unchecked);
ui->checkBox_linesFilter->setCheckState(m_filters.contains(QString("newline"))
? Qt::Checked
: Qt::Unchecked);
ui->checkBox_spaceFilter->setCheckState(m_filters.contains(QString("space"))
? Qt::Checked
: Qt::Unchecked);
int ret = exec();
if (ret != 1) return ret;
if (ret != 1)
return ret;
setName(ui->lineEdit_name->text());
setComment(ui->lineEdit_comment->text());
setNumber(ui->label_numberValue->text().toInt());
@ -354,7 +367,8 @@ void ExtScript::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()), QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));

27
sources/awesomewidgets/extupgrade.cpp
View File

@ -64,7 +64,8 @@ ExtUpgrade *ExtUpgrade::copy(const QString _fileName, const int _number)
qCDebug(LOG_LIB) << "File" << _fileName;
qCDebug(LOG_LIB) << "Number" << _number;
ExtUpgrade *item = new ExtUpgrade(static_cast<QWidget *>(parent()), _fileName, directories());
ExtUpgrade *item = new ExtUpgrade(static_cast<QWidget *>(parent()),
_fileName, directories());
item->setActive(isActive());
item->setApiVersion(apiVersion());
item->setComment(comment());
@ -145,8 +146,10 @@ void ExtUpgrade::readConfiguration()
AbstractExtItem::readConfiguration();
for (int i=directories().count()-1; i>=0; i--) {
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName())) continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()), QSettings::IniFormat);
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()),
QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setExecutable(settings.value(QString("Exec"), m_executable).toString());
@ -168,14 +171,16 @@ void ExtUpgrade::readConfiguration()
QVariantHash ExtUpgrade::run()
{
qCDebug(LOG_LIB);
if (!isActive()) return value;
if (!isActive())
return value;
if ((times == 1) && (process->state() == QProcess::NotRunning)) {
QString cmd = QString("sh -c \"%1\"").arg(m_executable);
qCInfo(LOG_LIB) << "Run cmd" << cmd;
process->start(cmd);
} else if (times >= interval())
} else if (times >= interval()) {
times = 0;
}
times++;
return value;
@ -197,7 +202,8 @@ int ExtUpgrade::showConfiguration(const QVariant args)
ui->spinBox_interval->setValue(interval());
int ret = exec();
if (ret != 1) return ret;
if (ret != 1)
return ret;
setName(ui->lineEdit_name->text());
setComment(ui->lineEdit_comment->text());
setNumber(ui->label_numberValue->text().toInt());
@ -218,7 +224,8 @@ void ExtUpgrade::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()), QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@ -240,9 +247,9 @@ void ExtUpgrade::updateValue()
QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process->readAllStandardOutput()).trimmed();
value[tag(QString("pkgcount"))] = [this](QString output) {
return m_filter.isEmpty() ?
output.split(QChar('\n'), QString::SkipEmptyParts).count() - m_null :
output.split(QChar('\n'), QString::SkipEmptyParts).filter(QRegExp(m_filter)).count();
return m_filter.isEmpty()
? output.split(QChar('\n'), QString::SkipEmptyParts).count() - m_null
: output.split(QChar('\n'), QString::SkipEmptyParts).filter(QRegExp(m_filter)).count();
}(qoutput);
}

36
sources/awesomewidgets/extweather.cpp
View File

@ -76,7 +76,8 @@ ExtWeather *ExtWeather::copy(const QString _fileName, const int _number)
qCDebug(LOG_LIB) << "File" << _fileName;
qCDebug(LOG_LIB) << "Number" << _number;
ExtWeather *item = new ExtWeather(static_cast<QWidget *>(parent()), _fileName, directories());
ExtWeather *item = new ExtWeather(static_cast<QWidget *>(parent()),
_fileName, directories());
item->setActive(isActive());
item->setApiVersion(apiVersion());
item->setCity(city());
@ -184,8 +185,10 @@ void ExtWeather::readConfiguration()
AbstractExtItem::readConfiguration();
for (int i=directories().count()-1; i>=0; i--) {
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName())) continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()), QSettings::IniFormat);
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()),
QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setCity(settings.value(QString("X-AW-City"), m_city).toString());
@ -235,7 +238,8 @@ void ExtWeather::readJsonMap()
QVariantHash ExtWeather::run()
{
qCDebug(LOG_LIB);
if ((!isActive()) || (isRunning)) return values;
if ((!isActive()) || (isRunning))
return values;
if (times == 1) {
qCInfo(LOG_LIB) << "Send request";
@ -245,7 +249,8 @@ QVariantHash ExtWeather::run()
}
// update value
if (times >= interval()) times = 0;
if (times >= interval())
times = 0;
times++;
return values;
@ -268,7 +273,8 @@ int ExtWeather::showConfiguration(const QVariant args)
ui->spinBox_interval->setValue(interval());
int ret = exec();
if (ret != 1) return ret;
if (ret != 1)
return ret;
setName(ui->lineEdit_name->text());
setComment(ui->lineEdit_comment->text());
setNumber(ui->label_numberValue->text().toInt());
@ -290,7 +296,8 @@ void ExtWeather::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()), QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@ -314,8 +321,8 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply)
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error);
reply->deleteLater();
if ((reply->error() != QNetworkReply::NoError) ||
(error.error != QJsonParseError::NoError)) {
if ((reply->error() != QNetworkReply::NoError)
|| (error.error != QJsonParseError::NoError)) {
qCWarning(LOG_LIB) << "Parse error" << error.errorString();
return;
}
@ -328,13 +335,16 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply)
}
QVariantHash data;
if (m_ts == 0)
if (m_ts == 0) {
data = parseSingleJson(json);
else {
} else {
QVariantList list = json[QString("list")].toList();
data = parseSingleJson(list.count() <= m_ts ? list.at(m_ts-1).toMap() : list.last().toMap());
data = parseSingleJson(list.count() <= m_ts
? list.at(m_ts-1).toMap()
: list.last().toMap());
}
foreach(QString key, data.keys()) values[tag(key)] = data[key];
foreach(QString key, data.keys())
values[tag(key)] = data[key];
}

34
sources/awesomewidgets/graphicalitem.cpp
View File

@ -67,7 +67,8 @@ GraphicalItem *GraphicalItem::copy(const QString _fileName, const int _number)
qCDebug(LOG_LIB) << "File" << _fileName;
qCDebug(LOG_LIB) << "Number" << _number;
GraphicalItem *item = new GraphicalItem(static_cast<QWidget *>(parent()), _fileName, directories());
GraphicalItem *item = new GraphicalItem(static_cast<QWidget *>(parent()),
_fileName, directories());
item->setActive(isActive());
item->setActiveColor(activeColor());
item->setApiVersion(apiVersion());
@ -124,7 +125,8 @@ QString GraphicalItem::image(const QVariant value)
QByteArray byteArray;
QBuffer buffer(&byteArray);
pixmap.save(&buffer, "PNG");
QString url = QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
QString url = QString("<img src=\"data:image/png;base64,%1\"/>").
arg(QString(byteArray.toBase64()));
return url;
}
@ -254,8 +256,9 @@ void GraphicalItem::setBar(const QString _bar)
if (!_bar.contains(QRegExp(QString("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)")))) {
qCWarning(LOG_LIB) << "Unsupported bar type" << _bar;
m_bar = QString("none");
} else
} else {
m_bar = _bar;
}
}
@ -327,7 +330,8 @@ void GraphicalItem::setHeight(const int _height)
{
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Height" << _height;
if (_height <= 0) return;
if (_height <= 0)
return;
m_height = _height;
}
@ -337,7 +341,8 @@ void GraphicalItem::setWidth(const int _width)
{
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Width" << _width;
if (_width <= 0) return;
if (_width <= 0)
return;
m_width = _width;
}
@ -349,8 +354,10 @@ void GraphicalItem::readConfiguration()
AbstractExtItem::readConfiguration();
for (int i=directories().count()-1; i>=0; i--) {
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName())) continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()), QSettings::IniFormat);
if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
continue;
QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()),
QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setBar(settings.value(QString("X-AW-Value"), m_bar).toString());
@ -361,7 +368,8 @@ void GraphicalItem::readConfiguration()
setHeight(settings.value(QString("X-AW-Height"), m_height).toInt());
setWidth(settings.value(QString("X-AW-Width"), m_width).toInt());
// api == 2
if (apiVersion() < 2) setNumber(bar().remove(QString("bar")).toInt());
if (apiVersion() < 2)
setNumber(bar().remove(QString("bar")).toInt());
settings.endGroup();
}
@ -402,8 +410,8 @@ int GraphicalItem::showConfiguration(const QVariant args)
ui->spinBox_width->setValue(m_width);
int ret = exec();
if (ret != 1) return ret;
if (ret != 1)
return ret;
setName(ui->label_nameValue->text());
setComment(ui->lineEdit_comment->text());
setApiVersion(AWGIAPI);
@ -425,7 +433,8 @@ void GraphicalItem::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()), QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@ -449,7 +458,8 @@ void GraphicalItem::changeColor()
QColor color = stringToColor((static_cast<QPushButton *>(sender()))->text());
QColor newColor = QColorDialog::getColor(color, this, tr("Select color"),
QColorDialog::ShowAlphaChannel);
if (!newColor.isValid()) return;
if (!newColor.isValid())
return;
qCInfo(LOG_LIB) << "Selected color" << newColor;
QStringList colorText;