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

Firmware/companion string consistency

Browse source
This commit is contained in:
Andre Bernet 2014-04-03 21:04:36 +02:00
parent 0075f20ae4
commit c65b26ec69
12 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
companion/src/generaledit.ui
View file

@ -1471,14 +1471,14 @@ p, li { white-space: pre-wrap; }
<item row="13" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
<string>Alarm Warning</string>
<string>&quot;No Sound&quot; Warning</string>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Memory Startup Warning</string>
<string>Low Memory Warning</string>
</property>
</widget>
</item>

8
companion/src/modeledit/channels.cpp
View file

@ -18,16 +18,16 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
minimize=true;
addLabel(gridLayout, tr("Name"), col++);
}
addLabel(gridLayout, tr("Offset"), col++, minimize);
addLabel(gridLayout, tr("Subtrim"), col++, minimize);
addLabel(gridLayout, tr("Min"), col++, minimize);
addLabel(gridLayout, tr("Max"), col++, minimize);
addLabel(gridLayout, tr("Invert"), col++, minimize);
addLabel(gridLayout, tr("Direction"), col++, minimize);
if (IS_TARANIS(GetEepromInterface()->getBoard()))
addLabel(gridLayout, tr("Curve"), col++, minimize);
if (GetEepromInterface()->getCapability(PPMCenter))
addLabel(gridLayout, tr("Center"), col++, minimize);
addLabel(gridLayout, tr("PPM Center"), col++, minimize);
if (GetEepromInterface()->getCapability(SYMLimits))
addLabel(gridLayout, tr("Sym"), col++, true);
addLabel(gridLayout, tr("Linear Subtrim"), col++, true);
for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
col = 0;

4
companion/src/modeledit/logicalswitches.cpp
View file

@ -14,10 +14,10 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
QGridLayout * gridLayout = new QGridLayout(this);
int col = 1;
addLabel(gridLayout, tr("Condition"), col++);
addLabel(gridLayout, tr("Function"), col++);
addLabel(gridLayout, tr("V1"), col++);
addLabel(gridLayout, tr("V2"), col++);
addLabel(gridLayout, tr("AND"), col++);
addLabel(gridLayout, tr("AND Switch"), col++);
if (GetEepromInterface()->getCapability(LogicalSwitchesExt)) {
addLabel(gridLayout, tr("Duration"), col++);
addLabel(gridLayout, tr("Delay"), col++);

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

@ -30,7 +30,7 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
addTab(new FlightModes(this, model, generalSettings), tr("Flight Modes"));
addTab(new InputsPanel(this, model, generalSettings), tr("Inputs"));
addTab(new MixesPanel(this, model, generalSettings), tr("Mixes"));
addTab(new Channels(this, model, generalSettings), tr("Channels"));
addTab(new Channels(this, model, generalSettings), tr("Servos"));
addTab(new LogicalSwitchesPanel(this, model, generalSettings), tr("Logical Switches"));
if (GetEepromInterface()->getCapability(CustomFunctions))
addTab(new CustomFunctionsPanel(this, model, generalSettings), tr("Special Functions"));

6
companion/src/modeledit/setup.cpp
View file

@ -22,10 +22,10 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
ui->persistentValue->hide();
}
ui->countdownBeep->addItem(tr("None"));
ui->countdownBeep->addItem(tr("Silent"));
ui->countdownBeep->addItem(tr("Beeps"));
if (IS_ARM(GetEepromInterface()->getBoard()) || IS_2560(GetEepromInterface()->getBoard()))
ui->countdownBeep->addItem(tr("Countdown"));
ui->countdownBeep->addItem(tr("Voice"));
lock = false;
}
@ -106,7 +106,7 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
QString label;
if (moduleIdx < 0) {
label = tr("Trainer Output");
label = tr("Trainer Port");
ui->trainerMode->setCurrentIndex(model.trainerMode);
}
else {

6
companion/src/modeledit/setup.ui
View file

@ -70,7 +70,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Throttle Trim</string>
<string>Throttle Trim Idle Only</string>
</property>
</widget>
</item>
@ -187,7 +187,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi
</font>
</property>
<property name="text">
<string>Throttle Source</string>
<string>Timer Source</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -203,7 +203,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi
</font>
</property>
<property name="text">
<string>Trim Increment</string>
<string>Trim Step</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

2
companion/src/modeledit/setup_module.ui
View file

@ -526,7 +526,7 @@
</size>
</property>
<property name="text">
<string>RX Number</string>
<string>Receiver No.</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

2
companion/src/modeledit/setup_timer.ui
View file

@ -46,7 +46,7 @@
<item>
<widget class="QCheckBox" name="minuteBeep">
<property name="text">
<string>MinuteBeep</string>
<string>Minute Call</string>
</property>
</widget>
</item>

6
companion/src/modeledit/telemetry.ui
View file

@ -975,6 +975,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> mAh</string>
</property>
<property name="maximum">
<number>32767</number>
</property>
@ -988,6 +991,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> A</string>
</property>
<property name="decimals">
<number>1</number>
</property>

13
companion/src/modeledit/telemetry_analog.ui
View file

@ -17,16 +17,7 @@
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@ -271,7 +262,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Min Value</string>
<string>Offset</string>
</property>
</widget>
</item>

2
radio/src/gui/menu_model.cpp
View file

@ -1321,7 +1321,7 @@ void menuModelSetup(uint8_t event)
break;
case ITEM_MODEL_EXTERNAL_MODULE_MODE:
lcd_putsLeft(y, STR_MODULE);
lcd_putsLeft(y, STR_MODE);
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_TARANIS_PROTOCOLS, g_model.externalModule, m_posHorz==0 ? attr : 0);
if (g_model.externalModule == MODULE_TYPE_XJT)
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0);

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

@ -740,7 +740,7 @@
#define TR_MODULE_RANGE "[Range]"
#define TR_RESET_BTN "[Reset]"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
#define TR_TRAINER "Trainer Port"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID already used","Model ID already used")
#define TR_MODULE INDENT "Module"
@ -759,7 +759,7 @@
#define TR_PTS "pts"
#define TR_SMOOTH "Smooth"
#define TR_COPY_TRIMS_TO_OFS "Copy Trim To Subtrim"
#define TR_PERSISTENT_MAH TR(INDENT "Str mAh", INDENT "Store mAh")
#define TR_PERSISTENT_MAH TR(INDENT "Str mAh", INDENT "Persistent mAh")
#define TR_PREFLIGHT "Preflight Checks"
#define TR_CHECKLIST INDENT "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")