piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 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
companion/src/modeledit/inputs.cpp
+6 -6
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"));