1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 00:05:17 +03:00
This commit is contained in:
mhotar 2014-01-26 21:18:45 +01:00
commit 220ddb8bcf
532 changed files with 732 additions and 661 deletions

View file

@ -299,3 +299,6 @@ Heinz Vogel
Heung Jin Choi Heung Jin Choi
MMJS van der Helm MMJS van der Helm
Dan Neelands Dan Neelands
Yashiro Masayuki
Isaac Sloan
Harold Baird

View file

@ -319,6 +319,9 @@ TARGET_LINK_LIBRARIES( ${PROJECT_NAME} modeledit ${QT_LIBRARIES} ${QT_QTMAIN_LIB
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
INSTALL( FILES companion.desktop DESTINATION share/applications ) INSTALL( FILES companion.desktop DESTINATION share/applications )
INSTALL( FILES images/linuxicons/16x16/companion.png DESTINATION /usr/share/icons/hicolor/16x16/apps )
INSTALL( FILES images/linuxicons/22x22/companion.png DESTINATION /usr/share/icons/hicolor/22x22/apps )
INSTALL( FILES images/linuxicons/24x24/companion.png DESTINATION /usr/share/icons/hicolor/24x24/apps )
INSTALL( FILES images/linuxicons/32x32/companion.png DESTINATION /usr/share/icons/hicolor/32x32/apps ) INSTALL( FILES images/linuxicons/32x32/companion.png DESTINATION /usr/share/icons/hicolor/32x32/apps )
INSTALL( FILES images/linuxicons/48x48/companion.png DESTINATION /usr/share/icons/hicolor/48x48/apps ) INSTALL( FILES images/linuxicons/48x48/companion.png DESTINATION /usr/share/icons/hicolor/48x48/apps )
INSTALL( FILES images/linuxicons/128x128/companion.png DESTINATION /usr/share/icons/hicolor/128x128/apps ) INSTALL( FILES images/linuxicons/128x128/companion.png DESTINATION /usr/share/icons/hicolor/128x128/apps )

View file

@ -324,7 +324,6 @@
<file>themes/monochrome/16/paste.png</file> <file>themes/monochrome/16/paste.png</file>
<file>themes/monochrome/16/print.png</file> <file>themes/monochrome/16/print.png</file>
<file>themes/monochrome/16/compare.png</file> <file>themes/monochrome/16/compare.png</file>
<file>themes/monochrome/16/customize.png</file>
<file>themes/monochrome/16/saveas.png</file> <file>themes/monochrome/16/saveas.png</file>
<file>themes/monochrome/16/preferences.png</file> <file>themes/monochrome/16/preferences.png</file>
<file>themes/monochrome/16/movedown.png</file> <file>themes/monochrome/16/movedown.png</file>
@ -367,7 +366,6 @@
<file>themes/monochrome/24/paste.png</file> <file>themes/monochrome/24/paste.png</file>
<file>themes/monochrome/24/print.png</file> <file>themes/monochrome/24/print.png</file>
<file>themes/monochrome/24/compare.png</file> <file>themes/monochrome/24/compare.png</file>
<file>themes/monochrome/24/customize.png</file>
<file>themes/monochrome/24/saveas.png</file> <file>themes/monochrome/24/saveas.png</file>
<file>themes/monochrome/24/preferences.png</file> <file>themes/monochrome/24/preferences.png</file>
<file>themes/monochrome/24/movedown.png</file> <file>themes/monochrome/24/movedown.png</file>
@ -410,7 +408,6 @@
<file>themes/monochrome/32/paste.png</file> <file>themes/monochrome/32/paste.png</file>
<file>themes/monochrome/32/print.png</file> <file>themes/monochrome/32/print.png</file>
<file>themes/monochrome/32/compare.png</file> <file>themes/monochrome/32/compare.png</file>
<file>themes/monochrome/32/customize.png</file>
<file>themes/monochrome/32/saveas.png</file> <file>themes/monochrome/32/saveas.png</file>
<file>themes/monochrome/32/preferences.png</file> <file>themes/monochrome/32/preferences.png</file>
<file>themes/monochrome/32/movedown.png</file> <file>themes/monochrome/32/movedown.png</file>
@ -453,7 +450,6 @@
<file>themes/monochrome/48/paste.png</file> <file>themes/monochrome/48/paste.png</file>
<file>themes/monochrome/48/print.png</file> <file>themes/monochrome/48/print.png</file>
<file>themes/monochrome/48/compare.png</file> <file>themes/monochrome/48/compare.png</file>
<file>themes/monochrome/48/customize.png</file>
<file>themes/monochrome/48/saveas.png</file> <file>themes/monochrome/48/saveas.png</file>
<file>themes/monochrome/48/preferences.png</file> <file>themes/monochrome/48/preferences.png</file>
<file>themes/monochrome/48/movedown.png</file> <file>themes/monochrome/48/movedown.png</file>
@ -496,7 +492,6 @@
<file>themes/classic/16/paste.png</file> <file>themes/classic/16/paste.png</file>
<file>themes/classic/16/print.png</file> <file>themes/classic/16/print.png</file>
<file>themes/classic/16/compare.png</file> <file>themes/classic/16/compare.png</file>
<file>themes/classic/16/customize.png</file>
<file>themes/classic/16/saveas.png</file> <file>themes/classic/16/saveas.png</file>
<file>themes/classic/16/preferences.png</file> <file>themes/classic/16/preferences.png</file>
<file>themes/classic/16/movedown.png</file> <file>themes/classic/16/movedown.png</file>
@ -539,7 +534,6 @@
<file>themes/classic/24/paste.png</file> <file>themes/classic/24/paste.png</file>
<file>themes/classic/24/print.png</file> <file>themes/classic/24/print.png</file>
<file>themes/classic/24/compare.png</file> <file>themes/classic/24/compare.png</file>
<file>themes/classic/24/customize.png</file>
<file>themes/classic/24/saveas.png</file> <file>themes/classic/24/saveas.png</file>
<file>themes/classic/24/preferences.png</file> <file>themes/classic/24/preferences.png</file>
<file>themes/classic/24/movedown.png</file> <file>themes/classic/24/movedown.png</file>
@ -582,7 +576,6 @@
<file>themes/classic/32/paste.png</file> <file>themes/classic/32/paste.png</file>
<file>themes/classic/32/print.png</file> <file>themes/classic/32/print.png</file>
<file>themes/classic/32/compare.png</file> <file>themes/classic/32/compare.png</file>
<file>themes/classic/32/customize.png</file>
<file>themes/classic/32/saveas.png</file> <file>themes/classic/32/saveas.png</file>
<file>themes/classic/32/preferences.png</file> <file>themes/classic/32/preferences.png</file>
<file>themes/classic/32/movedown.png</file> <file>themes/classic/32/movedown.png</file>
@ -625,7 +618,6 @@
<file>themes/classic/48/paste.png</file> <file>themes/classic/48/paste.png</file>
<file>themes/classic/48/print.png</file> <file>themes/classic/48/print.png</file>
<file>themes/classic/48/compare.png</file> <file>themes/classic/48/compare.png</file>
<file>themes/classic/48/customize.png</file>
<file>themes/classic/48/saveas.png</file> <file>themes/classic/48/saveas.png</file>
<file>themes/classic/48/preferences.png</file> <file>themes/classic/48/preferences.png</file>
<file>themes/classic/48/movedown.png</file> <file>themes/classic/48/movedown.png</file>
@ -668,7 +660,6 @@
<file>themes/monoblue/16/paste.png</file> <file>themes/monoblue/16/paste.png</file>
<file>themes/monoblue/16/print.png</file> <file>themes/monoblue/16/print.png</file>
<file>themes/monoblue/16/compare.png</file> <file>themes/monoblue/16/compare.png</file>
<file>themes/monoblue/16/customize.png</file>
<file>themes/monoblue/16/saveas.png</file> <file>themes/monoblue/16/saveas.png</file>
<file>themes/monoblue/16/preferences.png</file> <file>themes/monoblue/16/preferences.png</file>
<file>themes/monoblue/16/movedown.png</file> <file>themes/monoblue/16/movedown.png</file>
@ -711,7 +702,6 @@
<file>themes/monoblue/24/paste.png</file> <file>themes/monoblue/24/paste.png</file>
<file>themes/monoblue/24/print.png</file> <file>themes/monoblue/24/print.png</file>
<file>themes/monoblue/24/compare.png</file> <file>themes/monoblue/24/compare.png</file>
<file>themes/monoblue/24/customize.png</file>
<file>themes/monoblue/24/saveas.png</file> <file>themes/monoblue/24/saveas.png</file>
<file>themes/monoblue/24/preferences.png</file> <file>themes/monoblue/24/preferences.png</file>
<file>themes/monoblue/24/movedown.png</file> <file>themes/monoblue/24/movedown.png</file>
@ -754,7 +744,6 @@
<file>themes/monoblue/32/paste.png</file> <file>themes/monoblue/32/paste.png</file>
<file>themes/monoblue/32/print.png</file> <file>themes/monoblue/32/print.png</file>
<file>themes/monoblue/32/compare.png</file> <file>themes/monoblue/32/compare.png</file>
<file>themes/monoblue/32/customize.png</file>
<file>themes/monoblue/32/saveas.png</file> <file>themes/monoblue/32/saveas.png</file>
<file>themes/monoblue/32/preferences.png</file> <file>themes/monoblue/32/preferences.png</file>
<file>themes/monoblue/32/movedown.png</file> <file>themes/monoblue/32/movedown.png</file>
@ -797,7 +786,6 @@
<file>themes/monoblue/48/paste.png</file> <file>themes/monoblue/48/paste.png</file>
<file>themes/monoblue/48/print.png</file> <file>themes/monoblue/48/print.png</file>
<file>themes/monoblue/48/compare.png</file> <file>themes/monoblue/48/compare.png</file>
<file>themes/monoblue/48/customize.png</file>
<file>themes/monoblue/48/saveas.png</file> <file>themes/monoblue/48/saveas.png</file>
<file>themes/monoblue/48/preferences.png</file> <file>themes/monoblue/48/preferences.png</file>
<file>themes/monoblue/48/movedown.png</file> <file>themes/monoblue/48/movedown.png</file>
@ -840,7 +828,6 @@
<file>themes/monowhite/16/paste.png</file> <file>themes/monowhite/16/paste.png</file>
<file>themes/monowhite/16/print.png</file> <file>themes/monowhite/16/print.png</file>
<file>themes/monowhite/16/compare.png</file> <file>themes/monowhite/16/compare.png</file>
<file>themes/monowhite/16/customize.png</file>
<file>themes/monowhite/16/saveas.png</file> <file>themes/monowhite/16/saveas.png</file>
<file>themes/monowhite/16/preferences.png</file> <file>themes/monowhite/16/preferences.png</file>
<file>themes/monowhite/16/movedown.png</file> <file>themes/monowhite/16/movedown.png</file>
@ -883,7 +870,6 @@
<file>themes/monowhite/24/paste.png</file> <file>themes/monowhite/24/paste.png</file>
<file>themes/monowhite/24/print.png</file> <file>themes/monowhite/24/print.png</file>
<file>themes/monowhite/24/compare.png</file> <file>themes/monowhite/24/compare.png</file>
<file>themes/monowhite/24/customize.png</file>
<file>themes/monowhite/24/saveas.png</file> <file>themes/monowhite/24/saveas.png</file>
<file>themes/monowhite/24/preferences.png</file> <file>themes/monowhite/24/preferences.png</file>
<file>themes/monowhite/24/movedown.png</file> <file>themes/monowhite/24/movedown.png</file>
@ -926,7 +912,6 @@
<file>themes/monowhite/32/paste.png</file> <file>themes/monowhite/32/paste.png</file>
<file>themes/monowhite/32/print.png</file> <file>themes/monowhite/32/print.png</file>
<file>themes/monowhite/32/compare.png</file> <file>themes/monowhite/32/compare.png</file>
<file>themes/monowhite/32/customize.png</file>
<file>themes/monowhite/32/saveas.png</file> <file>themes/monowhite/32/saveas.png</file>
<file>themes/monowhite/32/preferences.png</file> <file>themes/monowhite/32/preferences.png</file>
<file>themes/monowhite/32/movedown.png</file> <file>themes/monowhite/32/movedown.png</file>
@ -969,7 +954,6 @@
<file>themes/monowhite/48/paste.png</file> <file>themes/monowhite/48/paste.png</file>
<file>themes/monowhite/48/print.png</file> <file>themes/monowhite/48/print.png</file>
<file>themes/monowhite/48/compare.png</file> <file>themes/monowhite/48/compare.png</file>
<file>themes/monowhite/48/customize.png</file>
<file>themes/monowhite/48/saveas.png</file> <file>themes/monowhite/48/saveas.png</file>
<file>themes/monowhite/48/preferences.png</file> <file>themes/monowhite/48/preferences.png</file>
<file>themes/monowhite/48/movedown.png</file> <file>themes/monowhite/48/movedown.png</file>

View file

@ -1038,7 +1038,7 @@ void compareDialog::printSwitches()
int sc=0; int sc=0;
QString color; QString color;
QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">"; QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
str.append("<tr><td><h2>"+tr("Custom Switches")+"</h2></td></tr>"); str.append("<tr><td><h2>"+tr("Logical Switches")+"</h2></td></tr>");
str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">"); str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">");
for (int i=0; i<GetEepromInterface()->getCapability(CustomSwitches); i++) { for (int i=0; i<GetEepromInterface()->getCapability(CustomSwitches); i++) {
QString sw1 = getCustomSwitchStr(&g_model1->customSw[i], *g_model1); QString sw1 = getCustomSwitchStr(&g_model1->customSw[i], *g_model1);
@ -1048,9 +1048,9 @@ void compareDialog::printSwitches()
color=getColor1(sw1,sw2); color=getColor1(sw1,sw2);
str.append(QString("<td width=\"45%\"><font color=%1>").arg(color)+sw1+"</font></td>"); str.append(QString("<td width=\"45%\"><font color=%1>").arg(color)+sw1+"</font></td>");
if (i<9) { if (i<9) {
str.append("<td align=\"center\" width=\"10%\"><b>"+tr("CS")+QString("%1</b></td>").arg(i+1)); str.append("<td align=\"center\" width=\"10%\"><b>"+tr("LS")+QString("%1</b></td>").arg(i+1));
} else { } else {
str.append("<td align=\"center\" width=\"10%\"><b>"+tr("CS")+('A'+(i-9))+"</b></td>"); str.append("<td align=\"center\" width=\"10%\"><b>"+tr("LS")+('A'+(i-9))+"</b></td>");
} }
color=getColor2(sw1,sw2); color=getColor2(sw1,sw2);
str.append(QString("<td width=\"45%\"><font color=%1>").arg(color)+sw2+"</font></td>"); str.append(QString("<td width=\"45%\"><font color=%1>").arg(color)+sw2+"</font></td>");
@ -1069,7 +1069,7 @@ void compareDialog::printFSwitches()
QString color2; QString color2;
int sc=0; int sc=0;
QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-before:always;\" width=\"100%\">"; QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-before:always;\" width=\"100%\">";
str.append("<tr><td><h2>"+tr("Custom Functions")+"</h2></td></tr>"); str.append("<tr><td><h2>"+tr("Switch Assignment")+"</h2></td></tr>");
str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\"><tr>"); str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\"><tr>");
str.append("<td width=\"7%\" align=\"center\"><b>"+tr("Switch")+"</b></td>"); str.append("<td width=\"7%\" align=\"center\"><b>"+tr("Switch")+"</b></td>");
str.append("<td width=\"12%\" align=\"center\"><b>"+tr("Function")+"</b></td>"); str.append("<td width=\"12%\" align=\"center\"><b>"+tr("Function")+"</b></td>");

