arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-10-31 13:13:41 +00:00
Code Issues Projects Releases Wiki Activity

rollback taging

Browse Source
This commit is contained in:
arcan1s
2014-09-08 00:09:41 +04:00
parent 97fbb4acc1
commit f91c80b5b1
5 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,22 +149,22 @@ QStringList AwesomeWidget::getTimeKeys()
if (debug) qDebug() << PDEBUG;
QStringList timeKeys;
timeKeys.append(QString("d"));
timeKeys.append(QString("dd"));
timeKeys.append(QString("ddd"));
timeKeys.append(QString("dddd"));
timeKeys.append(QString("M"));
timeKeys.append(QString("MM"));
timeKeys.append(QString("MMM"));
timeKeys.append(QString("ddd"));
timeKeys.append(QString("dd"));
timeKeys.append(QString("d"));
timeKeys.append(QString("MMMM"));
timeKeys.append(QString("yy"));
timeKeys.append(QString("MMM"));
timeKeys.append(QString("MM"));
timeKeys.append(QString("M"));
timeKeys.append(QString("yyyy"));
timeKeys.append(QString("h"));
timeKeys.append(QString("yy"));
timeKeys.append(QString("hh"));
timeKeys.append(QString("m"));
timeKeys.append(QString("h"));
timeKeys.append(QString("mm"));
timeKeys.append(QString("s"));
timeKeys.append(QString("m"));
timeKeys.append(QString("ss"));
timeKeys.append(QString("s"));
return timeKeys;
}
@ -232,7 +232,7 @@ QStringList AwesomeWidget::findKeys()
QStringList selectedKeys;
for (int i=0; i<keys.count(); i++)
if (configuration[QString("text")]
.indexOf(QString("$") + keys[i] + QString("$")) > -1) {
.indexOf(QString("$") + keys[i]) > -1) {
if (debug) qDebug() << PDEBUG << ":" << "Found key" << keys[i];
selectedKeys.append(keys[i]);
}
@ -257,14 +257,14 @@ QStringList AwesomeWidget::getKeys()
allKeys.append(QString("cuptime"));
// cpu
allKeys.append(QString("cpu"));
for (int i=0; i<counts[QString("cpu")]; i++)
for (int i=counts[QString("cpu")]-1; i>=0; i--)
allKeys.append(QString("cpu") + QString::number(i));
// cpuclock
allKeys.append(QString("cpucl"));
for (int i=0; i<counts[QString("cpu")]; i++)
for (int i=counts[QString("cpu")]-1; i>=0; i--)
allKeys.append(QString("cpucl") + QString::number(i));
// temperature
for (int i=0; i<counts[QString("temp")]; i++)
for (int i=counts[QString("temp")]-1; i>=0; i--)
allKeys.append(QString("temp") + QString::number(i));
// gpu
allKeys.append(QString("gpu"));
@ -289,7 +289,7 @@ QStringList AwesomeWidget::getKeys()
allKeys.append(QString("swaptotmb"));
allKeys.append(QString("swaptotgb"));
// hdd
for (int i=0; i<counts[QString("mount")]; i++) {
for (int i=counts[QString("mount")]-1; i>=0; i--) {
allKeys.append(QString("hdd") + QString::number(i));
allKeys.append(QString("hddmb") + QString::number(i));
allKeys.append(QString("hddgb") + QString::number(i));
@ -299,12 +299,12 @@ QStringList AwesomeWidget::getKeys()
allKeys.append(QString("hddtotgb") + QString::number(i));
}
// hdd speed
for (int i=0; i<counts[QString("disk")]; i++) {
for (int i=counts[QString("disk")]-1; i>=0; i--) {
allKeys.append(QString("hddr") + QString::number(i));
allKeys.append(QString("hddw") + QString::number(i));
}
// hdd temp
for (int i=0; i<counts[QString("hddtemp")]; i++) {
for (int i=counts[QString("hddtemp")]-1; i>=0; i--) {
allKeys.append(QString("hddtemp") + QString::number(i));
allKeys.append(QString("hddtemp") + QString::number(i));
}
@ -326,10 +326,10 @@ QStringList AwesomeWidget::getKeys()
allKeys.append(QString("pscount"));
allKeys.append(QString("pstotal"));
// package manager
for (int i=0; i<counts[QString("pkg")]; i++)
for (int i=counts[QString("pkg")]-1; i>=0; i--)
allKeys.append(QString("pkgcount") + QString::number(i));
// custom
for (int i=0; i<counts[QString("custom")]; i++)
for (int i=counts[QString("custom")]-1; i>=0; i--)
allKeys.append(QString("custom") + QString::number(i));
// desktop
allKeys.append(QString("desktop"));

10
sources/awesome-widget/configuration.cpp
View File

@ -519,7 +519,7 @@ void AwesomeWidget::configChanged()
KConfigGroup cg = config();
// widget
configuration[QString("text")] = cg.readEntry("text", "[cpu: $cpu$%] [mem: $mem$%] [swap: $swap$%] [$netdev$: $down$/$up$KB/s]");
configuration[QString("text")] = cg.readEntry("text", "[cpu: $cpu%] [mem: $mem%] [swap: $swap%] [$netdev: $down/$upKB/s]");
// advanced
configuration[QString("background")] = cg.readEntry("background", "2");
@ -527,8 +527,8 @@ void AwesomeWidget::configChanged()
configuration[QString("popup")] = cg.readEntry("popup", "2");
configuration[QString("leftStretch")] = cg.readEntry("leftStretch", "2");
configuration[QString("rightStretch")] = cg.readEntry("rightStretch", "2");
configuration[QString("customTime")] = cg.readEntry("customTime", "$hh$:$mm$");
configuration[QString("customUptime")] = cg.readEntry("customUptime", "$dd$,$hh$,$mm$");
configuration[QString("customTime")] = cg.readEntry("customTime", "$hh:$mm");
configuration[QString("customUptime")] = cg.readEntry("customUptime", "$dd,$hh,$mm");
configuration[QString("tempUnits")] = cg.readEntry("tempUnits", "Celsius");
configuration[QString("tempDevice")] = cg.readEntry("tempDevice", "");
configuration[QString("mount")] = cg.readEntry("mount", "/");
@ -739,9 +739,7 @@ void AwesomeWidget::setFormating()
QString selectedText = uiWidConfig.textEdit_elements->textCursor().selectedText();
if (sender() == uiWidConfig.pushButton_tags)
uiWidConfig.textEdit_elements->insertPlainText(QString("$") +
uiWidConfig.comboBox_tags->currentText() +
QString("$"));
uiWidConfig.textEdit_elements->insertPlainText(QString("$") + uiWidConfig.comboBox_tags->currentText());
else if (sender() == uiWidConfig.pushButton_bold)
uiWidConfig.textEdit_elements->insertPlainText(QString("<b>") + selectedText + QString("</b>"));
else if (sender() == uiWidConfig.pushButton_italic)

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

@ -397,7 +397,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng
QStringList timeKeys = getTimeKeys();
values[QString("ctime")] = configuration[QString("customTime")];
for (int i=0; i<timeKeys.count(); i++)
values[QString("ctime")].replace(QString("$") + timeKeys[i] + QString("$"),
values[QString("ctime")].replace(QString("$") + timeKeys[i],
data[QString("DateTime")].toDateTime().toString(timeKeys[i]));
} else if (sourceName == QString("system/uptime")) {
int uptime = data[QString("value")].toFloat();
@ -407,12 +407,12 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng
int days = (((seconds / 60) - minutes) / 60 - hours) / 24;
values[QString("uptime")] = QString("%1d%2h%3m").arg(days, 3).arg(hours, 2).arg(minutes, 2);
values[QString("cuptime")] = configuration[QString("customUptime")];
values[QString("cuptime")].replace(QString("$d$"), QString("%1").arg(days));
values[QString("cuptime")].replace(QString("$dd$"), QString("%1").arg(days, 3, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$h$"), QString("%1").arg(hours));
values[QString("cuptime")].replace(QString("$hh$"), QString("%1").arg(hours, 2, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$m$"), QString("%1").arg(minutes));
values[QString("cuptime")].replace(QString("$mm$"), QString("%1").arg(minutes, 2, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$dd"), QString("%1").arg(days, 3, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$d"), QString("%1").arg(days));
values[QString("cuptime")].replace(QString("$hh"), QString("%1").arg(hours, 2, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$h"), QString("%1").arg(hours));
values[QString("cuptime")].replace(QString("$mm"), QString("%1").arg(minutes, 2, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$m"), QString("%1").arg(minutes));
}
}

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

@ -105,7 +105,7 @@ void AwesomeWidget::updateText(bool clear)
text.replace(QString("\n"), QString("<br>"));
if (!clear)
for (int i=0; i<foundKeys.count(); i++)
text.replace(QString("$") + foundKeys[i] + QString("$"), values[foundKeys[i]]);
text.replace(QString("$") + foundKeys[i], values[foundKeys[i]]);
textLabel->setText(formatLine[0] + text + formatLine[1]);
}

28
sources/desktop-panel/desktop-panel.cpp
View File

@ -161,22 +161,14 @@ QString DesktopPanel::parsePattern(const QString rawLine, const int num)
mark = configuration[QString("mark")];
else
mark = QString("");
if (line.split(QString("$mark$"))[0] != line) {
if (debug) qDebug() << PDEBUG << ":" << "Found mark";
line = line.split(QString("$mark$"))[0] + mark + line.split(QString("$mark$"))[1];
}
if (line.split(QString("$name$"))[0] != line) {
if (debug) qDebug() << PDEBUG << ":" << "Found name";
line = line.split(QString("$name$"))[0] + desktopNames[num] + line.split(QString("$name$"))[1];
}
if (line.split(QString("$number$"))[0] != line) {
if (debug) qDebug() << PDEBUG << ":" << "Found number";
line = line.split(QString("$number$"))[0] + QString::number(num + 1) + line.split(QString("$number$"))[1];
}
if (line.split(QString("$total$"))[0] != line) {
if (debug) qDebug() << PDEBUG << ":" << "Found total";
line = line.split(QString("$total$"))[0] + QString::number(desktopNames.count()) + line.split(QString("$total$"))[1];
}
if (line.contains(QString("$mark")))
line.replace(QString("$mark"), mark);
if (line.contains(QString("$name")))
line.replace(QString("$name"), desktopNames[num]);
if (line.contains(QString("$number")))
line.replace(QString("$number"), QString::number(num + 1));
if (line.contains(QString("$total")))
line.replace(QString("$total"), QString::number(desktopNames.count()));
return line;
}
@ -435,13 +427,13 @@ void DesktopPanel::configChanged()
KConfigGroup cg = config();
configuration[QString("background")] = cg.readEntry("background", "2");
configuration[QString("desktopcmd")] = cg.readEntry("desktopcmd", "qdbus org.kde.kwin /KWin setCurrentDesktop $number$");
configuration[QString("desktopcmd")] = cg.readEntry("desktopcmd", "qdbus org.kde.kwin /KWin setCurrentDesktop $number");
configuration[QString("interval")] = cg.readEntry("interval", "1000");
configuration[QString("layout")] = cg.readEntry("layout", "0");
configuration[QString("leftStretch")] = cg.readEntry("leftStretch", "2");
configuration[QString("mark")] = cg.readEntry("mark", "¤");
configuration[QString("panels")] = cg.readEntry("panels", "-1");
configuration[QString("pattern")] = cg.readEntry("pattern", "[$mark$$number$/$total$: $name$]");
configuration[QString("pattern")] = cg.readEntry("pattern", "[$mark$number/$total: $name]");
configuration[QString("rightStretch")] = cg.readEntry("rightStretch", "2");
extsysmonEngine->connectSource(QString("desktop"), this, configuration[QString("interval")].toInt());