luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1333 from KLayout/issue-1328 

Fixed issue #1328 (width of layer selection boxes too small)
This commit is contained in:
Matthias Köfferlein 2023-04-13 22:54:48 +02:00 committed by GitHub
parent 69097bbf04 9c1da8d3e1
commit 31b34eeb8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 1180 additions and 995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/lay/lay/ClipDialog.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClipDialog</class>
<widget class="QDialog" name="ClipDialog">
@ -13,12 +14,12 @@
<string>Clip Tool</string>
</property>
<layout class="QVBoxLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<property name="margin" stdset="0">
<number>9</number>
</property>
<item>
<widget class="QFrame" name="frame_3">
<property name="frameShape">
@ -28,12 +29,12 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<property name="margin" stdset="0">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_13">
<property name="text">
@ -44,9 +45,7 @@
<item>
<widget class="QLineEdit" name="le_cell_name">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -67,7 +66,7 @@
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
@ -81,7 +80,7 @@
<string>Clip Box Specification</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -96,12 +95,12 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<property name="margin" stdset="0">
<number>0</number>
</property>
<item>
<widget class="QRadioButton" name="rb_box2">
<property name="text">
@ -117,7 +116,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@ -137,12 +136,12 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<property name="margin" stdset="0">
<number>0</number>
</property>
<item>
<widget class="QRadioButton" name="rb_box1">
<property name="text">
@ -161,7 +160,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@ -177,7 +176,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>231</width>
<height>20</height>
@ -201,7 +200,7 @@
<string>Box Boundaries</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -270,7 +269,7 @@
<string>Box Center And Dimensions</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -344,7 +343,11 @@
</widget>
</item>
<item row="0" column="1">
<widget class="lay::LayerSelectionComboBox" name="cb_layer" />
<widget class="lay::LayerSelectionComboBox" name="cb_layer">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
</layout>
</widget>
@ -354,7 +357,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@ -368,7 +371,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>

87
src/lay/lay/FillDialog.ui
View File

@ -49,7 +49,7 @@
<item>
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -70,8 +70,30 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>15</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QFrame" name="frame_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
@ -131,10 +153,13 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>20</height>
</size>
</property>
</spacer>
@ -142,20 +167,7 @@
</layout>
</widget>
</item>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="3">
<item row="2" column="0" colspan="3">
<widget class="QFrame" name="frame_6">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
@ -203,19 +215,6 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_37">
<property name="text">
@ -251,6 +250,12 @@
</item>
<item row="0" column="2">
<widget class="QStackedWidget" name="fill_area_stack">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>1</number>
</property>
@ -277,10 +282,13 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>241</width>
<height>40</height>
<height>20</height>
</size>
</property>
</spacer>
@ -303,6 +311,9 @@
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
</layout>
@ -409,6 +420,22 @@
</widget>
</widget>
</item>
<item row="1" column="0" colspan="3">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>

27
src/lay/lay/ReplacePropertiesBox.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ReplacePropertiesBox</class>
<widget class="QWidget" name="ReplacePropertiesBox">
@ -13,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -34,7 +35,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>40</height>
@ -48,7 +49,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -58,7 +59,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -78,7 +79,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -104,7 +105,17 @@
</widget>
</item>
<item row="0" column="2">
<widget class="lay::LayerSelectionComboBox" name="box_layer" />
<widget class="lay::LayerSelectionComboBox" name="box_layer">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
</layout>
</widget>
@ -115,6 +126,8 @@
<header>layWidgets.h</header>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../../icons/icons.qrc"/>
</resources>
<connections/>
</ui>

27
src/lay/lay/ReplacePropertiesPath.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ReplacePropertiesPath</class>
<widget class="QWidget" name="ReplacePropertiesPath">
@ -5,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>239</width>
<width>246</width>
<height>241</height>
</rect>
</property>
@ -13,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -31,7 +32,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>40</height>
@ -47,7 +48,17 @@
</widget>
</item>
<item row="0" column="2">
<widget class="lay::LayerSelectionComboBox" name="path_layer" />
<widget class="lay::LayerSelectionComboBox" name="path_layer">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_61">
@ -55,7 +66,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -68,7 +79,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -88,6 +99,8 @@
<header>layWidgets.h</header>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../../icons/icons.qrc"/>
</resources>
<connections/>
</ui>

