Merge remote-tracking branch 'origin/next' into mhotar/cz_translations
Conflicts: companion/src/translations/companion_cs.ts
This commit is contained in:
@@ -368,3 +368,7 @@ Gordon Evans
|
|||||||
Fred Figge
|
Fred Figge
|
||||||
Uwe Kuehn
|
Uwe Kuehn
|
||||||
David Beatty
|
David Beatty
|
||||||
|
Aaron Stringer
|
||||||
|
Alan J Wasserman
|
||||||
|
Wolfgang Rauser
|
||||||
|
Samuel Cook
|
||||||
|
|||||||
@@ -134,9 +134,7 @@ Mode 4:
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>Channel order
|
<string><html><head/><body><p>Channel order</p><p><br/></p><p>Defines the order of the default mixes created on a new model.</p></body></html></string>
|
||||||
|
|
||||||
This is used by the templated to determine which channel goes to what number output.</string>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
@@ -318,7 +316,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Channel Order</string>
|
<string>Default Channel Order</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||||
@@ -559,7 +557,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>General Settings Label</string>
|
<string notr="true">General Settings Label</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -353,7 +353,7 @@ void burnDialog::on_useProfileImageCB_clicked()
|
|||||||
if (!fileName.isEmpty()){
|
if (!fileName.isEmpty()){
|
||||||
QImage image(fileName);
|
QImage image(fileName);
|
||||||
if (image.isNull()) {
|
if (image.isNull()) {
|
||||||
QMessageBox::critical(this, tr("Error"), tr("The profile image %1 does not contain an image.").arg(fileName));
|
QMessageBox::critical(this, tr("Error"), tr("Profile image %1 is invalid.").arg(fileName));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
imageSource = PROFILE;
|
imageSource = PROFILE;
|
||||||
|
|||||||
@@ -123,5 +123,7 @@ int main(int argc, char *argv[])
|
|||||||
delete splash;
|
delete splash;
|
||||||
delete mainWin;
|
delete mainWin;
|
||||||
|
|
||||||
|
UnregisterFirmwares();
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -971,7 +971,7 @@ void compareDialog::printCurves()
|
|||||||
QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>";
|
QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>";
|
||||||
str.append(tr("Curves"));
|
str.append(tr("Curves"));
|
||||||
str.append("</h2></td></tr><tr><td>");
|
str.append("</h2></td></tr><tr><td>");
|
||||||
str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=11><b>"+tr("5 Points Curves")+"</b></td></tr><tr>");
|
str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=11><b>"+tr("5 Point Curves")+"</b></td></tr><tr>");
|
||||||
for(i=0; i<5; i++)
|
for(i=0; i<5; i++)
|
||||||
str.append(doTC(tr("pt %1").arg(i+1), "", true));
|
str.append(doTC(tr("pt %1").arg(i+1), "", true));
|
||||||
str.append("<td></td>");
|
str.append("<td></td>");
|
||||||
@@ -1001,7 +1001,7 @@ void compareDialog::printCurves()
|
|||||||
}
|
}
|
||||||
str.append("</table></td></tr><tr><td>");
|
str.append("</table></td></tr><tr><td>");
|
||||||
|
|
||||||
str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=19><b>"+tr("9 Points Curves")+"</b></td></tr><tr>");
|
str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=19><b>"+tr("9 Point Curves")+"</b></td></tr><tr>");
|
||||||
for(i=0; i<9; i++)
|
for(i=0; i<9; i++)
|
||||||
str.append(doTC(tr("pt %1").arg(i+1), "", true));
|
str.append(doTC(tr("pt %1").arg(i+1), "", true));
|
||||||
str.append("<td></td>");
|
str.append("<td></td>");
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Dialog</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ void customizeSplashDialog::loadProfile(Side side)
|
|||||||
|
|
||||||
if (!fileName.isEmpty()) {
|
if (!fileName.isEmpty()) {
|
||||||
if (!side.displayImage( fileName, PROFILE ))
|
if (!side.displayImage( fileName, PROFILE ))
|
||||||
QMessageBox::critical(this, tr("Error"), tr("Cannot load the profile image %1.").arg(fileName));
|
QMessageBox::critical(this, tr("Error"), tr("Cannot load profile image %1.").arg(fileName));
|
||||||
}
|
}
|
||||||
side.markSourceButton();
|
side.markSourceButton();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
#include "firmwares/th9x/th9xinterface.h"
|
#include "firmwares/th9x/th9xinterface.h"
|
||||||
#include "firmwares/gruvin9x/gruvin9xinterface.h"
|
#include "firmwares/gruvin9x/gruvin9xinterface.h"
|
||||||
#include "firmwares/opentx/opentxinterface.h"
|
#include "firmwares/opentx/opentxinterface.h"
|
||||||
|
#include "firmwares/opentx/opentxeeprom.h"
|
||||||
#include "firmwares/ersky9x/ersky9xinterface.h"
|
#include "firmwares/ersky9x/ersky9xinterface.h"
|
||||||
#include "appdata.h"
|
#include "appdata.h"
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
@@ -307,10 +308,7 @@ QString RawSource::toString()
|
|||||||
case SOURCE_TYPE_PPM:
|
case SOURCE_TYPE_PPM:
|
||||||
return QObject::tr("TR%1").arg(index+1);
|
return QObject::tr("TR%1").arg(index+1);
|
||||||
case SOURCE_TYPE_CH:
|
case SOURCE_TYPE_CH:
|
||||||
if (index < GetEepromInterface()->getCapability(Outputs))
|
return QObject::tr("CH%1").arg(index+1);
|
||||||
return QObject::tr("CH%1%2").arg((index+1)/10).arg((index+1)%10);
|
|
||||||
else
|
|
||||||
return QObject::tr("X%1").arg(index-GetEepromInterface()->getCapability(Outputs)+1);
|
|
||||||
case SOURCE_TYPE_TELEMETRY:
|
case SOURCE_TYPE_TELEMETRY:
|
||||||
return CHECK_IN_ARRAY(telemetry, index);
|
return CHECK_IN_ARRAY(telemetry, index);
|
||||||
case SOURCE_TYPE_GVAR:
|
case SOURCE_TYPE_GVAR:
|
||||||
@@ -1202,6 +1200,15 @@ void RegisterEepromInterfaces()
|
|||||||
eepromInterfaces.push_back(new Er9xInterface());
|
eepromInterfaces.push_back(new Er9xInterface());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UnregisterEepromInterfaces()
|
||||||
|
{
|
||||||
|
foreach(EEPROMInterface * intf, eepromInterfaces) {
|
||||||
|
qDebug() << "UnregisterEepromInterfaces(): deleting " << QString::number( reinterpret_cast<uint64_t>(intf), 16 );
|
||||||
|
delete intf;
|
||||||
|
}
|
||||||
|
OpenTxEepromCleanup();
|
||||||
|
}
|
||||||
|
|
||||||
QList<FirmwareInfo *> firmwares;
|
QList<FirmwareInfo *> firmwares;
|
||||||
FirmwareVariant default_firmware_variant;
|
FirmwareVariant default_firmware_variant;
|
||||||
FirmwareVariant current_firmware_variant;
|
FirmwareVariant current_firmware_variant;
|
||||||
@@ -1214,6 +1221,13 @@ void RegisterFirmwares()
|
|||||||
RegisterEepromInterfaces();
|
RegisterEepromInterfaces();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UnregisterFirmwares()
|
||||||
|
{
|
||||||
|
UnregisterEepromInterfaces();
|
||||||
|
UnregisterOpen9xFirmwares();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool LoadEeprom(RadioData &radioData, const uint8_t *eeprom, const int size)
|
bool LoadEeprom(RadioData &radioData, const uint8_t *eeprom, const int size)
|
||||||
{
|
{
|
||||||
foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
|
foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
|
||||||
|
|||||||
@@ -1022,7 +1022,6 @@ enum Capability {
|
|||||||
RotaryEncoders,
|
RotaryEncoders,
|
||||||
Outputs,
|
Outputs,
|
||||||
ChannelsName,
|
ChannelsName,
|
||||||
ExtraChannels,
|
|
||||||
ExtraInputs,
|
ExtraInputs,
|
||||||
ExtendedTrims,
|
ExtendedTrims,
|
||||||
NumCurves,
|
NumCurves,
|
||||||
@@ -1245,6 +1244,7 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void RegisterFirmwares();
|
void RegisterFirmwares();
|
||||||
|
void UnregisterFirmwares();
|
||||||
|
|
||||||
bool LoadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index);
|
bool LoadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index);
|
||||||
bool LoadEeprom(RadioData &radioData, const uint8_t *eeprom, int size);
|
bool LoadEeprom(RadioData &radioData, const uint8_t *eeprom, int size);
|
||||||
@@ -1269,6 +1269,7 @@ class FirmwareInfo {
|
|||||||
|
|
||||||
virtual ~FirmwareInfo()
|
virtual ~FirmwareInfo()
|
||||||
{
|
{
|
||||||
|
delete eepromInterface;
|
||||||
}
|
}
|
||||||
|
|
||||||
FirmwareInfo(const QString & id, const QString & name, EEPROMInterface * eepromInterface, const QString & url = QString(), const QString & stamp = QString(), const QString & rnurl = QString(), bool voice = false):
|
FirmwareInfo(const QString & id, const QString & name, EEPROMInterface * eepromInterface, const QString & url = QString(), const QString & stamp = QString(), const QString & rnurl = QString(), bool voice = false):
|
||||||
|
|||||||
@@ -239,8 +239,6 @@ int Er9xInterface::getCapability(const Capability capability)
|
|||||||
return 13;
|
return 13;
|
||||||
case Outputs:
|
case Outputs:
|
||||||
return 16;
|
return 16;
|
||||||
case ExtraChannels:
|
|
||||||
return 0;
|
|
||||||
case Simulation:
|
case Simulation:
|
||||||
return 1;
|
return 1;
|
||||||
case Telemetry:
|
case Telemetry:
|
||||||
|
|||||||
@@ -283,8 +283,6 @@ int Ersky9xInterface::getCapability(const Capability capability)
|
|||||||
return 13;
|
return 13;
|
||||||
case Outputs:
|
case Outputs:
|
||||||
return ERSKY9X_NUM_CHNOUT_V11;
|
return ERSKY9X_NUM_CHNOUT_V11;
|
||||||
case ExtraChannels:
|
|
||||||
return 0;
|
|
||||||
case Simulation:
|
case Simulation:
|
||||||
return 1;
|
return 1;
|
||||||
case Telemetry:
|
case Telemetry:
|
||||||
|
|||||||
@@ -241,8 +241,6 @@ int Gruvin9xInterface::getCapability(const Capability capability)
|
|||||||
return 13;
|
return 13;
|
||||||
case Outputs:
|
case Outputs:
|
||||||
return 16;
|
return 16;
|
||||||
case ExtraChannels:
|
|
||||||
return 0;
|
|
||||||
case ExtendedTrims:
|
case ExtendedTrims:
|
||||||
return 500;
|
return 500;
|
||||||
case Simulation:
|
case Simulation:
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ t_Open9xExpoData_v201::operator ExpoData ()
|
|||||||
c9x.mode = mode;
|
c9x.mode = mode;
|
||||||
c9x.chn = chn;
|
c9x.chn = chn;
|
||||||
if (expo!=0 && curve!=0) {
|
if (expo!=0 && curve!=0) {
|
||||||
EEPROMWarnings += ::QObject::tr("Simultaneous usage of expo and curves is no longer supported in open9x") + "\n";
|
EEPROMWarnings += ::QObject::tr("Simultaneous usage of expo and curves is no longer supported in OpenTX") + "\n";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (curve == 0) {
|
if (curve == 0) {
|
||||||
|
|||||||
@@ -86,8 +86,10 @@ class SwitchesConversionTable: public ConversionTable {
|
|||||||
addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, i), val++);
|
addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, i), val++);
|
||||||
}
|
}
|
||||||
|
|
||||||
addConversion(RawSwitch(SWITCH_TYPE_OFF), -val+offset);
|
if (!(flags & POPULATE_TIMER_MODES)) {
|
||||||
addConversion(RawSwitch(SWITCH_TYPE_ON), val++);
|
addConversion(RawSwitch(SWITCH_TYPE_OFF), -val+offset);
|
||||||
|
addConversion(RawSwitch(SWITCH_TYPE_ON), val++);
|
||||||
|
}
|
||||||
|
|
||||||
if (version < 216) {
|
if (version < 216) {
|
||||||
// previous "moment" switches
|
// previous "moment" switches
|
||||||
@@ -127,12 +129,12 @@ class SwitchesConversionTable: public ConversionTable {
|
|||||||
SwitchesConversionTable * table;
|
SwitchesConversionTable * table;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static std::list<Cache> internalCache;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static SwitchesConversionTable * getInstance(BoardEnum board, unsigned int version, unsigned long flags=0)
|
static SwitchesConversionTable * getInstance(BoardEnum board, unsigned int version, unsigned long flags=0)
|
||||||
{
|
{
|
||||||
static std::list<Cache> internalCache;
|
|
||||||
|
|
||||||
for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
|
for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
|
||||||
Cache element = *it;
|
Cache element = *it;
|
||||||
if (element.board == board && element.version == version && element.flags == flags)
|
if (element.board == board && element.version == version && element.flags == flags)
|
||||||
@@ -143,8 +145,18 @@ class SwitchesConversionTable: public ConversionTable {
|
|||||||
internalCache.push_back(element);
|
internalCache.push_back(element);
|
||||||
return element.table;
|
return element.table;
|
||||||
}
|
}
|
||||||
|
static void Cleanup()
|
||||||
|
{
|
||||||
|
for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
|
||||||
|
Cache element = *it;
|
||||||
|
delete element.table;
|
||||||
|
}
|
||||||
|
internalCache.clear();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
std::list<SwitchesConversionTable::Cache> SwitchesConversionTable::internalCache;
|
||||||
|
|
||||||
#define FLAG_NONONE 0x01
|
#define FLAG_NONONE 0x01
|
||||||
#define FLAG_NOSWITCHES 0x02
|
#define FLAG_NOSWITCHES 0x02
|
||||||
#define FLAG_NOTELEMETRY 0x04
|
#define FLAG_NOTELEMETRY 0x04
|
||||||
@@ -279,13 +291,12 @@ class SourcesConversionTable: public ConversionTable {
|
|||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
SourcesConversionTable * table;
|
SourcesConversionTable * table;
|
||||||
};
|
};
|
||||||
|
static std::list<Cache> internalCache;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static SourcesConversionTable * getInstance(BoardEnum board, unsigned int version, unsigned int variant, unsigned long flags=0)
|
static SourcesConversionTable * getInstance(BoardEnum board, unsigned int version, unsigned int variant, unsigned long flags=0)
|
||||||
{
|
{
|
||||||
static std::list<Cache> internalCache;
|
|
||||||
|
|
||||||
for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
|
for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
|
||||||
Cache element = *it;
|
Cache element = *it;
|
||||||
if (element.board == board && element.version == version && element.variant == variant && element.flags == flags)
|
if (element.board == board && element.version == version && element.variant == variant && element.flags == flags)
|
||||||
@@ -296,8 +307,24 @@ class SourcesConversionTable: public ConversionTable {
|
|||||||
internalCache.push_back(element);
|
internalCache.push_back(element);
|
||||||
return element.table;
|
return element.table;
|
||||||
}
|
}
|
||||||
|
static void Cleanup()
|
||||||
|
{
|
||||||
|
for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
|
||||||
|
Cache element = *it;
|
||||||
|
delete element.table;
|
||||||
|
}
|
||||||
|
internalCache.clear();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
std::list<SourcesConversionTable::Cache> SourcesConversionTable::internalCache;
|
||||||
|
|
||||||
|
void OpenTxEepromCleanup(void)
|
||||||
|
{
|
||||||
|
SourcesConversionTable::Cleanup();
|
||||||
|
SwitchesConversionTable::Cleanup();
|
||||||
|
}
|
||||||
|
|
||||||
ThrottleSourceConversionTable::ThrottleSourceConversionTable(BoardEnum board, unsigned int version)
|
ThrottleSourceConversionTable::ThrottleSourceConversionTable(BoardEnum board, unsigned int version)
|
||||||
{
|
{
|
||||||
int val=0;
|
int val=0;
|
||||||
@@ -678,8 +705,9 @@ class FlightModeField: public TransformedField {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
for (int i=0; i<NUM_STICKS; i++)
|
for (int i=0; i<NUM_STICKS; i++) {
|
||||||
internalField.Append(new SignedField<16>(trimBase[i]));
|
internalField.Append(new SignedField<16>(trimBase[i]));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internalField.Append(new SwitchField<8>(phase.swtch, board, version));
|
internalField.Append(new SwitchField<8>(phase.swtch, board, version));
|
||||||
@@ -749,22 +777,29 @@ class FlightModeField: public TransformedField {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int trim;
|
if (phase.swtch == RawSwitch(SWITCH_TYPE_NONE)) {
|
||||||
if (board == BOARD_STOCK || (board == BOARD_M128 && version >= 215))
|
phase.trimRef[i] = 0;
|
||||||
trim = ((trimBase[i]) << 2) + (trimExt[i] & 0x03);
|
|
||||||
else
|
|
||||||
trim = trimBase[i];
|
|
||||||
if (trim > 500) {
|
|
||||||
phase.trimRef[i] = trim - 501;
|
|
||||||
if (phase.trimRef[i] >= index)
|
|
||||||
phase.trimRef[i] += 1;
|
|
||||||
phase.trimMode[i] = 0;
|
phase.trimMode[i] = 0;
|
||||||
phase.trim[i] = 0;
|
phase.trim[i] = 0;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
phase.trimRef[i] = index;
|
int trim;
|
||||||
phase.trimMode[i] = 0;
|
if (board == BOARD_STOCK || (board == BOARD_M128 && version >= 215))
|
||||||
phase.trim[i] = trim;
|
trim = ((trimBase[i]) << 2) + (trimExt[i] & 0x03);
|
||||||
|
else
|
||||||
|
trim = trimBase[i];
|
||||||
|
if (trim > 500) {
|
||||||
|
phase.trimRef[i] = trim - 501;
|
||||||
|
if (phase.trimRef[i] >= index)
|
||||||
|
phase.trimRef[i] += 1;
|
||||||
|
phase.trimMode[i] = 0;
|
||||||
|
phase.trim[i] = 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
phase.trimRef[i] = index/*own trim*/;
|
||||||
|
phase.trimMode[i] = 0;
|
||||||
|
phase.trim[i] = trim;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1434,6 +1469,10 @@ class LogicalSwitchField: public TransformedField {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
~LogicalSwitchField()
|
||||||
|
{
|
||||||
|
delete andswitchesConversionTable;
|
||||||
|
}
|
||||||
virtual void beforeExport()
|
virtual void beforeExport()
|
||||||
{
|
{
|
||||||
if (csw.func == LS_FN_TIMER) {
|
if (csw.func == LS_FN_TIMER) {
|
||||||
|
|||||||
@@ -144,4 +144,5 @@ class OpenTxModelData: public TransformedField {
|
|||||||
ChannelsConversionTable channelsConversionTable;
|
ChannelsConversionTable channelsConversionTable;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void OpenTxEepromCleanup(void);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -278,7 +278,7 @@ template <class T>
|
|||||||
bool OpenTxInterface::saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant)
|
bool OpenTxInterface::saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant)
|
||||||
{
|
{
|
||||||
T open9xModel(model, board, version, variant);
|
T open9xModel(model, board, version, variant);
|
||||||
open9xModel.Dump();
|
// open9xModel.Dump();
|
||||||
QByteArray eeprom;
|
QByteArray eeprom;
|
||||||
open9xModel.Export(eeprom);
|
open9xModel.Export(eeprom);
|
||||||
int sz = efile->writeRlc2(FILE_MODEL(index), FILE_TYP_MODEL, (const uint8_t*)eeprom.constData(), eeprom.size());
|
int sz = efile->writeRlc2(FILE_MODEL(index), FILE_TYP_MODEL, (const uint8_t*)eeprom.constData(), eeprom.size());
|
||||||
@@ -581,8 +581,6 @@ int OpenTxInterface::getCapability(const Capability capability)
|
|||||||
return (IS_ARM(board) ? 23 : 7);
|
return (IS_ARM(board) ? 23 : 7);
|
||||||
case HasSoundMixer:
|
case HasSoundMixer:
|
||||||
return (IS_ARM(board) ? 1 : 0);
|
return (IS_ARM(board) ? 1 : 0);
|
||||||
case ExtraChannels:
|
|
||||||
return 0;
|
|
||||||
case ExtraInputs:
|
case ExtraInputs:
|
||||||
return 1;
|
return 1;
|
||||||
case ExtendedTrims:
|
case ExtendedTrims:
|
||||||
@@ -1037,13 +1035,13 @@ void RegisterOpen9xFirmwares()
|
|||||||
// NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
|
// NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
|
||||||
open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
|
open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
|
||||||
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
||||||
open9x->addOption("ppmus", QObject::tr("PPM values displayed in us"));
|
open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
||||||
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
||||||
open9x->addOptions(nav_options);
|
open9x->addOptions(nav_options);
|
||||||
open9x->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support"));
|
open9x->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support"));
|
||||||
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them"));
|
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
|
||||||
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them"));
|
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
|
||||||
open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
||||||
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
||||||
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
||||||
@@ -1074,13 +1072,13 @@ void RegisterOpen9xFirmwares()
|
|||||||
// NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
|
// NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
|
||||||
open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
|
open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
|
||||||
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
||||||
open9x->addOption("ppmus", QObject::tr("PPM values displayed in us"));
|
open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
||||||
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
||||||
open9x->addOptions(nav_options);
|
open9x->addOptions(nav_options);
|
||||||
open9x->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support"));
|
open9x->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support"));
|
||||||
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them"));
|
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
|
||||||
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them"));
|
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
|
||||||
open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
||||||
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
||||||
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
||||||
@@ -1106,12 +1104,12 @@ void RegisterOpen9xFirmwares()
|
|||||||
// NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
|
// NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
|
||||||
open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
|
open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
|
||||||
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
||||||
open9x->addOption("ppmus", QObject::tr("PPM values displayed in us"));
|
open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
||||||
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
||||||
open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
|
open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
|
||||||
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them"));
|
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
|
||||||
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them"));
|
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
|
||||||
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
||||||
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
||||||
open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
|
open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
|
||||||
@@ -1140,12 +1138,12 @@ void RegisterOpen9xFirmwares()
|
|||||||
// NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
|
// NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
|
||||||
open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
|
open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
|
||||||
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
||||||
open9x->addOption("ppmus", QObject::tr("PPM values displayed in us"));
|
open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
||||||
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
||||||
open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
|
open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
|
||||||
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them"));
|
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
|
||||||
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them"));
|
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
|
||||||
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
||||||
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
||||||
open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
|
open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
|
||||||
@@ -1169,12 +1167,12 @@ void RegisterOpen9xFirmwares()
|
|||||||
Option dsm2_options[] = { { "DSM2", QObject::tr("Support for DSM2 modules"), 0 }, { "DSM2PPM", QObject::tr("Support for DSM2 modules using ppm instead of true serial"), 0 }, { NULL } };
|
Option dsm2_options[] = { { "DSM2", QObject::tr("Support for DSM2 modules"), 0 }, { "DSM2PPM", QObject::tr("Support for DSM2 modules using ppm instead of true serial"), 0 }, { NULL } };
|
||||||
open9x->addOptions(dsm2_options);
|
open9x->addOptions(dsm2_options);
|
||||||
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
||||||
open9x->addOption("ppmus", QObject::tr("PPM values displayed in us"));
|
open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
||||||
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
||||||
open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
|
open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
|
||||||
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them"));
|
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
|
||||||
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them"));
|
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
|
||||||
open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
||||||
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
||||||
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
||||||
@@ -1194,12 +1192,12 @@ void RegisterOpen9xFirmwares()
|
|||||||
open9x->addOption("nofp", QObject::tr("No flight modes"));
|
open9x->addOption("nofp", QObject::tr("No flight modes"));
|
||||||
open9x->addOption("nocurves", QObject::tr("Disable curves menus"));
|
open9x->addOption("nocurves", QObject::tr("Disable curves menus"));
|
||||||
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
||||||
open9x->addOption("ppmus", QObject::tr("PPM values displayed in us"));
|
open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
||||||
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
||||||
open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
|
open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
|
||||||
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them"));
|
open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
|
||||||
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them"));
|
open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
|
||||||
open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
||||||
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
|
||||||
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
open9x->addOption("battgraph", QObject::tr("Battery graph"));
|
||||||
@@ -1216,7 +1214,7 @@ void RegisterOpen9xFirmwares()
|
|||||||
open9x->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
|
open9x->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
|
||||||
open9x->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
|
open9x->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
|
||||||
open9x->addOption("nogvars", QObject::tr("Disable Global variables"));
|
open9x->addOption("nogvars", QObject::tr("Disable Global variables"));
|
||||||
open9x->addOption("ppmus", QObject::tr("PPM values displayed in us"));
|
open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
|
open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
|
||||||
open9x->addOptions(fai_options);
|
open9x->addOptions(fai_options);
|
||||||
firmwares.push_back(open9x);
|
firmwares.push_back(open9x);
|
||||||
@@ -1226,9 +1224,17 @@ void RegisterOpen9xFirmwares()
|
|||||||
open9x->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
|
open9x->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
|
||||||
open9x->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
|
open9x->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
|
||||||
open9x->addOption("nogvars", QObject::tr("Disable Global variables"));
|
open9x->addOption("nogvars", QObject::tr("Disable Global variables"));
|
||||||
open9x->addOption("ppmus", QObject::tr("PPM values displayed in us"));
|
open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
|
open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
|
||||||
open9x->addOptions(fai_options);
|
open9x->addOptions(fai_options);
|
||||||
firmwares.push_back(open9x);
|
firmwares.push_back(open9x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UnregisterOpen9xFirmwares()
|
||||||
|
{
|
||||||
|
foreach (FirmwareInfo * f, firmwares) {
|
||||||
|
qDebug() << "UnregisterOpen9xFirmwares(): deleting " << QString::number(reinterpret_cast<uint64_t>(f), 16 );
|
||||||
|
delete f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -164,5 +164,6 @@ class Open9xFirmware: public FirmwareInfo {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void RegisterOpen9xFirmwares();
|
void RegisterOpen9xFirmwares();
|
||||||
|
void UnregisterOpen9xFirmwares();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -159,8 +159,6 @@ int Th9xInterface::getCapability(const Capability capability)
|
|||||||
return TH9X_MAX_SWITCHES;
|
return TH9X_MAX_SWITCHES;
|
||||||
case Outputs:
|
case Outputs:
|
||||||
return 8;
|
return 8;
|
||||||
case ExtraChannels:
|
|
||||||
return 4;
|
|
||||||
case OffsetWeight:
|
case OffsetWeight:
|
||||||
return 125;
|
return 125;
|
||||||
case Simulation:
|
case Simulation:
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -113,7 +113,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -126,7 +126,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -139,7 +139,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -152,7 +152,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -214,7 +214,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -227,7 +227,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -240,7 +240,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -253,7 +253,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -266,7 +266,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -279,7 +279,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -292,7 +292,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -305,7 +305,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -318,7 +318,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -331,7 +331,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -344,7 +344,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -357,7 +357,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -370,7 +370,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -383,7 +383,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -396,7 +396,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -409,7 +409,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -422,7 +422,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -435,7 +435,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -448,7 +448,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -461,7 +461,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -474,7 +474,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -487,7 +487,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -500,7 +500,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -513,7 +513,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -574,7 +574,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -587,7 +587,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -614,7 +614,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -627,7 +627,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -640,7 +640,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -653,7 +653,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -666,7 +666,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -679,7 +679,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -699,7 +699,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -712,7 +712,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>FwInfo</string>
|
<string notr="true">FwInfo</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -725,7 +725,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -540,7 +540,7 @@ Mode 4:
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Channel Order (For Templates)</string>
|
<string>Default Channel Order</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -683,9 +683,7 @@ Mode 4:
|
|||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>Channel order
|
<string><html><head/><body><p>Channel order</p><p><br/></p><p>Defines the order of the default mixes created on a new model.</p></body></html></string>
|
||||||
|
|
||||||
This is used by the templated to determine which channel goes to what number output.</string>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
@@ -1628,12 +1626,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
<string/>
|
||||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
|
||||||
p, li { white-space: pre-wrap; }
|
|
||||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p>
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html></string>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>10</number>
|
<number>10</number>
|
||||||
@@ -2388,7 +2381,7 @@ Acceptable values are 5v..10v</string>
|
|||||||
<item row="4" column="5">
|
<item row="4" column="5">
|
||||||
<widget class="QLabel" name="label_pot4">
|
<widget class="QLabel" name="label_pot4">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>POT 4</string>
|
<string>Pot. 4</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -2402,7 +2395,7 @@ Acceptable values are 5v..10v</string>
|
|||||||
<item row="3" column="5">
|
<item row="3" column="5">
|
||||||
<widget class="QLabel" name="label_pot3">
|
<widget class="QLabel" name="label_pot3">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>POT 3</string>
|
<string>Pot. 3</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -2422,14 +2415,14 @@ Acceptable values are 5v..10v</string>
|
|||||||
<item row="2" column="5">
|
<item row="2" column="5">
|
||||||
<widget class="QLabel" name="label_pot2">
|
<widget class="QLabel" name="label_pot2">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>POT 2</string>
|
<string>Pot. 2</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="5">
|
<item row="1" column="5">
|
||||||
<widget class="QLabel" name="label_pot1">
|
<widget class="QLabel" name="label_pot1">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>POT 1</string>
|
<string>Pot. 1</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -2456,7 +2449,7 @@ Acceptable values are 5v..10v</string>
|
|||||||
<item row="3" column="0">
|
<item row="3" column="0">
|
||||||
<widget class="QLabel" name="label_17">
|
<widget class="QLabel" name="label_17">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>STICK 3</string>
|
<string>Stick 3</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -2493,7 +2486,7 @@ Acceptable values are 5v..10v</string>
|
|||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label_15">
|
<widget class="QLabel" name="label_15">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>STICK 1</string>
|
<string>Stick 1</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -2542,7 +2535,7 @@ Acceptable values are 5v..10v</string>
|
|||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="label_16">
|
<widget class="QLabel" name="label_16">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>STICK 2</string>
|
<string>Stick 2</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -2627,7 +2620,7 @@ Acceptable values are 5v..10v</string>
|
|||||||
<item row="4" column="0">
|
<item row="4" column="0">
|
||||||
<widget class="QLabel" name="label_18">
|
<widget class="QLabel" name="label_18">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>STICK 4</string>
|
<string>Stick 4</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
#include "appdata.h"
|
#include "appdata.h"
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
#include "simulatordialog.h"
|
#include "simulatordialog.h"
|
||||||
|
#include "simulatorinterface.h"
|
||||||
#include "flashinterface.h"
|
#include "flashinterface.h"
|
||||||
|
|
||||||
const QColor colors[C9X_MAX_CURVES] = {
|
const QColor colors[C9X_MAX_CURVES] = {
|
||||||
@@ -604,7 +605,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
|
|||||||
if (item == source) b->setCurrentIndex(b->count()-1);
|
if (item == source) b->setCurrentIndex(b->count()-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i=0; i<GetEepromInterface()->getCapability(Outputs)+GetEepromInterface()->getCapability(ExtraChannels); i++) {
|
for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
|
||||||
item = RawSource(SOURCE_TYPE_CH, i);
|
item = RawSource(SOURCE_TYPE_CH, i);
|
||||||
b->addItem(item.toString(), item.toValue());
|
b->addItem(item.toString(), item.toValue());
|
||||||
if (item == source) b->setCurrentIndex(b->count()-1);
|
if (item == source) b->setCurrentIndex(b->count()-1);
|
||||||
@@ -905,7 +906,9 @@ CompanionIcon::CompanionIcon(QString baseimage)
|
|||||||
|
|
||||||
void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
|
void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
|
||||||
{
|
{
|
||||||
if (GetEepromInterface()->getSimulator()) {
|
SimulatorInterface * si = GetEepromInterface()->getSimulator();
|
||||||
|
if (si) {
|
||||||
|
delete si;
|
||||||
RadioData * simuData = new RadioData(radioData);
|
RadioData * simuData = new RadioData(radioData);
|
||||||
unsigned int flags = 0;
|
unsigned int flags = 0;
|
||||||
if (modelIdx >= 0) {
|
if (modelIdx >= 0) {
|
||||||
|
|||||||
@@ -87,7 +87,7 @@
|
|||||||
MainWindow::MainWindow():
|
MainWindow::MainWindow():
|
||||||
downloadDialog_forWait(NULL)
|
downloadDialog_forWait(NULL)
|
||||||
{
|
{
|
||||||
mdiArea = new QMdiArea;
|
mdiArea = new QMdiArea(this);
|
||||||
mdiArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
|
mdiArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
|
||||||
mdiArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
|
mdiArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
|
||||||
setCentralWidget(mdiArea);
|
setCentralWidget(mdiArea);
|
||||||
@@ -277,7 +277,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available please check the OpenTX website!"));
|
QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available, please check the OpenTX website!"));
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
if (showcheckForUpdatesResult && check1done && check2done)
|
if (showcheckForUpdatesResult && check1done && check2done)
|
||||||
@@ -341,7 +341,7 @@ void MainWindow::reply1Accepted()
|
|||||||
int errnum=hline.mid(6).toInt();
|
int errnum=hline.mid(6).toInt();
|
||||||
switch(errnum) {
|
switch(errnum) {
|
||||||
case 1:
|
case 1:
|
||||||
errormsg=tr("Firmware does not longer fit in the radio, due to selected firmware options");
|
errormsg=tr("Not enough memory for all the selected firmware options");
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
errormsg=tr("Compilation server temporary failure, try later");
|
errormsg=tr("Compilation server temporary failure, try later");
|
||||||
@@ -380,7 +380,7 @@ void MainWindow::reply1Accepted()
|
|||||||
int errnum=hline.mid(6).toInt();
|
int errnum=hline.mid(6).toInt();
|
||||||
switch(errnum) {
|
switch(errnum) {
|
||||||
case 1:
|
case 1:
|
||||||
errormsg=tr("Firmware does not fit in the radio, due to selected firmware options");
|
errormsg=tr("Not enough memory for all the selected firmware options");
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
errormsg=tr("Compilation server termporary failure, try later");
|
errormsg=tr("Compilation server termporary failure, try later");
|
||||||
@@ -1611,14 +1611,14 @@ void MainWindow::createActions()
|
|||||||
}
|
}
|
||||||
updateProfilesActions();
|
updateProfilesActions();
|
||||||
|
|
||||||
newAct = addAct("new.png", tr("New Models+Settings"), tr("Create a new Models and Settings file"), QKeySequence::New, SLOT(newFile()));
|
newAct = addAct("new.png", tr("New"), tr("Create a new Models and Settings file"), QKeySequence::New, SLOT(newFile()));
|
||||||
openAct = addAct("open.png", tr("Open Models+Settings..."), tr("Open Models and Settings file"), QKeySequence::Open, SLOT(openFile()));
|
openAct = addAct("open.png", tr("Open..."), tr("Open Models and Settings file"), QKeySequence::Open, SLOT(openFile()));
|
||||||
saveAct = addAct("save.png", tr("Save Models+Settings..."), tr("Save Models and Settings file"), QKeySequence::Save, SLOT(save()));
|
saveAct = addAct("save.png", tr("Save"), tr("Save Models and Settings file"), QKeySequence::Save, SLOT(save()));
|
||||||
saveAsAct = addAct("saveas.png", tr("Save Models+Settings as..."), tr("Save Models and Settings file"), QKeySequence::SaveAs, SLOT(saveAs()));
|
saveAsAct = addAct("saveas.png", tr("Save As..."), tr("Save Models and Settings file"), QKeySequence::SaveAs, SLOT(saveAs()));
|
||||||
exitAct = addAct("exit.png", tr("Exit"), tr("Exit the application"), QKeySequence::Quit, SLOT(closeAllWindows()), qApp);
|
exitAct = addAct("exit.png", tr("Exit"), tr("Exit the application"), QKeySequence::Quit, SLOT(closeAllWindows()), qApp);
|
||||||
cutAct = addAct("cut.png", tr("Cut Model"), tr("Cut current model to the clipboard"), QKeySequence::Cut, SLOT(cut()));
|
cutAct = addAct("cut.png", tr("Cut Model"), tr("Cut current model to the clipboard"), QKeySequence::Cut, SLOT(cut()));
|
||||||
copyAct = addAct("copy.png", tr("Copy Model..."), tr("Copy current model to the clipboard"), QKeySequence::Copy, SLOT(copy()));
|
copyAct = addAct("copy.png", tr("Copy Model"), tr("Copy current model to the clipboard"), QKeySequence::Copy, SLOT(copy()));
|
||||||
pasteAct = addAct("paste.png", tr("Paste Model..."), tr("Paste model from clipboard"), QKeySequence::Paste, SLOT(paste()));
|
pasteAct = addAct("paste.png", tr("Paste Model"), tr("Paste model from clipboard"), QKeySequence::Paste, SLOT(paste()));
|
||||||
|
|
||||||
QActionGroup *themeAlignGroup = new QActionGroup(this);
|
QActionGroup *themeAlignGroup = new QActionGroup(this);
|
||||||
classicThemeAct = addAct( themeAlignGroup, tr("Classical"), tr("The classic companion9x icon theme"), SLOT(setClassicTheme()));
|
classicThemeAct = addAct( themeAlignGroup, tr("Classical"), tr("The classic companion9x icon theme"), SLOT(setClassicTheme()));
|
||||||
@@ -1641,12 +1641,12 @@ void MainWindow::createActions()
|
|||||||
finnishLangAct = addAct( langAlignGroup, tr("Finnish"), tr("Use Finnish in menus"), SLOT(setFILanguage()));
|
finnishLangAct = addAct( langAlignGroup, tr("Finnish"), tr("Use Finnish in menus"), SLOT(setFILanguage()));
|
||||||
frenchLangAct = addAct( langAlignGroup, tr("French"), tr("Use French in menus"), SLOT(setFRLanguage()));
|
frenchLangAct = addAct( langAlignGroup, tr("French"), tr("Use French in menus"), SLOT(setFRLanguage()));
|
||||||
italianLangAct = addAct( langAlignGroup, tr("Italian"), tr("Use Italian in menus"), SLOT(setITLanguage()));
|
italianLangAct = addAct( langAlignGroup, tr("Italian"), tr("Use Italian in menus"), SLOT(setITLanguage()));
|
||||||
hebrewLangAct = addAct( langAlignGroup, tr("Hebrew"), tr("Use Hebrew in menus"), SLOT(setHELanguage()));
|
// hebrewLangAct = addAct( langAlignGroup, tr("Hebrew"), tr("Use Hebrew in menus"), SLOT(setHELanguage()));
|
||||||
polishLangAct = addAct( langAlignGroup, tr("Polish"), tr("Use Polish in menus"), SLOT(setPLLanguage()));
|
polishLangAct = addAct( langAlignGroup, tr("Polish"), tr("Use Polish in menus"), SLOT(setPLLanguage()));
|
||||||
portugueseLangAct = addAct( langAlignGroup, tr("Portuguese"), tr("Use Portuguese in menus"), SLOT(setPTLanguage()));
|
// portugueseLangAct = addAct( langAlignGroup, tr("Portuguese"), tr("Use Portuguese in menus"), SLOT(setPTLanguage()));
|
||||||
swedishLangAct = addAct( langAlignGroup, tr("Swedish"), tr("Use Swedish in menus"), SLOT(setSELanguage()));
|
swedishLangAct = addAct( langAlignGroup, tr("Swedish"), tr("Use Swedish in menus"), SLOT(setSELanguage()));
|
||||||
russianLangAct = addAct( langAlignGroup, tr("Russian"), tr("Use Russian in menus"), SLOT(setRULanguage()));
|
// russianLangAct = addAct( langAlignGroup, tr("Russian"), tr("Use Russian in menus"), SLOT(setRULanguage()));
|
||||||
dutchLangAct = addAct( langAlignGroup, tr("Dutch"), tr("Use Dutch in menus"), SLOT(setNLLanguage()));
|
// dutchLangAct = addAct( langAlignGroup, tr("Dutch"), tr("Use Dutch in menus"), SLOT(setNLLanguage()));
|
||||||
|
|
||||||
aboutAct = addAct("information.png", tr("About..."), tr("Show the application's About box"), SLOT(about()));
|
aboutAct = addAct("information.png", tr("About..."), tr("Show the application's About box"), SLOT(about()));
|
||||||
printAct = addAct("print.png", tr("Print..."), tr("Print current model"), SLOT(print()));
|
printAct = addAct("print.png", tr("Print..."), tr("Print current model"), SLOT(print()));
|
||||||
@@ -1681,10 +1681,10 @@ void MainWindow::createActions()
|
|||||||
void MainWindow::createMenus()
|
void MainWindow::createMenus()
|
||||||
|
|
||||||
{
|
{
|
||||||
QMenu *recentFileMenu=new QMenu(tr("Recent Models+Settings"));
|
QMenu *recentFileMenu=new QMenu(tr("Recent Files"), this);
|
||||||
QMenu *languageMenu=new QMenu(tr("Set Menu Language"));
|
QMenu *languageMenu=new QMenu(tr("Set Menu Language"), this);
|
||||||
QMenu *themeMenu=new QMenu(tr("Set Icon Theme"));
|
QMenu *themeMenu=new QMenu(tr("Set Icon Theme"), this);
|
||||||
QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size"));
|
QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size"), this);
|
||||||
|
|
||||||
fileMenu = menuBar()->addMenu(tr("File"));
|
fileMenu = menuBar()->addMenu(tr("File"));
|
||||||
fileMenu->addAction(newAct);
|
fileMenu->addAction(newAct);
|
||||||
@@ -1718,13 +1718,13 @@ void MainWindow::createMenus()
|
|||||||
languageMenu->addAction(germanLangAct);
|
languageMenu->addAction(germanLangAct);
|
||||||
languageMenu->addAction(finnishLangAct);
|
languageMenu->addAction(finnishLangAct);
|
||||||
languageMenu->addAction(frenchLangAct);
|
languageMenu->addAction(frenchLangAct);
|
||||||
languageMenu->addAction(hebrewLangAct);
|
// languageMenu->addAction(hebrewLangAct);
|
||||||
languageMenu->addAction(italianLangAct);
|
languageMenu->addAction(italianLangAct);
|
||||||
languageMenu->addAction(polishLangAct);
|
languageMenu->addAction(polishLangAct);
|
||||||
languageMenu->addAction(portugueseLangAct);
|
// languageMenu->addAction(portugueseLangAct);
|
||||||
languageMenu->addAction(swedishLangAct);
|
languageMenu->addAction(swedishLangAct);
|
||||||
languageMenu->addAction(russianLangAct);
|
// languageMenu->addAction(russianLangAct);
|
||||||
languageMenu->addAction(dutchLangAct);
|
// languageMenu->addAction(dutchLangAct);
|
||||||
|
|
||||||
settingsMenu->addMenu(themeMenu);
|
settingsMenu->addMenu(themeMenu);
|
||||||
themeMenu->addAction(classicThemeAct);
|
themeMenu->addAction(classicThemeAct);
|
||||||
@@ -1783,7 +1783,7 @@ QMenu *MainWindow::createRecentFileMenu()
|
|||||||
|
|
||||||
QMenu *MainWindow::createProfilesMenu()
|
QMenu *MainWindow::createProfilesMenu()
|
||||||
{
|
{
|
||||||
QMenu *profilesMenu=new QMenu(tr("Radio Profile"));
|
QMenu *profilesMenu=new QMenu(tr("Radio Profile"), this);
|
||||||
int i;
|
int i;
|
||||||
for ( i = 0; i < MAX_PROFILES; ++i) {
|
for ( i = 0; i < MAX_PROFILES; ++i) {
|
||||||
profilesMenu->addAction(profileActs[i]);
|
profilesMenu->addAction(profileActs[i]);
|
||||||
@@ -1843,7 +1843,7 @@ void MainWindow::createToolBars()
|
|||||||
profileButton->setMenu(createProfilesMenu());
|
profileButton->setMenu(createProfilesMenu());
|
||||||
profileButton->setIcon(CompanionIcon("profiles.png"));
|
profileButton->setIcon(CompanionIcon("profiles.png"));
|
||||||
profileButton->setToolTip(tr("Radio Profile"));
|
profileButton->setToolTip(tr("Radio Profile"));
|
||||||
profileButton->setStatusTip(tr("Show a selection list of radio profiles"));
|
profileButton->setStatusTip(tr("Show the list of radio profiles"));
|
||||||
|
|
||||||
fileToolBar->addWidget(profileButton);
|
fileToolBar->addWidget(profileButton);
|
||||||
fileToolBar->addAction(editSplashAct);
|
fileToolBar->addAction(editSplashAct);
|
||||||
|
|||||||
@@ -82,6 +82,11 @@ MdiChild::MdiChild():
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MdiChild::~MdiChild()
|
||||||
|
{
|
||||||
|
delete ui;
|
||||||
|
}
|
||||||
|
|
||||||
void MdiChild::qSleep(int ms)
|
void MdiChild::qSleep(int ms)
|
||||||
{
|
{
|
||||||
if (ms<0)
|
if (ms<0)
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ class MdiChild : public QWidget
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
MdiChild();
|
MdiChild();
|
||||||
|
~MdiChild();
|
||||||
|
|
||||||
void newFile();
|
void newFile();
|
||||||
bool loadFile(const QString &fileName, bool resetCurrentFile=true);
|
bool loadFile(const QString &fileName, bool resetCurrentFile=true);
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
<item>
|
<item>
|
||||||
@@ -65,12 +65,12 @@
|
|||||||
<widget class="QComboBox" name="curveCustom">
|
<widget class="QComboBox" name="curveCustom">
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Standard</string>
|
<string>Fixed X</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Custom</string>
|
<string>Custom X</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
<item row="2" column="1">
|
<item row="2" column="1">
|
||||||
<widget class="QComboBox" name="sourceCB">
|
<widget class="QComboBox" name="sourceCB">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>The source for the mixer</string>
|
<string>Source for the mixer.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QComboBox" name="weightCB">
|
<widget class="QComboBox" name="weightCB">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>Phase used by the input.</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -104,7 +104,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="lb_FP0">
|
<widget class="QLabel" name="lb_FP0">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0</string>
|
<string notr="true">0</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -114,7 +114,7 @@
|
|||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QLabel" name="lb_FP1">
|
<widget class="QLabel" name="lb_FP1">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>1</string>
|
<string notr="true">1</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -124,7 +124,7 @@
|
|||||||
<item row="0" column="2">
|
<item row="0" column="2">
|
||||||
<widget class="QLabel" name="lb_FP2">
|
<widget class="QLabel" name="lb_FP2">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>2</string>
|
<string notr="true">2</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -134,7 +134,7 @@
|
|||||||
<item row="0" column="3">
|
<item row="0" column="3">
|
||||||
<widget class="QLabel" name="lb_FP3">
|
<widget class="QLabel" name="lb_FP3">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>3</string>
|
<string notr="true">3</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -144,7 +144,7 @@
|
|||||||
<item row="0" column="4">
|
<item row="0" column="4">
|
||||||
<widget class="QLabel" name="lb_FP4">
|
<widget class="QLabel" name="lb_FP4">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>4</string>
|
<string notr="true">4</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -154,7 +154,7 @@
|
|||||||
<item row="0" column="5">
|
<item row="0" column="5">
|
||||||
<widget class="QLabel" name="lb_FP5">
|
<widget class="QLabel" name="lb_FP5">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>5</string>
|
<string notr="true">5</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -164,7 +164,7 @@
|
|||||||
<item row="0" column="6">
|
<item row="0" column="6">
|
||||||
<widget class="QLabel" name="lb_FP6">
|
<widget class="QLabel" name="lb_FP6">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>6</string>
|
<string notr="true">6</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -174,7 +174,7 @@
|
|||||||
<item row="0" column="7">
|
<item row="0" column="7">
|
||||||
<widget class="QLabel" name="lb_FP7">
|
<widget class="QLabel" name="lb_FP7">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>7</string>
|
<string notr="true">7</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -184,7 +184,7 @@
|
|||||||
<item row="0" column="8">
|
<item row="0" column="8">
|
||||||
<widget class="QLabel" name="lb_FP8">
|
<widget class="QLabel" name="lb_FP8">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>8</string>
|
<string notr="true">8</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -266,7 +266,7 @@
|
|||||||
<item row="9" column="1">
|
<item row="9" column="1">
|
||||||
<widget class="QComboBox" name="switchesCB">
|
<widget class="QComboBox" name="switchesCB">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>Switch used by the input.
|
<string>Switch used to enable the line.
|
||||||
If blank then the input is considered to be "ON" all the time.</string>
|
If blank then the input is considered to be "ON" all the time.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
@@ -332,17 +332,7 @@ If blank then the input is considered to be "ON" all the time.</string
|
|||||||
<item row="3" column="1">
|
<item row="3" column="1">
|
||||||
<widget class="QDoubleSpinBox" name="scale">
|
<widget class="QDoubleSpinBox" name="scale">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
<string/>
|
||||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
|
||||||
p, li { white-space: pre-wrap; }
|
|
||||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
|
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p>
|
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
|
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html></string>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
@@ -395,7 +385,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>The curve used by the input</string>
|
<string>Curve applied to the source.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
@@ -169,7 +169,7 @@
|
|||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="trim1Label">
|
<widget class="QLabel" name="trim1Label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>trim1</string>
|
<string notr="true">trim1</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
@@ -277,7 +277,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="trim2Label">
|
<widget class="QLabel" name="trim2Label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>trim2</string>
|
<string notr="true">trim2</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
@@ -303,7 +303,7 @@
|
|||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="trim4Label">
|
<widget class="QLabel" name="trim4Label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>trim4</string>
|
<string notr="true">trim4</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
@@ -313,7 +313,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="trim3Label">
|
<widget class="QLabel" name="trim3Label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>trim3</string>
|
<string notr="true">trim3</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
|||||||
@@ -158,11 +158,13 @@ FlightMode::FlightMode(QWidget * parent, ModelData & model, int phaseIdx, Genera
|
|||||||
gvLayout->addWidget(gvValues[i], i, col++, 1, 1);
|
gvLayout->addWidget(gvValues[i], i, col++, 1, 1);
|
||||||
|
|
||||||
// Popups
|
// Popups
|
||||||
gvPopups[i] = new QCheckBox(ui->gvGB);
|
if (IS_TARANIS(GetEepromInterface()->getBoard())) {
|
||||||
gvPopups[i]->setProperty("index", i);
|
gvPopups[i] = new QCheckBox(ui->gvGB);
|
||||||
gvPopups[i]->setText(tr("Popup enabled"));
|
gvPopups[i]->setProperty("index", i);
|
||||||
connect(gvPopups[i], SIGNAL(toggled(bool)), this, SLOT(phaseGVPopupToggled(bool)));
|
gvPopups[i]->setText(tr("Popup enabled"));
|
||||||
gvLayout->addWidget(gvPopups[i], i, col++, 1, 1);
|
connect(gvPopups[i], SIGNAL(toggled(bool)), this, SLOT(phaseGVPopupToggled(bool)));
|
||||||
|
gvLayout->addWidget(gvPopups[i], i, col++, 1, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -209,8 +211,10 @@ void FlightMode::update()
|
|||||||
idx = phasegvar->gvars[i];
|
idx = phasegvar->gvars[i];
|
||||||
gvValues[i]->setDisabled(true);
|
gvValues[i]->setDisabled(true);
|
||||||
}
|
}
|
||||||
gvValues[i]->setValue(phasegvar->gvars[i]);
|
if (IS_TARANIS(GetEepromInterface()->getBoard())) {
|
||||||
gvPopups[i]->setChecked(model.gvars_popups[i]);
|
gvValues[i]->setValue(phasegvar->gvars[i]);
|
||||||
|
gvPopups[i]->setChecked(model.gvars_popups[i]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i=0; i<reCount; i++) {
|
for (int i=0; i<reCount; i++) {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1" columnminimumwidth="100,0">
|
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1" columnminimumwidth="100,0">
|
||||||
<property name="horizontalSpacing">
|
<property name="horizontalSpacing">
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ InputsPanel::InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & g
|
|||||||
qbDown->setText(tr("Move Down"));
|
qbDown->setText(tr("Move Down"));
|
||||||
qbDown->setIcon(CompanionIcon("movedown.png"));
|
qbDown->setIcon(CompanionIcon("movedown.png"));
|
||||||
qbDown->setShortcut(QKeySequence(tr("Ctrl+Down")));
|
qbDown->setShortcut(QKeySequence(tr("Ctrl+Down")));
|
||||||
qbClear->setText(tr("Clear All Settings"));
|
qbClear->setText(tr("Clear All Inputs"));
|
||||||
qbClear->setIcon(CompanionIcon("clear.png"));
|
qbClear->setIcon(CompanionIcon("clear.png"));
|
||||||
|
|
||||||
exposLayout->addWidget(ExposlistWidget,1,1,1,3);
|
exposLayout->addWidget(ExposlistWidget,1,1,1,3);
|
||||||
|
|||||||
@@ -308,6 +308,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
|
|||||||
populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), model, POPULATE_SOURCES | POPULATE_TRIMS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
|
populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), model, POPULATE_SOURCES | POPULATE_TRIMS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
|
||||||
break;
|
break;
|
||||||
case LS_FAMILY_TIMER:
|
case LS_FAMILY_TIMER:
|
||||||
|
mask |= VALUE1_VISIBLE | VALUE2_VISIBLE;
|
||||||
updateTimerParam(cswitchValue[i], model.customSw[i].val1);
|
updateTimerParam(cswitchValue[i], model.customSw[i].val1);
|
||||||
updateTimerParam(cswitchOffset[i], model.customSw[i].val2);
|
updateTimerParam(cswitchOffset[i], model.customSw[i].val2);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -16,10 +16,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
|
|||||||
QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
|
QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
|
||||||
QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
|
QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
|
||||||
|
|
||||||
if (md->destCh > (unsigned int)GetEepromInterface()->getCapability(Outputs))
|
this->setWindowTitle(tr("DEST -> CH%1").arg(md->destCh));
|
||||||
this->setWindowTitle(tr("DEST -> X%1").arg(md->destCh-GetEepromInterface()->getCapability(Outputs)));
|
|
||||||
else
|
|
||||||
this->setWindowTitle(tr("DEST -> CH%1%2").arg(md->destCh/10).arg(md->destCh%10));
|
|
||||||
|
|
||||||
populateSourceCB(ui->sourceCB, md->srcRaw, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
populateSourceCB(ui->sourceCB, md->srcRaw, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
||||||
ui->sourceCB->removeItem(0);
|
ui->sourceCB->removeItem(0);
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="lb_FP0">
|
<widget class="QLabel" name="lb_FP0">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0</string>
|
<string notr="true">0</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -214,7 +214,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QLabel" name="lb_FP1">
|
<widget class="QLabel" name="lb_FP1">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>1</string>
|
<string notr="true">1</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -224,7 +224,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="2">
|
<item row="0" column="2">
|
||||||
<widget class="QLabel" name="lb_FP2">
|
<widget class="QLabel" name="lb_FP2">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>2</string>
|
<string notr="true">2</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -234,7 +234,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="3">
|
<item row="0" column="3">
|
||||||
<widget class="QLabel" name="lb_FP3">
|
<widget class="QLabel" name="lb_FP3">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>3</string>
|
<string notr="true">3</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -244,7 +244,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="4">
|
<item row="0" column="4">
|
||||||
<widget class="QLabel" name="lb_FP4">
|
<widget class="QLabel" name="lb_FP4">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>4</string>
|
<string notr="true">4</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -254,7 +254,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="5">
|
<item row="0" column="5">
|
||||||
<widget class="QLabel" name="lb_FP5">
|
<widget class="QLabel" name="lb_FP5">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>5</string>
|
<string notr="true">5</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -264,7 +264,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="6">
|
<item row="0" column="6">
|
||||||
<widget class="QLabel" name="lb_FP6">
|
<widget class="QLabel" name="lb_FP6">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>6</string>
|
<string notr="true">6</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -274,7 +274,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="7">
|
<item row="0" column="7">
|
||||||
<widget class="QLabel" name="lb_FP7">
|
<widget class="QLabel" name="lb_FP7">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>7</string>
|
<string notr="true">7</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -284,7 +284,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="0" column="8">
|
<item row="0" column="8">
|
||||||
<widget class="QLabel" name="lb_FP8">
|
<widget class="QLabel" name="lb_FP8">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>8</string>
|
<string notr="true">8</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
|
|||||||
@@ -5,7 +5,8 @@
|
|||||||
|
|
||||||
MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
|
MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
|
||||||
ModelPanel(parent, model, generalSettings),
|
ModelPanel(parent, model, generalSettings),
|
||||||
mixInserted(false)
|
mixInserted(false),
|
||||||
|
highlightedSource(0)
|
||||||
{
|
{
|
||||||
QGridLayout * mixesLayout = new QGridLayout(this);
|
QGridLayout * mixesLayout = new QGridLayout(this);
|
||||||
|
|
||||||
@@ -46,20 +47,15 @@ QString MixesPanel::getChannelLabel(int curDest)
|
|||||||
{
|
{
|
||||||
QString str;
|
QString str;
|
||||||
int outputs = GetEepromInterface()->getCapability(Outputs);
|
int outputs = GetEepromInterface()->getCapability(Outputs);
|
||||||
if (curDest > outputs) {
|
str = QObject::tr("CH%1").arg(curDest);
|
||||||
str = QObject::tr("X%1 ").arg(curDest-outputs);
|
(str.length() < 4) ? str.append(" ") : str.append(" ");
|
||||||
}
|
if (GetEepromInterface()->getCapability(HasChNames)) {
|
||||||
else {
|
QString name = model.limitData[curDest-1].name;
|
||||||
str = QObject::tr("CH%1").arg(curDest);
|
if (!name.isEmpty()) {
|
||||||
str.append(" ");
|
name = QString("(") + name + QString(")");
|
||||||
if (GetEepromInterface()->getCapability(HasChNames)) {
|
|
||||||
QString name = model.limitData[curDest-1].name;
|
|
||||||
if (!name.isEmpty()) {
|
|
||||||
name = QString("(") + name + QString(")");
|
|
||||||
}
|
|
||||||
name.append(" ");
|
|
||||||
str += name.left(8);
|
|
||||||
}
|
}
|
||||||
|
name.append(" ");
|
||||||
|
str += name.left(8);
|
||||||
}
|
}
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
@@ -73,25 +69,84 @@ void MixesPanel::update()
|
|||||||
unsigned int curDest = 0;
|
unsigned int curDest = 0;
|
||||||
int i;
|
int i;
|
||||||
unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
|
unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
|
||||||
|
|
||||||
for (i=0; i<GetEepromInterface()->getCapability(Mixes); i++) {
|
for (i=0; i<GetEepromInterface()->getCapability(Mixes); i++) {
|
||||||
MixData *md = &model.mixData[i];
|
MixData *md = &model.mixData[i];
|
||||||
if ((md->destCh==0) || (md->destCh>outputs+(unsigned int)GetEepromInterface()->getCapability(ExtraChannels))) continue;
|
// qDebug() << "md->destCh: " << md->destCh;
|
||||||
|
if (md->destCh==0 || md->destCh>outputs) continue;
|
||||||
QString str = "";
|
QString str = "";
|
||||||
while (curDest < md->destCh-1) {
|
while (curDest < md->destCh-1) {
|
||||||
curDest++;
|
curDest++;
|
||||||
str = getChannelLabel(curDest);
|
AddMixerLine(-curDest);
|
||||||
qba.clear();
|
|
||||||
qba.append((quint8)-curDest);
|
|
||||||
QListWidgetItem *itm = new QListWidgetItem(str);
|
|
||||||
itm->setData(Qt::UserRole,qba);
|
|
||||||
MixerlistWidget->addItem(itm);
|
|
||||||
}
|
}
|
||||||
|
if (AddMixerLine(i)) {
|
||||||
|
curDest++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
while (curDest < outputs) {
|
||||||
|
curDest++;
|
||||||
|
AddMixerLine(-curDest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#define MIX_ROW_HEIGHT_INCREASE 8 //how much space is added above mixer row (for new channel), if 0 space adding is disabled
|
||||||
|
|
||||||
|
bool MixesPanel::AddMixerLine(int dest)
|
||||||
|
{
|
||||||
|
bool new_ch;
|
||||||
|
QString str = getMixerText(dest, &new_ch);
|
||||||
|
QListWidgetItem *itm = new QListWidgetItem();
|
||||||
|
itm->setData(Qt::UserRole, QByteArray(1, (quint8)dest));
|
||||||
|
#if MIX_ROW_HEIGHT_INCREASE > 0
|
||||||
|
if ((new_ch && (dest > 0)) || (dest < 0)) {
|
||||||
|
//increase size of this row
|
||||||
|
QFontMetrics * fm = new QFontMetrics(itm->font());
|
||||||
|
QRect rect = fm->boundingRect("C)");
|
||||||
|
itm->setSizeHint(QSize(-1, (rect.height() * (14+MIX_ROW_HEIGHT_INCREASE))/10));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
MixerlistWidget->addItem(itm);
|
||||||
|
MixerlistWidget->setItemWidget(itm, getMixerWidget(str));
|
||||||
|
// qDebug() << "MixesPanel::AddMixerLine(): " << str;
|
||||||
|
return new_ch;
|
||||||
|
}
|
||||||
|
|
||||||
|
QWidget * MixesPanel::getMixerWidget(const QString & mixer_text)
|
||||||
|
{
|
||||||
|
QLabel * l = new QLabel();
|
||||||
|
l->setFont(QFont("Courier New",12));
|
||||||
|
l->setTextFormat(Qt::RichText);
|
||||||
|
l->setAlignment(Qt::AlignBottom);
|
||||||
|
QString formated_str(mixer_text);
|
||||||
|
formated_str.replace(" ", " ");
|
||||||
|
l->setText(formated_str);
|
||||||
|
return l;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString MixesPanel::getMixerText(int dest, bool * new_ch)
|
||||||
|
{
|
||||||
|
QString str;
|
||||||
|
*new_ch = 0;
|
||||||
|
if (dest < 0) {
|
||||||
|
str = getChannelLabel(-dest);
|
||||||
|
//highlight channell if needed
|
||||||
|
if (-dest == (int)highlightedSource) {
|
||||||
|
str = "<b>" + str + "</b>";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
MixData *md = &model.mixData[dest];
|
||||||
|
//md->destCh from 1 to 32
|
||||||
str = getChannelLabel(md->destCh);
|
str = getChannelLabel(md->destCh);
|
||||||
|
|
||||||
if (curDest != md->destCh) {
|
if ((dest == 0) || (model.mixData[dest-1].destCh != md->destCh)) {
|
||||||
curDest = md->destCh;
|
*new_ch = 1;
|
||||||
}
|
//highlight channell if needed
|
||||||
|
if (md->destCh == highlightedSource) {
|
||||||
|
str = "<b>" + str + "</b>";
|
||||||
|
}
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
str.fill(' ');
|
str.fill(' ');
|
||||||
}
|
}
|
||||||
@@ -102,63 +157,53 @@ void MixesPanel::update()
|
|||||||
default: str += " "; break;
|
default: str += " "; break;
|
||||||
};
|
};
|
||||||
|
|
||||||
str += " " + md->srcRaw.toString();
|
//highlight source if needed
|
||||||
|
if ( (md->srcRaw.type == SOURCE_TYPE_CH) && (md->srcRaw.index+1 == (int)highlightedSource) ) {
|
||||||
|
str += " <b>" + Qt::escape(md->srcRaw.toString()) + "</b>";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
str += " " + Qt::escape(md->srcRaw.toString());
|
||||||
|
}
|
||||||
|
|
||||||
str += " " + tr("Weight(%1)").arg(getGVarString(md->weight, true));
|
str += " " + Qt::escape(tr("Weight(%1)").arg(getGVarString(md->weight, true)));
|
||||||
|
|
||||||
QString phasesStr = getPhasesStr(md->phases, model);
|
QString phasesStr = getPhasesStr(md->phases, model);
|
||||||
if (!phasesStr.isEmpty()) str += " " + phasesStr;
|
if (!phasesStr.isEmpty()) str += " " + Qt::escape(phasesStr);
|
||||||
|
|
||||||
if (md->swtch.type != SWITCH_TYPE_NONE) {
|
if (md->swtch.type != SWITCH_TYPE_NONE) {
|
||||||
str += " " + tr("Switch(%1)").arg(md->swtch.toString());
|
str += " " + Qt::escape(tr("Switch(%1)").arg(md->swtch.toString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (md->carryTrim>0) {
|
if (md->carryTrim>0) {
|
||||||
str += " " + tr("No Trim");
|
str += " " + Qt::escape(tr("No Trim"));
|
||||||
}
|
}
|
||||||
else if (md->carryTrim<0) {
|
else if (md->carryTrim<0) {
|
||||||
str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
|
str += " " + Qt::escape(RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (md->noExpo) str += " " + tr("No DR/Expo");
|
if (md->noExpo) str += " " + Qt::escape(tr("No DR/Expo"));
|
||||||
if (md->sOffset) str += " " + tr("Offset(%1)").arg(getGVarString(md->sOffset));
|
if (md->sOffset) str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset)));
|
||||||
if (md->curve.value) str += " " + md->curve.toString();
|
if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
|
||||||
|
|
||||||
int scale = GetEepromInterface()->getCapability(SlowScale);
|
int scale = GetEepromInterface()->getCapability(SlowScale);
|
||||||
if (scale == 0)
|
if (scale == 0)
|
||||||
scale = 1;
|
scale = 1;
|
||||||
if (md->delayDown || md->delayUp)
|
if (md->delayDown || md->delayUp)
|
||||||
str += tr(" Delay(u%1:d%2)").arg((double)md->delayUp/scale).arg((double)md->delayDown/scale);
|
str += Qt::escape(tr(" Delay(u%1:d%2)").arg((double)md->delayUp/scale).arg((double)md->delayDown/scale));
|
||||||
if (md->speedDown || md->speedUp)
|
if (md->speedDown || md->speedUp)
|
||||||
str += tr(" Slow(u%1:d%2)").arg((double)md->speedUp/scale).arg((double)md->speedDown/scale);
|
str += Qt::escape(tr(" Slow(u%1:d%2)").arg((double)md->speedUp/scale).arg((double)md->speedDown/scale));
|
||||||
if (md->mixWarn) str += tr(" Warn(%1)").arg(md->mixWarn);
|
if (md->mixWarn) str += Qt::escape(tr(" Warn(%1)").arg(md->mixWarn));
|
||||||
if (GetEepromInterface()->getCapability(HasMixerNames)) {
|
if (GetEepromInterface()->getCapability(HasMixerNames)) {
|
||||||
QString MixerName;
|
QString MixerName;
|
||||||
MixerName.append(md->name);
|
MixerName.append(md->name);
|
||||||
if (!MixerName.isEmpty()) {
|
if (!MixerName.isEmpty()) {
|
||||||
str += QString("(%1)").arg(MixerName);
|
str += Qt::escape(QString("(%1)").arg(MixerName));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
qba.clear();
|
|
||||||
qba.append((quint8)i);
|
|
||||||
qba.append((const char*)md, sizeof(MixData));
|
|
||||||
QListWidgetItem *itm = new QListWidgetItem(str);
|
|
||||||
itm->setData(Qt::UserRole, qba); // mix number
|
|
||||||
MixerlistWidget->addItem(itm); //(str);
|
|
||||||
}
|
|
||||||
|
|
||||||
while(curDest<outputs+GetEepromInterface()->getCapability(ExtraChannels)) {
|
|
||||||
curDest++;
|
|
||||||
QString str = getChannelLabel(curDest);
|
|
||||||
qba.clear();
|
|
||||||
qba.append((quint8)-curDest);
|
|
||||||
QListWidgetItem *itm = new QListWidgetItem(str);
|
|
||||||
itm->setData(Qt::UserRole,qba); // add new mixer
|
|
||||||
MixerlistWidget->addItem(itm);
|
|
||||||
}
|
}
|
||||||
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool MixesPanel::gm_insertMix(int idx)
|
bool MixesPanel::gm_insertMix(int idx)
|
||||||
{
|
{
|
||||||
if (idx<0 || idx>=GetEepromInterface()->getCapability(Mixes) || model.mixData[GetEepromInterface()->getCapability(Mixes)-1].destCh > 0) {
|
if (idx<0 || idx>=GetEepromInterface()->getCapability(Mixes) || model.mixData[GetEepromInterface()->getCapability(Mixes)-1].destCh > 0) {
|
||||||
@@ -367,6 +412,26 @@ void MixesPanel::mixerOpen()
|
|||||||
gm_openMix(idx);
|
gm_openMix(idx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MixesPanel::mixerHighlight()
|
||||||
|
{
|
||||||
|
int idx = MixerlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
|
||||||
|
int dest;
|
||||||
|
if (idx<0) {
|
||||||
|
dest = -idx;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
dest = model.mixData[idx].destCh;
|
||||||
|
}
|
||||||
|
highlightedSource = ( (int)highlightedSource == dest) ? 0 : dest;
|
||||||
|
// qDebug() << "MixesPanel::mixerHighlight(): " << highlightedSource ;
|
||||||
|
for(int i=0; i<MixerlistWidget->count(); i++) {
|
||||||
|
int t = MixerlistWidget->item(i)->data(Qt::UserRole).toByteArray().at(0);
|
||||||
|
bool dummy;
|
||||||
|
QWidget *w = getMixerWidget(getMixerText(t, &dummy));
|
||||||
|
MixerlistWidget->setItemWidget(MixerlistWidget->item(i), w);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void MixesPanel::mixerAdd()
|
void MixesPanel::mixerAdd()
|
||||||
{
|
{
|
||||||
if (!MixerlistWidget->currentItem())
|
if (!MixerlistWidget->currentItem())
|
||||||
@@ -401,10 +466,11 @@ void MixesPanel::mixerlistWidget_customContextMenuRequested(QPoint pos)
|
|||||||
QMenu contextMenu;
|
QMenu contextMenu;
|
||||||
contextMenu.addAction(CompanionIcon("add.png"), tr("&Add"),this,SLOT(mixerAdd()),tr("Ctrl+A"));
|
contextMenu.addAction(CompanionIcon("add.png"), tr("&Add"),this,SLOT(mixerAdd()),tr("Ctrl+A"));
|
||||||
contextMenu.addAction(CompanionIcon("edit.png"), tr("&Edit"),this,SLOT(mixerOpen()),tr("Enter"));
|
contextMenu.addAction(CompanionIcon("edit.png"), tr("&Edit"),this,SLOT(mixerOpen()),tr("Enter"));
|
||||||
|
contextMenu.addAction(CompanionIcon("fuses.png"), tr("&Toggle highlight"),this,SLOT(mixerHighlight()),tr("Ctrl+T"));
|
||||||
contextMenu.addSeparator();
|
contextMenu.addSeparator();
|
||||||
contextMenu.addAction(CompanionIcon("clear.png"), tr("&Delete"),this,SLOT(mixersDelete()),tr("Delete"));
|
contextMenu.addAction(CompanionIcon("clear.png"), tr("&Delete"),this,SLOT(mixersDelete()),tr("Delete"));
|
||||||
contextMenu.addAction(CompanionIcon("copy.png"), tr("&Copy"),this,SLOT(mixersCopy()),tr("Ctrl+C"));
|
contextMenu.addAction(CompanionIcon("copy.png"), tr("&Copy"),this,SLOT(mixersCopy()),tr("Ctrl+C"));
|
||||||
contextMenu.addAction(CompanionIcon("cut.png"), tr("&Cut"),this,SLOT(mixersCut()),tr("Ctrl+X"));
|
contextMenu.addAction(CompanionIcon("cut.png"), tr("C&ut"),this,SLOT(mixersCut()),tr("Ctrl+X"));
|
||||||
contextMenu.addAction(CompanionIcon("paste.png"), tr("&Paste"),this,SLOT(mixersPaste()),tr("Ctrl+V"))->setEnabled(hasData);
|
contextMenu.addAction(CompanionIcon("paste.png"), tr("&Paste"),this,SLOT(mixersPaste()),tr("Ctrl+V"))->setEnabled(hasData);
|
||||||
contextMenu.addAction(CompanionIcon("duplicate.png"), tr("Du&plicate"),this,SLOT(mixersDuplicate()),tr("Ctrl+U"));
|
contextMenu.addAction(CompanionIcon("duplicate.png"), tr("Du&plicate"),this,SLOT(mixersDuplicate()),tr("Ctrl+U"));
|
||||||
contextMenu.addSeparator();
|
contextMenu.addSeparator();
|
||||||
@@ -433,6 +499,7 @@ void MixesPanel::mixerlistWidget_KeyPress(QKeyEvent *event)
|
|||||||
if(event->matches(QKeySequence::Cut)) mixersCut();
|
if(event->matches(QKeySequence::Cut)) mixersCut();
|
||||||
if(event->matches(QKeySequence::Paste)) mixersPaste();
|
if(event->matches(QKeySequence::Paste)) mixersPaste();
|
||||||
if(event->matches(QKeySequence::Underline)) mixersDuplicate();
|
if(event->matches(QKeySequence::Underline)) mixersDuplicate();
|
||||||
|
if(event->matches(QKeySequence::AddTab)) mixerHighlight();
|
||||||
|
|
||||||
if(event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter) mixerOpen();
|
if(event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter) mixerOpen();
|
||||||
if(event->matches(QKeySequence::MoveToNextLine))
|
if(event->matches(QKeySequence::MoveToNextLine))
|
||||||
@@ -443,12 +510,15 @@ void MixesPanel::mixerlistWidget_KeyPress(QKeyEvent *event)
|
|||||||
|
|
||||||
int MixesPanel::gm_moveMix(int idx, bool dir) //true=inc=down false=dec=up
|
int MixesPanel::gm_moveMix(int idx, bool dir) //true=inc=down false=dec=up
|
||||||
{
|
{
|
||||||
if(idx>GetEepromInterface()->getCapability(Mixes) || (idx==0 && !dir) || (idx==GetEepromInterface()->getCapability(Mixes) && dir)) return idx;
|
if(idx>GetEepromInterface()->getCapability(Mixes) || (idx==GetEepromInterface()->getCapability(Mixes) && dir)) return idx;
|
||||||
|
|
||||||
int tdx = dir ? idx+1 : idx-1;
|
int tdx = dir ? idx+1 : idx-1;
|
||||||
MixData &src=model.mixData[idx];
|
MixData &src=model.mixData[idx];
|
||||||
MixData &tgt=model.mixData[tdx];
|
MixData &tgt=model.mixData[tdx];
|
||||||
|
|
||||||
|
if (src.destCh == 1 && !dir)
|
||||||
|
return idx;
|
||||||
|
|
||||||
unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
|
unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
|
||||||
if((src.destCh==0) || (src.destCh>outputs) || (tgt.destCh>outputs)) return idx;
|
if((src.destCh==0) || (src.destCh>outputs) || (tgt.destCh>outputs)) return idx;
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ class MixesPanel : public ModelPanel
|
|||||||
void mixerAdd();
|
void mixerAdd();
|
||||||
void moveMixUp();
|
void moveMixUp();
|
||||||
void moveMixDown();
|
void moveMixDown();
|
||||||
|
void mixerHighlight();
|
||||||
|
|
||||||
|
|
||||||
void mixerlistWidget_customContextMenuRequested(QPoint pos);
|
void mixerlistWidget_customContextMenuRequested(QPoint pos);
|
||||||
void mixerlistWidget_doubleClicked(QModelIndex index);
|
void mixerlistWidget_doubleClicked(QModelIndex index);
|
||||||
@@ -40,6 +42,7 @@ class MixesPanel : public ModelPanel
|
|||||||
private:
|
private:
|
||||||
MixersList *MixerlistWidget;
|
MixersList *MixerlistWidget;
|
||||||
bool mixInserted;
|
bool mixInserted;
|
||||||
|
unsigned int highlightedSource;
|
||||||
|
|
||||||
int getMixerIndex(unsigned int dch);
|
int getMixerIndex(unsigned int dch);
|
||||||
bool gm_insertMix(int idx);
|
bool gm_insertMix(int idx);
|
||||||
@@ -50,6 +53,9 @@ class MixesPanel : public ModelPanel
|
|||||||
QList<int> createMixListFromSelected();
|
QList<int> createMixListFromSelected();
|
||||||
void setSelectedByMixList(QList<int> list);
|
void setSelectedByMixList(QList<int> list);
|
||||||
QString getChannelLabel(int curDest);
|
QString getChannelLabel(int curDest);
|
||||||
|
bool AddMixerLine(int dest);
|
||||||
|
QString getMixerText(int dest, bool * new_ch);
|
||||||
|
QWidget * getMixerWidget(const QString & mixer_text);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // MIXES_H
|
#endif // MIXES_H
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
@@ -153,7 +153,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi
|
|||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Timer2</string>
|
<string>Timer 2</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
@@ -169,7 +169,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi
|
|||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Timer1</string>
|
<string>Timer 1</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Label</string>
|
<string notr="true">Label</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -85,7 +85,10 @@
|
|||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>ch</string>
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="prefix">
|
||||||
|
<string>CH </string>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>1</number>
|
<number>1</number>
|
||||||
@@ -192,7 +195,7 @@
|
|||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string> usec</string>
|
<string> us</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>100</number>
|
<number>100</number>
|
||||||
@@ -307,7 +310,7 @@
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string> mSec</string>
|
<string> ms</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="decimals">
|
<property name="decimals">
|
||||||
<number>1</number>
|
<number>1</number>
|
||||||
@@ -338,7 +341,7 @@
|
|||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>ch</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>1</number>
|
<number>1</number>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<property name="margin">
|
<property name="margin">
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
<enum>QDateTimeEdit::MinuteSection</enum>
|
<enum>QDateTimeEdit::MinuteSection</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="displayFormat">
|
<property name="displayFormat">
|
||||||
<string>mm:ss</string>
|
<string notr="true">mm:ss</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="persistentValue">
|
<widget class="QLabel" name="persistentValue">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string> (00:00:00)</string>
|
<string notr="true"> (00:00:00)</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0">
|
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
@@ -534,7 +534,7 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CEL</string>
|
<string>CELS</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
|
|||||||
@@ -968,7 +968,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -981,7 +981,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -994,7 +994,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1007,7 +1007,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1020,7 +1020,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1033,7 +1033,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1046,7 +1046,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1059,7 +1059,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1072,7 +1072,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1085,7 +1085,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1098,7 +1098,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1111,7 +1111,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1124,7 +1124,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1137,7 +1137,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1150,7 +1150,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1163,7 +1163,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1176,7 +1176,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1189,7 +1189,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1202,7 +1202,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1215,7 +1215,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1228,7 +1228,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1241,7 +1241,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1254,7 +1254,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1267,7 +1267,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1280,7 +1280,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1293,7 +1293,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1306,7 +1306,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1319,7 +1319,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1332,7 +1332,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1345,7 +1345,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1358,7 +1358,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1371,7 +1371,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1384,7 +1384,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1397,7 +1397,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1410,7 +1410,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1423,7 +1423,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1436,7 +1436,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1449,7 +1449,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1462,7 +1462,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1475,7 +1475,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1488,7 +1488,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1501,7 +1501,7 @@ May be different from firmware language</string>
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>CheckBox</string>
|
<string notr="true">CheckBox</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Dialog</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
<number>6</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0">
|
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0">
|
||||||
<item row="1" column="1">
|
<item row="1" column="1">
|
||||||
<widget class="QGraphicsView" name="leftStick">
|
<widget class="QGraphicsView" name="leftStick">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
@@ -121,7 +121,7 @@ QPushButton:checked {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>THR</string>
|
<string notr="true">THR</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -151,7 +151,7 @@ QPushButton:checked {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>RUD</string>
|
<string notr="true">RUD</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -181,7 +181,7 @@ QPushButton:checked {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>ELE</string>
|
<string notr="true">ELE</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -211,7 +211,7 @@ QPushButton:checked {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>AIL</string>
|
<string notr="true">AIL</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -355,7 +355,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="leftXPerc">
|
<widget class="QLabel" name="leftXPerc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string notr="true">TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -365,7 +365,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="leftYPerc">
|
<widget class="QLabel" name="leftYPerc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string notr="true">TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -393,6 +393,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true"><-</string>
|
<string notr="true"><-</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -428,6 +431,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">-></string>
|
<string notr="true">-></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -451,6 +457,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">^</string>
|
<string notr="true">^</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -486,6 +495,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">v</string>
|
<string notr="true">v</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -535,7 +547,7 @@ QPushButton:pressed {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TRN</string>
|
<string notr="true">TRN</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -562,7 +574,7 @@ QPushButton:checked {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>GEA</string>
|
<string notr="true">GEA</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -595,7 +607,7 @@ QPushButton:checked {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>ID0</string>
|
<string notr="true">ID0</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -632,7 +644,7 @@ QPushButton:checked {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>ID1</string>
|
<string notr="true">ID1</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -665,7 +677,7 @@ QPushButton:checked {
|
|||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>ID2</string>
|
<string notr="true">ID2</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -812,7 +824,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="rightXPerc">
|
<widget class="QLabel" name="rightXPerc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string notr="true">TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -822,7 +834,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="rightYPerc">
|
<widget class="QLabel" name="rightYPerc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string notr="true">TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -850,6 +862,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true"><-</string>
|
<string notr="true"><-</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -885,6 +900,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">-></string>
|
<string notr="true">-></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -908,6 +926,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">^</string>
|
<string notr="true">^</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -943,6 +964,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">v</string>
|
<string notr="true">v</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -1010,7 +1034,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>P1</string>
|
<string notr="true">P1</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>-1024</number>
|
<number>-1024</number>
|
||||||
@@ -1032,7 +1056,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="dialP_1value">
|
<widget class="QLabel" name="dialP_1value">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0 %</string>
|
<string notr="true">0 %</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1067,7 +1091,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>P2</string>
|
<string notr="true">P2</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>-1024</number>
|
<number>-1024</number>
|
||||||
@@ -1092,7 +1116,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="dialP_2value">
|
<widget class="QLabel" name="dialP_2value">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0 %</string>
|
<string notr="true">0 %</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1127,7 +1151,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>P3</string>
|
<string notr="true">P3</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>-1024</number>
|
<number>-1024</number>
|
||||||
@@ -1149,7 +1173,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="dialP_3value">
|
<widget class="QLabel" name="dialP_3value">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0 %</string>
|
<string notr="true">0 %</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
|
|||||||
@@ -301,6 +301,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">^</string>
|
<string notr="true">^</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item alignment="Qt::AlignHCenter">
|
<item alignment="Qt::AlignHCenter">
|
||||||
@@ -342,6 +345,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">v</string>
|
<string notr="true">v</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -555,7 +561,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>S1</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>-1024</number>
|
<number>-1024</number>
|
||||||
@@ -585,7 +591,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="leftXPerc">
|
<widget class="QLabel" name="leftXPerc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string notr="true">TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -595,7 +601,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="leftYPerc">
|
<widget class="QLabel" name="leftYPerc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string notr="true">TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -619,7 +625,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>SB</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
@@ -675,7 +681,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>SA</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
@@ -715,7 +721,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>SE</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
@@ -743,7 +749,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="0">
|
<item row="3" column="0">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>SF</string>
|
<string notr="true">SF</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -765,10 +771,10 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>SF</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string>SF</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>1</number>
|
<number>1</number>
|
||||||
@@ -811,7 +817,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>LS</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>-1024</number>
|
<number>-1024</number>
|
||||||
@@ -833,7 +839,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="6">
|
<item row="3" column="6">
|
||||||
<widget class="QLabel" name="label_2">
|
<widget class="QLabel" name="label_2">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>SA</string>
|
<string notr="true">SA</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -843,7 +849,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="8">
|
<item row="3" column="8">
|
||||||
<widget class="QLabel" name="label_3">
|
<widget class="QLabel" name="label_3">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>SB</string>
|
<string notr="true">SB</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -853,7 +859,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="5">
|
<item row="3" column="5">
|
||||||
<widget class="QLabel" name="label_5">
|
<widget class="QLabel" name="label_5">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>SE</string>
|
<string notr="true">SE</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -863,7 +869,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="3">
|
<item row="3" column="3">
|
||||||
<widget class="QLabel" name="label_9">
|
<widget class="QLabel" name="label_9">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>LS</string>
|
<string notr="true">LS</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -873,7 +879,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="10">
|
<item row="3" column="10">
|
||||||
<widget class="QLabel" name="label_10">
|
<widget class="QLabel" name="label_10">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>S1</string>
|
<string notr="true">S1</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -899,6 +905,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true"><-</string>
|
<string notr="true"><-</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -934,6 +943,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">-></string>
|
<string notr="true">-></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -982,6 +994,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">^</string>
|
<string notr="true">^</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item alignment="Qt::AlignHCenter">
|
<item alignment="Qt::AlignHCenter">
|
||||||
@@ -1017,6 +1032,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">v</string>
|
<string notr="true">v</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -1038,7 +1056,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>S2</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>-1024</number>
|
<number>-1024</number>
|
||||||
@@ -1060,7 +1078,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="1">
|
<item row="3" column="1">
|
||||||
<widget class="QLabel" name="label_11">
|
<widget class="QLabel" name="label_11">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>S2</string>
|
<string notr="true">S2</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1254,7 +1272,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>SD</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
@@ -1294,7 +1312,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>SC</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
@@ -1360,7 +1378,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>SG</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
@@ -1403,7 +1421,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>RS</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimum">
|
<property name="minimum">
|
||||||
<number>-1024</number>
|
<number>-1024</number>
|
||||||
@@ -1437,7 +1455,7 @@ QPushButton:checked {
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>SH</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="styleSheet">
|
<property name="styleSheet">
|
||||||
<string notr="true"/>
|
<string notr="true"/>
|
||||||
@@ -1468,7 +1486,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="3">
|
<item row="3" column="3">
|
||||||
<widget class="QLabel" name="label_4">
|
<widget class="QLabel" name="label_4">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>SC</string>
|
<string notr="true">SC</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1478,7 +1496,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="5">
|
<item row="3" column="5">
|
||||||
<widget class="QLabel" name="label_6">
|
<widget class="QLabel" name="label_6">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>SD</string>
|
<string notr="true">SD</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1488,7 +1506,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="6">
|
<item row="3" column="6">
|
||||||
<widget class="QLabel" name="label_7">
|
<widget class="QLabel" name="label_7">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>SG</string>
|
<string notr="true">SG</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1498,7 +1516,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="11">
|
<item row="3" column="11">
|
||||||
<widget class="QLabel" name="label_8">
|
<widget class="QLabel" name="label_8">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>SH</string>
|
<string notr="true">SH</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1508,7 +1526,7 @@ QPushButton:checked {
|
|||||||
<item row="3" column="8">
|
<item row="3" column="8">
|
||||||
<widget class="QLabel" name="label_12">
|
<widget class="QLabel" name="label_12">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>RS</string>
|
<string notr="true">RS</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1526,7 +1544,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="rightXPerc">
|
<widget class="QLabel" name="rightXPerc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string notr="true">TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1536,7 +1554,7 @@ QPushButton:checked {
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="rightYPerc">
|
<widget class="QLabel" name="rightYPerc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string notr="true">TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -1564,6 +1582,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true"><-</string>
|
<string notr="true"><-</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -1605,6 +1626,9 @@ QPushButton:checked {
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">-></string>
|
<string notr="true">-></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|||||||
@@ -142,6 +142,7 @@ SimulatorDialogTaranis::~SimulatorDialogTaranis()
|
|||||||
SimulatorDialog::~SimulatorDialog()
|
SimulatorDialog::~SimulatorDialog()
|
||||||
{
|
{
|
||||||
delete timer;
|
delete timer;
|
||||||
|
delete simulator;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimulatorDialog::closeEvent (QCloseEvent *)
|
void SimulatorDialog::closeEvent (QCloseEvent *)
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ class SimulatorInterface {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
virtual ~SimulatorInterface() {};
|
||||||
|
|
||||||
virtual void start(QByteArray & eeprom, bool tests=true) = 0;
|
virtual void start(QByteArray & eeprom, bool tests=true) = 0;
|
||||||
|
|
||||||
virtual void start(const char * filename, bool tests=true) = 0;
|
virtual void start(const char * filename, bool tests=true) = 0;
|
||||||
|
|||||||
+1323
-1671
File diff suppressed because it is too large
Load Diff
+1917
-2010
File diff suppressed because it is too large
Load Diff
+1452
-1486
File diff suppressed because it is too large
Load Diff
+2837
-3320
File diff suppressed because it is too large
Load Diff
+1471
-1972
File diff suppressed because it is too large
Load Diff
+1502
-1704
File diff suppressed because it is too large
Load Diff
+1329
-1829
File diff suppressed because it is too large
Load Diff
+1346
-1401
File diff suppressed because it is too large
Load Diff
+1503
-1903
File diff suppressed because it is too large
Load Diff
+1484
-1938
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,8 @@
|
|||||||
#ifndef WARNINGS_H
|
#ifndef WARNINGS_H
|
||||||
#define WARNINGS_H
|
#define WARNINGS_H
|
||||||
#define WARNING_LEVEL 0
|
#define WARNING_LEVEL 0
|
||||||
#define WARNING_ID 6
|
#define WARNING_ID 7
|
||||||
#define WARNING QObject::tr("Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.\n\nWe are really appreciative for that!\n\nThe OpenTX/Companion Team.")
|
#define WARNING QObject::tr("Thank you for upgrading to OpenTX 2.0. This is a major upgrade that adds and modifies a lot of things, so please make sure that you read release notes carefully to learn about the changes, and thoroughly check each of your models for proper function.\n\nThe OpenTX Team.")
|
||||||
|
|
||||||
#endif /* WARNINGS_H */
|
#endif /* WARNINGS_H */
|
||||||
|
|
||||||
|
|||||||
@@ -68,11 +68,11 @@ void WizardDialog::showHelp()
|
|||||||
"Throttle - Spektrum: CH1, Futaba: CH3"); break;
|
"Throttle - Spektrum: CH1, Futaba: CH3"); break;
|
||||||
case Page_Wingtypes:
|
case Page_Wingtypes:
|
||||||
message = tr("Most aircraft have a main wing and a tail with control surfaces. Flying wings and delta winged aircraft only have a single wing. "
|
message = tr("Most aircraft have a main wing and a tail with control surfaces. Flying wings and delta winged aircraft only have a single wing. "
|
||||||
"The main control surface on a standard wing controlls the roll of the aircraft. This surface is called an aileron.<br>"
|
"The main control surface on a standard wing controls the roll of the aircraft. This surface is called an aileron.<br>"
|
||||||
"The control surface of a delta wing controls both roll and elevation. This surface is called an elevon. "); break;
|
"The control surface of a delta wing controls both roll and pitch. This surface is called an elevon. "); break;
|
||||||
case Page_Ailerons:
|
case Page_Ailerons:
|
||||||
message = tr("Models use one or two channels to control the ailerons.<br>"
|
message = tr("Models use one or two channels to control the ailerons.<br>"
|
||||||
"A so called Y-cable can be used to connect single receiver channel to two separeate aileron servos. "
|
"A so called Y-cable can be used to connect a single receiver channel to two separate aileron servos. "
|
||||||
"If your servos are connected by a Y-cable you should select the single-servo option.<br><br>"
|
"If your servos are connected by a Y-cable you should select the single-servo option.<br><br>"
|
||||||
"Aileron - Spektrum: CH2, Futaba: CH1"); break;
|
"Aileron - Spektrum: CH2, Futaba: CH1"); break;
|
||||||
case Page_Flaps:
|
case Page_Flaps:
|
||||||
@@ -83,7 +83,7 @@ void WizardDialog::showHelp()
|
|||||||
"They are very uncommon on other types of planes."); break;
|
"They are very uncommon on other types of planes."); break;
|
||||||
case Page_Bank:
|
case Page_Bank:
|
||||||
message = tr("Models use one or two channels to control the elevons.<br>"
|
message = tr("Models use one or two channels to control the elevons.<br>"
|
||||||
"A so called Y-cable can be used to connect single receiver channel to two separeate elevon servos. "
|
"A so called Y-cable can be used to connect single a receiver channel to two separate elevon servos. "
|
||||||
"If your servos are connected by a Y-cable you should select the single-servo option."); break;
|
"If your servos are connected by a Y-cable you should select the single-servo option."); break;
|
||||||
case Page_Rudder:
|
case Page_Rudder:
|
||||||
message = tr("Select the receiver channel that is connected to your rudder.<br><br>"
|
message = tr("Select the receiver channel that is connected to your rudder.<br><br>"
|
||||||
@@ -736,7 +736,7 @@ FblPage::FblPage(WizardDialog *dlg, QString image, QString title, QString text,
|
|||||||
rollCB = new QComboBox();
|
rollCB = new QComboBox();
|
||||||
|
|
||||||
QLayout *l = layout();
|
QLayout *l = layout();
|
||||||
l->addWidget(new QLabel(tr("Trottle Channel:")));
|
l->addWidget(new QLabel(tr("Throttle Channel:")));
|
||||||
l->addWidget(throttleCB);
|
l->addWidget(throttleCB);
|
||||||
l->addWidget(new QLabel(tr("Yaw Channel:")));
|
l->addWidget(new QLabel(tr("Yaw Channel:")));
|
||||||
l->addWidget(yawCB);
|
l->addWidget(yawCB);
|
||||||
@@ -771,7 +771,7 @@ HeliPage::HeliPage(WizardDialog *dlg, QString image, QString title, QString text
|
|||||||
rollCB = new QComboBox();
|
rollCB = new QComboBox();
|
||||||
|
|
||||||
QLayout *l = layout();
|
QLayout *l = layout();
|
||||||
l->addWidget(new QLabel(tr("Trottle Channel:")));
|
l->addWidget(new QLabel(tr("Throttle Channel:")));
|
||||||
l->addWidget(throttleCB);
|
l->addWidget(throttleCB);
|
||||||
l->addWidget(new QLabel(tr("Yaw Channel:")));
|
l->addWidget(new QLabel(tr("Yaw Channel:")));
|
||||||
l->addWidget(yawCB);
|
l->addWidget(yawCB);
|
||||||
@@ -806,7 +806,7 @@ MultirotorPage::MultirotorPage(WizardDialog *dlg, QString image, QString title,
|
|||||||
rollCB = new QComboBox();
|
rollCB = new QComboBox();
|
||||||
|
|
||||||
QLayout *l = layout();
|
QLayout *l = layout();
|
||||||
l->addWidget(new QLabel(tr("Trottle Channel:")));
|
l->addWidget(new QLabel(tr("Throttle Channel:")));
|
||||||
l->addWidget(throttleCB);
|
l->addWidget(throttleCB);
|
||||||
l->addWidget(new QLabel(tr("Yaw Channel:")));
|
l->addWidget(new QLabel(tr("Yaw Channel:")));
|
||||||
l->addWidget(yawCB);
|
l->addWidget(yawCB);
|
||||||
|
|||||||
Binary file not shown.
@@ -274,7 +274,7 @@ void referenceSystemAudioFiles()
|
|||||||
|
|
||||||
for (int i=0; i<AU_FRSKY_FIRST; i++) {
|
for (int i=0; i<AU_FRSKY_FIRST; i++) {
|
||||||
getSystemAudioFile(path, i);
|
getSystemAudioFile(path, i);
|
||||||
if (!strcmp(filename, fn)) {
|
if (!strcasecmp(filename, fn)) {
|
||||||
availableAudioFiles |= MASK_SYSTEM_AUDIO_FILE(i);
|
availableAudioFiles |= MASK_SYSTEM_AUDIO_FILE(i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -372,7 +372,7 @@ void referenceModelAudioFiles()
|
|||||||
for (int i=0; i<MAX_PHASES && !found; i++) {
|
for (int i=0; i<MAX_PHASES && !found; i++) {
|
||||||
for (int event=0; event<2; event++) {
|
for (int event=0; event<2; event++) {
|
||||||
getPhaseAudioFile(path, i, event);
|
getPhaseAudioFile(path, i, event);
|
||||||
if (!strcmp(filename, fn)) {
|
if (!strcasecmp(filename, fn)) {
|
||||||
sdAvailablePhaseAudioFiles |= MASK_PHASE_AUDIO_FILE(i, event);
|
sdAvailablePhaseAudioFiles |= MASK_PHASE_AUDIO_FILE(i, event);
|
||||||
found = true;
|
found = true;
|
||||||
break;
|
break;
|
||||||
@@ -383,7 +383,7 @@ void referenceModelAudioFiles()
|
|||||||
// Switches Audio Files <switchname>-[up|mid|down].wav
|
// Switches Audio Files <switchname>-[up|mid|down].wav
|
||||||
for (int i=0; i<SWSRC_LAST_SWITCH+NUM_XPOTS*XPOTS_MULTIPOS_COUNT && !found; i++) {
|
for (int i=0; i<SWSRC_LAST_SWITCH+NUM_XPOTS*XPOTS_MULTIPOS_COUNT && !found; i++) {
|
||||||
getSwitchAudioFile(path, i);
|
getSwitchAudioFile(path, i);
|
||||||
if (!strcmp(filename, fn)) {
|
if (!strcasecmp(filename, fn)) {
|
||||||
sdAvailableSwitchAudioFiles |= MASK_SWITCH_AUDIO_FILE(i);
|
sdAvailableSwitchAudioFiles |= MASK_SWITCH_AUDIO_FILE(i);
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
@@ -393,7 +393,7 @@ void referenceModelAudioFiles()
|
|||||||
for (int i=0; i<NUM_LOGICAL_SWITCH && !found; i++) {
|
for (int i=0; i<NUM_LOGICAL_SWITCH && !found; i++) {
|
||||||
for (int event=0; event<2; event++) {
|
for (int event=0; event<2; event++) {
|
||||||
getLogicalSwitchAudioFile(path, i, event);
|
getLogicalSwitchAudioFile(path, i, event);
|
||||||
if (!strcmp(filename, fn)) {
|
if (!strcasecmp(filename, fn)) {
|
||||||
sdAvailableLogicalSwitchAudioFiles |= MASK_LOGICAL_SWITCH_AUDIO_FILE(i, event);
|
sdAvailableLogicalSwitchAudioFiles |= MASK_LOGICAL_SWITCH_AUDIO_FILE(i, event);
|
||||||
found = true;
|
found = true;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -387,12 +387,14 @@ int ConvertSwitch_215_to_216(int swtch)
|
|||||||
return -ConvertSwitch_215_to_216(-swtch);
|
return -ConvertSwitch_215_to_216(-swtch);
|
||||||
else if (swtch <= SWSRC_LAST_SWITCH)
|
else if (swtch <= SWSRC_LAST_SWITCH)
|
||||||
return swtch;
|
return swtch;
|
||||||
|
else if (swtch > SWSRC_LAST_SWITCH + 32) {
|
||||||
|
swtch -= (22+32);
|
||||||
|
if (swtch > SWSRC_ON)
|
||||||
|
swtch = 0;
|
||||||
|
return swtch;
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
swtch += (2*4) + (3*6); // 4 trims and 2 * 6-pos added as switches
|
swtch += (2*4) + (3*6); // 4 trims and 2 * 6-pos added as switches
|
||||||
if (swtch > SWSRC_ON)
|
|
||||||
swtch -= (22+32+1);
|
|
||||||
if (swtch > SWSRC_ON)
|
|
||||||
swtch = SWSRC_ON;
|
|
||||||
return swtch;
|
return swtch;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -770,8 +770,10 @@ void editName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, uin
|
|||||||
|
|
||||||
uint8_t mode = 0;
|
uint8_t mode = 0;
|
||||||
if (active) {
|
if (active) {
|
||||||
if (s_editMode <= 0) mode = INVERS+FIXEDWIDTH;
|
if (s_editMode <= 0)
|
||||||
else mode = FIXEDWIDTH;
|
mode = INVERS + FIXEDWIDTH;
|
||||||
|
else
|
||||||
|
mode = FIXEDWIDTH;
|
||||||
}
|
}
|
||||||
lcd_putsnAtt(x, y, name, size, ZCHAR | mode);
|
lcd_putsnAtt(x, y, name, size, ZCHAR | mode);
|
||||||
|
|
||||||
@@ -783,7 +785,7 @@ void editName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, uin
|
|||||||
|
|
||||||
if (p1valdiff || IS_ROTARY_RIGHT(event) || IS_ROTARY_LEFT(event) || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_FIRST(KEY_UP)
|
if (p1valdiff || IS_ROTARY_RIGHT(event) || IS_ROTARY_LEFT(event) || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_FIRST(KEY_UP)
|
||||||
|| event==EVT_KEY_REPT(KEY_DOWN) || event==EVT_KEY_REPT(KEY_UP)) {
|
|| event==EVT_KEY_REPT(KEY_DOWN) || event==EVT_KEY_REPT(KEY_UP)) {
|
||||||
v = checkIncDec(event, abs(v), 0, LEN_STD_CHARS, 0);
|
v = checkIncDec(event, abs(v), 0, ZCHAR_MAX, 0);
|
||||||
if (c <= 0) v = -v;
|
if (c <= 0) v = -v;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4608,6 +4610,9 @@ void menuModelLogicalSwitches(uint8_t event)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else if (cstate == LS_FAMILY_COMP) {
|
else if (cstate == LS_FAMILY_COMP) {
|
||||||
|
#if defined(CPUARM)
|
||||||
|
v1_val = (uint8_t)cs->v1;
|
||||||
|
#endif
|
||||||
putsMixerSource(CSW_2ND_COLUMN, y, v1_val, attr1);
|
putsMixerSource(CSW_2ND_COLUMN, y, v1_val, attr1);
|
||||||
putsMixerSource(CSW_3RD_COLUMN, y, cs->v2, attr2);
|
putsMixerSource(CSW_3RD_COLUMN, y, cs->v2, attr2);
|
||||||
INCDEC_SET_FLAG(INCDEC_SOURCE);
|
INCDEC_SET_FLAG(INCDEC_SOURCE);
|
||||||
|
|||||||
@@ -1478,6 +1478,10 @@ bool isSwitchAvailable(int swtch)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (swtch < 0) {
|
||||||
|
swtch = -swtch;
|
||||||
|
}
|
||||||
|
|
||||||
if (swtch >= SWSRC_FIRST_CSW && swtch <= SWSRC_LAST_CSW) {
|
if (swtch >= SWSRC_FIRST_CSW && swtch <= SWSRC_LAST_CSW) {
|
||||||
LogicalSwitchData * cs = cswAddress(swtch-SWSRC_FIRST_CSW);
|
LogicalSwitchData * cs = cswAddress(swtch-SWSRC_FIRST_CSW);
|
||||||
return (cs->func != LS_FUNC_NONE);
|
return (cs->func != LS_FUNC_NONE);
|
||||||
|
|||||||
@@ -1249,6 +1249,10 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
|
|||||||
putsTelemetryValue(x, y, div10_and_round(val), UNIT_RAW, att|PREC1);
|
putsTelemetryValue(x, y, div10_and_round(val), UNIT_RAW, att|PREC1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case TELEM_ASPD-1:
|
||||||
|
putsTelemetryValue(x, y, val, UNIT_KTS, att);
|
||||||
|
break;
|
||||||
|
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
case TELEM_SWR-1:
|
case TELEM_SWR-1:
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+34
-11
@@ -198,7 +198,9 @@ char idx2char(int8_t idx)
|
|||||||
if (idx < 27) return 'A' + idx - 1;
|
if (idx < 27) return 'A' + idx - 1;
|
||||||
if (idx < 37) return '0' + idx - 27;
|
if (idx < 37) return '0' + idx - 27;
|
||||||
if (idx <= 40) return pgm_read_byte(s_charTab+idx-37);
|
if (idx <= 40) return pgm_read_byte(s_charTab+idx-37);
|
||||||
// Needed if we want the special chars ... if (idx <= ZCHAR_MAX) return 'z' + 5 + idx - 40;
|
#if LEN_SPECIAL_CHARS > 0
|
||||||
|
if (idx <= ZCHAR_MAX) return 'z' + 5 + idx - 40;
|
||||||
|
#endif
|
||||||
return ' ';
|
return ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,6 +208,9 @@ char idx2char(int8_t idx)
|
|||||||
int8_t char2idx(char c)
|
int8_t char2idx(char c)
|
||||||
{
|
{
|
||||||
if (c == '_') return 37;
|
if (c == '_') return 37;
|
||||||
|
#if LEN_SPECIAL_CHARS > 0
|
||||||
|
if (c < 0 && c+128 <= LEN_SPECIAL_CHARS) return 41 + (c+128);
|
||||||
|
#endif
|
||||||
if (c >= 'a') return 'a' - c - 1;
|
if (c >= 'a') return 'a' - c - 1;
|
||||||
if (c >= 'A') return c - 'A' + 1;
|
if (c >= 'A') return c - 'A' + 1;
|
||||||
if (c >= '0') return c - '0' + 27;
|
if (c >= '0') return c - '0' + 27;
|
||||||
@@ -946,6 +951,13 @@ int expo(int x, int k)
|
|||||||
return neg? -y : y;
|
return neg? -y : y;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(HELI)
|
||||||
|
int16_t cyc_anas[3] = {0};
|
||||||
|
#if defined(PCBTARANIS)
|
||||||
|
int16_t heliAnas[4] = {0};
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
||||||
{
|
{
|
||||||
#if !defined(PCBTARANIS)
|
#if !defined(PCBTARANIS)
|
||||||
@@ -967,9 +979,20 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
|||||||
continue;
|
continue;
|
||||||
if (getSwitch(ed->swtch)) {
|
if (getSwitch(ed->swtch)) {
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS)
|
||||||
int v = (ed->srcRaw == ovwrIdx ? ovwrValue : getValue(ed->srcRaw));
|
int v;
|
||||||
if (ed->srcRaw != ovwrIdx && ed->srcRaw >= MIXSRC_FIRST_TELEM && ed->scale > 0) {
|
if (ed->srcRaw == ovwrIdx)
|
||||||
v = limit(-1024, int((v * 1024) / convertTelemValue(ed->srcRaw-MIXSRC_FIRST_TELEM+1, ed->scale)), 1024);
|
v = ovwrValue;
|
||||||
|
#if defined(HELI)
|
||||||
|
else if (ed->srcRaw == MIXSRC_Ele && g_model.swashR.value)
|
||||||
|
v = heliAnas[ELE_STICK];
|
||||||
|
else if (ed->srcRaw == MIXSRC_Ail && g_model.swashR.value)
|
||||||
|
v = heliAnas[AIL_STICK];
|
||||||
|
#endif
|
||||||
|
else {
|
||||||
|
v = getValue(ed->srcRaw);
|
||||||
|
if (ed->srcRaw >= MIXSRC_FIRST_TELEM && ed->scale > 0) {
|
||||||
|
v = limit(-1024, int((v * 1024) / convertTelemValue(ed->srcRaw-MIXSRC_FIRST_TELEM+1, ed->scale)), 1024);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
int16_t v = anas2[ed->chn];
|
int16_t v = anas2[ed->chn];
|
||||||
@@ -1193,9 +1216,6 @@ int16_t applyLimits(uint8_t channel, int32_t value)
|
|||||||
int16_t calibratedStick[NUM_STICKS+NUM_POTS];
|
int16_t calibratedStick[NUM_STICKS+NUM_POTS];
|
||||||
int16_t channelOutputs[NUM_CHNOUT] = {0};
|
int16_t channelOutputs[NUM_CHNOUT] = {0};
|
||||||
int16_t ex_chans[NUM_CHNOUT] = {0}; // Outputs (before LIMITS) of the last perMain;
|
int16_t ex_chans[NUM_CHNOUT] = {0}; // Outputs (before LIMITS) of the last perMain;
|
||||||
#ifdef HELI
|
|
||||||
int16_t cyc_anas[3] = {0};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// TODO same naming convention than the putsMixerSource
|
// TODO same naming convention than the putsMixerSource
|
||||||
|
|
||||||
@@ -3179,9 +3199,9 @@ void evalInputs(uint8_t mode)
|
|||||||
|
|
||||||
#if defined(HELI)
|
#if defined(HELI)
|
||||||
if (d && (ch==ELE_STICK || ch==AIL_STICK)) {
|
if (d && (ch==ELE_STICK || ch==AIL_STICK)) {
|
||||||
v = (int32_t(v)*calc100toRESX(g_model.swashR.value))/int32_t(d);
|
v = (int32_t(v) * calc100toRESX(g_model.swashR.value)) / int32_t(d);
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS)
|
||||||
calibratedStick[ch] = v;
|
heliAnas[ch] = v;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -3294,10 +3314,13 @@ PLAY_FUNCTION(playValue, uint8_t idx)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case MIXSRC_FIRST_TELEM+TELEM_VSPD-1:
|
case MIXSRC_FIRST_TELEM+TELEM_VSPD-1:
|
||||||
case MIXSRC_FIRST_TELEM+TELEM_ASPD-1:
|
|
||||||
PLAY_NUMBER(div10_and_round(val), 1+UNIT_METERS_PER_SECOND, PREC1);
|
PLAY_NUMBER(div10_and_round(val), 1+UNIT_METERS_PER_SECOND, PREC1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case MIXSRC_FIRST_TELEM+TELEM_ASPD-1:
|
||||||
|
PLAY_NUMBER(val, 1+UNIT_KTS, 0);
|
||||||
|
break;
|
||||||
|
|
||||||
case MIXSRC_FIRST_TELEM+TELEM_CONSUMPTION-1:
|
case MIXSRC_FIRST_TELEM+TELEM_CONSUMPTION-1:
|
||||||
PLAY_NUMBER(val, 1+UNIT_MAH, 0);
|
PLAY_NUMBER(val, 1+UNIT_MAH, 0);
|
||||||
break;
|
break;
|
||||||
@@ -3662,7 +3685,7 @@ void evalFunctions()
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS)
|
||||||
#define HELI_ANAS_ARRAY calibratedStick
|
#define HELI_ANAS_ARRAY heliAnas
|
||||||
#else
|
#else
|
||||||
#define HELI_ANAS_ARRAY anas
|
#define HELI_ANAS_ARRAY anas
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -791,6 +791,8 @@ void resetTelemetry()
|
|||||||
frskyData.hub.gpsSpeed_bp = 100;
|
frskyData.hub.gpsSpeed_bp = 100;
|
||||||
frskyData.hub.gpsSpeed_ap = 50;
|
frskyData.hub.gpsSpeed_ap = 50;
|
||||||
|
|
||||||
|
frskyData.hub.airSpeed = 100;
|
||||||
|
|
||||||
frskyData.hub.cellsCount = 6;
|
frskyData.hub.cellsCount = 6;
|
||||||
|
|
||||||
frskyData.hub.baroAltitudeOffset = 500 * 100;
|
frskyData.hub.baroAltitudeOffset = 500 * 100;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* German checked 04.04.2014 Test 012 kleine Änderungen
|
/* German checked 12.04.2014 Test 012 kleine Änderungen
|
||||||
* Authors (alphabetical order)
|
* Authors (alphabetical order)
|
||||||
* - Bertrand Songis <bsongis@gmail.com>
|
* - Bertrand Songis <bsongis@gmail.com>
|
||||||
* - Bernet Andre <bernet.andre@gmail.com>
|
* - Bernet Andre <bernet.andre@gmail.com>
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
#define TR_DATETIME "DATE:""ZEIT:"
|
#define TR_DATETIME "DATE:""ZEIT:"
|
||||||
|
|
||||||
#define LEN_VLCD "\006"
|
#define LEN_VLCD "\006"
|
||||||
#define TR_VLCD "NormalOptrex"
|
#define TR_VLCD "Normal""Optrex"
|
||||||
|
|
||||||
#define LEN_COUNTRYCODES TR("\002", "\007")
|
#define LEN_COUNTRYCODES TR("\002", "\007")
|
||||||
#define TR_COUNTRYCODES TR("US""JP""EU", "Amerika""Japan\0 ""Europa\0")
|
#define TR_COUNTRYCODES TR("US""JP""EU", "Amerika""Japan\0 ""Europa\0")
|
||||||
@@ -277,14 +277,14 @@
|
|||||||
#define LEN_FUNCSOUNDS TR("\004", "\006")
|
#define LEN_FUNCSOUNDS TR("\004", "\006")
|
||||||
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Piep1\0""Piep2\0""Piep3\0""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")
|
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Piep1\0""Piep2\0""Piep3\0""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")
|
||||||
|
|
||||||
#define LEN_VTELEMCHNS "\004"
|
#define LEN_VTELEMCHNS TR("\004", "\005")
|
||||||
|
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
#define TR_TELEM_RESERVE "[--]"
|
#define TR_TELEM_RESERVE TR("[--]", "[---]")
|
||||||
#define TR_SWR "SWR\0"
|
#define TR_SWR TR("SWR\0", "SWR\0 ")
|
||||||
#define TR_RX_BATT "RxBt"
|
#define TR_RX_BATT TR("RxBt", "RxBat")
|
||||||
#define TR_A3_A4 "A3\0 ""A4\0 "
|
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
|
||||||
#define TR_A3_A4_MIN "A3-\0""A4-\0"
|
#define TR_A3_A4_MIN TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
|
||||||
#else
|
#else
|
||||||
#define TR_TELEM_RESERVE
|
#define TR_TELEM_RESERVE
|
||||||
#define TR_SWR
|
#define TR_SWR
|
||||||
@@ -293,9 +293,13 @@
|
|||||||
#define TR_A3_A4_MIN
|
#define TR_A3_A4_MIN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define TR_ASPD_MAX "ASp+"
|
#define TR_ASPD_MAX TR("ASp+", "ASpd+")
|
||||||
|
|
||||||
#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
|
#if LCD_W >= 212
|
||||||
|
#define TR_VTELEMCHNS "---\0 ""Batt\0""Tmr1\0""Tmr2\0" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0 ""T2\0 ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0"
|
||||||
|
#else
|
||||||
|
#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define LENGTH_UNIT_IMP "ft\0"
|
#define LENGTH_UNIT_IMP "ft\0"
|
||||||
#define SPEED_UNIT_IMP "mph"
|
#define SPEED_UNIT_IMP "mph"
|
||||||
@@ -311,11 +315,11 @@
|
|||||||
#define TR_VTELEMUNIT_IMP "V\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
|
#define TR_VTELEMUNIT_IMP "V\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
|
||||||
#else
|
#else
|
||||||
#if defined(IMPERIAL_UNITS)
|
#if defined(IMPERIAL_UNITS)
|
||||||
#define LENGTH_UNIT "ft\0"
|
#define LENGTH_UNIT LENGTH_UNIT_IMP
|
||||||
#define SPEED_UNIT "kts"
|
#define SPEED_UNIT SPEED_UNIT_IMP
|
||||||
#else
|
#else
|
||||||
#define LENGTH_UNIT "m\0 "
|
#define LENGTH_UNIT LENGTH_UNIT_METR
|
||||||
#define SPEED_UNIT "Kmh"
|
#define SPEED_UNIT SPEED_UNIT_METR
|
||||||
#endif
|
#endif
|
||||||
#define LEN_VTELEMUNIT "\003"
|
#define LEN_VTELEMUNIT "\003"
|
||||||
#define TR_VTELEMUNIT "V\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
|
#define TR_VTELEMUNIT "V\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
|
||||||
@@ -480,14 +484,14 @@
|
|||||||
#define TR_FADEIN "Langs. Ein"
|
#define TR_FADEIN "Langs. Ein"
|
||||||
#define TR_FADEOUT "Langs. Aus"
|
#define TR_FADEOUT "Langs. Aus"
|
||||||
#define TR_DEFAULT "(Normal)"
|
#define TR_DEFAULT "(Normal)"
|
||||||
#define TR_CHECKTRIMS "\006Trims\012Prüfen"
|
#define TR_CHECKTRIMS CENTER"\006Trims\012Prüfen"
|
||||||
#define OFS_CHECKTRIMS (9*FW)
|
#define OFS_CHECKTRIMS CENTER_OFS+(9*FW)
|
||||||
#define TR_SWASHTYPE TR("Typ Taumelsch","Typ Taumelscheibe")
|
#define TR_SWASHTYPE TR("Typ Taumelsch","Typ Taumelscheibe")
|
||||||
#define TR_COLLECTIVE TR("Kollekt.Pitch","Kollekt. Pitch Kanal")
|
#define TR_COLLECTIVE TR("Kollekt.Pitch","Kollekt. Pitch Kanal")
|
||||||
#define TR_SWASHRING TR("Zykl. Begrenz","Zyklische Begrenzung")
|
#define TR_SWASHRING TR("Zykl. Begrenz","Zykl. Kreis Begrenz.")
|
||||||
#define TR_ELEDIRECTION TR("Nick Richtung"," Nick Servo Richtung")
|
#define TR_ELEDIRECTION TR("Nick Richtung","Nick Servo Richtung")
|
||||||
#define TR_AILDIRECTION TR("Roll Richtung"," Roll Servo Richtung")
|
#define TR_AILDIRECTION TR("Roll Richtung","Roll Servo Richtung")
|
||||||
#define TR_COLDIRECTION TR("Pit. Richtung"," Pitch Servo Richtung")
|
#define TR_COLDIRECTION TR("Pit. Richtung","Pitch Servo Richtung")
|
||||||
#define TR_MODE INDENT"Modus"
|
#define TR_MODE INDENT"Modus"
|
||||||
#define TR_NOFREEEXPO "Expos voll!"
|
#define TR_NOFREEEXPO "Expos voll!"
|
||||||
#define TR_NOFREEMIXER "Mischer voll!"
|
#define TR_NOFREEMIXER "Mischer voll!"
|
||||||
@@ -513,12 +517,12 @@
|
|||||||
#define TR_MIXER "MISCHER"
|
#define TR_MIXER "MISCHER"
|
||||||
#define TR_CV "KV"
|
#define TR_CV "KV"
|
||||||
#define TR_GV "GV"
|
#define TR_GV "GV"
|
||||||
#define TR_ACHANNEL "A\004Kanal "
|
#define TR_ACHANNEL "A\004Kanal gemessen =>"
|
||||||
#define TR_RANGE INDENT"Skala"
|
#define TR_RANGE INDENT"Messbereich"
|
||||||
#define TR_BAR "Streifen"
|
#define TR_BAR "Streifen"
|
||||||
#define TR_ALARM INDENT"Alarm"
|
#define TR_ALARM INDENT"Alarm"
|
||||||
#define TR_USRDATA "Daten berechnen--"
|
#define TR_USRDATA "Daten berechnen aus"
|
||||||
#define TR_BLADES INDENT"Blätter"
|
#define TR_BLADES INDENT"Prop-Blätter"
|
||||||
#define TR_SCREEN "Telm-Bild "
|
#define TR_SCREEN "Telm-Bild "
|
||||||
#define TR_SOUND_LABEL "----Töne---------"
|
#define TR_SOUND_LABEL "----Töne---------"
|
||||||
#define TR_LENGTH INDENT"Dauer"
|
#define TR_LENGTH INDENT"Dauer"
|
||||||
@@ -548,7 +552,7 @@
|
|||||||
#define TR_POTWARNING TR("Pot Warn.", INDENT "Poti Warnung")
|
#define TR_POTWARNING TR("Pot Warn.", INDENT "Poti Warnung")
|
||||||
#define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone")
|
#define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone")
|
||||||
#define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung")
|
#define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung")
|
||||||
#define TR_SLAVE "Schüler PPM1-16 als Ausgang"
|
#define TR_SLAVE TR("Schüler PPM1-16","Schüler PPM1-16 als Ausgang")
|
||||||
#define TR_MODESRC " Modus\002% Quelle"
|
#define TR_MODESRC " Modus\002% Quelle"
|
||||||
#define TR_MULTIPLIER "Multiplikator"
|
#define TR_MULTIPLIER "Multiplikator"
|
||||||
#define TR_CAL "Kal."
|
#define TR_CAL "Kal."
|
||||||
@@ -598,7 +602,7 @@
|
|||||||
#define TR_MENUDIAG TR("Schalt.","Schalter Test")
|
#define TR_MENUDIAG TR("Schalt.","Schalter Test")
|
||||||
#define TR_MENUANA "Analog Test"
|
#define TR_MENUANA "Analog Test"
|
||||||
#define TR_MENUCALIBRATION TR("KALIB. ANALOG","KALIBRIERUNG STICKS+POTIS")
|
#define TR_MENUCALIBRATION TR("KALIB. ANALOG","KALIBRIERUNG STICKS+POTIS")
|
||||||
#define TR_TRIMS2OFFSETS "Kopie Trim to Servo-Subtrim" // "Trims => Offset"
|
#define TR_TRIMS2OFFSETS "Kopie Trim to Servo-Mitte" // "Trims => Offset"
|
||||||
#define TR_MENUMODELSEL TR("MODELLE","MODELL WÄHLEN")
|
#define TR_MENUMODELSEL TR("MODELLE","MODELL WÄHLEN")
|
||||||
#define TR_MENUSETUP TR("KONF.","MODELL EINSTELLUNGEN")
|
#define TR_MENUSETUP TR("KONF.","MODELL EINSTELLUNGEN")
|
||||||
#define TR_MENUFLIGHTPHASE "FLUGPHASE"
|
#define TR_MENUFLIGHTPHASE "FLUGPHASE"
|
||||||
@@ -750,27 +754,27 @@
|
|||||||
#define TR_MODELIDUSED TR("ID schon benutzt","Modell ID schon benutzt")
|
#define TR_MODELIDUSED TR("ID schon benutzt","Modell ID schon benutzt")
|
||||||
#define TR_MODULE INDENT "Modul-Typ"
|
#define TR_MODULE INDENT "Modul-Typ"
|
||||||
#define TR_CHANNELRANGE INDENT "Ausgangs Kanäle"
|
#define TR_CHANNELRANGE INDENT "Ausgangs Kanäle"
|
||||||
#define TR_LOWALARM INDENT "Low Alarm"
|
#define TR_LOWALARM INDENT "Vor-Alarm bei"
|
||||||
#define TR_CRITICALALARM INDENT "Kritisch Alarm"
|
#define TR_CRITICALALARM INDENT "Kritisch Alarm"
|
||||||
#define TR_ENABLE_POPUP "Enable Popup"
|
#define TR_ENABLE_POPUP "Enable Popup"
|
||||||
#define TR_DISABLE_POPUP "Disable Popup"
|
#define TR_DISABLE_POPUP "Disable Popup"
|
||||||
#define TR_CURVE_PRESET "Preset..."
|
#define TR_CURVE_PRESET "Gerade 0 11 22 33 45"
|
||||||
#define TR_PRESET "Preset"
|
#define TR_PRESET "Preset"
|
||||||
#define TR_MIRROR "Mirror"
|
#define TR_MIRROR "Spiegeln"
|
||||||
#define TR_CLEAR "Clear"
|
#define TR_CLEAR "Löschen"
|
||||||
#define TR_RESET "Reset Servowerte"
|
#define TR_RESET "Reset Servowerte"
|
||||||
#define TR_RESET_SUBMENU "Reset..."
|
#define TR_RESET_SUBMENU "Reset=>Timer Flug Telem"
|
||||||
#define TR_COUNT "Punkte"
|
#define TR_COUNT "Punkte"
|
||||||
#define TR_PT "Pt"
|
#define TR_PT "Pt"
|
||||||
#define TR_PTS "Pts"
|
#define TR_PTS "Pts"
|
||||||
#define TR_SMOOTH "Runden"
|
#define TR_SMOOTH "Runden"
|
||||||
#define TR_COPY_TRIMS_TO_OFS "Kopie Trim to Servo-Subtrim" // "Trims => Offset"
|
#define TR_COPY_TRIMS_TO_OFS "Kopie Trim to Servo-Mitte" // "Trims => Offset"
|
||||||
#define TR_PERSISTENT_MAH INDENT "Speichern mAh"
|
#define TR_PERSISTENT_MAH INDENT "Speichern mAh"
|
||||||
#define TR_PREFLIGHT "----Preflight Checks----"
|
#define TR_PREFLIGHT "----Preflight Checks----"
|
||||||
#define TR_CHECKLIST INDENT "Display Checklist"
|
#define TR_CHECKLIST INDENT "Display Checklist"
|
||||||
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
|
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
|
||||||
#define TR_UART3MODE "Serial Port"
|
#define TR_UART3MODE "Serial Port"
|
||||||
#define TR_SCRIPT "Script"
|
#define TR_SCRIPT "Lua-Script"
|
||||||
#define TR_INPUTS "Inputs"
|
#define TR_INPUTS "Inputs"
|
||||||
#define TR_OUTPUTS "Outputs"
|
#define TR_OUTPUTS "Outputs"
|
||||||
|
|
||||||
@@ -802,7 +806,7 @@
|
|||||||
|
|
||||||
// Taranis Info Zeile Anzeigen
|
// Taranis Info Zeile Anzeigen
|
||||||
#define TR_PHASES_HEADERS { " Name ", " Schalter ", " Seite Trim ", " Höhe Trim ", " Gas Trim ", " Quer Trim ", " Fade In ", " Fade Out " }
|
#define TR_PHASES_HEADERS { " Name ", " Schalter ", " Seite Trim ", " Höhe Trim ", " Gas Trim ", " Quer Trim ", " Fade In ", " Fade Out " }
|
||||||
#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Richtung ", " Kurve ", " PPM Mitte ", " Subtrim Mode " }
|
#define TR_LIMITS_HEADERS { " Name ", " Mitte ", " Min ", " Max ", " Richtung ", " Kurve ", " PPM Mitte ", " Mitte Mode " }
|
||||||
#define TR_CSW_HEADERS { " Funktion ", " Var1 ", " Var2 ", " Var2 ", " UND Schalter ", " Dauer ", " Verzögerung " }
|
#define TR_CSW_HEADERS { " Funktion ", " Var1 ", " Var2 ", " Var2 ", " UND Schalter ", " Dauer ", " Verzögerung " }
|
||||||
|
|
||||||
//Taranis About screen
|
//Taranis About screen
|
||||||
@@ -848,7 +852,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define TR_ABOUT_PARENTS_1 "Vorgänger-Projekte"
|
#define TR_ABOUT_PARENTS_1 "Vorgänger-Projekte"
|
||||||
#define TR_ABOUT_PARENTS_2 "ersky9x (Mike Blandford)"
|
#define TR_ABOUT_PARENTS_2 "Ersky9x (Mike Blandford)"
|
||||||
#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)"
|
#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)"
|
||||||
#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)"
|
#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)"
|
||||||
|
|
||||||
@@ -865,8 +869,8 @@
|
|||||||
|
|
||||||
#define TR_TOP_BAR "----Info Zeile----"
|
#define TR_TOP_BAR "----Info Zeile----"
|
||||||
#define TR_ALTITUDE INDENT "Höhe"
|
#define TR_ALTITUDE INDENT "Höhe"
|
||||||
#define TR_SCALE "Scale"
|
#define TR_SCALE "Skalliere"
|
||||||
#define TR_VIEW_CHANNELS "View Channels"
|
#define TR_VIEW_CHANNELS "Zeige Kanäle"
|
||||||
#define TR_VIEW_NOTES "View Notes"
|
#define TR_VIEW_NOTES "Zeige Notes"
|
||||||
#define TR_MODS_FORBIDDEN "Veränderungen verboten!"
|
#define TR_MODS_FORBIDDEN "Veränderungen verboten!"
|
||||||
#define TR_UNLOCKED "Entsperrt"
|
#define TR_UNLOCKED "Entsperrt"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
* Authors (alphabetical order)
|
* Authors (alphabetical order)
|
||||||
* - Andre Bernet <bernet.andre@gmail.com>
|
* - Andre Bernet <bernet.andre@gmail.com>
|
||||||
* - Bertrand Songis <bsongis@gmail.com>
|
* - Bertrand Songis <bsongis@gmail.com>
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ")
|
#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ")
|
||||||
|
|
||||||
#define LEN_VBEEPCOUNTDOWN "\007"
|
#define LEN_VBEEPCOUNTDOWN "\007"
|
||||||
#define TR_VBEEPCOUNTDOWN "Silence""Bips\0 ""Voix\0 "
|
#define TR_VBEEPCOUNTDOWN "Aucun\0 ""Bips\0 ""Voix\0 "
|
||||||
|
|
||||||
#define LEN_CURVE_TYPES "\010"
|
#define LEN_CURVE_TYPES "\010"
|
||||||
#define TR_CURVE_TYPES "Standard""Libre\0"
|
#define TR_CURVE_TYPES "Standard""Libre\0"
|
||||||
|
|||||||
Reference in New Issue
Block a user