Fix source list

Author: elecpower

companion/src/datamodels/compounditemmodels.cpp

@@ -667,6 +667,54 @@ void FlexSwitchesItemModel::update(const int event)
   }
 }
 
+//
+// BacklightSourceItemModel
+//
+
+BacklightSourceItemModel::BacklightSourceItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData,
+                                       Firmware * firmware, const Boards * const board, const Board::Type boardType) :
+  AbstractDynamicItemModel(generalSettings, modelData, firmware, board, boardType)
+{
+  setId(IMID_BacklightSource);
+  setUpdateMask(IMUE_SystemRefresh);
+
+  addItems(SOURCE_TYPE_NONE,   1);
+  addItems(SOURCE_TYPE_INPUT,  board->getCapability(Board::Inputs), board->getCapability(Board::Sticks));
+  addItems(SOURCE_TYPE_SWITCH, board->getCapability(Board::Switches));
+}
+
+void BacklightSourceItemModel::setDynamicItemData(QStandardItem * item, const RawSource & src) const
+{
+  item->setText(src.toString(modelData, generalSettings, boardType));
+  item->setData(src.isAvailable(modelData, generalSettings, boardType), IMDR_Available);
+}
+
+void BacklightSourceItemModel::addItems(const RawSourceType & type, int count, const int start)
+{
+  const int idxAdj = (type == SOURCE_TYPE_NONE ? -1 : 0);
+
+  for (int i = 1 + start; i <= count; ++i) {
+    const RawSource src = RawSource(type, i + idxAdj);
+    QStandardItem * modelItem = new QStandardItem();
+    modelItem->setData(src.toValue(), IMDR_Id);
+    modelItem->setData(type, IMDR_Type);
+    setDynamicItemData(modelItem, src);
+    appendRow(modelItem);
+  }
+}
+
+void BacklightSourceItemModel::update(const int event)
+{
+  if (doUpdate(event)) {
+    emit aboutToBeUpdated();
+
+    for (int i = 0; i < rowCount(); ++i)
+      setDynamicItemData(item(i), RawSource(item(i)->data(IMDR_Id).toInt()));
+
+    emit updateComplete();
+  }
+}
+
 //
 // CompoundItemModelFactory
 //
@@ -722,6 +770,9 @@ void CompoundItemModelFactory::addItemModel(const int id)
     case AbstractItemModel::IMID_FlexSwitches:
       registerItemModel(new FlexSwitchesItemModel(generalSettings, modelData, firmware, board, boardType));
       break;
+    case AbstractItemModel::IMID_BacklightSource:
+      registerItemModel(new BacklightSourceItemModel(generalSettings, modelData, firmware, board, boardType));
+      break;
     default:
       qDebug() << "Error: unknown item model: id";
       break;

companion/src/datamodels/compounditemmodels.h

@@ -47,6 +47,7 @@ class AbstractItemModel: public QStandardItemModel
       IMID_CurveRefType,
       IMID_CurveRefFunc,
       IMID_FlexSwitches,
+      IMID_BacklightSource,
       IMID_ReservedCount,
       IMID_Custom
     };
@@ -349,6 +350,22 @@ class FlexSwitchesItemModel: public AbstractDynamicItemModel
     virtual void setDynamicItemData(QStandardItem * item, const int value) const;
 };
 
+class BacklightSourceItemModel: public AbstractDynamicItemModel
+{
+    Q_OBJECT
+  public:
+    explicit BacklightSourceItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData,
+                                Firmware * firmware, const Boards * const board, const Board::Type boardType);
+    virtual ~BacklightSourceItemModel() {};
+
+  public slots:
+    virtual void update(const int event = IMUE_SystemRefresh) override;
+
+  protected:
+    virtual void setDynamicItemData(QStandardItem * item, const RawSource & src) const;
+    void addItems(const RawSourceType & type, int count, const int start = 0);
+};
+
 
 //
 //  CompoundItemModelFactory

companion/src/generaledit/generaledit.cpp

