Skip to content

better 3d model path handling and add support for named variables for… #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
the-this-pointer wants to merge 5 commits into
base: master
Choose a base branch
from
Open

better 3d model path handling and add support for named variables for… #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50642fd
better 3d model path handling and add support for named variables for…
the-this-pointer Jul 31, 2023
7680d00
skip adding hidden 3d models of component
the-this-pointer Jul 31, 2023
7dadfea
fix alternative path migration on update mod
the-this-pointer Aug 2, 2023
9d192f7
changed the name of pref text edit
the-this-pointer Aug 31, 2023
45dc0a5
recursive path expansion implemented
the-this-pointer Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
254 changes: 38 additions & 216 deletions Resources/ui/ksu_prefs.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,114 +82,44 @@
<property name="title">
<string>3D Prefix working folder</string>
</property>
<widget class="QWidget" name="horizontalLayoutWidget_2">
<property name="geometry">
<rect>
<x>10</x>
<y>25</y>
<width>501</width>
<height>34</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_prefix3d_1">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;your &lt;span style=&quot; font-weight:600;&quot;&gt;KISYS3DMOD&lt;/span&gt; path&lt;/p&gt;&lt;p&gt;or 3D model &lt;span style=&quot; font-weight:600;&quot;&gt;main prefix path&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>main 3D folder location 'KISYS3DMOD'
or 'KICAD6_3DMODEL_DIR'</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefFileChooser" name="main_prefix" native="true">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;main 3D folder location&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;'KISYS3DMOD'&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>prefix3d_1</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/kicadStepUpGui</cstring>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget_3">
<property name="geometry">
<rect>
<x>10</x>
<y>65</y>
<width>501</width>
<height>34</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_prefix3d_2">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;your &lt;span style=&quot; font-weight:600;&quot;&gt;ALIAS&lt;/span&gt; 3D&lt;/p&gt;&lt;p&gt;model prefix path&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>secondary 3D folder loc
'ALT2 3DMOD'</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefFileChooser" name="alias_prefix" native="true">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;secondary 3D folder location&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;'ALT3DMOD'&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>prefix3d_2</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/kicadStepUpGui</cstring>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QLabel" name="label">
<property name="text">
<string>3D Model Paths (one per line):</string>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>25</y>
<width>501</width>
<height>34</height>
</rect>
</property>
</widget>
<widget class="Gui::PrefTextEdit" name="guipreftexteditmodelpaths">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>501</width>
<height>100</height>
</rect>
</property>
<property name="toolTip">
<string>You can add new paths to this list one per line.\n Also you can add named path like this: PATH_NAME@PATH, this will be parsed as ${PATH_NAME} in the KiCad prefrences.\n Please add 'KISYS3DMOD' or 'KICAD6_3DMODEL_DIR' to the first line.</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>3d_model_paths</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/kicadStepUpGui</cstring>
</property>
</widget>
<widget class="QGroupBox" name="pcb_settings">
<property name="geometry">
<rect>
Expand Down Expand Up @@ -1241,114 +1171,6 @@ Allowing or not Loading Multi Parts objects</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget_4">
<property name="geometry">
<rect>
<x>10</x>
<y>105</y>
<width>501</width>
<height>34</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label_prefix3d_3">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;your &lt;span style=&quot; font-weight:600;&quot;&gt;ALIAS&lt;/span&gt; 3D&lt;/p&gt;&lt;p&gt;model prefix path&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>third 3D folder loc
'ALT3 3DMOD'</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefFileChooser" name="alias_prefix_2" native="true">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;secondary 3D folder location&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;'ALT3DMOD'&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>prefix3d_3</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/kicadStepUpGui</cstring>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget_5">
<property name="geometry">
<rect>
<x>10</x>
<y>145</y>
<width>501</width>
<height>34</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label_prefix3d_4">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;your &lt;span style=&quot; font-weight:600;&quot;&gt;ALIAS&lt;/span&gt; 3D&lt;/p&gt;&lt;p&gt;model prefix path&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>fourth 3D folder loc
'ALT4 3DMOD'</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefFileChooser" name="alias_prefix_3" native="true">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;secondary 3D folder location&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;'ALT3DMOD'&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>prefix3d_4</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/kicadStepUpGui</cstring>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="Gui::PrefCheckBox" name="cb_dontuseNativeDlg">
<property name="geometry">
<rect>
Expand Down
Loading