From 67b18fbbde348b320137f01d33de18a1af40e493 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 7 Aug 2016 23:41:49 +0300 Subject: [PATCH] Fix problems with layouts in dialog tool Detail. Returned detail name by default. Setted clear button for field Letter. --HG-- branch : develop --- .../vtools/dialogs/tools/dialogdetail.cpp | 1 + src/libs/vtools/dialogs/tools/dialogdetail.ui | 950 +++++++++--------- 2 files changed, 455 insertions(+), 496 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index 29d1df0ed..10131cfbe 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -51,6 +51,7 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) ui.lineEditName->setClearButtonEnabled(true); + ui.lineEditLetter->setClearButtonEnabled(true); #endif labelEditNamePoint = ui.labelEditName; diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.ui b/src/libs/vtools/dialogs/tools/dialogdetail.ui index 418b88edf..064d8f72f 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.ui +++ b/src/libs/vtools/dialogs/tools/dialogdetail.ui @@ -6,8 +6,8 @@ 0 0 - 522 - 481 + 523 + 442 @@ -20,8 +20,8 @@ - - + + 1 @@ -30,526 +30,483 @@ General - - - - 59 - 468 - 504 - 15 - - - - Ready! - - - Qt::RichText - - - false - - - - - - 50 - 40 - 367 - 34 - - - - - - - - 0 - 30 - 561 - 361 - - - - - - - - - 6 - - - QLayout::SetDefaultConstraint - - - 0 - - - 0 - - - - - - 1 - 0 - - - - Bias X: - - - - - - - - 1 - 0 - - - - -900.990000000000009 - - - 900.990000000000009 - - - 0.100000000000000 - - - 0.000000000000000 - - - - - - - cm - - - - - - - - - - - - 1 - 0 - - - - Bias Y: - - - - - - - - 1 - 0 - - - - -900.990000000000009 - - - 900.990000000000009 - - - 0.100000000000000 - - - - - - - cm - - - - - - - - - - - Reverse - - - - - - - - - Options - - + + + + + + + + 0 + 0 + + + + + + + :/icon/32x32/clockwise.png + + + + + + + All objects in path should follow in clockwise direction. + + + true + + + + + + + + + + + + + 6 + + + QLayout::SetDefaultConstraint + + + 0 + + + 0 + - - - - - - Seam allowance + + + + 1 + 0 + - - true + + Bias X: - - - - - - 1 - 0 - - - - - - - Width: - - - - - - - - 1 - 0 - - - - 900.990000000000009 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - - 0 - 0 - - - - cm - - - - - - - - - Closed + + + + 1 + 0 + - - true + + -900.990000000000009 + + + 900.990000000000009 + + + 0.100000000000000 + + + 0.000000000000000 - - - QLayout::SetFixedSize + + + cm - - 10 - - - 10 - - - 10 - - - 10 - - - - - false - - - Delete - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Scroll down the list - - - ... - - - - - - - - - - - - Scroll up the list - - - ... - - - - - - - - - + - - - - - - - - - - - - - 50 - 0 - 327 - 32 - - - - All objects in path should follow in clockwise direction. - - - - - - 10 - 0 - 32 - 32 - - - - - 0 - 0 - - - - - - - :/icon/32x32/clockwise.png - - + + + + + + + + 1 + 0 + + + + Bias Y: + + + + + + + + 1 + 0 + + + + -900.990000000000009 + + + 900.990000000000009 + + + 0.100000000000000 + + + + + + + cm + + + + + + + + + + + Reverse + + + + + + + + + Options + + + + + + Seam allowance + + + true + + + + + + + + + + 1 + 0 + + + + + + + Width: + + + + + + + + 1 + 0 + + + + 900.990000000000009 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + cm + + + + + + + + + Closed + + + true + + + + + + + QLayout::SetFixedSize + + + 10 + + + 10 + + + 10 + + + 10 + + + + + false + + + Delete + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Scroll down the list + + + ... + + + + + + + + + + + + Scroll up the list + + + ... + + + + + + + + + + + + + + + + + + + + + + + + Ready! + + + Qt::RichText + + + false + + + + Pattern piece data - - - - - - - 280 - 0 - 201 - 381 - - - - Qt::ClickFocus - - - - - - 0 - 70 - 271 - 153 - - - - Material/Cut number/Placement - - - - - - Material type: + + + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + Letter: + + + + + + + 3 + + + + + + + Name of detail: + + + + + + + Detail + + + 30 + + + + + + + + + Material/Cut number/Placement + + + + + + Cut number: + + + + + + + Material type: + + + + + + + true + + + + + + + 1000 + + + + + + + Placement: + + + + + + + + + + Add + + + + + + + Cancel + + + + + + + Remove + + + + - - - - true - - - - - - - Cut number: - - - - - - - 1000 - - - - - - - Placement: - - - - - - - - - - Add - - - - - - - Cancel - - - - - - - Remove - - + + + + + + Detail label visible + + + + + + + Pattern label visible + + + + - - - - - 0 - 0 - 271 - 61 - - - - - - - Letter: - - - - - - - 3 - - - - - - - Name of detail: - - - - - - - 15 - - - - - - - - - 0 - 230 - 261 - 80 - - - - - - - Detail label visible - - - - - - - Pattern label visible - - - - - - + + + + + + 180 + 0 + + + + Qt::ClickFocus + + + + - + Qt::Horizontal @@ -560,6 +517,8 @@ + buttonBox + tabWidget lineEditLetter @@ -570,7 +529,6 @@ pushButtonAdd pushButtonCancel pushButtonRemove - tabWidget listWidgetMCP buttonBox toolButtonUp