From bf60cfec3ba8cf09beee1fe755fa459c57806b8c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 22 May 2015 08:21:38 +0300 Subject: [PATCH] Fixed issue #303. Valentina stops accepting input on defocus - Gentoo Linux/KDE/KWin. --HG-- branch : develop --- src/app/dialogs/app/configdialog.cpp | 1 - src/app/dialogs/app/dialogaboutapp.ui | 2 +- .../app/dialogindividualmeasurements.cpp | 1 - .../app/dialogindividualmeasurements.ui | 14 +++++++++- src/app/dialogs/app/dialoglayoutsettings.ui | 12 ++++++++ src/app/dialogs/app/dialogmeasurements.ui | 2 +- .../dialogs/app/dialogpatternproperties.ui | 12 ++++++++ src/app/dialogs/app/dialogsavelayout.ui | 6 ++++ .../app/dialogstandardmeasurements.cpp | 1 - .../dialogs/app/dialogstandardmeasurements.ui | 28 ++++++++++--------- src/app/dialogs/tools/dialogalongline.ui | 12 ++++++++ src/app/dialogs/tools/dialogarc.ui | 12 ++++++++ src/app/dialogs/tools/dialogbisector.ui | 12 ++++++++ .../dialogs/tools/dialogcurveintersectaxis.ui | 12 ++++++++ src/app/dialogs/tools/dialogcutarc.ui | 12 ++++++++ src/app/dialogs/tools/dialogcutspline.ui | 12 ++++++++ src/app/dialogs/tools/dialogcutsplinepath.ui | 12 ++++++++ src/app/dialogs/tools/dialogdetail.ui | 12 ++++++++ .../dialogs/tools/dialogeditwrongformula.ui | 12 ++++++++ src/app/dialogs/tools/dialogendline.ui | 12 ++++++++ src/app/dialogs/tools/dialogheight.ui | 12 ++++++++ src/app/dialogs/tools/dialoglineintersect.ui | 12 ++++++++ .../dialogs/tools/dialoglineintersectaxis.ui | 12 ++++++++ src/app/dialogs/tools/dialognormal.ui | 12 ++++++++ src/app/dialogs/tools/dialogpointofcontact.ui | 12 ++++++++ .../tools/dialogpointofintersection.ui | 12 ++++++++ src/app/dialogs/tools/dialogshoulderpoint.ui | 12 ++++++++ src/app/dialogs/tools/dialogsinglepoint.ui | 18 ++++++++++++ src/app/dialogs/tools/dialogspline.ui | 12 ++++++++ src/app/dialogs/tools/dialogsplinepath.ui | 12 ++++++++ src/app/dialogs/tools/dialogtool.cpp | 1 - src/app/dialogs/tools/dialogtriangle.ui | 12 ++++++++ 32 files changed, 318 insertions(+), 20 deletions(-) diff --git a/src/app/dialogs/app/configdialog.cpp b/src/app/dialogs/app/configdialog.cpp index e6642114f..e36471a83 100644 --- a/src/app/dialogs/app/configdialog.cpp +++ b/src/app/dialogs/app/configdialog.cpp @@ -93,7 +93,6 @@ ConfigDialog::ConfigDialog(QWidget *parent) : setWindowTitle(tr("Config Dialog")); this->setFixedSize(QSize(750, 550)); - this->setWindowFlags(Qt::Tool | Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint); qApp->getSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); } diff --git a/src/app/dialogs/app/dialogaboutapp.ui b/src/app/dialogs/app/dialogaboutapp.ui index f901b50a8..576b39522 100644 --- a/src/app/dialogs/app/dialogaboutapp.ui +++ b/src/app/dialogs/app/dialogaboutapp.ui @@ -21,7 +21,7 @@ - 573 + 583 524 diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp index 893772ae3..c7f0e94f9 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/app/dialogindividualmeasurements.cpp @@ -73,7 +73,6 @@ DialogIndividualMeasurements::DialogIndividualMeasurements(VContainer *data, con &DialogIndividualMeasurements::CheckState); connect(ui->toolButtonOpenExist, &QToolButton::clicked, this, &DialogIndividualMeasurements::OpenTable); connect(ui->toolButtonOpenNew, &QToolButton::clicked, this, &DialogIndividualMeasurements::NewTable); - this->setWindowFlags(Qt::Tool | Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/app/dialogindividualmeasurements.ui b/src/app/dialogs/app/dialogindividualmeasurements.ui index 68b90e10a..0cf76a26a 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.ui +++ b/src/app/dialogs/app/dialogindividualmeasurements.ui @@ -9,10 +9,22 @@ 0 0 - 385 + 505 295 + + + 505 + 295 + + + + + 505 + 295 + + Individual measurements diff --git a/src/app/dialogs/app/dialoglayoutsettings.ui b/src/app/dialogs/app/dialoglayoutsettings.ui index 04adfb2d3..3e834a942 100644 --- a/src/app/dialogs/app/dialoglayoutsettings.ui +++ b/src/app/dialogs/app/dialoglayoutsettings.ui @@ -10,6 +10,18 @@ 345 + + + 661 + 345 + + + + + 661 + 345 + + Create a layout diff --git a/src/app/dialogs/app/dialogmeasurements.ui b/src/app/dialogs/app/dialogmeasurements.ui index 2f4d16d62..7b8f3df0f 100644 --- a/src/app/dialogs/app/dialogmeasurements.ui +++ b/src/app/dialogs/app/dialogmeasurements.ui @@ -21,7 +21,7 @@ - 529 + 448 244 diff --git a/src/app/dialogs/app/dialogpatternproperties.ui b/src/app/dialogs/app/dialogpatternproperties.ui index fb8b10f30..b4c3a339b 100644 --- a/src/app/dialogs/app/dialogpatternproperties.ui +++ b/src/app/dialogs/app/dialogpatternproperties.ui @@ -10,6 +10,18 @@ 562 + + + 657 + 562 + + + + + 657 + 562 + + Pattern properties diff --git a/src/app/dialogs/app/dialogsavelayout.ui b/src/app/dialogs/app/dialogsavelayout.ui index e6a29d400..9f7f90d32 100644 --- a/src/app/dialogs/app/dialogsavelayout.ui +++ b/src/app/dialogs/app/dialogsavelayout.ui @@ -10,6 +10,12 @@ 179 + + + 692 + 179 + + 692 diff --git a/src/app/dialogs/app/dialogstandardmeasurements.cpp b/src/app/dialogs/app/dialogstandardmeasurements.cpp index a136dcfe3..52e0f7486 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/app/dialogstandardmeasurements.cpp @@ -71,7 +71,6 @@ DialogStandardMeasurements::DialogStandardMeasurements(VContainer *data, const Q CheckState(); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogStandardMeasurements::CheckState); - this->setWindowFlags(Qt::Tool | Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/app/dialogstandardmeasurements.ui b/src/app/dialogs/app/dialogstandardmeasurements.ui index 208adf019..ae83dae55 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.ui +++ b/src/app/dialogs/app/dialogstandardmeasurements.ui @@ -9,10 +9,16 @@ 0 0 - 452 - 115 + 430 + 113 + + + 430 + 113 + + Standard table @@ -25,11 +31,11 @@ - - + + - + 0 0 @@ -48,7 +54,7 @@ - + @@ -58,14 +64,10 @@ - - - - - + - + 0 0 @@ -75,7 +77,7 @@ - + diff --git a/src/app/dialogs/tools/dialogalongline.ui b/src/app/dialogs/tools/dialogalongline.ui index a360a175b..1674c85a1 100644 --- a/src/app/dialogs/tools/dialogalongline.ui +++ b/src/app/dialogs/tools/dialogalongline.ui @@ -10,6 +10,18 @@ 284 + + + 412 + 284 + + + + + 412 + 284 + + Point at distance along line diff --git a/src/app/dialogs/tools/dialogarc.ui b/src/app/dialogs/tools/dialogarc.ui index f74c2598c..cbf075d3c 100644 --- a/src/app/dialogs/tools/dialogarc.ui +++ b/src/app/dialogs/tools/dialogarc.ui @@ -10,6 +10,18 @@ 329 + + + 425 + 329 + + + + + 425 + 329 + + Arc diff --git a/src/app/dialogs/tools/dialogbisector.ui b/src/app/dialogs/tools/dialogbisector.ui index 6020f5b99..39c8fb9a0 100644 --- a/src/app/dialogs/tools/dialogbisector.ui +++ b/src/app/dialogs/tools/dialogbisector.ui @@ -10,6 +10,18 @@ 317 + + + 428 + 317 + + + + + 428 + 317 + + Point along bisector diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.ui b/src/app/dialogs/tools/dialogcurveintersectaxis.ui index c0332731f..87233f23b 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.ui +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.ui @@ -10,6 +10,18 @@ 284 + + + 419 + 284 + + + + + 419 + 284 + + Point intersect curve and axis diff --git a/src/app/dialogs/tools/dialogcutarc.ui b/src/app/dialogs/tools/dialogcutarc.ui index cc3e2753e..2928da2d7 100644 --- a/src/app/dialogs/tools/dialogcutarc.ui +++ b/src/app/dialogs/tools/dialogcutarc.ui @@ -10,6 +10,18 @@ 218 + + + 412 + 218 + + + + + 412 + 218 + + Segment an arc diff --git a/src/app/dialogs/tools/dialogcutspline.ui b/src/app/dialogs/tools/dialogcutspline.ui index d0e1bc041..74792b668 100644 --- a/src/app/dialogs/tools/dialogcutspline.ui +++ b/src/app/dialogs/tools/dialogcutspline.ui @@ -10,6 +10,18 @@ 218 + + + 412 + 218 + + + + + 412 + 218 + + Segmenting a simple curve diff --git a/src/app/dialogs/tools/dialogcutsplinepath.ui b/src/app/dialogs/tools/dialogcutsplinepath.ui index 8707ac9c8..5244a8555 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.ui +++ b/src/app/dialogs/tools/dialogcutsplinepath.ui @@ -10,6 +10,18 @@ 218 + + + 412 + 218 + + + + + 412 + 218 + + Segment a curved path diff --git a/src/app/dialogs/tools/dialogdetail.ui b/src/app/dialogs/tools/dialogdetail.ui index b64e0807c..a21aa9f2e 100644 --- a/src/app/dialogs/tools/dialogdetail.ui +++ b/src/app/dialogs/tools/dialogdetail.ui @@ -10,6 +10,18 @@ 342 + + + 565 + 342 + + + + + 565 + 342 + + Seam allowance tool diff --git a/src/app/dialogs/tools/dialogeditwrongformula.ui b/src/app/dialogs/tools/dialogeditwrongformula.ui index f724d9930..27668da0b 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.ui +++ b/src/app/dialogs/tools/dialogeditwrongformula.ui @@ -13,6 +13,18 @@ 365 + + + 390 + 365 + + + + + 390 + 365 + + Edit formula diff --git a/src/app/dialogs/tools/dialogendline.ui b/src/app/dialogs/tools/dialogendline.ui index 73427619c..59e23a2b9 100644 --- a/src/app/dialogs/tools/dialogendline.ui +++ b/src/app/dialogs/tools/dialogendline.ui @@ -16,6 +16,18 @@ 0 + + + 358 + 323 + + + + + 358 + 323 + + Point at distance and angle diff --git a/src/app/dialogs/tools/dialogheight.ui b/src/app/dialogs/tools/dialogheight.ui index 45541665a..669eb1058 100644 --- a/src/app/dialogs/tools/dialogheight.ui +++ b/src/app/dialogs/tools/dialogheight.ui @@ -10,6 +10,18 @@ 245 + + + 285 + 245 + + + + + 285 + 245 + + Perpendicular point along line diff --git a/src/app/dialogs/tools/dialoglineintersect.ui b/src/app/dialogs/tools/dialoglineintersect.ui index 6d2a44ffb..fb013cda4 100644 --- a/src/app/dialogs/tools/dialoglineintersect.ui +++ b/src/app/dialogs/tools/dialoglineintersect.ui @@ -10,6 +10,18 @@ 196 + + + 367 + 196 + + + + + 367 + 196 + + Point at line intersection diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.ui b/src/app/dialogs/tools/dialoglineintersectaxis.ui index 3186a2aef..8026551fa 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.ui +++ b/src/app/dialogs/tools/dialoglineintersectaxis.ui @@ -10,6 +10,18 @@ 317 + + + 457 + 317 + + + + + 457 + 317 + + Point intersect line and axis diff --git a/src/app/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui index 2cb96c91c..aad5d0f30 100644 --- a/src/app/dialogs/tools/dialognormal.ui +++ b/src/app/dialogs/tools/dialognormal.ui @@ -10,6 +10,18 @@ 428 + + + 517 + 428 + + + + + 517 + 428 + + Point along perpendicular diff --git a/src/app/dialogs/tools/dialogpointofcontact.ui b/src/app/dialogs/tools/dialogpointofcontact.ui index 5f3aa5cad..5f8f69550 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.ui +++ b/src/app/dialogs/tools/dialogpointofcontact.ui @@ -10,6 +10,18 @@ 251 + + + 498 + 251 + + + + + 498 + 251 + + Point at intersection of arc and line diff --git a/src/app/dialogs/tools/dialogpointofintersection.ui b/src/app/dialogs/tools/dialogpointofintersection.ui index 26f11dbbf..d6d5cd4ac 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.ui +++ b/src/app/dialogs/tools/dialogpointofintersection.ui @@ -10,6 +10,18 @@ 146 + + + 285 + 146 + + + + + 285 + 146 + + Point from X and Y of two other points diff --git a/src/app/dialogs/tools/dialogshoulderpoint.ui b/src/app/dialogs/tools/dialogshoulderpoint.ui index 4c730548c..95fe903d4 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.ui +++ b/src/app/dialogs/tools/dialogshoulderpoint.ui @@ -10,6 +10,18 @@ 317 + + + 488 + 317 + + + + + 488 + 317 + + Special point on shoulder diff --git a/src/app/dialogs/tools/dialogsinglepoint.ui b/src/app/dialogs/tools/dialogsinglepoint.ui index aa0bcbc91..b32b3fef8 100644 --- a/src/app/dialogs/tools/dialogsinglepoint.ui +++ b/src/app/dialogs/tools/dialogsinglepoint.ui @@ -13,6 +13,18 @@ 202 + + + 250 + 202 + + + + + 250 + 202 + + Single point @@ -35,6 +47,12 @@ 129 + + + 241 + 129 + + Coordinates on the sheet diff --git a/src/app/dialogs/tools/dialogspline.ui b/src/app/dialogs/tools/dialogspline.ui index 8fabe0e2f..9ca8fb73a 100644 --- a/src/app/dialogs/tools/dialogspline.ui +++ b/src/app/dialogs/tools/dialogspline.ui @@ -10,6 +10,18 @@ 233 + + + 540 + 233 + + + + + 540 + 233 + + Simple curve diff --git a/src/app/dialogs/tools/dialogsplinepath.ui b/src/app/dialogs/tools/dialogsplinepath.ui index 7c00882f6..23d7876eb 100644 --- a/src/app/dialogs/tools/dialogsplinepath.ui +++ b/src/app/dialogs/tools/dialogsplinepath.ui @@ -10,6 +10,18 @@ 322 + + + 528 + 322 + + + + + 528 + 322 + + Curved path diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index be3a446cf..207818f67 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -67,7 +67,6 @@ DialogTool::DialogTool(const VContainer *data, const quint32 &toolId, QWidget *p SCASSERT(data != nullptr); timerFormula = new QTimer(this); connect(timerFormula, &QTimer::timeout, this, &DialogTool::EvalFormula); - this->setWindowFlags(Qt::Tool | Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint); } diff --git a/src/app/dialogs/tools/dialogtriangle.ui b/src/app/dialogs/tools/dialogtriangle.ui index 533f33928..a8acb9de7 100644 --- a/src/app/dialogs/tools/dialogtriangle.ui +++ b/src/app/dialogs/tools/dialogtriangle.ui @@ -10,6 +10,18 @@ 212 + + + 285 + 212 + + + + + 285 + 212 + + Triangle tool