View file

@ -278,10 +278,10 @@ QString RawSource::toString()
QObject::tr("Cur+"), QObject::tr("Pwr+"), QObject::tr("ACC "), QObject::tr("Time"), QObject::tr("Cur+"), QObject::tr("Pwr+"), QObject::tr("ACC "), QObject::tr("Time"),
}; };
static const QString virtualSwitches[] = { QObject::tr("CS1"), QObject::tr("CS2"), QObject::tr("CS3"), QObject::tr("CS4"), QObject::tr("CS5"), QObject::tr("CS6"), QObject::tr("CS7"), QObject::tr("CS8"), QObject::tr("CS9"), QObject::tr("CSA"), static const QString virtualSwitches[] = { QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"),
QObject::tr("CSB"), QObject::tr("CSC"), QObject::tr("CSD"), QObject::tr("CSE"), QObject::tr("CSF"), QObject::tr("CSG"), QObject::tr("CSH"), QObject::tr("CSI"), QObject::tr("CSJ"), QObject::tr("CSK"), QObject::tr("LSB"), QObject::tr("LSC"), QObject::tr("LSD"), QObject::tr("LSE"), QObject::tr("LSF"), QObject::tr("LSG"), QObject::tr("LSH"), QObject::tr("LSI"), QObject::tr("LSJ"), QObject::tr("LSK"),
QObject::tr("CSL"), QObject::tr("CSM"), QObject::tr("CSN"), QObject::tr("CSO"), QObject::tr("CSP"), QObject::tr("CSQ"), QObject::tr("CSR"), QObject::tr("CSS"), QObject::tr("CST"), QObject::tr("CSU"), QObject::tr("LSL"), QObject::tr("LSM"), QObject::tr("LSN"), QObject::tr("LSO"), QObject::tr("LSP"), QObject::tr("LSQ"), QObject::tr("LSR"), QObject::tr("LSS"), QObject::tr("LST"), QObject::tr("LSU"),
QObject::tr("CSV"), QObject::tr("CSW") QObject::tr("LSV"), QObject::tr("LSW")
}; };
if (index<0) { if (index<0) {
@ -292,7 +292,7 @@ QString RawSource::toString()
if (model && strlen(model->inputNames[index]) > 0) if (model && strlen(model->inputNames[index]) > 0)
return QString(model->inputNames[index]); return QString(model->inputNames[index]);
else else
return QObject::tr("Virtual Input %1").arg(index+1); return QObject::tr("Input %1").arg(index+1);
case SOURCE_TYPE_STICK: case SOURCE_TYPE_STICK:
return AnalogString(index); return AnalogString(index);
case SOURCE_TYPE_TRIM: case SOURCE_TYPE_TRIM:
@ -352,10 +352,10 @@ QString RawSwitch::toString()
SwitchUp('H'), SwitchDn('H'), SwitchUp('H'), SwitchDn('H'),
}; };
static const QString virtualSwitches[] = { QObject::tr("CS1"), QObject::tr("CS2"), QObject::tr("CS3"), QObject::tr("CS4"), QObject::tr("CS5"), QObject::tr("CS6"), QObject::tr("CS7"), QObject::tr("CS8"), QObject::tr("CS9"), QObject::tr("CSA"), static const QString virtualSwitches[] = { QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"),
QObject::tr("CSB"), QObject::tr("CSC"), QObject::tr("CSD"), QObject::tr("CSE"), QObject::tr("CSF"), QObject::tr("CSG"), QObject::tr("CSH"), QObject::tr("CSI"), QObject::tr("CSJ"), QObject::tr("CSK"), QObject::tr("LSB"), QObject::tr("LSC"), QObject::tr("LSD"), QObject::tr("LSE"), QObject::tr("LSF"), QObject::tr("LSG"), QObject::tr("LSH"), QObject::tr("LSI"), QObject::tr("LSJ"), QObject::tr("LSK"),
QObject::tr("CSL"), QObject::tr("CSM"), QObject::tr("CSN"), QObject::tr("CSO"), QObject::tr("CSP"), QObject::tr("CSQ"), QObject::tr("CSR"), QObject::tr("CSS"), QObject::tr("CST"), QObject::tr("CSU"), QObject::tr("LSL"), QObject::tr("LSM"), QObject::tr("LSN"), QObject::tr("LSO"), QObject::tr("LSP"), QObject::tr("LSQ"), QObject::tr("LSR"), QObject::tr("LSS"), QObject::tr("LST"), QObject::tr("LSU"),
QObject::tr("CSV"), QObject::tr("CSW") QObject::tr("LSV"), QObject::tr("LSW")
}; };
switch(type) { switch(type) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 871 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 864 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 812 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 713 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 815 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 460 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 343 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 426 B

View file

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 616 B

View file

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 521 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 B

View file

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 444 B

View file

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 445 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 634 B

View file

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

View file

@ -45,7 +45,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
int col = 1; int col = 1;
addLabel(gridLayout, tr("Switch"), col++); addLabel(gridLayout, tr("Switch"), col++);
addLabel(gridLayout, tr("Function"), col++); addLabel(gridLayout, tr("Action"), col++);
addLabel(gridLayout, tr("Parameters"), col++); addLabel(gridLayout, tr("Parameters"), col++);
addLabel(gridLayout, tr("Enable"), col++); addLabel(gridLayout, tr("Enable"), col++);
@ -90,15 +90,6 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
for (int i=0; i<num_fsw; i++) { for (int i=0; i<num_fsw; i++) {
AssignFunc func = model.funcSw[i].func; AssignFunc func = model.funcSw[i].func;
// The label
QLabel * label = new QLabel(this);
label->setContextMenuPolicy(Qt::CustomContextMenu);
label->setMouseTracking(true);
label->setProperty("index", i);
label->setText(tr("CF%1").arg(i+1));
gridLayout->addWidget(label, i+1, 0);
connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint)));
// The switch // The switch
fswtchSwtch[i] = new QComboBox(this); fswtchSwtch[i] = new QComboBox(this);
fswtchSwtch[i]->setProperty("index", i); fswtchSwtch[i]->setProperty("index", i);

