diff --git a/companion/src/comparedialog.cpp b/companion/src/comparedialog.cpp index 7c7436e99..3cebee856 100644 --- a/companion/src/comparedialog.cpp +++ b/companion/src/comparedialog.cpp @@ -1038,7 +1038,7 @@ void compareDialog::printSwitches() int sc=0; QString color; QString str = ""; - str.append(""); + str.append(""); str.append("

"+tr("Custom Switches")+"

"+tr("Logical Switches")+"

"); for (int i=0; igetCapability(CustomSwitches); i++) { QString sw1 = getCustomSwitchStr(&g_model1->customSw[i], *g_model1); @@ -1048,9 +1048,9 @@ void compareDialog::printSwitches() color=getColor1(sw1,sw2); str.append(QString(""); if (i<9) { - str.append("").arg(i+1)); + str.append("").arg(i+1)); } else { - str.append(""); + str.append(""); } color=getColor2(sw1,sw2); str.append(QString(""); @@ -1069,7 +1069,7 @@ void compareDialog::printFSwitches() QString color2; int sc=0; QString str = "
").arg(color)+sw1+""+tr("CS")+QString("%1"+tr("LS")+QString("%1"+tr("CS")+('A'+(i-9))+""+tr("LS")+('A'+(i-9))+"").arg(color)+sw2+"
"; - str.append(""); + str.append(""); str.append("

"+tr("Custom Functions")+"

"+tr("Switch Assignment")+"

"); str.append(""); str.append(""); diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp index 70ea33e0e..af73cc9cd 100644 --- a/companion/src/modeledit/customfunctions.cpp +++ b/companion/src/modeledit/customfunctions.cpp @@ -90,15 +90,6 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, for (int i=0; isetContextMenuPolicy(Qt::CustomContextMenu); - label->setMouseTracking(true); - label->setProperty("index", i); - label->setText(tr("CF%1").arg(i+1)); - gridLayout->addWidget(label, i+1, 0); - connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint))); - // The switch fswtchSwtch[i] = new QComboBox(this); fswtchSwtch[i]->setProperty("index", i); diff --git a/companion/src/modeledit/customswitches.cpp b/companion/src/modeledit/customswitches.cpp index 008f5cfe8..9d6d5596c 100644 --- a/companion/src/modeledit/customswitches.cpp +++ b/companion/src/modeledit/customswitches.cpp @@ -29,9 +29,9 @@ CustomSwitchesPanel::CustomSwitchesPanel(QWidget * parent, ModelData & model): QLabel * label = new QLabel(this); label->setProperty("index", i); if (i < 9) - label->setText(tr("CS%1").arg(i+1)); + label->setText(tr("LS%1").arg(i+1)); else - label->setText(tr("CS%1").arg(QChar('A'+i-9))); + label->setText(tr("LS%1").arg(QChar('A'+i-9))); label->setContextMenuPolicy(Qt::CustomContextMenu); label->setMouseTracking(true); connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(csw_customContextMenuRequested(QPoint))); diff --git a/companion/src/modeledit/modeledit.cpp b/companion/src/modeledit/modeledit.cpp index b9e0e8e5b..3aed2b38f 100644 --- a/companion/src/modeledit/modeledit.cpp +++ b/companion/src/modeledit/modeledit.cpp @@ -30,9 +30,9 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i addTab(new InputsPanel(this, model, radioData.generalSettings), tr("Inputs")); addTab(new MixesPanel(this, model, radioData.generalSettings), tr("Mixes")); addTab(new Channels(this, model), tr("Channels")); - addTab(new CustomSwitchesPanel(this, model), tr("Custom Switches")); + addTab(new CustomSwitchesPanel(this, model), tr("Logical Switches")); if (GetEepromInterface()->getCapability(CustomFunctions)) - addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Assignable Functions")); + addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Switch Assignment")); addTab(new Curves(this, model), tr("Curves")); if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY) addTab(new TelemetryPanel(this, model), tr("Telemetry")); diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp index e952e3ee3..cfd6938d6 100644 --- a/companion/src/printdialog.cpp +++ b/companion/src/printdialog.cpp @@ -640,16 +640,16 @@ void printDialog::printSwitches() { int sc=0; QString str = "
"+tr("Switch")+""+tr("Function")+"
"; - str.append(""); + str.append(""); str.append("

"+tr("Custom Switches")+"

"+tr("Logical Switches")+"

"); for (int i=0; igetCapability(CustomSwitches); i++) { if (g_model->customSw[i].func) { str.append(""); if (i<9) { - str.append("").arg(i+1)); + str.append("").arg(i+1)); } else { - str.append(""); + str.append(""); } QString tstr = getCustomSwitchStr(&g_model->customSw[i], *g_model); str.append(doTC(tstr,"green")); @@ -724,9 +724,8 @@ void printDialog::printFSwitches() { int sc=0; QString str = "
"+tr("CS")+QString("%1"+tr("LS")+QString("%1"+tr("CS")+('A'+(i-9))+""+tr("LS")+('A'+(i-9))+"
"; - str.append(""); + str.append(""); str.append("

"+tr("Function Switches")+"

"+tr("Switch Assignments")+"

"); - str.append(""); str.append(doTC(tr("Switch"), "", true)); str.append(doTL(tr("Function"), "", true)); str.append(doTL(tr("Parameter"), "", true)); @@ -736,7 +735,6 @@ void printDialog::printFSwitches() for(int i=0; igetCapability(CustomFunctions); i++) { if (g_model->funcSw[i].swtch.type!=SWITCH_TYPE_NONE) { str.append(""); - str.append(doTC(tr("CF")+QString("%1").arg(i+1),"",true)); str.append(doTC(g_model->funcSw[i].swtch.toString(),"green")); str.append(doTC(getFuncName(g_model->funcSw[i].func),"green")); str.append(doTC(FuncParam(g_model->funcSw[i].func,g_model->funcSw[i].param,g_model->funcSw[i].paramarm, g_model->funcSw[i].adjustMode),"green"));