68
src/lay/lay/ReplacePropertiesShape.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ReplacePropertiesShape</class>
<widget class="QWidget" name="ReplacePropertiesShape">
@ -13,21 +14,21 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QLabel" name="label_57" >
<property name="text" >
<string/>
<item row="2" column="0" colspan="3">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="pixmap" >
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>281</height>
</size>
</property>
</widget>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_47">
@ -36,31 +37,42 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="3" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>10</width>
<height>281</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="lay::LayerSelectionComboBox" name="shape_layer">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_57">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
@ -70,6 +82,8 @@
<header>layWidgets.h</header>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../../icons/icons.qrc"/>
</resources>
<connections/>
</ui>

53
src/lay/lay/ReplacePropertiesText.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ReplacePropertiesText</class>
<widget class="QWidget" name="ReplacePropertiesText">
@ -13,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -31,7 +32,8 @@
<string>R0</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/r0_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/r0_24px.png</normaloff>:/r0_24px.png</iconset>
</property>
</item>
<item>
@ -39,7 +41,8 @@
<string>R90</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/r90_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/r90_24px.png</normaloff>:/r90_24px.png</iconset>
</property>
</item>
<item>
@ -47,7 +50,8 @@
<string>R180</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/r180_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/r180_24px.png</normaloff>:/r180_24px.png</iconset>
</property>
</item>
<item>
@ -55,7 +59,8 @@
<string>R270</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/r270_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/r270_24px.png</normaloff>:/r270_24px.png</iconset>
</property>
</item>
<item>
@ -63,7 +68,8 @@
<string>M0</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/m0_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/m0_24px.png</normaloff>:/m0_24px.png</iconset>
</property>
</item>
<item>
@ -71,7 +77,8 @@
<string>M45</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/m45_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/m45_24px.png</normaloff>:/m45_24px.png</iconset>
</property>
</item>
<item>
@ -79,7 +86,8 @@
<string>M90</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/m90_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/m90_24px.png</normaloff>:/m90_24px.png</iconset>
</property>
</item>
<item>
@ -87,7 +95,8 @@
<string>M135</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/m135_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/m135_24px.png</normaloff>:/m135_24px.png</iconset>
</property>
</item>
</widget>
@ -105,7 +114,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -115,7 +124,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -127,7 +136,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>40</height>
@ -141,7 +150,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -158,7 +167,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="layResources.qrc" >:/right_16px@2x.png</pixmap>
<pixmap resource="../../icons/icons.qrc">:/right_16px@2x.png</pixmap>
</property>
</widget>
</item>
@ -180,7 +189,17 @@
</widget>
</item>
<item row="0" column="2">
<widget class="lay::LayerSelectionComboBox" name="text_layer" />
<widget class="lay::LayerSelectionComboBox" name="text_layer">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QLabel" name="label">
@ -198,6 +217,8 @@
<header>layWidgets.h</header>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../../icons/icons.qrc"/>
</resources>
<connections/>
</ui>

33
src/lay/lay/SearchPropertiesBox.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SearchPropertiesBox</class>
<widget class="QWidget" name="SearchPropertiesBox">
@ -13,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -60,12 +61,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>
@ -82,7 +83,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>281</height>
@ -91,7 +92,17 @@
</spacer>
</item>
<item row="0" column="2">
<widget class="lay::LayerSelectionComboBox" name="box_layer" />
<widget class="lay::LayerSelectionComboBox" name="box_layer">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="box_width_op">
@ -117,12 +128,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>
@ -168,12 +179,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>
@ -226,12 +237,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>

25
src/lay/lay/SearchPropertiesPath.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SearchPropertiesPath</class>
<widget class="QWidget" name="SearchPropertiesPath">
@ -13,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -67,12 +68,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>
@ -101,12 +102,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>
@ -129,14 +130,24 @@
</widget>
</item>
<item row="0" column="2">
<widget class="lay::LayerSelectionComboBox" name="path_layer" />
<widget class="lay::LayerSelectionComboBox" name="path_layer">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>40</height>

25
src/lay/lay/SearchPropertiesShape.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SearchPropertiesShape</class>
<widget class="QWidget" name="SearchPropertiesShape">
@ -13,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -57,12 +58,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>
@ -104,12 +105,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>
@ -129,14 +130,24 @@
</widget>
</item>
<item row="0" column="2">
<widget class="lay::LayerSelectionComboBox" name="shape_layer" />
<widget class="lay::LayerSelectionComboBox" name="shape_layer">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>281</height>

