Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Fixed last companion9x strings. Getting very close.

Browse source
This commit is contained in:
Dvogonen 2014-01-06 18:21:30 +01:00
parent 57718d0100
commit a646e240fb
5 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/companion9x.qrc
View file

@ -48,7 +48,7 @@
<file>images/screenshot.png</file> <file>images/screenshot.png</file>
<file>images/splash.png</file> <file>images/splash.png</file>
<file>images/splasht.png</file> <file>images/splasht.png</file>
<file>images/companion9x-title.png</file> <file>images/companion-title.png</file>
<file>images/read_eeprom.png</file> <file>images/read_eeprom.png</file>
<file>images/write_eeprom.png</file> <file>images/write_eeprom.png</file>
<file>images/write_flash.png</file> <file>images/write_flash.png</file>

0
companion/src/images/companion9x-title.png → companion/src/images/companion-title.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Before After
Before After

2
companion/src/mainwindow.cpp
View file

@ -1495,7 +1495,7 @@ void MainWindow::logFile()
void MainWindow::about() void MainWindow::about()
{ {
QString aboutStr = "<center><img src=\":/images/companion9x-title.png\"></center><br>"; QString aboutStr = "<center><img src=\":/images/companion-title.png\"></center><br>";
aboutStr.append("OpenTX Home Page: <a href='http://opentx.github.io'>http://open-tx.org</a><br><br>"); aboutStr.append("OpenTX Home Page: <a href='http://opentx.github.io'>http://open-tx.org</a><br><br>");
aboutStr.append(tr("The Companion project was originally forked from eePe")+QString(" <a href='http://code.google.com/p/eepe'>http://code.google.com/p/eepe</a><br/><br/>")); aboutStr.append(tr("The Companion project was originally forked from eePe")+QString(" <a href='http://code.google.com/p/eepe'>http://code.google.com/p/eepe</a><br/><br/>"));
aboutStr.append(tr("If you've found this program useful, please support by")); aboutStr.append(tr("If you've found this program useful, please support by"));

2
companion/src/modelslist.cpp
View file

@ -445,7 +445,7 @@ void ModelsListWidget::doPaste(QByteArray *gmData, int index)
i++; i++;
gData++; gData++;
if(c=='G') { //General settings if(c=='G') { //General settings
ret = QMessageBox::question(this, "companion9x", tr("Do you want to overwrite TX general settings?"), ret = QMessageBox::question(this, "Companion", tr("Do you want to overwrite TX general settings?"),
QMessageBox::Yes | QMessageBox::No); QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) { if (ret == QMessageBox::Yes) {
radioData->generalSettings = *((GeneralSettings *)gData); radioData->generalSettings = *((GeneralSettings *)gData);

2
companion/src/xsimulatordialog.cpp
View file

@ -195,7 +195,7 @@ void xsimulatorDialog::onTimerEvent()
{ {
static unsigned int lcd_counter = 0; static unsigned int lcd_counter = 0;
if (!simulator->timer10ms()) { if (!simulator->timer10ms()) {
QMessageBox::critical(this, "companion9x", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError())); QMessageBox::critical(this, "companion", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError()));
timer->stop(); timer->stop();
return; return;
} }