Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 11:59:50 +03:00
Code Issues Wiki Activity

Switch assignments -> Special functions

Browse source
This commit is contained in:
Andre Bernet 2014-03-23 22:38:57 +01:00
parent 0b20297306
commit a2aeaa3d69
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
companion/src/comparedialog.cpp
View file

@ -1069,7 +1069,7 @@ void compareDialog::printFSwitches()
QString color2; QString color2;
int sc=0; int sc=0;
QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-before:always;\" width=\"100%\">"; QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-before:always;\" width=\"100%\">";
str.append("<tr><td><h2>"+tr("Switch Assignment")+"</h2></td></tr>"); str.append("<tr><td><h2>"+tr("Special Functions")+"</h2></td></tr>");
str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\"><tr>"); str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\"><tr>");
str.append("<td width=\"7%\" align=\"center\"><b>"+tr("Switch")+"</b></td>"); str.append("<td width=\"7%\" align=\"center\"><b>"+tr("Switch")+"</b></td>");
str.append("<td width=\"12%\" align=\"center\"><b>"+tr("Function")+"</b></td>"); str.append("<td width=\"12%\" align=\"center\"><b>"+tr("Function")+"</b></td>");
@ -1112,7 +1112,7 @@ void compareDialog::printFSwitches()
} else { } else {
str.append("<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>"); str.append("<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>");
} }
str.append(doTC(tr("CF")+QString("%1").arg(i+1),"",true)); str.append(doTC(tr("SF")+QString("%1").arg(i+1),"",true));
if (g_model2->funcSw[i].swtch.type) { if (g_model2->funcSw[i].swtch.type) {
str.append(doTC(g_model2->funcSw[i].swtch.toString(),color2)); str.append(doTC(g_model2->funcSw[i].swtch.toString(),color2));
str.append(doTC(g_model2->funcSw[i].funcToString(),color2)); str.append(doTC(g_model2->funcSw[i].funcToString(),color2));

2
companion/src/modeledit/customfunctions.cpp
View file

@ -104,7 +104,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
label->setContextMenuPolicy(Qt::CustomContextMenu); label->setContextMenuPolicy(Qt::CustomContextMenu);
label->setMouseTracking(true); label->setMouseTracking(true);
label->setProperty("index", i); label->setProperty("index", i);
label->setText(tr("CF%1").arg(i+1)); label->setText(tr("SF%1").arg(i+1));
gridLayout->addWidget(label, i+1, 0); gridLayout->addWidget(label, i+1, 0);
connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint))); connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint)));

2
companion/src/modeledit/modeledit.cpp
View file

@ -33,7 +33,7 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
addTab(new Channels(this, model), tr("Channels")); addTab(new Channels(this, model), tr("Channels"));
addTab(new LogicalSwitchesPanel(this, model), tr("Logical Switches")); addTab(new LogicalSwitchesPanel(this, model), tr("Logical Switches"));
if (GetEepromInterface()->getCapability(CustomFunctions)) if (GetEepromInterface()->getCapability(CustomFunctions))
addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Switch Assignment")); addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Special Functions"));
addTab(new Curves(this, model), tr("Curves")); addTab(new Curves(this, model), tr("Curves"));
if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY) if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY)
addTab(new TelemetryPanel(this, model), tr("Telemetry")); addTab(new TelemetryPanel(this, model), tr("Telemetry"));

2
companion/src/printdialog.cpp
View file

@ -697,7 +697,7 @@ void printDialog::printFSwitches()
{ {
int sc=0; int sc=0;
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("Switch Assignments")+"</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(doTC(tr("Switch"), "", true));
str.append(doTL(tr("Function"), "", true)); str.append(doTL(tr("Function"), "", true));

4
radio/src/translations/en.h.txt
View file

@ -618,7 +618,7 @@
#define TR_MENUCURVE "CURVE" #define TR_MENUCURVE "CURVE"
#define TR_MENULOGICALSWITCH "LOGICAL SWITCH" #define TR_MENULOGICALSWITCH "LOGICAL SWITCH"
#define TR_MENULOGICALSWITCHES "LOGICAL SWITCHES" #define TR_MENULOGICALSWITCHES "LOGICAL SWITCHES"
#define TR_MENUCUSTOMFUNC "SWITCH ASSIGNMENT" #define TR_MENUCUSTOMFUNC "SPECIAL FUNCTIONS"
#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS" #define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS"
#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT" #define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT"
#define TR_MENUTELEMETRY "TELEMETRY" #define TR_MENUTELEMETRY "TELEMETRY"
@ -732,7 +732,7 @@
#define TR_STATISTICS "Statistics" #define TR_STATISTICS "Statistics"
#define TR_ABOUT_US "About" #define TR_ABOUT_US "About"
#define TR_AND_SWITCH "AND Switch" #define TR_AND_SWITCH "AND Switch"
#define TR_CF "CF" #define TR_CF "SF"
#define TR_SPEAKER INDENT "Speaker" #define TR_SPEAKER INDENT "Speaker"
#define TR_BUZZER INDENT "Buzzer" #define TR_BUZZER INDENT "Buzzer"
#define TR_BYTES "bytes" #define TR_BYTES "bytes"