49
src/lay/lay/SearchPropertiesText.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SearchPropertiesText</class>
<widget class="QWidget" name="SearchPropertiesText">
@ -13,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -37,7 +38,17 @@
<widget class="QLineEdit" name="text_size_value"/>
</item>
<item row="0" column="2">
<widget class="lay::LayerSelectionComboBox" name="text_layer" />
<widget class="lay::LayerSelectionComboBox" name="text_layer">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="text_string_op">
@ -68,7 +79,8 @@
<string>R0</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/r0_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/r0_24px.png</normaloff>:/r0_24px.png</iconset>
</property>
</item>
<item>
@ -76,7 +88,8 @@
<string>R90</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/r90_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/r90_24px.png</normaloff>:/r90_24px.png</iconset>
</property>
</item>
<item>
@ -84,7 +97,8 @@
<string>R180</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/r180_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/r180_24px.png</normaloff>:/r180_24px.png</iconset>
</property>
</item>
<item>
@ -92,7 +106,8 @@
<string>R270</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/r270_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/r270_24px.png</normaloff>:/r270_24px.png</iconset>
</property>
</item>
<item>
@ -100,7 +115,8 @@
<string>M0</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/m0_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/m0_24px.png</normaloff>:/m0_24px.png</iconset>
</property>
</item>
<item>
@ -108,7 +124,8 @@
<string>M45</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/m45_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/m45_24px.png</normaloff>:/m45_24px.png</iconset>
</property>
</item>
<item>
@ -116,7 +133,8 @@
<string>M90</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/m90_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/m90_24px.png</normaloff>:/m90_24px.png</iconset>
</property>
</item>
<item>
@ -124,7 +142,8 @@
<string>M135</string>
</property>
<property name="icon">
<iconset resource="layResources.qrc" >:/m135_24px.png</iconset>
<iconset resource="../../icons/icons.qrc">
<normaloff>:/m135_24px.png</normaloff>:/m135_24px.png</iconset>
</property>
</item>
</widget>
@ -153,12 +172,12 @@
</item>
<item>
<property name="text">
<string>></string>
<string>&gt;</string>
</property>
</item>
<item>
<property name="text">
<string>>=</string>
<string>&gt;=</string>
</property>
</item>
</widget>
@ -203,7 +222,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>101</height>
@ -229,6 +248,8 @@
<tabstop>text_size_op</tabstop>
<tabstop>text_size_value</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../../icons/icons.qrc"/>
</resources>
<connections/>
</ui>

6
src/lay/lay/layClipDialog.cc
View File

@ -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 ();
}

8
src/lay/lay/layFillDialog.cc
View File

@ -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 ();
}

41
src/layui/layui/DuplicateLayerDialog.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DuplicateLayerDialog</class>
<widget class="QDialog" name="DuplicateLayerDialog">
@ -13,19 +14,19 @@
<string>Copy Layer</string>
</property>
<layout class="QVBoxLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<property name="margin" stdset="0">
<number>9</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Copy Layer</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -41,9 +42,7 @@
<item row="2" column="2">
<widget class="lay::CellViewSelectionComboBox" name="cvr_cbx">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -53,9 +52,7 @@
<item row="1" column="2">
<widget class="lay::CellViewSelectionComboBox" name="cv_cbx">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -88,7 +85,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -97,10 +94,18 @@
</spacer>
</item>
<item row="1" column="3">
<widget class="lay::LayerSelectionComboBox" name="layer_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layer_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="lay::LayerSelectionComboBox" name="layerr_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layerr_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_5">
@ -124,7 +129,7 @@
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
@ -166,7 +171,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>623</width>
<height>51</height>
@ -180,7 +185,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@ -188,12 +193,12 @@
</widget>
<customwidgets>
<customwidget>
<class>lay::CellViewSelectionComboBox</class>
<class>lay::LayerSelectionComboBox</class>
<extends>QComboBox</extends>
<header>layWidgets.h</header>
</customwidget>
<customwidget>
<class>lay::LayerSelectionComboBox</class>
<class>lay::CellViewSelectionComboBox</class>
<extends>QComboBox</extends>
<header>layWidgets.h</header>
</customwidget>

