aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring.

Browse Source 
Code style.
This commit is contained in:
Roman Telezhynskyi 2023-10-06 10:18:00 +03:00
parent 1ed8bf4a46
commit 479866431c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/valentina/core/vformulapropertyeditor.cpp
View File

@ -28,23 +28,23 @@
#include "vformulapropertyeditor.h" #include "vformulapropertyeditor.h"
#include <QHBoxLayout>
#include <QFileDialog>
#include <QKeyEvent>
#include <QApplication> #include <QApplication>
#include <QColorDialog> #include <QColorDialog>
#include <QDebug> #include <QDebug>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QRegularExpression> #include <QRegularExpression>
#include <QSpacerItem> #include <QSpacerItem>
#include "../vmisc/vabstractvalapplication.h"
#include "../vpropertyexplorer/vproperty.h" #include "../vpropertyexplorer/vproperty.h"
#include "../vtools/dialogs/support/dialogeditwrongformula.h" #include "../vtools/dialogs/support/dialogeditwrongformula.h"
#include "../vmisc/vabstractvalapplication.h"
// VFormulaPropertyEditor // VFormulaPropertyEditor
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VFormulaPropertyEditor::VFormulaPropertyEditor(QWidget *parent) VFormulaPropertyEditor::VFormulaPropertyEditor(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
setAutoFillBackground(true); setAutoFillBackground(true);
@ -56,7 +56,7 @@ VFormulaPropertyEditor::VFormulaPropertyEditor(QWidget *parent)
m_ToolButton->setIconSize(QSize(16, 16)); m_ToolButton->setIconSize(QSize(16, 16));
m_ToolButton->setFixedSize(24, 24); m_ToolButton->setFixedSize(24, 24);
m_ToolButton->installEventFilter(this); m_ToolButton->installEventFilter(this);
setFocusProxy(m_ToolButton); // Make the ToolButton the focus proxy setFocusProxy(m_ToolButton); // Make the ToolButton the focus proxy
setFocusPolicy(m_ToolButton->focusPolicy()); setFocusPolicy(m_ToolButton->focusPolicy());
connect(m_ToolButton, &QToolButton::clicked, this, &VFormulaPropertyEditor::onToolButtonClicked); connect(m_ToolButton, &QToolButton::clicked, this, &VFormulaPropertyEditor::onToolButtonClicked);
@ -66,7 +66,7 @@ VFormulaPropertyEditor::VFormulaPropertyEditor(QWidget *parent)
m_TextLabel->setText(m_formula.getStringValue()); m_TextLabel->setText(m_formula.getStringValue());
// The layout (a horizontal layout) // The layout (a horizontal layout)
auto* layout = new QHBoxLayout(this); auto *layout = new QHBoxLayout(this);
layout->setSpacing(3); layout->setSpacing(3);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(m_TextLabel); layout->addWidget(m_TextLabel);
@ -76,7 +76,7 @@ VFormulaPropertyEditor::VFormulaPropertyEditor(QWidget *parent)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VFormulaPropertyEditor::SetFormula(const VFormula& formula) void VFormulaPropertyEditor::SetFormula(const VFormula &formula)
{ {
if (this->m_formula != formula) if (this->m_formula != formula)
{ {
@ -88,9 +88,8 @@ void VFormulaPropertyEditor::SetFormula(const VFormula& formula)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VFormulaPropertyEditor::onToolButtonClicked() void VFormulaPropertyEditor::onToolButtonClicked()
{ {
QScopedPointer<DialogEditWrongFormula> tmpWidget( QScopedPointer<DialogEditWrongFormula> tmpWidget(new DialogEditWrongFormula(
new DialogEditWrongFormula(m_formula.getData(), m_formula.getToolId(), m_formula.getData(), m_formula.getToolId(), VAbstractValApplication::VApp()->getMainWindow()));
VAbstractValApplication::VApp()->getMainWindow()));
tmpWidget->setCheckZero(m_formula.getCheckZero()); tmpWidget->setCheckZero(m_formula.getCheckZero());
tmpWidget->setPostfix(m_formula.getPostfix()); tmpWidget->setPostfix(m_formula.getPostfix());
tmpWidget->SetFormula(m_formula.GetFormula(FormulaType::FromUser)); tmpWidget->SetFormula(m_formula.GetFormula(FormulaType::FromUser));