@@ -50,6 +50,7 @@ GeneralEdit::GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * fir
   editorItemModels->addItemModel(AbstractItemModel::IMID_RawSwitch);
   editorItemModels->addItemModel(AbstractItemModel::IMID_CustomFuncAction);
   editorItemModels->addItemModel(AbstractItemModel::IMID_CustomFuncResetParam);
+  editorItemModels->addItemModel(AbstractItemModel::IMID_BacklightSource);
 
   addTab(new GeneralSetupPanel(this, generalSettings, firmware, editorItemModels), tr("Setup"));
   addTab(new CustomFunctionsPanel(this, nullptr, generalSettings, firmware, editorItemModels), tr("Global Functions"));

companion/src/generaledit/generalsetup.cpp

@@ -31,28 +31,25 @@ constexpr char FIM_HATSMODE[]       {"Hats Mode"};
 constexpr char FIM_STICKMODE[]      {"Stick Mode"};
 constexpr char FIM_TEMPLATESETUP[]  {"Template Setup"};
 constexpr char FIM_BACKLIGHTMODE[]  {"Backlight Mode"};
+constexpr char FIM_BACKLIGHTSRC[]   {"Backlight Source"};
 
-GeneralSetupPanel::GeneralSetupPanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware, CompoundItemModelFactory * sharedItemModels):
+GeneralSetupPanel::GeneralSetupPanel(QWidget * parent, GeneralSettings & generalSettings,
+  Firmware * firmware, CompoundItemModelFactory * sharedItemModels):
 GeneralPanel(parent, generalSettings, firmware),
 ui(new Ui::GeneralSetup)
 {
   ui->setupUi(this);
-
   Board::Type board = firmware->getBoard();
-
   panelFilteredModels = new FilteredItemModelFactory();
-
   panelFilteredModels->registerItemModel(new FilteredItemModel(GeneralSettings::hatsModeItemModel()), FIM_HATSMODE);
   panelFilteredModels->registerItemModel(new FilteredItemModel(GeneralSettings::stickModeItemModel()), FIM_STICKMODE);
   panelFilteredModels->registerItemModel(new FilteredItemModel(GeneralSettings::templateSetupItemModel(),
                                                                Boards::isAir(board) ? GeneralSettings::RadioTypeContextAir :
                                                                                       GeneralSettings::RadioTypeContextSurface),
                                          FIM_TEMPLATESETUP);
   panelFilteredModels->registerItemModel(new FilteredItemModel(GeneralSettings::backlightModeItemModel()), FIM_BACKLIGHTMODE);
-
-  int imId = panelFilteredModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
-                                                         (RawSource::NoneGroup | RawSource::SourcesGroup | RawSource::SwitchesGroup)),
-                                                         "RawSource");
+  panelFilteredModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_BacklightSource)),
+                                         FIM_BACKLIGHTSRC);
 
   QLabel *pmsl[] = {ui->ro_label, ui->ro1_label, ui->ro2_label, ui->ro3_label, ui->ro4_label, ui->ro5_label, ui->ro6_label, ui->ro7_label, ui->ro8_label, NULL};
   QSlider *tpmsld[] = {ui->chkSA, ui->chkSB, ui->chkSC, ui->chkSD, ui->chkSE, ui->chkSF, ui->chkSG, ui->chkSH, NULL};
@@ -99,7 +96,7 @@ ui(new Ui::GeneralSetup)
   lock = true;
 
   ui->brightCtrl_CB->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-  ui->brightCtrl_CB->setModel(panelFilteredModels->getItemModel(imId));
+  ui->brightCtrl_CB->setModel(panelFilteredModels->getItemModel(FIM_BACKLIGHTSRC));
   ui->brightCtrl_CB->setCurrentIndex(ui->brightCtrl_CB->findData(generalSettings.backlightSrc.toValue()));
   if (ui->brightCtrl_CB->currentIndex() < 0 && generalSettings.backlightSrc.toValue() == 0)
     ui->brightCtrl_CB->setCurrentIndex(Helpers::getFirstPosValueIndex(ui->brightCtrl_CB));