Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 12:55:12 +03:00
Code Issues Wiki Activity

References to companion9x were still present

Browse source
This commit is contained in:
Romolo Manfredini 2014-01-20 14:42:22 +01:00
parent 8f1ae2e529
commit 0d394ca7c6
14 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
companion/src/comparedialog.cpp
View file

@ -48,7 +48,7 @@ compareDialog::compareDialog(QWidget *parent, GeneralSettings *gg) :
void compareDialog::dragMoveEvent(QDragMoveEvent *event)
{
if (event->mimeData()->hasFormat("application/x-companion9x")) {
if (event->mimeData()->hasFormat("application/x-companion")) {
event->acceptProposedAction();
} else {
event->ignore();
@ -58,7 +58,7 @@ void compareDialog::dragMoveEvent(QDragMoveEvent *event)
void compareDialog::dragEnterEvent(QDragEnterEvent *event)
{
// accept just text/uri-list mime format
if (event->mimeData()->hasFormat("application/x-companion9x")) {
if (event->mimeData()->hasFormat("application/x-companion")) {
event->acceptProposedAction();
} else {
event->ignore();
@ -95,8 +95,8 @@ void compareDialog::dropEvent(QDropEvent *event)
const QMimeData *mimeData = event->mimeData();
if (child) {
if (child->objectName().contains("label_1")) {
if(mimeData->hasFormat("application/x-companion9x")) {
QByteArray gmData = mimeData->data("application/x-companion9x");
if(mimeData->hasFormat("application/x-companion")) {
QByteArray gmData = mimeData->data("application/x-companion");
DragDropHeader *header = (DragDropHeader *)gmData.data();
if (!header->general_settings) {
char *gData = gmData.data()+sizeof(DragDropHeader);//new char[gmData.size() + 1];
@ -120,8 +120,8 @@ void compareDialog::dropEvent(QDropEvent *event)
}
}
else if (child->objectName().contains("label_2")) {
if(mimeData->hasFormat("application/x-companion9x")) {
QByteArray gmData = mimeData->data("application/x-companion9x");
if(mimeData->hasFormat("application/x-companion")) {
QByteArray gmData = mimeData->data("application/x-companion");
DragDropHeader *header = (DragDropHeader *)gmData.data();
if (!header->general_settings) {
char *gData = gmData.data()+sizeof(DragDropHeader);//new char[gmData.size() + 1];

2
companion/src/contributorsdialog.cpp
View file

@ -82,7 +82,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
ui->textEditor->setHtml(file.readAll());
}
ui->textEditor->scroll(0,0);
this->setWindowTitle(tr("Companion9x Release Notes"));
this->setWindowTitle(tr("Companion Release Notes"));
}
break;
case 2:{

10
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -309,7 +309,7 @@ bool Open9xInterface::load(RadioData &radioData, uint8_t *eeprom, int size)
std::cout << " wrong size (" << size << ")\n";
return false;
} else {
QMessageBox::warning(NULL,"companion9x", QObject::tr("Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"));
QMessageBox::warning(NULL,"companion", QObject::tr("Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"));
size=2048;
}
} else {
@ -945,7 +945,7 @@ bool Open9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esiz
QString geturl( int board)
{
QString url="http://";
QSettings settings("companion9x", "companion9x");
QSettings settings("companion", "companion");
int server = settings.value("fwserver", 0).toInt();
if (server >= o9xservers.count()) {
server = 0;
@ -973,7 +973,7 @@ QString geturl( int board)
QString getstamp( int board)
{
QString url="http://";
QSettings settings("companion9x", "companion9x");
QSettings settings("companion", "companion");
int server = settings.value("fwserver",0).toInt();
if (server >=o9xservers.count()) {
server=0;
@ -1008,7 +1008,7 @@ QString getstamp( int board)
QString getrnurl( int board)
{
QString url="http://";
QSettings settings("companion9x", "companion9x");
QSettings settings("companion", "companion");
int server = settings.value("fwserver",0).toInt();
if (server >=o9xservers.count()) {
server=0;
@ -1239,7 +1239,7 @@ void RegisterOpen9xFirmwares()
open9x->addOptions(fai_options);
firmwares.push_back(open9x);
QSettings settings("companion9x", "companion9x");
QSettings settings("companion", "companion");
int rev4a = settings.value("rev4asupport",0).toInt();
if (rev4a) {
open9x = new Open9xFirmware("opentx-taranisrev4a", QObject::tr("openTx for FrSky Taranis Rev4a"), new Open9xInterface(BOARD_TARANIS_REV4a), geturl(BOARD_TARANIS_REV4a), getstamp(BOARD_TARANIS_REV4a),getrnurl(BOARD_TARANIS), true);

2
companion/src/mainwindow.cpp
View file

@ -2090,7 +2090,7 @@ void MainWindow::readSettings()
{
QSettings settings("companion", "companion");
restoreState(settings.value("mainWindowState").toByteArray());
checkCompanion9x = settings.value("startup_check_companion9x", true).toBool();
checkCompanion9x = settings.value("startup_check_companion", true).toBool();
checkFW = settings.value("startup_check_fw", true).toBool();
MaxRecentFiles =settings.value("history_size",10).toInt();
ActiveProfile=settings.value("activeprofile",0).toInt();

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

@ -154,7 +154,7 @@ void Curves::resetCurve()
{
QPushButton *button = (QPushButton *)sender();
int index = button->property("index").toInt();
int res = QMessageBox::question(this, "companion9x", tr("Are you sure you want to reset curve %1 ?").arg(index+1), QMessageBox::Yes | QMessageBox::No);
int res = QMessageBox::question(this, "companion", tr("Are you sure you want to reset curve %1 ?").arg(index+1), QMessageBox::Yes | QMessageBox::No);
if (res == QMessageBox::Yes) {
model.curves[index].clear(5);
update();
@ -364,7 +364,7 @@ void Curves::on_curvetype_CB_currentIndexChanged(int index)
int fwpoints = GetEepromInterface()->getCapability(NumCurvePoints);
if (fwpoints!=0) {
if (fwpoints < totalpoints) {
QMessageBox::warning(this, "companion9x", tr("Not enough free points in EEPROM to store the curve."));
QMessageBox::warning(this, "companion", tr("Not enough free points in EEPROM to store the curve."));
updateCurveType();
lock = false;
return;

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

@ -425,8 +425,8 @@ void CustomFunctionsPanel::fswPaste()
{
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
if (mimeData->hasFormat("application/x-companion9x-fsw")) {
QByteArray fswData = mimeData->data("application/x-companion9x-fsw");
if (mimeData->hasFormat("application/x-companion-fsw")) {
QByteArray fswData = mimeData->data("application/x-companion-fsw");
FuncSwData *fsw = &model.funcSw[selectedFunction];
memcpy(fsw, fswData.mid(0, sizeof(FuncSwData)).constData(), sizeof(FuncSwData));
@ -453,7 +453,7 @@ void CustomFunctionsPanel::fswCopy()
QByteArray fswData;
fswData.append((char*)&model.funcSw[selectedFunction],sizeof(FuncSwData));
QMimeData *mimeData = new QMimeData;
mimeData->setData("application/x-companion9x-fsw", fswData);
mimeData->setData("application/x-companion-fsw", fswData);
QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
}
@ -480,7 +480,7 @@ void CustomFunctionsPanel::fsw_customContextMenuRequested(QPoint pos)
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
bool hasData = mimeData->hasFormat("application/x-companion9x-fsw");
bool hasData = mimeData->hasFormat("application/x-companion-fsw");
QMenu contextMenu;
contextMenu.addAction(ClearIcon, tr("&Delete"),this,SLOT(fswDelete()),tr("Delete"));

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

@ -337,8 +337,8 @@ void CustomSwitchesPanel::cswPaste()
{
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
if (mimeData->hasFormat("application/x-companion9x-csw")) {
QByteArray cswData = mimeData->data("application/x-companion9x-csw");
if (mimeData->hasFormat("application/x-companion-csw")) {
QByteArray cswData = mimeData->data("application/x-companion-csw");
CustomSwData *csw = &model.customSw[selectedSwitch];
memcpy(csw, cswData.mid(0, sizeof(CustomSwData)).constData(), sizeof(CustomSwData));
@ -359,7 +359,7 @@ void CustomSwitchesPanel::cswCopy()
QByteArray cswData;
cswData.append((char*)&model.customSw[selectedSwitch],sizeof(CustomSwData));
QMimeData *mimeData = new QMimeData;
mimeData->setData("application/x-companion9x-csw", cswData);
mimeData->setData("application/x-companion-csw", cswData);
QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
}
@ -395,7 +395,7 @@ void CustomSwitchesPanel::csw_customContextMenuRequested(QPoint pos)
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
bool hasData = mimeData->hasFormat("application/x-companion9x-csw");
bool hasData = mimeData->hasFormat("application/x-companion-csw");
QMenu contextMenu;
contextMenu.addAction(ClearIcon, tr("&Delete"),this,SLOT(cswDelete()),tr("Delete"));

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

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>370</width>
<height>331</height>
<height>356</height>
</rect>
</property>
<property name="sizePolicy">
@ -26,7 +26,7 @@
<string/>
</property>
<property name="windowIcon">
<iconset>
<iconset resource="../companion.qrc">
<normaloff>:/icon.png</normaloff>:/icon.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
@ -442,7 +442,7 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
<resources>
<include location="companion9x.qrc"/>
<include location="../companion.qrc"/>
</resources>
<connections>
<connection>

12
companion/src/modeledit/inputs.cpp
View file

@ -143,7 +143,7 @@ void InputsPanel::update()
bool InputsPanel::gm_insertExpo(int idx)
{
if (idx<0 || idx>=C9X_MAX_EXPOS || model.expoData[C9X_MAX_EXPOS-1].mode > 0) {
QMessageBox::information(this, "companion9x", tr("Not enough available expos!"));
QMessageBox::information(this, "companion", tr("Not enough available expos!"));
return false;
}
@ -222,7 +222,7 @@ void InputsPanel::exposDelete(bool ask)
QMessageBox::StandardButton ret = QMessageBox::No;
if(ask)
ret = QMessageBox::warning(this, "companion9x",
ret = QMessageBox::warning(this, "companion",
tr("Delete Selected Expos?"),
QMessageBox::Yes | QMessageBox::No);
@ -250,7 +250,7 @@ void InputsPanel::exposCopy()
}
QMimeData *mimeData = new QMimeData;
mimeData->setData("application/x-companion9x-expo", mxData);
mimeData->setData("application/x-companion-expo", mxData);
QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
}
@ -264,7 +264,7 @@ void InputsPanel::mimeExpoDropped(int index, const QMimeData *data, Qt::DropActi
#include <QtGui/qwidget.h>
void InputsPanel::pasteExpoMimeData(const QMimeData * mimeData, int destIdx)
{
if (mimeData->hasFormat("application/x-companion9x-expo")) {
if (mimeData->hasFormat("application/x-companion-expo")) {
int idx; // mixer index
int dch;
@ -276,7 +276,7 @@ void InputsPanel::pasteExpoMimeData(const QMimeData * mimeData, int destIdx)
dch = model.expoData[idx].chn;
}
QByteArray mxData = mimeData->data("application/x-companion9x-expo");
QByteArray mxData = mimeData->data("application/x-companion-expo");
int i = 0;
while (i < mxData.size()) {
@ -370,7 +370,7 @@ void InputsPanel::expolistWidget_customContextMenuRequested(QPoint pos)
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
bool hasData = mimeData->hasFormat("application/x-companion9x-expo");
bool hasData = mimeData->hasFormat("application/x-companion-expo");
QMenu contextMenu;
contextMenu.addAction(AddIcon, tr("&Add"),this,SLOT(expoAdd()),tr("Ctrl+A"));

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

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>342</width>
<width>364</width>
<height>434</height>
</rect>
</property>
@ -20,7 +20,7 @@
<string>Dialog</string>
</property>
<property name="windowIcon">
<iconset resource="../companion9x.qrc">
<iconset resource="../companion.qrc">
<normaloff>:/icon.png</normaloff>:/icon.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@ -612,7 +612,7 @@ If blank then the mix is considered to be &quot;ON&quot; all the time.</string>
</layout>
</widget>
<resources>
<include location="../companion9x.qrc"/>
<include location="../companion.qrc"/>
</resources>
<connections>
<connection>

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

@ -40,9 +40,9 @@ bool MixersList::dropMimeData( int index, const QMimeData * data, Qt::DropAction
{
QMimeData *mimeData = new QMimeData;
if (expo)
mimeData->setData("application/x-companion9x-expo", qba);
mimeData->setData("application/x-companion-expo", qba);
else
mimeData->setData("application/x-companion9x-mix", qba);
mimeData->setData("application/x-companion-mix", qba);
emit mimeDropped(index, mimeData, action);
}

12
companion/src/modeledit/mixes.cpp
View file

@ -181,7 +181,7 @@ void MixesPanel::update()
bool MixesPanel::gm_insertMix(int idx)
{
if (idx<0 || idx>=GetEepromInterface()->getCapability(Mixes) || model.mixData[GetEepromInterface()->getCapability(Mixes)-1].destCh > 0) {
QMessageBox::information(this, "companion9x", tr("Not enough available mixers!"));
QMessageBox::information(this, "companion", tr("Not enough available mixers!"));
return false;
}
@ -286,7 +286,7 @@ void MixesPanel::mixersDelete(bool ask)
QMessageBox::StandardButton ret = QMessageBox::No;
if(ask)
ret = QMessageBox::warning(this, "companion9x",
ret = QMessageBox::warning(this, "companion",
tr("Delete Selected Mixes?"),
QMessageBox::Yes | QMessageBox::No);
@ -315,13 +315,13 @@ void MixesPanel::mixersCopy()
}
QMimeData *mimeData = new QMimeData;
mimeData->setData("application/x-companion9x-mix", mxData);
mimeData->setData("application/x-companion-mix", mxData);
QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
}
void MixesPanel::pasteMixerMimeData(const QMimeData * mimeData, int destIdx)
{
if(mimeData->hasFormat("application/x-companion9x-mix")) {
if(mimeData->hasFormat("application/x-companion-mix")) {
int idx; // mixer index
int dch;
@ -333,7 +333,7 @@ void MixesPanel::pasteMixerMimeData(const QMimeData * mimeData, int destIdx)
dch = model.mixData[idx].destCh;
}
QByteArray mxData = mimeData->data("application/x-companion9x-mix");
QByteArray mxData = mimeData->data("application/x-companion-mix");
int i = 0;
while(i<mxData.size()) {
@ -433,7 +433,7 @@ void MixesPanel::mixerlistWidget_customContextMenuRequested(QPoint pos)
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
bool hasData = mimeData->hasFormat("application/x-companion9x-mix");
bool hasData = mimeData->hasFormat("application/x-companion-mix");
QMenu contextMenu;
contextMenu.addAction(AddIcon, tr("&Add"),this,SLOT(mixerAdd()),tr("Ctrl+A"));

22
companion/src/modelslist.cpp
View file

@ -82,7 +82,7 @@ void ModelsListWidget::ShowContextMenu(const QPoint& pos)
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
bool hasData = mimeData->hasFormat("application/x-companion9x");
bool hasData = mimeData->hasFormat("application/x-companion");
QIcon AddIcon;
populate_icon(&AddIcon,"add.png");
QIcon EditIcon;
@ -186,7 +186,7 @@ void ModelsListWidget::mouseMoveEvent(QMouseEvent *event)
doCopy(&gmData);
QMimeData *mimeData = new QMimeData;
mimeData->setData("application/x-companion9x", gmData);
mimeData->setData("application/x-companion", gmData);
drag->setMimeData(mimeData);
@ -214,7 +214,7 @@ void ModelsListWidget::restoreSelection()
void ModelsListWidget::dragEnterEvent(QDragEnterEvent *event)
{
if (event->mimeData()->hasFormat("application/x-companion9x"))
if (event->mimeData()->hasFormat("application/x-companion"))
{
event->acceptProposedAction();
saveSelection();
@ -230,9 +230,9 @@ void ModelsListWidget::dragMoveEvent(QDragMoveEvent *event)
{
int row=this->indexAt(event->pos()).row();
const QMimeData *mimeData = event->mimeData();
if (mimeData->hasFormat("application/x-companion9x"))
if (mimeData->hasFormat("application/x-companion"))
{
QByteArray gmData = mimeData->data("application/x-companion9x");
QByteArray gmData = mimeData->data("application/x-companion");
event->acceptProposedAction();
clearSelection();
DragDropHeader *header = (DragDropHeader *)gmData.data();
@ -253,9 +253,9 @@ void ModelsListWidget::dropEvent(QDropEvent *event)
// QMessageBox::warning(this, tr("Companion"),tr("Index :%1").arg(row));
const QMimeData *mimeData = event->mimeData();
if(mimeData->hasFormat("application/x-companion9x"))
if(mimeData->hasFormat("application/x-companion"))
{
QByteArray gmData = mimeData->data("application/x-companion9x");
QByteArray gmData = mimeData->data("application/x-companion");
if (event->source() && event->dropAction() == Qt::MoveAction)
((ModelsListWidget*)event->source())->doCut(&gmData);
doPaste(&gmData, row);
@ -450,7 +450,7 @@ void ModelsListWidget::copy()
doCopy(&gmData);
QMimeData *mimeData = new QMimeData;
mimeData->setData("application/x-companion9x", gmData);
mimeData->setData("application/x-companion", gmData);
QClipboard *clipboard = QApplication::clipboard();
clipboard->setMimeData(mimeData,QClipboard::Clipboard);
@ -458,7 +458,7 @@ void ModelsListWidget::copy()
void ModelsListWidget::doPaste(QByteArray *gmData, int index)
{
//QByteArray gmData = mimeD->data("application/x-companion9x");
//QByteArray gmData = mimeD->data("application/x-companion");
char *gData = gmData->data()+sizeof(DragDropHeader);//new char[gmData.size() + 1];
int i = sizeof(DragDropHeader);
int id = index;
@ -515,7 +515,7 @@ bool ModelsListWidget::hasPasteData()
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
return mimeData->hasFormat("application/x-companion9x");
return mimeData->hasFormat("application/x-companion");
}
void ModelsListWidget::paste()
@ -524,7 +524,7 @@ void ModelsListWidget::paste()
const QClipboard *clipboard = QApplication::clipboard();
const QMimeData *mimeData = clipboard->mimeData();
QByteArray gmData = mimeData->data("application/x-companion9x");
QByteArray gmData = mimeData->data("application/x-companion");
doPaste(&gmData,this->currentRow());
}
}

4
companion/src/preferencesdialog.cpp
View file

@ -268,7 +268,7 @@ void preferencesDialog::writeValues()
settings.setValue("default_channel_order", ui->channelorderCB->currentIndex());
settings.setValue("default_mode", ui->stickmodeCB->currentIndex());
settings.setValue("cpu_id", ui->CPU_ID_LE->text());
settings.setValue("startup_check_companion9x", ui->startupCheck_companion9x->isChecked());
settings.setValue("startup_check_companion", ui->startupCheck_companion9x->isChecked());
settings.setValue("startup_check_fw", ui->startupCheck_fw->isChecked());
settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked());
settings.setValue("wizardEnable", ui->wizardEnable_ChkB->isChecked());
@ -410,7 +410,7 @@ void preferencesDialog::initSettings()
}
ui->channelorderCB->setCurrentIndex(settings.value("default_channel_order", 0).toInt());
ui->stickmodeCB->setCurrentIndex(settings.value("default_mode", 1).toInt());
ui->startupCheck_companion9x->setChecked(settings.value("startup_check_companion9x", true).toBool());
ui->startupCheck_companion9x->setChecked(settings.value("startup_check_companion", true).toBool());
ui->renameFirmware->setChecked(settings.value("rename_firmware_files", false).toBool());
ui->wizardEnable_ChkB->setChecked(settings.value("wizardEnable", true).toBool());
ui->showSplash->setChecked(settings.value("show_splash", true).toBool());