mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-18 05:00:33 +01:00
Fix Qt 6 deprecated QVBoxLayout::setMargin
Use QVBoxLayout::setContentsMargins instead.
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
/*
|
||||
Copyright 2006-2020 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
@@ -200,7 +200,7 @@ StyleEditor::StyleEditor(QETElementEditor *editor, CustomElementGraphicPart *p,
|
||||
line_style -> addItem(tr("Pointillé", "element part line style"), CustomElementGraphicPart::DottedStyle);
|
||||
line_style -> addItem(tr("Traits et points", "element part line style"), CustomElementGraphicPart::DashdottedStyle);
|
||||
//normal_style -> setChecked(true);
|
||||
|
||||
|
||||
// epaisseur
|
||||
size_weight = new QComboBox(this);
|
||||
size_weight -> addItem(tr("Nulle", "element part weight"), CustomElementGraphicPart::NoneWeight);
|
||||
@@ -374,12 +374,12 @@ StyleEditor::StyleEditor(QETElementEditor *editor, CustomElementGraphicPart *p,
|
||||
|
||||
// antialiasing
|
||||
antialiasing = new QCheckBox(tr("Antialiasing"));
|
||||
|
||||
|
||||
updateForm();
|
||||
|
||||
|
||||
auto main_layout = new QVBoxLayout();
|
||||
main_layout -> setMargin(0);
|
||||
|
||||
main_layout -> setContentsMargins(0,0,0,0);
|
||||
|
||||
main_layout -> addWidget(new QLabel("<u>" + tr("Apparence :") + "</u> "));
|
||||
|
||||
outline_color->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
|
||||
|
||||
Reference in New Issue
Block a user