diff --git a/src/lay/lay/ClipDialog.ui b/src/lay/lay/ClipDialog.ui index 59640fc55..075131738 100644 --- a/src/lay/lay/ClipDialog.ui +++ b/src/lay/lay/ClipDialog.ui @@ -1,7 +1,8 @@ - + + ClipDialog - - + + 0 0 @@ -9,49 +10,47 @@ 421 - + Clip Tool - - - 9 - - + + 6 + + 9 + - - + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - + + Clip result cell name - - - - 7 - 0 + + + 0 0 - + CLIP @@ -61,13 +60,13 @@ - + Qt::Vertical - + QSizePolicy::Fixed - + 20 10 @@ -76,48 +75,48 @@ - - + + Clip Box Specification - - + + 9 - + 6 - - - + + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - + + Single box with ... - + false - + Qt::Vertical - + 20 40 @@ -128,40 +127,40 @@ - - - + + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - + + Single box with ... - + true - + false - + Qt::Vertical - + 20 40 @@ -172,12 +171,12 @@ - + - + Qt::Horizontal - + 231 20 @@ -185,176 +184,180 @@ - - - + + + Shapes on layer (multi clip) - + false - - - + + + Box Boundaries - - + + 9 - + 6 - - - + + + y = - - - + + + 2nd corner - - - + + + x = - - - + + + 1st corner - - - + + + x = - - - + + + y = - - + + - - + + - - + + - - + + - - - + + + Box Center And Dimensions - - + + 9 - + 6 - - - + + + h = - - - + + + Dimensions - - - + + + w = - - - + + + Center - - - + + + x = - - - + + + y = - - + + - - + + - - + + - - + + - - - + + + From ruler start and end points (multi clip) - + false - - + + + + QComboBox::AdjustToContents + + - + Qt::Vertical - + 20 40 @@ -363,12 +366,12 @@ - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -406,11 +409,11 @@ ClipDialog accept() - + 248 254 - + 157 274 @@ -422,11 +425,11 @@ ClipDialog reject() - + 316 260 - + 286 274 diff --git a/src/lay/lay/FillDialog.ui b/src/lay/lay/FillDialog.ui index f0853556c..592435ffb 100644 --- a/src/lay/lay/FillDialog.ui +++ b/src/lay/lay/FillDialog.ui @@ -49,7 +49,7 @@ - + 0 0 @@ -70,8 +70,30 @@ 6 + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 15 + 20 + + + + + + + 0 + 0 + + QFrame::NoFrame @@ -131,10 +153,13 @@ Qt::Vertical + + QSizePolicy::Expanding + 20 - 40 + 20 @@ -142,20 +167,7 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + QFrame::NoFrame @@ -203,19 +215,6 @@ 0 - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -251,6 +250,12 @@ + + + 1 + 0 + + 1 @@ -277,10 +282,13 @@ Qt::Vertical + + QSizePolicy::Expanding + 241 - 40 + 20 @@ -303,6 +311,9 @@ true + + QComboBox::AdjustToContents + @@ -409,6 +420,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + diff --git a/src/lay/lay/ReplacePropertiesBox.ui b/src/lay/lay/ReplacePropertiesBox.ui index 3a7b3ce70..2c667f89f 100644 --- a/src/lay/lay/ReplacePropertiesBox.ui +++ b/src/lay/lay/ReplacePropertiesBox.ui @@ -1,7 +1,8 @@ - + + ReplacePropertiesBox - - + + 0 0 @@ -9,32 +10,32 @@ 265 - + Form - - + + 9 - + 6 - - - + + + Height - - + + - + - + Qt::Vertical - + 200 40 @@ -42,69 +43,79 @@ - - - + + + - - :/right_16px@2x.png + + :/right_16px@2x.png - - - + + + - - :/right_16px@2x.png + + :/right_16px@2x.png - - + + - - - + + + Width - - - + + + - - :/right_16px@2x.png + + :/right_16px@2x.png - - - + + + Layer - - - + + + µm - - - + + + µm - - + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + @@ -115,6 +126,8 @@
layWidgets.h
- + + + diff --git a/src/lay/lay/ReplacePropertiesPath.ui b/src/lay/lay/ReplacePropertiesPath.ui index 9be6091e7..c03d9224a 100644 --- a/src/lay/lay/ReplacePropertiesPath.ui +++ b/src/lay/lay/ReplacePropertiesPath.ui @@ -1,37 +1,38 @@ - + + ReplacePropertiesPath - - + + 0 0 - 239 + 246 241 - + Form - - + + 9 - + 6 - - - + + + Width - + - + Qt::Vertical - + 200 40 @@ -39,42 +40,52 @@ - - - + + + Layer - - - - - - - + + + + + 0 + 0 + - - :/right_16px@2x.png + + QComboBox::AdjustToContents - - - - - - + + + - - :/right_16px@2x.png + + :/right_16px@2x.png - - - + + + + + + + + + + :/right_16px@2x.png + + + + + + µm @@ -88,6 +99,8 @@
layWidgets.h
- + + + diff --git a/src/lay/lay/ReplacePropertiesShape.ui b/src/lay/lay/ReplacePropertiesShape.ui index 0493ba1f5..fd4a258ab 100644 --- a/src/lay/lay/ReplacePropertiesShape.ui +++ b/src/lay/lay/ReplacePropertiesShape.ui @@ -1,7 +1,8 @@ - + + ReplacePropertiesShape - - + + 0 0 @@ -9,39 +10,19 @@ 187 - + Form - - - 9 - - + + 6 - - - - - - - :/right_16px@2x.png - - - - - - - Layer - - - - + - + Qt::Vertical - + 10 281 @@ -49,18 +30,49 @@ - - - - - 7 - 5 + + + + Layer + + + + + + + 0 0 + + QComboBox::AdjustToContents + + + + + + + + :/right_16px@2x.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -70,6 +82,8 @@
layWidgets.h
 - + + + diff --git a/src/lay/lay/ReplacePropertiesText.ui b/src/lay/lay/ReplacePropertiesText.ui index a5b6da715..312800040 100644 --- a/src/lay/lay/ReplacePropertiesText.ui +++ b/src/lay/lay/ReplacePropertiesText.ui @@ -1,7 +1,8 @@ - + + ReplacePropertiesText - - + + 0 0 @@ -9,125 +10,133 @@ 269 - + Form - - + + 9 - + 6 - - + + - + - + R0 - - :/r0_24px.png + + + :/r0_24px.png:/r0_24px.png - + R90 - - :/r90_24px.png + + + :/r90_24px.png:/r90_24px.png - + R180 - - :/r180_24px.png + + + :/r180_24px.png:/r180_24px.png - + R270 - - :/r270_24px.png + + + :/r270_24px.png:/r270_24px.png - + M0 - - :/m0_24px.png + + + :/m0_24px.png:/m0_24px.png - + M45 - - :/m45_24px.png + + + :/m45_24px.png:/m45_24px.png - + M90 - - :/m90_24px.png + + + :/m90_24px.png:/m90_24px.png - + M135 - - :/m135_24px.png + + + :/m135_24px.png:/m135_24px.png - - - + + + Text - - - + + + - - :/right_16px@2x.png + + :/right_16px@2x.png - - - + + + - - :/right_16px@2x.png + + :/right_16px@2x.png - - + + - + - + Qt::Vertical - + 200 40 @@ -135,56 +144,66 @@ - - - + + + - - :/right_16px@2x.png + + :/right_16px@2x.png - - - + + + Orientation - - - + + + - - :/right_16px@2x.png + + :/right_16px@2x.png - - - + + + Size - - + + - - - + + + Layer - - + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + - - - + + + µm @@ -198,6 +217,8 @@
