SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

.clang-format

Browse Source
This commit is contained in:
Пелипенко Иван
2023-05-04 14:14:24 +03:00
parent 1f0c71ec0c
commit f37a8e6d93
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-format
View File

@@ -219,5 +219,6 @@ WhitespaceSensitiveMacros:
- BOOST_PP_STRINGIZE - BOOST_PP_STRINGIZE
- NS_SWIFT_NAME - NS_SWIFT_NAME
- CF_SWIFT_NAME - CF_SWIFT_NAME
- PIMETA
... ...

6
libs/piqt_utils/pivaluetree_edit.cpp
View File

@@ -297,7 +297,7 @@ void PIValueTreeEdit::applyPermissions() {
for (auto * c: {wp->checkHidden, wp->checkLabel, wp->checkReadOnly}) for (auto * c: {wp->checkHidden, wp->checkLabel, wp->checkReadOnly})
if (!c->isEnabled()) c->setChecked(false); if (!c->isEnabled()) c->setChecked(false);
grid->button_add->setVisible( grid->button_add->setVisible(
PIVector<QAction *>({wp->actionValue, wp->actionGroup, wp->actionArray, wp->actionPaste}).any([](QAction * a) { is_full_edit && PIVector<QAction *>({wp->actionValue, wp->actionGroup, wp->actionArray, wp->actionPaste}).any([](QAction * a) {
return a->isVisible(); return a->isVisible();
})); }));
for (auto c: tree_edits) for (auto c: tree_edits)
@@ -550,6 +550,7 @@ PIValueTreeEdit * PIValueTreeEdit::addTreeEdit(const PIValueTree & vt) {
cw->layout()->addWidget(ve); cw->layout()->addWidget(ve);
cw->layout()->addItem(new QSpacerItem(0, 0, QSizePolicy::Preferred, QSizePolicy::Expanding)); cw->layout()->addItem(new QSpacerItem(0, 0, QSizePolicy::Preferred, QSizePolicy::Expanding));
int tab = tab_widget->addTab(cw, PIVariantEditorBase::vtTr(vt.name())); int tab = tab_widget->addTab(cw, PIVariantEditorBase::vtTr(vt.name()));
tab_widget->setTabToolTip(tab, PIVariantEditorBase::vtTr(vt.comment()));
tab_widget->tabBar()->setTabData(tab, PI2QString(vt.name())); tab_widget->tabBar()->setTabData(tab, PI2QString(vt.name()));
if (is_full_edit) { if (is_full_edit) {
auto * b = grid->createConfigButton(vt, true); auto * b = grid->createConfigButton(vt, true);
@@ -708,10 +709,11 @@ PIValueTreeEdit::GridWidgets::GridWidgets(PIValueTreeEdit * p) {
menu_group.addActions(common_actions); menu_group.addActions(common_actions);
menu_conf.addActions(common_actions); menu_conf.addActions(common_actions);
menu_new.addActions({wp->actionValue, wp->actionGroup, wp->actionArray, newSeparator(), wp->actionPaste}); menu_new.addActions({wp->actionValue, wp->actionGroup, wp->actionArray, newSeparator(), wp->actionPaste});
button_add = new ToolButton(); button_add = new ToolButton(parent);
button_add->setIcon(QIcon(":/icons/list-add.png")); button_add->setIcon(QIcon(":/icons/list-add.png"));
button_add->setPopupMode(QToolButton::InstantPopup); button_add->setPopupMode(QToolButton::InstantPopup);
button_add->setMenu(&menu_new); button_add->setMenu(&menu_new);
button_add->hide();
((ToolButton *)button_add)->setPressHandler([this]() { parent->checkActions(); }); ((ToolButton *)button_add)->setPressHandler([this]() { parent->checkActions(); });
wp->actionValue->setData((int)NewType::Value); wp->actionValue->setData((int)NewType::Value);
wp->actionGroup->setData((int)NewType::Group); wp->actionGroup->setData((int)NewType::Group);

2
libs/piqt_utils/pivaluetree_edit.h
View File

@@ -190,5 +190,7 @@ private:
std::function<PIVariant(PIString)> value_by_name; std::function<PIVariant(PIString)> value_by_name;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(PIValueTreeEdit::Permissions)
#endif #endif