From b0fbe7491166664b43ea416b597c32b4d72f6701 Mon Sep 17 00:00:00 2001 From: val177 Date: Tue, 28 Jul 2015 23:41:20 +0300 Subject: [PATCH] fixed about-Valentina bug --HG-- branch : develop --- src/app/dialogs/configdialog.cpp | 2 +- src/app/dialogs/dialogaboutapp.cpp | 1 - src/app/dialogs/dialogaboutapp.ui | 2 +- src/app/dialogs/dialogindividualmeasurements.cpp | 1 - src/app/dialogs/dialoglayoutprogress.cpp | 1 - src/app/dialogs/dialoglayoutsettings.cpp | 1 - src/app/dialogs/dialogmeasurements.cpp | 1 - src/app/dialogs/dialogpatternproperties.cpp | 1 - src/app/dialogs/dialogsavelayout.cpp | 1 - src/app/dialogs/dialogstandardmeasurements.cpp | 1 - src/libs/vtools/dialogs/tools/dialogtool.cpp | 1 - 11 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/app/dialogs/configdialog.cpp b/src/app/dialogs/configdialog.cpp index 77c25891c..b5783e753 100644 --- a/src/app/dialogs/configdialog.cpp +++ b/src/app/dialogs/configdialog.cpp @@ -92,7 +92,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) : setWindowTitle(tr("Config Dialog")); - this->setFixedSize(QSize(750, 550)); + this->setFixedSize(QSize(750, 565)); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); } diff --git a/src/app/dialogs/dialogaboutapp.cpp b/src/app/dialogs/dialogaboutapp.cpp index 6ad3b4e8b..93f54e944 100644 --- a/src/app/dialogs/dialogaboutapp.cpp +++ b/src/app/dialogs/dialogaboutapp.cpp @@ -66,7 +66,6 @@ DialogAboutApp::DialogAboutApp(QWidget *parent) : FontPointSize(ui->label_Valentina_Built, 11); FontPointSize(ui->label_QT_Version, 11); - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); } diff --git a/src/app/dialogs/dialogaboutapp.ui b/src/app/dialogs/dialogaboutapp.ui index f9299fd1b..971783530 100644 --- a/src/app/dialogs/dialogaboutapp.ui +++ b/src/app/dialogs/dialogaboutapp.ui @@ -10,7 +10,7 @@ 0 0 583 - 524 + 526 diff --git a/src/app/dialogs/dialogindividualmeasurements.cpp b/src/app/dialogs/dialogindividualmeasurements.cpp index 6526eb1fa..d126fed68 100644 --- a/src/app/dialogs/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/dialogindividualmeasurements.cpp @@ -74,7 +74,6 @@ DialogIndividualMeasurements::DialogIndividualMeasurements(VContainer *data, con connect(ui->toolButtonOpenExist, &QToolButton::clicked, this, &DialogIndividualMeasurements::OpenTable); connect(ui->toolButtonOpenNew, &QToolButton::clicked, this, &DialogIndividualMeasurements::NewTable); - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); } diff --git a/src/app/dialogs/dialoglayoutprogress.cpp b/src/app/dialogs/dialoglayoutprogress.cpp index a0c711bc7..1eec94ff3 100644 --- a/src/app/dialogs/dialoglayoutprogress.cpp +++ b/src/app/dialogs/dialoglayoutprogress.cpp @@ -59,7 +59,6 @@ DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent) this->setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint); - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); } diff --git a/src/app/dialogs/dialoglayoutsettings.cpp b/src/app/dialogs/dialoglayoutsettings.cpp index 710dd5036..019edcc19 100644 --- a/src/app/dialogs/dialoglayoutsettings.cpp +++ b/src/app/dialogs/dialoglayoutsettings.cpp @@ -75,7 +75,6 @@ DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget QPushButton *bRestoreDefaults = ui->buttonBox->button(QDialogButtonBox::RestoreDefaults); connect(bRestoreDefaults, &QPushButton::clicked, this, &DialogLayoutSettings::RestoreDefaults); - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); } diff --git a/src/app/dialogs/dialogmeasurements.cpp b/src/app/dialogs/dialogmeasurements.cpp index 4744e6043..7bcd52189 100644 --- a/src/app/dialogs/dialogmeasurements.cpp +++ b/src/app/dialogs/dialogmeasurements.cpp @@ -41,7 +41,6 @@ DialogMeasurements::DialogMeasurements(QWidget *parent) : connect(ui->toolButtonStandard, &QToolButton::clicked, this, &DialogMeasurements::StandardMeasurements); connect(ui->toolButtonIndividual, &QToolButton::clicked, this, &DialogMeasurements::IndividualMeasurements); - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); } diff --git a/src/app/dialogs/dialogpatternproperties.cpp b/src/app/dialogs/dialogpatternproperties.cpp index 9d77bcd11..a4855905f 100644 --- a/src/app/dialogs/dialogpatternproperties.cpp +++ b/src/app/dialogs/dialogpatternproperties.cpp @@ -81,7 +81,6 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent) gradationChanged = false;//Set to default value after initialization - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); } diff --git a/src/app/dialogs/dialogsavelayout.cpp b/src/app/dialogs/dialogsavelayout.cpp index cab670fb2..c2fe40e0f 100644 --- a/src/app/dialogs/dialogsavelayout.cpp +++ b/src/app/dialogs/dialogsavelayout.cpp @@ -70,7 +70,6 @@ DialogSaveLayout::DialogSaveLayout(const QMap &formates, int c ui->lineEditPath->setText(qApp->Settings()->GetPathLayout()); ShowExample();//Show example for current format. - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); } diff --git a/src/app/dialogs/dialogstandardmeasurements.cpp b/src/app/dialogs/dialogstandardmeasurements.cpp index b05277c3f..94f14bc01 100644 --- a/src/app/dialogs/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/dialogstandardmeasurements.cpp @@ -72,7 +72,6 @@ DialogStandardMeasurements::DialogStandardMeasurements(VContainer *data, const Q CheckState(); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogStandardMeasurements::CheckState); - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); } diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index 2d3169279..de0d17c5d 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -284,7 +284,6 @@ bool DialogTool::eventFilter(QObject *object, QEvent *event) //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FixateSize() { - adjustSize(); setMaximumSize(size()); setMinimumSize(size()); }