fix(color): Limit label lengths, improve lbl display, prevent inv. char (#2287)

* (cpn) Add bullets & length warning

* (fw) Show labels with bullet separators

* (fw) Check all running twice. Remove from here

* (fw) Correct buffer overflow when labels too long

* (fw) Rem bullets in model label string

* (fw, cpn) Labels length

cpn,fw Limit label length
cpn Check correct model on rename length
cpn Focus issues
cpn Add rename,  move up/down.. still has an issue with selection. TODO...
cpn Switch to utf8 encoding
cpn Rename button ;)

* (cpn) Move up down working

re-Fix Checkbox, partially isn't what I thought (not greyed)

* (fw) Add CSV string funcs

Limit length of model edit shorter in portrait mode

* (cpn) Correct Label option showing on B&W

* (fw) Radio filename set but no file exists don't create

* (cpn) Simplify wording

* (fw) Correct debug values

* (fw) Reduce truncation length

* (both) Don't allow special chars in label name

(cpn) Prevent move when at top and bottom
(fw) Remove multiple label length defines
(fw) Shorten truncate length even more

* (fw) Close model_select on new model
This commit is contained in:
Cliff
2022-09-18 10:47:21 +10:00
committed by GitHub
parent c3660ab931
commit 333c2828ea
16 changed files with 405 additions and 248 deletions
+100 -46
View File
@@ -106,33 +106,43 @@ void RadioData::convert(RadioDataConversionState & cstate)
void RadioData::addLabel(QString label)
{
label.replace("/c",",");
label.replace("//","/");
if(labels.indexOf(label) == -1)
label = unEscapeCSV(label);
// Truncate possible UTF-8 to 16char maximum
QByteArray output = label.toUtf8();
if (output.size() > LABEL_LENGTH) {
int truncateAt = 0;
for (int i = LABEL_LENGTH; i > 0; i--) {
if ((output[i] & 0xC0) != 0x80) {
truncateAt = i;
break;
}
}
output.truncate(truncateAt);
}
label = QString(output);
if (labels.indexOf(label) == -1)
labels.append(label);
}
bool RadioData::deleteLabel(QString label)
{
bool deleted = false;
QString csvLabel = label;
csvLabel.replace("/","//");
csvLabel.replace(",","/c");
// Remove labels in the models
for(auto& model : models) {
QStringList modelLabels = QString(model.labels).split(',',QString::SkipEmptyParts);
if(modelLabels.indexOf(csvLabel) >= 0)
QStringList modelLabels = fromCSV(QString::fromUtf8(model.labels));
if (modelLabels.indexOf(label) >= 0) {
deleted = true;
modelLabels.removeAll(csvLabel);
strcpy(model.labels, QString(modelLabels.join(',')).toLocal8Bit().data());
modelLabels.removeAll(label);
}
strcpy(model.labels, toCSV(modelLabels).toUtf8().data());
}
// Remove the label from the global list
labels.removeAll(label);
// If no labels remain, add a Favorites one
if(!labels.size()) {
if (!labels.size()) {
addLabel(tr("Favorites"));
}
return deleted;
@@ -140,42 +150,46 @@ bool RadioData::deleteLabel(QString label)
bool RadioData::deleteLabel(int index)
{
if(index >= labels.size()) return false;
if (index >= labels.size()) return false;
QString modelLabel = labels.at(index);
return deleteLabel(modelLabel);
}
bool RadioData::renameLabel(QString from, QString to)
{
bool success = true;
int lengthdiff = to.size() - from.size();
QString csvFrom = from;
QString csvTo = to;
csvFrom.replace("/","//");
csvFrom.replace(",","/c");
csvTo.replace("/","//");
csvTo.replace(",","/c");
bool success = true;
QString csvFrom = escapeCSV(from);
QString csvTo = escapeCSV(to);
int lengthdiff = csvTo.size() - csvFrom.size();
// Check that rename is possible, not too long
// Check that rename is possible (Rename won't cause too long of a string)
for(auto& model : models) {
if((int)strlen(model.labels) + lengthdiff > (int)sizeof(model.labels) - 1) {
success = false;
if (RadioData::fromCSV(model.labels).indexOf(from) != -1) {
if ((int)strlen(model.labels) + lengthdiff > (int)sizeof(model.labels) - 1) {
success = false;
throw std::length_error(model.name);
break;
}
}
}
if(success) {
if (success) {
for(auto& model : models) {
QStringList modelLabels = QString(model.labels).split(',',QString::SkipEmptyParts);
int ind = modelLabels.indexOf(csvFrom);
if(ind != -1) {
if (ind != -1) {
modelLabels.replace(ind, csvTo);
QString outputcsv = QString(modelLabels.join(','));
if(outputcsv.toLocal8Bit().size() < (int)sizeof(model.labels));
strcpy(model.labels, outputcsv.toLocal8Bit().data());
if (outputcsv.toUtf8().size() < (int)sizeof(model.labels)) {
strcpy(model.labels, outputcsv.toUtf8().data());
} else { // Shouldn't ever get here, from check above
success = false;
throw std::length_error(model.name);
break;
}
}
}
int ind = labels.indexOf(from);
if(ind != -1) {
if (ind != -1) {
labels.replace(ind, to);
}
}
@@ -184,42 +198,51 @@ bool RadioData::renameLabel(QString from, QString to)
bool RadioData::renameLabel(int index, QString to)
{
if(index >= labels.size()) return false;
if (index >= labels.size()) return false;
QString from = labels.at(index);
return renameLabel(from, to);
}
void RadioData::swapLabel(int indFrom, int indTo)
{
if(abs(indFrom - indTo) > 1 ||
indFrom >= labels.size() ||
indTo >= labels.size() ||
indFrom < 0 ||
indTo < 0)
return;
QString tmplbl = labels.at(indFrom);
labels.replace(indFrom, labels.at(indTo));
labels.replace(indTo, tmplbl);
}
bool RadioData::addLabelToModel(int index, QString label)
{
if(index >= models.size()) return false;
label.replace("/","//");
label.replace(",","/c");
if (index >= models.size()) return false;
label = escapeCSV(label);
char *modelLabelCsv = models[index].labels;
// Make sure it will fit
if(strlen(modelLabelCsv) + label.size() + 1 < sizeof(models[index].labels)-1) {
QStringList modelLabels = QString(modelLabelCsv).split(',',QString::SkipEmptyParts);
if(modelLabels.indexOf(label) == -1) {
if (strlen(modelLabelCsv) + label.size() + 1 < sizeof(models[index].labels)-1) {
QStringList modelLabels = QString::fromUtf8(modelLabelCsv).split(',',QString::SkipEmptyParts);
if (modelLabels.indexOf(label) == -1) {
modelLabels.append(label);
strcpy(models[index].labels, QString(modelLabels.join(',')).toLocal8Bit().data());
strcpy(models[index].labels, QString(modelLabels.join(',')).toUtf8().data());
return true;
}
}
throw std::length_error(models[index].name);
return false;
}
bool RadioData::removeLabelFromModel(int index, QString label)
{
if(index >= models.size()) return false;
label.replace("/","//");
label.replace(",","/c");
if (index >= models.size()) return false;
char *modelLabelCsv = models[index].labels;
QStringList modelLabels = QString(modelLabelCsv).split(',',QString::SkipEmptyParts);
if(modelLabels.indexOf(label) >= 0) {
modelLabels.removeAll(label);
strcpy(models[index].labels, QString(modelLabels.join(',')).toLocal8Bit().data());
QStringList lbls = fromCSV(QString::fromUtf8(models[index].labels));
if (lbls.indexOf(label) >= 0) {
lbls.removeAll(label);
strcpy(models[index].labels, toCSV(lbls).toUtf8().data());
return true;
}
return false;
@@ -234,3 +257,34 @@ void RadioData::addLabelsFromModels()
}
}
}
QStringList RadioData::fromCSV(const QString &csv)
{
QStringList lbls = QString(csv).split(',',QString::SkipEmptyParts);
for(QString &label: lbls) {
label = unEscapeCSV(label);
}
return lbls;
}
QString RadioData::toCSV(QStringList lbls)
{
for(QString &label: lbls) {
label = escapeCSV(label);
}
return lbls.join(',');
}
QString RadioData::escapeCSV(QString str)
{
str.replace("/","//");
str.replace(",","/c");
return str;
}
QString RadioData::unEscapeCSV(QString str)
{
str.replace("/c",",");
str.replace("//","/");
return str;
}