View file

@ -14,7 +14,7 @@ CustomSwitchesPanel::CustomSwitchesPanel(QWidget * parent, ModelData & model):
QGridLayout * gridLayout = new QGridLayout(this); QGridLayout * gridLayout = new QGridLayout(this);
int col = 1; int col = 1;
addLabel(gridLayout, tr("Function"), col++); addLabel(gridLayout, tr("Condition"), col++);
addLabel(gridLayout, tr("V1"), col++); addLabel(gridLayout, tr("V1"), col++);
addLabel(gridLayout, tr("V2"), col++); addLabel(gridLayout, tr("V2"), col++);
addLabel(gridLayout, tr("AND"), col++); addLabel(gridLayout, tr("AND"), col++);
@ -29,9 +29,9 @@ CustomSwitchesPanel::CustomSwitchesPanel(QWidget * parent, ModelData & model):
QLabel * label = new QLabel(this); QLabel * label = new QLabel(this);
label->setProperty("index", i); label->setProperty("index", i);
if (i < 9) if (i < 9)
label->setText(tr("CS%1").arg(i+1)); label->setText(tr("LS%1").arg(i+1));
else else
label->setText(tr("CS%1").arg(QChar('A'+i-9))); label->setText(tr("LS%1").arg(QChar('A'+i-9)));
label->setContextMenuPolicy(Qt::CustomContextMenu); label->setContextMenuPolicy(Qt::CustomContextMenu);
label->setMouseTracking(true); label->setMouseTracking(true);
connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(csw_customContextMenuRequested(QPoint))); connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(csw_customContextMenuRequested(QPoint)));

