This commit is contained in:
Bertrand Songis
2014-01-20 12:58:28 +01:00
parent 43059f3539
commit a3e4591144
+3 -4
View File
@@ -17,7 +17,7 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
ui(new Ui::ModelEdit), ui(new Ui::ModelEdit),
modelId(modelId), modelId(modelId),
model(radioData.models[modelId]), model(radioData.models[modelId]),
generalSettings(generalSettings) generalSettings(radioData.generalSettings)
{ {
ui->setupUi(this); ui->setupUi(this);
QSettings settings("companion", "companion"); QSettings settings("companion", "companion");
@@ -32,7 +32,6 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
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("Assignable Functions"));
addTab(new Curves(this, model), tr("Curves")); addTab(new Curves(this, model), tr("Curves"));
// TODO remove this capability if (!GetEepromInterface()->getCapability(FSSwitch))
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"));
} }
@@ -44,8 +43,8 @@ ModelEdit::~ModelEdit()
void ModelEdit::closeEvent(QCloseEvent *event) void ModelEdit::closeEvent(QCloseEvent *event)
{ {
QSettings settings("companion", "companion"); QSettings settings("companion", "companion");
settings.setValue("modelEditGeometry", saveGeometry()); settings.setValue("modelEditGeometry", saveGeometry());
} }
class VerticalScrollArea : public QScrollArea class VerticalScrollArea : public QScrollArea