From 4fdfcfc11e3a3439171f8400f350f5c63621d7b0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 4 Mar 2018 13:34:32 +0200 Subject: [PATCH] Improve description field. It should be flexible. --HG-- branch : develop --- src/app/tape/tmainwindow.ui | 843 +++++++++--------- .../dialogs/dialogfinalmeasurements.ui | 709 +++++++-------- src/app/valentina/dialogs/dialogincrements.ui | 753 ++++++++-------- 3 files changed, 1160 insertions(+), 1145 deletions(-) diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui index 96e70e411..591a7dfc9 100644 --- a/src/app/tape/tmainwindow.ui +++ b/src/app/tape/tmainwindow.ui @@ -123,431 +123,440 @@ - - - - 0 - 2 - + + + Qt::Vertical - - true - - - QAbstractItemView::SelectRows - - - true - - - - Name + + + + 0 + 2 + - - - - Full name + + true - - - - Calculated value + + QAbstractItemView::SelectRows - - - - Formula + + true + + + + Name + + + + + Full name + + + + + Calculated value + + + + + Formula + + + + + Base value + + + + + In sizes + + + + + In heights + + + + + + true - - - - Base value + + + 0 + 2 + - - - - In sizes + + Details - - - - In heights + + Details - - - - - - - true - - - - 0 - 2 - - - - Details - - - Details - - - - QFormLayout::ExpandingFieldsGrow - - - - - Name: - - - - - - - false - - - Measurement's name in a formula - - - Measurement's name in a formula. - - - - - - - Formula: - - - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 28 - - - - true - - - - - - - false - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - ../../libs/vtools/dialogs/support../../libs/vtools/dialogs/support - - - - 16 - 16 - - - - true - - - - - - - false - - - Function Wizard - - - ... - - - - :/tapeicon/24x24/fx.png:/tapeicon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - Base value: - - - - - - - In sizes: - - - - - - - In heights: - - - - - - - Description: - - - - - - - false - - - - 0 - 1 - - - - - - - - - - false - - - Move measurement top - - - ... - - - - .. - - - - - - - false - - - Move measurement up - - - ... - - - - .. - - - - - - - false - - - Move measurement down - - - ... - - - - .. - - - - - - - false - - - Move measurement bottom - - - ... - - - - .. - - - - - - - Qt::Horizontal - - - - 5000 - 20 - - - - - - - - - - - - Qt::Horizontal - - - - 5000 - 20 - - - - - - - - false - - - Delete measurement - - - ... - - - - .. - - - - - - - - - Calculated value: - - - - - - - Calculated value - - - - - - - - - - false - - - -10000.000000000000000 - - - 10000.000000000000000 - - - - - - - false - - - -10000.000000000000000 - - - 10000.000000000000000 - - - - - - - false - - - -10000.000000000000000 - - - 10000.000000000000000 - - - - - - - Full name: - - - - - - - false - - - - - - Measurement's human-readable name. - - - - + + + QFormLayout::ExpandingFieldsGrow + + + + + Name: + + + + + + + false + + + Measurement's name in a formula + + + Measurement's name in a formula. + + + + + + + Formula: + + + + + + + + + false + + + + 0 + 0 + + + + + 16777215 + 28 + + + + true + + + + + + + false + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + ../../libs/vtools/dialogs/support../../libs/vtools/dialogs/support + + + + 16 + 16 + + + + true + + + + + + + false + + + Function Wizard + + + ... + + + + :/tapeicon/24x24/fx.png:/tapeicon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + Base value: + + + + + + + In sizes: + + + + + + + In heights: + + + + + + + Description: + + + + + + + false + + + + 0 + 1 + + + + + 0 + 28 + + + + + + + + + + false + + + Move measurement top + + + ... + + + + .. + + + + + + + false + + + Move measurement up + + + ... + + + + .. + + + + + + + false + + + Move measurement down + + + ... + + + + .. + + + + + + + false + + + Move measurement bottom + + + ... + + + + .. + + + + + + + Qt::Horizontal + + + + 5000 + 20 + + + + + + + + + + + + Qt::Horizontal + + + + 5000 + 20 + + + + + + + + false + + + Delete measurement + + + ... + + + + .. + + + + + + + + + Calculated value: + + + + + + + Calculated value + + + + + + + + + + false + + + -10000.000000000000000 + + + 10000.000000000000000 + + + + + + + false + + + -10000.000000000000000 + + + 10000.000000000000000 + + + + + + + false + + + -10000.000000000000000 + + + 10000.000000000000000 + + + + + + + Full name: + + + + + + + false + + + + + + Measurement's human-readable name. + + + + + diff --git a/src/app/valentina/dialogs/dialogfinalmeasurements.ui b/src/app/valentina/dialogs/dialogfinalmeasurements.ui index d12374bd0..f6c425b8b 100644 --- a/src/app/valentina/dialogs/dialogfinalmeasurements.ui +++ b/src/app/valentina/dialogs/dialogfinalmeasurements.ui @@ -62,362 +62,365 @@ - - - - 0 - 8 - + + + Qt::Vertical - - - 0 - 150 - - - - true - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - false - - - true - - - false - - - 120 - - - 70 - - - false - - - true - - - false - - - false - - - 25 - - - 8 - - - false - - - - Name + + + + 0 + 8 + - - - - The calculated value + + + 0 + 150 + - - - - Formula + + true - - - - - - - - 0 - 4 - - - - - 0 - 236 - - - - Details - - - Details - - - - - - 6 - - - - - Qt::Horizontal - - - - 5000 - 20 - - - - - - - - - 0 - 0 - - - - ... - - - - .. - - - - - - - false - - - ... - - - - .. - - - - - - - - - Name: - - - - - - - false - - - - - - - Calculated value: - - - - - - - - - - - - - - Formula: - - - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - false - - - - 18 - 18 - - - - - 0 - 0 - - - - Qt::StrongFocus - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - ../../../libs/vtools/dialogs/support../../../libs/vtools/dialogs/support - - - - 16 - 16 - - - - false - - - true - - - - - - - false - - - - 24 - 24 - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - Description: - - - - - - - false - - - - 0 - 1 - - - - - - - - - - false - - - Move measurement up - - - ... - - - - ../../tape../../tape - - - - - - - false - - - Move measurement down - - - ... - - - - ../../tape../../tape - - - - - - - Qt::Horizontal - - - - 5000 - 20 - - - - - - - + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + false + + + true + + + false + + + 120 + + + 70 + + + false + + + true + + + false + + + false + + + 25 + + + 8 + + + false + + + + Name + + + + + The calculated value + + + + + Formula + + + + + + + 0 + 4 + + + + Details + + + Details + + + + + + 6 + + + + + Qt::Horizontal + + + + 5000 + 20 + + + + + + + + + 0 + 0 + + + + ... + + + + .. + + + + + + + false + + + ... + + + + .. + + + + + + + + + Name: + + + + + + + false + + + + + + + Calculated value: + + + + + + + + + + + + + + Formula: + + + + + + + + + false + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + false + + + + 18 + 18 + + + + + 0 + 0 + + + + Qt::StrongFocus + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + ../../../libs/vtools/dialogs/support../../../libs/vtools/dialogs/support + + + + 16 + 16 + + + + false + + + true + + + + + + + false + + + + 24 + 24 + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + Description: + + + + + + + false + + + + 0 + 1 + + + + + 0 + 28 + + + + + + + + + + false + + + Move measurement up + + + ... + + + + ../../tape../../tape + + + + + + + false + + + Move measurement down + + + ... + + + + ../../tape../../tape + + + + + + + Qt::Horizontal + + + + 5000 + 20 + + + + + + + + @@ -440,8 +443,8 @@ - + diff --git a/src/app/valentina/dialogs/dialogincrements.ui b/src/app/valentina/dialogs/dialogincrements.ui index 12dbb5b4c..63db2db2d 100644 --- a/src/app/valentina/dialogs/dialogincrements.ui +++ b/src/app/valentina/dialogs/dialogincrements.ui @@ -39,7 +39,7 @@ QTabWidget::North - 0 + 1 @@ -425,14 +425,14 @@ false - + 0 1 - + - 16777215 + 0 28 @@ -520,380 +520,383 @@ - - - - 0 - 8 - + + + Qt::Vertical - - - 0 - 150 - - - - true - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - false - - - true - - - false - - - 120 - - - 70 - - - false - - - true - - - false - - - false - - - 25 - - - 8 - - - false - - - - Name + + + + 0 + 8 + - - - - The calculated value + + + 0 + 150 + - - - - Formula + + true - - - - - - - - 0 - 4 - - - - Details - - - Details - - - - - - - - false - - - Move measurement up - - - ... - - - - ../../tape../../tape - - - - - - - false - - - Move measurement down - - - ... - - - - ../../tape../../tape - - - - - - - Qt::Horizontal - - - - 5000 - 20 - - - - - - - - - - 6 - - - - - Qt::Horizontal - - - - 5000 - 20 - - - - - - - - - 0 - 0 - - - - ... - - - - .. - - - - - - - false - - - ... - - - - .. - - - - - - - - - Name: - - - - - - - false - - - Unique variable name - - - - - - - Calculated value: - - - - - - - - - - - - - - Formula: - - - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - false - - - - 0 - 0 - - - - Qt::StrongFocus - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - ../../../libs/vtools/dialogs/support../../../libs/vtools/dialogs/support - - - - 16 - 16 - - - - false - - - true - - - - - - - false - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - Description: - - - - - - - false - - - - 0 - 1 - - - - - 16777215 - 28 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Refresh a pattern with all changes you made - - - Refresh - - - - - - + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + false + + + true + + + false + + + 120 + + + 70 + + + false + + + true + + + false + + + false + + + 25 + + + 8 + + + false + + + + Name + + + + + The calculated value + + + + + Formula + + + + + + + 0 + 4 + + + + Details + + + Details + + + + + + + + false + + + Move measurement up + + + ... + + + + ../../tape../../tape + + + + + + + false + + + Move measurement down + + + ... + + + + ../../tape../../tape + + + + + + + Qt::Horizontal + + + + 5000 + 20 + + + + + + + + + + 6 + + + + + Qt::Horizontal + + + + 5000 + 20 + + + + + + + + + 0 + 0 + + + + ... + + + + .. + + + + + + + false + + + ... + + + + .. + + + + + + + + + Name: + + + + + + + false + + + Unique variable name + + + + + + + Calculated value: + + + + + + + + + + + + + + Formula: + + + + + + + + + false + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + false + + + + 0 + 0 + + + + Qt::StrongFocus + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + ../../../libs/vtools/dialogs/support../../../libs/vtools/dialogs/support + + + + 16 + 16 + + + + false + + + true + + + + + + + false + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + Description: + + + + + + + false + + + + 0 + 1 + + + + + 0 + 28 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Refresh a pattern with all changes you made + + + Refresh + + + + + + + @@ -1151,8 +1154,8 @@ tableWidgetSplines - +