git-svn-id: svn://db.shs.com.ru/libs@611 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2019-10-10 10:05:20 +00:00
parent 47496c9570
commit 67cecc7a8d

View File

@@ -48,7 +48,7 @@ void TouchButtFrame::setButtons(const QStringList & captions) {
int cur = currentButton(); int cur = currentButton();
deleteButtons(); deleteButtons();
for (int i = 0; i < captions.size(); ++i) for (int i = 0; i < captions.size(); ++i)
addButton(captions.at(i)); addButton(QString(captions.at(i)).replace("\\n", "\n"));
if (button(cur) != 0) button(cur)->setChecked(true); if (button(cur) != 0) button(cur)->setChecked(true);
else if (!captions.isEmpty()) button(0)->setChecked(true); else if (!captions.isEmpty()) button(0)->setChecked(true);
} }
@@ -72,7 +72,7 @@ int TouchButtFrame::currentButton() {
QStringList TouchButtFrame::buttons() { QStringList TouchButtFrame::buttons() {
QStringList l; QStringList l;
for (int i = 0; i < lay->count(); ++i) for (int i = 0; i < lay->count(); ++i)
l.append(button(i)->text()); l.append(button(i)->text().replace("\n", "\\n"));
return l; return l;
} }