Skip to content

Commit

Permalink
Solver UI - Update for Maya 2025
Browse files Browse the repository at this point in the history 
This does not exactly match the previous Maya versions, but will
hopefully be fixed later.

GitHub Issue #251.
  • Loading branch information
@david-cattermole
david-cattermole committed Oct 20, 2024
1 parent b031d92 commit d76d029
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 339 deletions.
6 changes: 3 additions & 3 deletions python/mmSolver/tools/solver/ui/solver_layout.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ def __init__(self, parent=None, *args, **kwargs):

# Object Widget
self.object_browser = objectbrowser_widget.ObjectBrowserWidget(self)
self.ui.object_layout.addWidget(self.object_browser)
self.ui.object_frame.layout().addWidget(self.object_browser)

# Attribute Widget
self.attribute_browser = attrbrowser_widget.AttributeBrowserWidget(self)
self.ui.attribute_layout.addWidget(self.attribute_browser)
self.ui.attribute_frame.layout().addWidget(self.attribute_browser)

# Solver Widget
self.solver_settings = solver_widget.SolverWidget(self)
self.ui.solver_layout.addWidget(self.solver_settings)

# Solver State Widget
self.solver_state = solverstate_widget.SolverStateWidget(self)
self.ui.solverState_layout.addWidget(self.solver_state)
self.ui.solverState_frame.layout().addWidget(self.solver_state)

self.createConnections()

Expand Down
180 changes: 70 additions & 110 deletions python/mmSolver/tools/solver/ui/solver_layout.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<class>Form</class>
<widget class="QWidget" name="Form">
<property name="windowModality">
<enum>Qt::NonModal</enum>
<enum>Qt::WindowModality::NonModal</enum>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>419</width>
<height>295</height>
<width>639</width>
<height>353</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -42,127 +42,87 @@
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="objectAttribute_layout" stretch="0">
<property name="spacing">
<number>1</number>
<widget class="QSplitter" name="objectAttribute_splitter">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
<property name="handleWidth">
<number>5</number>
</property>
<item>
<widget class="QSplitter" name="objectAttribute_splitter">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QFrame" name="object_frame">
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Raised</enum>
</property>
<layout class="QVBoxLayout" name="objectVerticalLayout_2">
<property name="spacing">
<number>1</number>
</property>
<property name="handleWidth">
<number>5</number>
<property name="leftMargin">
<number>0</number>
</property>
<widget class="QFrame" name="object_frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="objectVerticalLayout">
<property name="spacing">
<number>1</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="object_layout">
<property name="spacing">
<number>1</number>
</property>
</layout>
</item>
</layout>
</widget>
<widget class="QFrame" name="attribute_frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="attributeVerticalLayout" stretch="0">
<property name="spacing">
<number>1</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="attribute_layout">
<property name="spacing">
<number>1</number>
</property>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
<widget class="QFrame" name="attribute_frame">
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Raised</enum>
</property>
<layout class="QVBoxLayout" name="attributeVerticalLayout_2">
<property name="spacing">
<number>1</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="solver_layout">
<property name="spacing">
<number>1</number>
</property>
</layout>
</item>
<item>
<widget class="Line" name="line_1">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="sizeConstraint">
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
</property>
</widget>
</layout>
</item>
<item>
<widget class="QFrame" name="solverState_frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<layout class="QVBoxLayout" name="solveStateVerticalLayout">
<property name="spacing">
Expand All @@ -180,16 +140,16 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="solverState_layout">
<property name="spacing">
<number>1</number>
</property>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line_1">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down
64 changes: 8 additions & 56 deletions python/mmSolver/tools/solver/widget/solver_basic_widget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>607</width>
<height>228</height>
<width>297</width>
<height>74</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -35,7 +35,7 @@
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
Expand All @@ -60,22 +60,6 @@
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -108,54 +92,22 @@
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>128</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>1</height>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
Expand Down
Loading

0 comments on commit d76d029

Please sign in to comment.