View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>370</width> <width>381</width>
<height>356</height> <height>414</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -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 expo.</string> <string>Phase used by the input.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -266,8 +266,8 @@
<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 expo. <string>Switch used by the input.
If blank then the expo is considered to be &quot;ON&quot; all the time.</string> If blank then the input is considered to be &quot;ON&quot; all the time.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -395,7 +395,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="whatsThis"> <property name="whatsThis">
<string>The curve used by the expo</string> <string>The curve used by the input</string>
</property> </property>
</widget> </widget>
</item> </item>

View file

@ -21,7 +21,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 Expo Settings")); qbClear->setText(tr("Clear All Settings"));
qbClear->setIcon(CompanionIcon("clear.png")); qbClear->setIcon(CompanionIcon("clear.png"));
exposLayout->addWidget(ExposlistWidget,1,1,1,3); exposLayout->addWidget(ExposlistWidget,1,1,1,3);
@ -142,7 +142,7 @@ void InputsPanel::update()
bool InputsPanel::gm_insertExpo(int idx) bool InputsPanel::gm_insertExpo(int idx)
{ {
if (idx<0 || idx>=C9X_MAX_EXPOS || model.expoData[C9X_MAX_EXPOS-1].mode > 0) { if (idx<0 || idx>=C9X_MAX_EXPOS || model.expoData[C9X_MAX_EXPOS-1].mode > 0) {
QMessageBox::information(this, "companion", tr("Not enough available expos!")); QMessageBox::information(this, "companion", tr("Not enough available inputs!"));
return false; return false;
} }
@ -222,7 +222,7 @@ void InputsPanel::exposDelete(bool ask)
if(ask) if(ask)
ret = QMessageBox::warning(this, "companion", ret = QMessageBox::warning(this, "companion",
tr("Delete Selected Expos?"), tr("Delete Selected Inputs?"),
QMessageBox::Yes | QMessageBox::No); QMessageBox::Yes | QMessageBox::No);
@ -460,7 +460,7 @@ void InputsPanel::exposDeleteList(QList<int> list)
void InputsPanel::clearExpos() void InputsPanel::clearExpos()
{ {
if (QMessageBox::question(this, tr("Clear Expos?"), tr("Really clear all the expos?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { if (QMessageBox::question(this, tr("Clear Inputs?"), tr("Really clear all the inputs?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
model.clearInputs(); model.clearInputs();
emit modified(); emit modified();
update(); update();

View file

@ -30,9 +30,9 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
addTab(new InputsPanel(this, model, radioData.generalSettings), tr("Inputs")); addTab(new InputsPanel(this, model, radioData.generalSettings), tr("Inputs"));
addTab(new MixesPanel(this, model, radioData.generalSettings), tr("Mixes")); addTab(new MixesPanel(this, model, radioData.generalSettings), tr("Mixes"));
addTab(new Channels(this, model), tr("Channels")); addTab(new Channels(this, model), tr("Channels"));
addTab(new CustomSwitchesPanel(this, model), tr("Custom Switches")); addTab(new CustomSwitchesPanel(this, model), tr("Logical Switches"));
if (GetEepromInterface()->getCapability(CustomFunctions)) if (GetEepromInterface()->getCapability(CustomFunctions))
addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Assignable Functions")); addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Switch Assignment"));
addTab(new Curves(this, model), tr("Curves")); addTab(new Curves(this, model), tr("Curves"));
if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY) if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY)
addTab(new TelemetryPanel(this, model), tr("Telemetry")); addTab(new TelemetryPanel(this, model), tr("Telemetry"));

View file

@ -99,16 +99,16 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
QString label; QString label;
if (moduleIdx < 0) { if (moduleIdx < 0) {
label = tr("Trainer Module"); label = tr("Trainer Output");
ui->trainerMode->setCurrentIndex(model.trainerMode); ui->trainerMode->setCurrentIndex(model.trainerMode);
} }
else { else {
ui->label_trainerMode->hide(); ui->label_trainerMode->hide();
ui->trainerMode->hide(); ui->trainerMode->hide();
if (moduleIdx == 0) if (moduleIdx == 0)
label = tr("Internal Module"); label = tr("Internal Radio System");
else else
label = tr("External Module"); label = tr("External Radio Module");
} }
ui->label_module->setText(label); ui->label_module->setText(label);

View file

@ -640,16 +640,16 @@ void printDialog::printSwitches()
{ {
int sc=0; int sc=0;
QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">"; QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
str.append("<tr><td><h2>"+tr("Custom Switches")+"</h2></td></tr>"); str.append("<tr><td><h2>"+tr("Logical Switches")+"</h2></td></tr>");
str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3>"); str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3>");
for (int i=0; i<GetEepromInterface()->getCapability(CustomSwitches); i++) { for (int i=0; i<GetEepromInterface()->getCapability(CustomSwitches); i++) {
if (g_model->customSw[i].func) { if (g_model->customSw[i].func) {
str.append("<tr>"); str.append("<tr>");
if (i<9) { if (i<9) {
str.append("<td width=\"60\" align=\"center\"><b>"+tr("CS")+QString("%1</b></td>").arg(i+1)); str.append("<td width=\"60\" align=\"center\"><b>"+tr("LS")+QString("%1</b></td>").arg(i+1));
} else { } else {
str.append("<td width=\"60\" align=\"center\"><b>"+tr("CS")+('A'+(i-9))+"</b></td>"); str.append("<td width=\"60\" align=\"center\"><b>"+tr("LS")+('A'+(i-9))+"</b></td>");
} }
QString tstr = getCustomSwitchStr(&g_model->customSw[i], *g_model); QString tstr = getCustomSwitchStr(&g_model->customSw[i], *g_model);
str.append(doTC(tstr,"green")); str.append(doTC(tstr,"green"));
@ -724,9 +724,8 @@ void printDialog::printFSwitches()
{ {
int sc=0; int sc=0;
QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">"; QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
str.append("<tr><td><h2>"+tr("Function Switches")+"</h2></td></tr>"); str.append("<tr><td><h2>"+tr("Switch Assignments")+"</h2></td></tr>");
str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3><tr>"); str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3><tr>");
str.append("<td width=\"60\">&nbsp;</td>");
str.append(doTC(tr("Switch"), "", true)); str.append(doTC(tr("Switch"), "", true));
str.append(doTL(tr("Function"), "", true)); str.append(doTL(tr("Function"), "", true));
str.append(doTL(tr("Parameter"), "", true)); str.append(doTL(tr("Parameter"), "", true));
@ -736,7 +735,6 @@ void printDialog::printFSwitches()
for(int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) { for(int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
if (g_model->funcSw[i].swtch.type!=SWITCH_TYPE_NONE) { if (g_model->funcSw[i].swtch.type!=SWITCH_TYPE_NONE) {
str.append("<tr>"); str.append("<tr>");
str.append(doTC(tr("CF")+QString("%1").arg(i+1),"",true));
str.append(doTC(g_model->funcSw[i].swtch.toString(),"green")); str.append(doTC(g_model->funcSw[i].swtch.toString(),"green"));
str.append(doTC(getFuncName(g_model->funcSw[i].func),"green")); str.append(doTC(getFuncName(g_model->funcSw[i].func),"green"));
str.append(doTC(FuncParam(g_model->funcSw[i].func,g_model->funcSw[i].param,g_model->funcSw[i].paramarm, g_model->funcSw[i].adjustMode),"green")); str.append(doTC(FuncParam(g_model->funcSw[i].func,g_model->funcSw[i].param,g_model->funcSw[i].paramarm, g_model->funcSw[i].adjustMode),"green"));

Binary file not shown.

Before

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 564 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 973 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Some files were not shown because too many files have changed in this diff Show more