39
src/plugins/tools/bool/lay_plugin/BooleanOptionsDialog.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BooleanOptionsDialog</class>
<widget class="QDialog" name="BooleanOptionsDialog">
@ -5,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>535</width>
<width>578</width>
<height>349</height>
</rect>
</property>
@ -13,19 +14,19 @@
<string>Boolean Operation</string>
</property>
<layout class="QVBoxLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<property name="margin" stdset="0">
<number>9</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Boolean Operation Setup</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -36,7 +37,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -160,13 +161,25 @@
<widget class="lay::CellViewSelectionComboBox" name="cvr_cbx"/>
</item>
<item row="1" column="2">
<widget class="lay::LayerSelectionComboBox" name="layera_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layera_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="lay::LayerSelectionComboBox" name="layerb_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layerb_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="lay::LayerSelectionComboBox" name="layerr_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layerr_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="6" column="3">
<widget class="QLabel" name="label_10">
@ -209,7 +222,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>506</width>
<height>51</height>
@ -223,7 +236,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@ -231,12 +244,12 @@
</widget>
<customwidgets>
<customwidget>
<class>lay::CellViewSelectionComboBox</class>
<class>lay::LayerSelectionComboBox</class>
<extends>QComboBox</extends>
<header>layWidgets.h</header>
</customwidget>
<customwidget>
<class>lay::LayerSelectionComboBox</class>
<class>lay::CellViewSelectionComboBox</class>
<extends>QComboBox</extends>
<header>layWidgets.h</header>
</customwidget>

21
src/plugins/tools/bool/lay_plugin/MergeOptionsDialog.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MergeOptionsDialog</class>
<widget class="QDialog" name="MergeOptionsDialog">
@ -16,7 +17,7 @@
<property name="spacing">
<number>6</number>
</property>
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<item>
@ -25,7 +26,7 @@
<string>Merge Operation Setup</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -136,10 +137,18 @@
</spacer>
</item>
<item row="1" column="2">
<widget class="lay::LayerSelectionComboBox" name="layer_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layer_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="lay::LayerSelectionComboBox" name="layerr_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layerr_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="3" column="2" colspan="2">
<widget class="QLabel" name="label_2">
@ -199,12 +208,12 @@
</widget>
<customwidgets>
<customwidget>
<class>lay::CellViewSelectionComboBox</class>
<class>lay::LayerSelectionComboBox</class>
<extends>QComboBox</extends>
<header>layWidgets.h</header>
</customwidget>
<customwidget>
<class>lay::LayerSelectionComboBox</class>
<class>lay::CellViewSelectionComboBox</class>
<extends>QComboBox</extends>
<header>layWidgets.h</header>
</customwidget>

37
src/plugins/tools/bool/lay_plugin/SizingOptionsDialog.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SizingOptionsDialog</class>
<widget class="QDialog" name="SizingOptionsDialog">
@ -5,27 +6,27 @@
<rect>
<x>0</x>
<y>0</y>
<width>567</width>
<height>331</height>
<width>680</width>
<height>341</height>
</rect>
</property>
<property name="windowTitle">
<string>Sizing Operation</string>
</property>
<layout class="QVBoxLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<property name="margin" stdset="0">
<number>9</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Sizing Operation Setup</string>
</property>
<layout class="QGridLayout">
<property name="margin" >
<property name="margin" stdset="0">
<number>9</number>
</property>
<property name="spacing">
@ -127,7 +128,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -136,10 +137,18 @@
</spacer>
</item>
<item row="1" column="2">
<widget class="lay::LayerSelectionComboBox" name="layer_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layer_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="lay::LayerSelectionComboBox" name="layerr_cbx" />
<widget class="lay::LayerSelectionComboBox" name="layerr_cbx">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
<item row="3" column="2" colspan="2">
<widget class="QLabel" name="label_2">
@ -195,7 +204,7 @@
</item>
<item>
<property name="text">
<string>Weak (sharps bends >135 deg.)</string>
<string>Weak (sharps bends &gt;135 deg.)</string>
</property>
</item>
<item>
@ -218,7 +227,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>506</width>
<height>51</height>
@ -232,7 +241,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@ -240,12 +249,12 @@
</widget>
<customwidgets>
<customwidget>
<class>lay::CellViewSelectionComboBox</class>
<class>lay::LayerSelectionComboBox</class>
<extends>QComboBox</extends>
<header>layWidgets.h</header>
</customwidget>
<customwidget>
<class>lay::LayerSelectionComboBox</class>
<class>lay::CellViewSelectionComboBox</class>
<extends>QComboBox</extends>
<header>layWidgets.h</header>
</customwidget>