layWidgets.h
- + + + diff --git a/src/lay/lay/SearchPropertiesBox.ui b/src/lay/lay/SearchPropertiesBox.ui index 7afa3a6dd..96170e2f3 100644 --- a/src/lay/lay/SearchPropertiesBox.ui +++ b/src/lay/lay/SearchPropertiesBox.ui @@ -1,7 +1,8 @@ - + + SearchPropertiesBox - - + + 0 0 @@ -9,80 +10,80 @@ 331 - + Form - - + + 9 - + 6 - - + + - - - + + + µm - - - + + + µm² - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - - + + + Area - + - + Qt::Vertical - + 200 281 @@ -90,158 +91,168 @@ - - + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - - + + + µm - - - + + + Width - - + + - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - + + - - - + + + Height - - - + + + Layer - - - + + + Perimeter - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - + + - - - + + + µm diff --git a/src/lay/lay/SearchPropertiesPath.ui b/src/lay/lay/SearchPropertiesPath.ui index 5fa5740d9..3ebb041b0 100644 --- a/src/lay/lay/SearchPropertiesPath.ui +++ b/src/lay/lay/SearchPropertiesPath.ui @@ -1,7 +1,8 @@ - + + SearchPropertiesPath - - + + 0 0 @@ -9,134 +10,144 @@ 260 - + Form - - + + 9 - + 6 - - - + + + Length - - + + - - - + + + Width - - - + + + Layer - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - + + - - - + + + µm - - - + + + µm - - + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + - + - + Qt::Vertical - + 200 40 diff --git a/src/lay/lay/SearchPropertiesShape.ui b/src/lay/lay/SearchPropertiesShape.ui index 06e9b47e9..67ad79319 100644 --- a/src/lay/lay/SearchPropertiesShape.ui +++ b/src/lay/lay/SearchPropertiesShape.ui @@ -1,7 +1,8 @@ - + + SearchPropertiesShape - - + + 0 0 @@ -9,134 +10,144 @@ 287 - + Form - - + + 9 - + 6 - - - + + + Layer - - - + + + Area - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - - + + + Perimeter - - + + - - + + - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - - + + + µm² - - - + + + µm - - + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + - + - + Qt::Vertical - + 200 281 diff --git a/src/lay/lay/SearchPropertiesText.ui b/src/lay/lay/SearchPropertiesText.ui index 7631b1aa4..2a2f311a8 100644 --- a/src/lay/lay/SearchPropertiesText.ui +++ b/src/lay/lay/SearchPropertiesText.ui @@ -1,7 +1,8 @@ - + + SearchPropertiesText - - + + 0 0 @@ -9,201 +10,219 @@ 308 - + Form - - + + 9 - + 6 - - - + + + Layer - - - + + + Size - - + + - - + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + - - + + - + ~ - + !~ - - + + - - + + - + - + R0 - - :/r0_24px.png + + + :/r0_24px.png:/r0_24px.png - + R90 - - :/r90_24px.png + + + :/r90_24px.png:/r90_24px.png - + R180 - - :/r180_24px.png + + + :/r180_24px.png:/r180_24px.png - + R270 - - :/r270_24px.png + + + :/r270_24px.png:/r270_24px.png - + M0 - - :/m0_24px.png + + + :/m0_24px.png:/m0_24px.png - + M45 - - :/m45_24px.png + + + :/m45_24px.png:/m45_24px.png - + M90 - - :/m90_24px.png + + + :/m90_24px.png:/m90_24px.png - + M135 - - :/m135_24px.png + + + :/m135_24px.png:/m135_24px.png - - + + - + == - + != - + < - + <= - - > + + > - - >= + + >= - - - + + + Text - - - + + + Orientation - - + + - + == - + != - - - + + + µm - + - + Qt::Vertical - + 200 101 @@ -229,6 +248,8 @@ text_size_op text_size_value - + + + diff --git a/src/lay/lay/layClipDialog.cc b/src/lay/lay/layClipDialog.cc index 23a103d45..7ddf31d3c 100644 --- a/src/lay/lay/layClipDialog.cc +++ b/src/lay/lay/layClipDialog.cc @@ -91,9 +91,11 @@ ClipDialog::menu_activated (const std::string &symbol) { if (symbol == "clip_tool::show") { - lay::CellView cv = view ()->cellview (view ()->active_cellview_index ()); + int cv_index = view ()->active_cellview_index (); + + lay::CellView cv = view ()->cellview (cv_index); if (cv.is_valid ()) { - cb_layer->set_layout (&cv->layout ()); + cb_layer->set_view (view (), cv_index); show (); activate (); } diff --git a/src/lay/lay/layFillDialog.cc b/src/lay/lay/layFillDialog.cc index 8ba9b9a3d..8c7de86e7 100644 --- a/src/lay/lay/layFillDialog.cc +++ b/src/lay/lay/layFillDialog.cc @@ -102,10 +102,12 @@ FillDialog::menu_activated (const std::string &symbol) { if (symbol == "fill_tool::show") { - lay::CellView cv = mp_view->cellview (mp_view->active_cellview_index ()); + int cv_index = mp_view->active_cellview_index (); + + lay::CellView cv = mp_view->cellview (cv_index); if (cv.is_valid ()) { - cb_layer->set_layout (&cv->layout ()); - fc_boundary_layer->set_layout (&cv->layout ()); + cb_layer->set_view (mp_view, cv_index); + fc_boundary_layer->set_view (mp_view, cv_index); show (); } diff --git a/src/layui/layui/DuplicateLayerDialog.ui b/src/layui/layui/DuplicateLayerDialog.ui index d289f052b..e3b39a7c7 100644 --- a/src/layui/layui/DuplicateLayerDialog.ui +++ b/src/layui/layui/DuplicateLayerDialog.ui @@ -1,7 +1,8 @@ - + + DuplicateLayerDialog - - + + 0 0 @@ -9,86 +10,82 @@ 266 - + Copy Layer - - - 9 - - + + 6 + + 9 + - - + + Copy Layer - - + + 9 - + 6 - - - + + + Qt::Horizontal - - - - - 5 - 0 + + + + 1 0 - - - - - 5 - 0 + + + + 1 0 - - - + + + Copy to - - - + + + Source layer - - - + + + Layer - + - + Qt::Horizontal - + 40 20 @@ -96,35 +93,43 @@ - - + + + + QComboBox::AdjustToContents + + - - + + + + QComboBox::AdjustToContents + + - - - + + + Layout and cell - - - + + + Replace content with source layer - + - + Qt::Horizontal - + QSizePolicy::Fixed - + 16 20 @@ -132,28 +137,28 @@ - - + + - + Flatten into target cell - + Top cell only - + Cell by cell below the current cell - - - + + + Hierarchy @@ -163,10 +168,10 @@ - + Qt::Vertical - + 623 51 @@ -175,12 +180,12 @@ - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -188,12 +193,12 @@ - lay::CellViewSelectionComboBox + lay::LayerSelectionComboBox QComboBox
layWidgets.h
 - lay::LayerSelectionComboBox + lay::CellViewSelectionComboBox QComboBox
layWidgets.h
 @@ -206,11 +211,11 @@ DuplicateLayerDialog accept() - + 248 254 - + 157 274 @@ -222,11 +227,11 @@ DuplicateLayerDialog reject() - + 316 260 - + 286 274 diff --git a/src/plugins/tools/bool/lay_plugin/BooleanOptionsDialog.ui b/src/plugins/tools/bool/lay_plugin/BooleanOptionsDialog.ui index f1a90a510..e01d5acf5 100644 --- a/src/plugins/tools/bool/lay_plugin/BooleanOptionsDialog.ui +++ b/src/plugins/tools/bool/lay_plugin/BooleanOptionsDialog.ui @@ -1,42 +1,43 @@ - + + BooleanOptionsDialog - - + + 0 0 - 535 + 578 349 - + Boolean Operation - - - 9 - - + + 6 + + 9 + - - + + Boolean Operation Setup - - + + 9 - + 6 - + - + Qt::Horizontal - + 40 20 @@ -44,158 +45,170 @@ - - - + + + Qt::Horizontal - - + + - + Union (OR) - + Intersection (AND) - + Difference (A NOT B) - + Difference (B NOT A) - + Symmetric Difference (XOR) - - - + + + Source B - - - + + + Source A - - - + + + Mode - - - + + + Result - - - + + + Hierarchy - - - + + + Qt::Horizontal - - - + + + Layout and cell - - - + + + Layer - - - + + + Layer - - - + + + Layout and cell - - + + - - + + - - + + - - + + + + QComboBox::AdjustToContents + + - - + + + + QComboBox::AdjustToContents + + - - + + + + QComboBox::AdjustToContents + + - - - + + + (Layer is overwritten) - - - + + + Minimum coherence (for touching corners) - - + + - + Flat - + Top cell only - + Individually for current and subcells (semi hierarchical) @@ -206,10 +219,10 @@ - + Qt::Vertical - + 506 51 @@ -218,12 +231,12 @@ - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -231,12 +244,12 @@ - lay::CellViewSelectionComboBox + lay::LayerSelectionComboBox QComboBox
layWidgets.h
 - lay::LayerSelectionComboBox + lay::CellViewSelectionComboBox QComboBox
layWidgets.h
 @@ -249,11 +262,11 @@ BooleanOptionsDialog accept() - + 248 254 - + 157 274 @@ -265,11 +278,11 @@ BooleanOptionsDialog reject() - + 316 260 - + 286 274 diff --git a/src/plugins/tools/bool/lay_plugin/MergeOptionsDialog.ui b/src/plugins/tools/bool/lay_plugin/MergeOptionsDialog.ui index f0981ea28..06592fbb6 100644 --- a/src/plugins/tools/bool/lay_plugin/MergeOptionsDialog.ui +++ b/src/plugins/tools/bool/lay_plugin/MergeOptionsDialog.ui @@ -1,7 +1,8 @@ - + + MergeOptionsDialog - - + + 0 0 @@ -9,125 +10,125 @@ 331 - + Merge Operation - - + + 6 - + 9 - - + + Merge Operation Setup - - + + 9 - + 6 - - + + - + Flat - + Top cell only - + Individually for current and subcells (semi hierarchical) - - - + + + (Layer is overwritten) - - - + + + Layer - - + + - - + + - - - + + + Qt::Horizontal - - - + + + Hierarchy - - + + - - - + + + Result - - - + + + Source - - - + + + Layer - - - + + + Qt::Horizontal - - - + + + Minimum coherence (for touching corners) - + - + Qt::Horizontal - + 40 20 @@ -135,36 +136,44 @@ - - + + + + QComboBox::AdjustToContents + + - - + + + + QComboBox::AdjustToContents + + - - - + + + (0: all polygons, 1: at least two overlapping ...) - - - + + + Layout and cell - - - + + + Layout and cell - - - + + + Overlap threshold @@ -174,10 +183,10 @@ - + Qt::Vertical - + 506 51 @@ -186,11 +195,11 @@ - - + + Qt::Horizontal - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -199,12 +208,12 @@ - lay::CellViewSelectionComboBox + lay::LayerSelectionComboBox QComboBox
layWidgets.h
 - lay::LayerSelectionComboBox + lay::CellViewSelectionComboBox QComboBox
layWidgets.h
 @@ -217,11 +226,11 @@ MergeOptionsDialog accept() - + 248 254 - + 157 274 @@ -233,11 +242,11 @@ MergeOptionsDialog reject() - + 316 260 - + 286 274 diff --git a/src/plugins/tools/bool/lay_plugin/SizingOptionsDialog.ui b/src/plugins/tools/bool/lay_plugin/SizingOptionsDialog.ui index c6e666936..746e27e0c 100644 --- a/src/plugins/tools/bool/lay_plugin/SizingOptionsDialog.ui +++ b/src/plugins/tools/bool/lay_plugin/SizingOptionsDialog.ui @@ -1,133 +1,134 @@ - + + SizingOptionsDialog - - + + 0 0 - 567 - 331 + 680 + 341 - + Sizing Operation - - - 9 - - + + 6 + + 9 + - - + + Sizing Operation Setup - - + + 9 - + 6 - - + + - + Flat - + Top cell only - + Individually for current and subcells (semi hierarchical) - - - + + + (Layer is overwritten) - - - + + + Layer - - + + - - + + - - - + + + Qt::Horizontal - - - + + + Hierarchy - - + + - - - + + + Result - - - + + + Source - - - + + + Layer - - - + + + Qt::Horizontal - - - + + + Minimum coherence (for touching corners) - + - + Qt::Horizontal - + 40 20 @@ -135,76 +136,84 @@ - - + + + + QComboBox::AdjustToContents + + - - + + + + QComboBox::AdjustToContents + + - - - + + + Single value or pair (one per direction: sx,sy) - - - + + + Layout and cell - - - + + + Layout and cell - - - + + + Sizing value - - - + + + Cutoff mode - - + + - + Strict (diagonal) - + Strong (octagon) - + Moderate (sharp bends only) - - Weak (sharps bends >135 deg.) + + Weak (sharps bends >135 deg.) - + Long limit (x10) - + Extreme limit (x100) @@ -215,10 +224,10 @@ - + Qt::Vertical - + 506 51 @@ -227,12 +236,12 @@ - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -240,12 +249,12 @@ - lay::CellViewSelectionComboBox + lay::LayerSelectionComboBox QComboBox
layWidgets.h
 - lay::LayerSelectionComboBox + lay::CellViewSelectionComboBox QComboBox
layWidgets.h
 @@ -258,11 +267,11 @@ SizingOptionsDialog accept() - + 248 254 - + 157 274 @@ -274,11 +283,11 @@ SizingOptionsDialog reject() - + 316 260 - + 286 274