feat(color): New label based Model Selector (#1374)
* Model Labels Selector * Portrait Layout * Receiver ID Check * Fix Labels .yml format * Companion Initial Commit commit 967ddf3979b4954402fe62c858faba4b7a416bba Author: dlktdr <cblackburn320@gmail.com> Date: Mon Aug 29 01:49:15 2022 -0700 Fix Labels .yml format commit 534221cad9e01146c47a9ac1080a655e04f1f6c8 Author: dlktdr <cblackburn320@gmail.com> Date: Mon Aug 29 01:20:57 2022 -0700 Receiver ID Check commit f32c0939d44e9ae60bc0705a9176354c23fec198 Author: dlktdr <cblackburn320@gmail.com> Date: Sun Aug 28 23:13:25 2022 -0700 Portrait Layout commit 961181217c7841ff3f21299ac6aa419b810f80e9 Author: dlktdr <cblackburn320@gmail.com> Date: Sat Dec 11 16:56:13 2021 -0800 Model Labels Selector commitdc99dd40d2Author: David PHAM-VAN <1387855+DavBfr@users.noreply.github.com> Date: Fri Aug 26 03:04:34 2022 -0300 feat: Allow Lua widget to override built-in widget with same name (#2208) * Allow CPP Widgets Override with LUA * Reset a widget option it the type differs commit4b747caff9Author: eshifri <46511024+eshifri@users.noreply.github.com> Date: Thu Aug 25 19:47:53 2022 -0700 fix: Write model name into models.yml when duplicating model (#2224) * Update model name in the models.yml file (#2214) * Fix the length of the name. commite97f23a305Author: eshifri <46511024+eshifri@users.noreply.github.com> Date: Wed Aug 24 21:19:52 2022 -0700 fix(cpn): Fix full path to model notes for Simulator (#2223) * Correct Highlighted Column * labels .yml indentation * Update da.h New defines translated to Danish * Update dataconstants.h Omit warnings due to difference of LEN_MODEL_FILENAME and LEN_MODEL_NAME in modellist.cpp * Update modelslist.cpp Wonder if this are the right file in PR #1374 (?), seems a lot are changed to the better in #1374 * Update dataconstants.h Restore #define for LEN_MODEL_FILENAME to 16 * Rebase, Correct Issues Delete now deletes instead of select New model stores correct information Duplicate save all information in cell Rework items to use cell over button Reword function variables * CMPN: Add context menu Fix output not functional. Removed Yaml::null at some point :) Fix some compiler warnings * CMPN: Compiler warning, replace ,->_ in list * FW: Various Changes Change view to a grid Don't allow comma in label name Add scroll indicators Save sort order Co-authored-by: HThuren <99370924+HThuren@users.noreply.github.com>
This commit is contained in:
+19
-19
@@ -25,29 +25,29 @@
|
||||
#include <QMimeData>
|
||||
#include <QUuid>
|
||||
|
||||
class TreeItem
|
||||
class ModelListItem
|
||||
{
|
||||
public:
|
||||
enum TreeItemFlags { MarkedForCut = 0x01 };
|
||||
enum ModelListItemFlags { MarkedForCut = 0x01 };
|
||||
|
||||
explicit TreeItem(const QVector<QVariant> & itemData);
|
||||
explicit TreeItem(TreeItem * parent, int categoryIndex, int modelIndex);
|
||||
~TreeItem();
|
||||
explicit ModelListItem(const QVector<QVariant> & itemData);
|
||||
explicit ModelListItem(ModelListItem * parent, int categoryIndex, int modelIndex);
|
||||
~ModelListItem();
|
||||
|
||||
TreeItem * child(int number);
|
||||
ModelListItem * child(int number);
|
||||
int childCount() const;
|
||||
int columnCount() const;
|
||||
QVariant data(int column) const;
|
||||
TreeItem * appendChild(int categoryIndex, int modelIndex);
|
||||
TreeItem * insertChild(const int row, int categoryIndex, int modelIndex);
|
||||
ModelListItem * appendChild(int categoryIndex, int modelIndex);
|
||||
ModelListItem * insertChild(const int row, int categoryIndex, int modelIndex);
|
||||
bool removeChildren(int position, int count);
|
||||
bool insertChildren(int row, int count);
|
||||
|
||||
int childNumber() const;
|
||||
bool setData(int column, const QVariant &value);
|
||||
|
||||
TreeItem * parent() { return parentItem; }
|
||||
void setParent(TreeItem * p) { parentItem = p; }
|
||||
ModelListItem * parent() { return parentItem; }
|
||||
void setParent(ModelListItem * p) { parentItem = p; }
|
||||
int getModelIndex() const { return modelIndex; }
|
||||
void setModelIndex(int value) { modelIndex = value; }
|
||||
int getCategoryIndex() const { return categoryIndex; }
|
||||
@@ -63,9 +63,9 @@ class TreeItem
|
||||
bool isModel() const;
|
||||
|
||||
private:
|
||||
QList<TreeItem*> childItems;
|
||||
QList<ModelListItem*> childItems;
|
||||
QVector<QVariant> itemData;
|
||||
TreeItem * parentItem;
|
||||
ModelListItem * parentItem;
|
||||
int categoryIndex;
|
||||
int modelIndex;
|
||||
quint16 flags;
|
||||
@@ -73,7 +73,7 @@ class TreeItem
|
||||
};
|
||||
|
||||
|
||||
class TreeModel : public QAbstractItemModel
|
||||
class ModelsListModel : public QAbstractItemModel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -83,8 +83,8 @@ class TreeModel : public QAbstractItemModel
|
||||
quint16 dataVersion;
|
||||
};
|
||||
|
||||
TreeModel(RadioData * radioData, QObject *parent = 0);
|
||||
virtual ~TreeModel();
|
||||
ModelsListModel(RadioData * radioData, QObject *parent = 0);
|
||||
virtual ~ModelsListModel();
|
||||
|
||||
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
@@ -92,7 +92,7 @@ class TreeModel : public QAbstractItemModel
|
||||
|
||||
virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
|
||||
virtual QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
|
||||
virtual Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
|
||||
virtual Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
|
||||
|
||||
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
|
||||
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
|
||||
@@ -146,11 +146,11 @@ class TreeModel : public QAbstractItemModel
|
||||
void onRowsRemoved(const QModelIndex & parent, int first, int last);
|
||||
|
||||
private:
|
||||
TreeItem * getItem(const QModelIndex & index) const;
|
||||
ModelListItem * getItem(const QModelIndex & index) const;
|
||||
bool isModelIdUnique(unsigned modelId, unsigned module, unsigned protocol);
|
||||
|
||||
TreeItem * rootItem;
|
||||
ModelListItem * rootItem;
|
||||
RadioData * radioData;
|
||||
MimeHeaderData mimeHeaderData;
|
||||
bool hasCategories;
|
||||
bool hasLabels;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user