From f91c80b5b1083e6d1bd62436f2643ab1576d9b45 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Mon, 8 Sep 2014 00:09:41 +0400 Subject: [PATCH] rollback taging --- sources/awesome-widget/awesome-widget.cpp | 38 +++++++++++------------ sources/awesome-widget/configuration.cpp | 10 +++--- sources/awesome-widget/deinteraction.cpp | 14 ++++----- sources/awesome-widget/reinit.cpp | 2 +- sources/desktop-panel/desktop-panel.cpp | 28 ++++++----------- 5 files changed, 41 insertions(+), 51 deletions(-) diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index 1bf92ed..b1ddfd3 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -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 -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=0; i--) allKeys.append(QString("cpu") + QString::number(i)); // cpuclock allKeys.append(QString("cpucl")); - for (int i=0; i=0; i--) allKeys.append(QString("cpucl") + QString::number(i)); // temperature - for (int i=0; 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=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=0; i--) { allKeys.append(QString("hddr") + QString::number(i)); allKeys.append(QString("hddw") + QString::number(i)); } // hdd temp - for (int i=0; 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=0; i--) allKeys.append(QString("pkgcount") + QString::number(i)); // custom - for (int i=0; i=0; i--) allKeys.append(QString("custom") + QString::number(i)); // desktop allKeys.append(QString("desktop")); diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index dc00843..fbe8255 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -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("") + selectedText + QString("")); else if (sender() == uiWidConfig.pushButton_italic) diff --git a/sources/awesome-widget/deinteraction.cpp b/sources/awesome-widget/deinteraction.cpp index 3c5f2aa..3e0c2ac 100644 --- a/sources/awesome-widget/deinteraction.cpp +++ b/sources/awesome-widget/deinteraction.cpp @@ -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")); if (!clear) for (int i=0; isetText(formatLine[0] + text + formatLine[1]); } diff --git a/sources/desktop-panel/desktop-panel.cpp b/sources/desktop-panel/desktop-panel.cpp index 2317196..babe5e5 100644 --- a/sources/desktop-panel/desktop-panel.cpp +++ b/sources/desktop-panel/desktop-panel.cpp @@ -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());