Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 22:35:12 +03:00
Code Issues Wiki Activity

Special Functions print improvement

Browse source
This commit is contained in:
Damjan Adamic 2014-05-04 18:37:58 +02:00
parent 7027d809c1
commit fe719686d9
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
companion/src/printdialog.cpp
View file

@ -656,7 +656,8 @@ void PrintDialog::printFSwitches()
QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">"; QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
str.append("<tr><td><h2>"+tr("Special Functions")+"</h2></td></tr>"); str.append("<tr><td><h2>"+tr("Special Functions")+"</h2></td></tr>");
str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3><tr>"); str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3><tr>");
str.append(doTC(tr("Switch"), "", true)); str.append("<td width=\"60\"><b>#</b></td>");
str.append(doTL(tr("Switch"), "", true));
str.append(doTL(tr("Function"), "", true)); str.append(doTL(tr("Function"), "", true));
str.append(doTL(tr("Parameter"), "", true)); str.append(doTL(tr("Parameter"), "", true));
str.append(doTL(tr("Repeat"), "", true)); str.append(doTL(tr("Repeat"), "", true));
@ -665,19 +666,21 @@ void PrintDialog::printFSwitches()
for(int i=0; i<firmware->getCapability(CustomFunctions); i++) { for(int i=0; i<firmware->getCapability(CustomFunctions); i++) {
if (g_model->funcSw[i].swtch.type!=SWITCH_TYPE_NONE) { if (g_model->funcSw[i].swtch.type!=SWITCH_TYPE_NONE) {
str.append("<tr>"); str.append("<tr>");
str.append(doTC(g_model->funcSw[i].swtch.toString(),"green")); str.append(doTL(tr("SF%1").arg(i+1),"", true));
str.append(doTC(g_model->funcSw[i].funcToString(),"green")); str.append(doTL(g_model->funcSw[i].swtch.toString(),"green"));
str.append(doTC(g_model->funcSw[i].paramToString(),"green")); str.append(doTL(g_model->funcSw[i].funcToString(),"green"));
str.append(doTL(g_model->funcSw[i].paramToString(),"green"));
int index=g_model->funcSw[i].func; int index=g_model->funcSw[i].func;
if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) { if ((g_model->funcSw[i].repeatParam>0) &&
str.append(doTC(QString("%1").arg(g_model->funcSw[i].repeatParam),"green")); (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic)) {
str.append(doTL(QString("%1").arg(g_model->funcSw[i].repeatParam),"green"));
} else { } else {
str.append(doTC( "&nbsp;","green")); str.append(doTL( "&nbsp;","green"));
} }
if ((index<=FuncInstantTrim) || (index>FuncBackgroundMusicPause)) { if ((index<=FuncInstantTrim) || (index>FuncBackgroundMusicPause)) {
str.append(doTC((g_model->funcSw[i].enabled ? "ON" : "OFF"),"green")); str.append(doTL((g_model->funcSw[i].enabled ? "ON" : "OFF"),"green"));
} else { } else {
str.append(doTC( "---","green")); str.append(doTL( "---","green"));
} }
str.append("</tr>"); str.append("</tr>");
sc++; sc++;