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

implement tag number support to widget

Browse Source 
bump api ver to 2
This commit is contained in:
arcan1s
2015-05-07 00:17:35 +03:00
parent 7f4dfe1060
commit 88c3e780cf
29 changed files with 288 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
sources/awesome-widget-kf5/plugin/awkeys.cpp
View File

@ -40,6 +40,7 @@
#include "extscript.h"
#include "extupgrade.h"
#include "graphicalitem.h"
#include "version.h"
AWKeys::AWKeys(QObject *parent)
@ -290,16 +291,16 @@ QStringList AWKeys::dictKeys()
allKeys.append(QString("ps"));
// package manager
for (int i=extUpgrade.count()-1; i>=0; i--)
allKeys.append(QString("pkgcount%1").arg(i));
allKeys.append(extUpgrade[i]->tag());
// quotes
for (int i=extQuotes.count()-1; i>=0; i--) {
allKeys.append(QString("ask%1").arg(i));
allKeys.append(QString("bid%1").arg(i));
allKeys.append(QString("price%1").arg(i));
allKeys.append(extQuotes[i]->tag(QString("ask")));
allKeys.append(extQuotes[i]->tag(QString("bid")));
allKeys.append(extQuotes[i]->tag(QString("price")));
}
// custom
for (int i=extScripts.count()-1; i>=0; i--)
allKeys.append(QString("custom%1").arg(i));
allKeys.append(extScripts[i]->tag());
// desktop
allKeys.append(QString("desktop"));
allKeys.append(QString("ndesktop"));
@ -958,17 +959,13 @@ void AWKeys::copyBar(const QString original)
{
if (debug) qDebug() << PDEBUG;
QStringList tagList;
for (int i=0; i<graphicalItems.count(); i++)
tagList.append(graphicalItems[i]->name());
int number = 0;
while (true) {
bool exit = true;
for (int i=0; i<graphicalItems.count(); i++)
if (graphicalItems[i]->name() == QString("bar%1").arg(number)) {
number++;
exit = false;
break;
}
if (exit) break;
}
while (tagList.contains(QString("bar%1").arg(number)))
number++;
QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
QString("awesomewidgets/desktops"),
QStandardPaths::LocateDirectory);
@ -995,6 +992,7 @@ void AWKeys::copyBar(const QString original)
break;
}
GraphicalItem *item = new GraphicalItem(0, name, dirs, debug);
item->setApiVersion(AWGIAPI);
item->setName(QString("bar%1").arg(number));
if (originalItem != -1) {
item->setComment(graphicalItems[originalItem]->comment());
@ -1026,6 +1024,13 @@ void AWKeys::copyQuotes(const QString original)
{
if (debug) qDebug() << PDEBUG;
QList<int> tagList;
for (int i=0; i<extQuotes.count(); i++)
tagList.append(extQuotes[i]->number());
int number = 0;
while (tagList.contains(number))
number++;
QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
QString("awesomewidgets/quotes"),
QStandardPaths::LocateDirectory);
@ -1045,6 +1050,8 @@ void AWKeys::copyQuotes(const QString original)
break;
}
ExtQuotes *quotes = new ExtQuotes(0, name, dirs, debug);
quotes->setApiVersion(AWEQAPI);
quotes->setNumber(number);
if (originalItem != -1) {
quotes->setActive(extQuotes[originalItem]->isActive());
quotes->setComment(extQuotes[originalItem]->comment());
@ -1074,6 +1081,13 @@ void AWKeys::copyScript(const QString original)
{
if (debug) qDebug() << PDEBUG;
QList<int> tagList;
for (int i=0; i<extScripts.count(); i++)
tagList.append(extScripts[i]->number());
int number = 0;
while (tagList.contains(number))
number++;
QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
QString("awesomewidgets/scripts"),
QStandardPaths::LocateDirectory);
@ -1093,6 +1107,8 @@ void AWKeys::copyScript(const QString original)
break;
}
ExtScript *script = new ExtScript(0, name, dirs, debug);
script->setApiVersion(AWESAPI);
script->setNumber(number);
if (originalItem != -1) {
script->setActive(extScripts[originalItem]->isActive());
script->setComment(extScripts[originalItem]->comment());
@ -1124,6 +1140,13 @@ void AWKeys::copyUpgrade(const QString original)
{
if (debug) qDebug() << PDEBUG;
QList<int> tagList;
for (int i=0; i<extUpgrade.count(); i++)
tagList.append(extUpgrade[i]->number());
int number = 0;
while (tagList.contains(number))
number++;
QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
QString("awesomewidgets/upgrade"),
QStandardPaths::LocateDirectory);
@ -1143,6 +1166,8 @@ void AWKeys::copyUpgrade(const QString original)
break;
}
ExtUpgrade *upgrade = new ExtUpgrade(0, name, dirs, debug);
upgrade->setApiVersion(AWEUAPI);
upgrade->setNumber(number);
if (originalItem != -1) {
upgrade->setActive(extUpgrade[originalItem]->isActive());
upgrade->setComment(extUpgrade[originalItem]->comment());

25
sources/awesome-widget-kf5/plugin/desktops/bar-template.desktop
View File

@ -1,25 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
# name should be barN and uniq
Name=bar100500
Comment=Template for the AW bars
# value to show. Supported types are
# cpu, cpu[0-9], mem, swap, bat
X-AW-Value=cpu
# active color, RGBA
# you should use double quotes
X-AW-ActiveColor="0,0,0,255"
# inactive color, RGBA
# you should use double quotes
X-AW-InactiveColor="255,255,255,255"
# bar type. Supported types are
# Horizontal, Vertical, Circle
X-AW-Type=Horizontal
# direction. LeftToRight or RightToLeft
X-AW-Direction=LeftToRight
# height in pixels
X-AW-Height=25
# width in pixels
X-AW-Width=100
# API version
X-AW-ApiVersion=1