From bcfbd50ad62b4d869a4e475f7a876a88c91f790a Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 23 Mar 2024 23:02:42 +0100 Subject: [PATCH] Some polishing --- src/edt/edt/EditorOptionsInst.ui | 269 +++++++++++------------ src/edt/edt/InstPropertiesPage.ui | 294 ++++++++++++++------------ src/edt/edt/MakeArrayOptionsDialog.ui | 116 +++++----- 3 files changed, 364 insertions(+), 315 deletions(-) diff --git a/src/edt/edt/EditorOptionsInst.ui b/src/edt/edt/EditorOptionsInst.ui index 63e963d20..2e3474e37 100644 --- a/src/edt/edt/EditorOptionsInst.ui +++ b/src/edt/edt/EditorOptionsInst.ui @@ -52,7 +52,7 @@ 0 0 402 - 506 + 513 @@ -359,107 +359,7 @@ 2 - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 1 - 0 - - - - - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Row vector - - - - - - - Column vector - - - - - - - x = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - - - - - Warning: although row and column vectors can be arbitrary combination, some design systems only accept orthogonal (rectangular) arrays. - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 4 - - - - - @@ -469,27 +369,10 @@ - - + + - Dimension - - - - - - - columns = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - rows = + y = Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -512,7 +395,127 @@ - + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Warning: although row and column vectors can be arbitrary combination, some design systems only accept orthogonal (rectangular) arrays. + + + true + + + + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + + + + + Row vector + + + + + + + Rows = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 4 + + + + + + + + Column vector + + + + + + + Columns = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + @@ -522,15 +525,21 @@ - - - - - 1 - 0 - + + + + Qt::Vertical - + + QSizePolicy::Fixed + + + + 20 + 5 + + + diff --git a/src/edt/edt/InstPropertiesPage.ui b/src/edt/edt/InstPropertiesPage.ui index 78e5ba162..2b0e64048 100644 --- a/src/edt/edt/InstPropertiesPage.ui +++ b/src/edt/edt/InstPropertiesPage.ui @@ -455,7 +455,114 @@ 6 - + + + + + 1 + 0 + + + + + + + + + 1 + 0 + + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + x = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Row vector (x,y) + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QFrame::NoFrame @@ -489,75 +596,7 @@ - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - This is instance [r,c] of array with - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Rows/Columns - - - - - - - Row vector (x,y) - - - - + false @@ -601,34 +640,7 @@ - - - - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Column vector (x,y) - - - - - - - - 1 - 0 - - - - - + QFrame::NoFrame @@ -662,22 +674,29 @@ - + - rows = + Rows = - - + + + + Column vector (x,y) + + + + + QFrame::NoFrame QFrame::Raised - + 0 @@ -693,7 +712,7 @@ - + @@ -703,53 +722,62 @@ - - - - - 1 - 0 - + + + + Qt::Horizontal - - - - - - - 1 - 0 - + + + 40 + 20 + - + - + - columns = - - - - - - - x = + Columns = Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + - x = + This is instance [r,c] of array with + + + + + + + y = Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + diff --git a/src/edt/edt/MakeArrayOptionsDialog.ui b/src/edt/edt/MakeArrayOptionsDialog.ui index dc3d3ef15..25e43bdb3 100644 --- a/src/edt/edt/MakeArrayOptionsDialog.ui +++ b/src/edt/edt/MakeArrayOptionsDialog.ui @@ -6,8 +6,8 @@ 0 0 - 606 - 332 + 561 + 323 @@ -67,7 +67,7 @@ 6 - + @@ -77,14 +77,7 @@ - - - - Rows/Columns - - - - + x = @@ -95,7 +88,7 @@ - + 1 @@ -104,34 +97,20 @@ + + + + Columns = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - rows = - - - - - - - Row vector (x,y) - - - - - - - columns = - - - - - - - - 1 - 0 - + Rows = @@ -145,18 +124,22 @@ - - + + - y = - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Row vector (x,y) - - + + + + Column vector (x,y) + + + + + 1 @@ -165,7 +148,7 @@ - + x = @@ -175,8 +158,8 @@ - - + + 1 @@ -185,7 +168,17 @@ - + + + + + 1 + 0 + + + + + y = @@ -195,13 +188,32 @@ - - + + - Column vector (x,y) + y = + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + +