mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-06 00:06:00 -04:00
--User changes
Add the ability to set the current xform by pressing F1 - F32. Add the ability to toggle an entire row or column of xaos values. --Bug fixes Prevent xform index flickering whenever changing the number of xforms. --Code changes Remove ForEach() wrappers and replace with range based for loops with auto. Replace every regular for loop with a range based one where applicable. Note this doesn't work everywhere. Make event filter application wide. Add parameter to FillXforms() to specify the index to select, default 0. Rename some scroll areas and layouts to names that make sense, rather than their designer defaults.
This commit is contained in:
@ -239,7 +239,7 @@
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<layout class="QHBoxLayout" name="DockWidgetHLayout">
|
||||
<property name="spacing">
|
||||
<number>4</number>
|
||||
</property>
|
||||
@ -379,7 +379,7 @@
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QScrollArea" name="scrollArea_4">
|
||||
<widget class="QScrollArea" name="LibraryTabScrollArea">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
@ -392,7 +392,7 @@
|
||||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents_5">
|
||||
<widget class="QWidget" name="LibraryTabScrollWidgetContents">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
@ -489,7 +489,7 @@
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QScrollArea" name="scrollArea">
|
||||
<widget class="QScrollArea" name="FlameTabScrollArea">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
@ -499,7 +499,7 @@
|
||||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents">
|
||||
<widget class="QWidget" name="FlameTabScrollWidgetContents">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
@ -1509,7 +1509,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<spacer name="FlameTabVerticalSpacer1">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
@ -1525,7 +1525,7 @@
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<spacer name="verticalSpacer_2">
|
||||
<spacer name="FlameTabVerticalSpacer2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
@ -1831,7 +1831,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="0">
|
||||
<spacer name="verticalSpacer_3">
|
||||
<spacer name="FlameTabVerticalSpacer3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
@ -1847,7 +1847,7 @@
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="11" column="0">
|
||||
<spacer name="verticalSpacer_8">
|
||||
<spacer name="FlameTabVerticalSpacer4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
@ -1954,7 +1954,7 @@ SpinBox
|
||||
<property name="currentIndex">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="ColorTab">
|
||||
<widget class="QWidget" name="XformColorTab">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
@ -2509,7 +2509,7 @@ SpinBox
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<widget class="QGroupBox" name="CurvesGroupBox">
|
||||
<property name="title">
|
||||
<string>Curve</string>
|
||||
</property>
|
||||
@ -2575,7 +2575,7 @@ SpinBox
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="AffineTab">
|
||||
<widget class="QWidget" name="XformAffineTab">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
@ -2608,7 +2608,7 @@ SpinBox
|
||||
<number>5</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QScrollArea" name="scrollArea_3">
|
||||
<widget class="QScrollArea" name="AffineTabScrollArea">
|
||||
<property name="autoFillBackground">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
@ -2621,7 +2621,7 @@ SpinBox
|
||||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents_3">
|
||||
<widget class="QWidget" name="AffineTabScrollWidgetContents">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
@ -3921,7 +3921,7 @@ SpinBox
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_10">
|
||||
<spacer name="AffineTabVerticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
@ -3942,7 +3942,7 @@ SpinBox
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="VariationsTab">
|
||||
<widget class="QWidget" name="XformVariationsTab">
|
||||
<property name="toolTip">
|
||||
<string>Full list of available variations and their weights for the currently selected xform.</string>
|
||||
</property>
|
||||
@ -3963,7 +3963,7 @@ SpinBox
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_11" stretch="0,0">
|
||||
<layout class="QHBoxLayout" name="VariationsTabHLayout" stretch="0,0">
|
||||
<property name="spacing">
|
||||
<number>5</number>
|
||||
</property>
|
||||
@ -4015,7 +4015,7 @@ SpinBox
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="focusPolicy">
|
||||
<enum>Qt::StrongFocus</enum>
|
||||
<enum>Qt::WheelFocus</enum>
|
||||
</property>
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::DefaultContextMenu</enum>
|
||||
@ -4173,10 +4173,13 @@ SpinBox
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="XformsSelectTab">
|
||||
<widget class="QWidget" name="XformSelectTab">
|
||||
<property name="toolTip">
|
||||
<string>Select multiple xforms to apply operations to.</string>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<attribute name="title">
|
||||
<string>Select</string>
|
||||
</attribute>
|
||||
@ -4218,6 +4221,9 @@ SpinBox
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Select Xforms</string>
|
||||
</property>
|
||||
@ -4248,6 +4254,9 @@ SpinBox
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
@ -4320,7 +4329,7 @@ SpinBox
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_13">
|
||||
<layout class="QHBoxLayout" name="XformTabHLayout">
|
||||
<property name="spacing">
|
||||
<number>2</number>
|
||||
</property>
|
||||
@ -4845,7 +4854,7 @@ SpinBox
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<layout class="QHBoxLayout" name="XaosTabHLayout">
|
||||
<item>
|
||||
<widget class="QPushButton" name="ClearXaosButton">
|
||||
<property name="toolTip">
|
||||
@ -5186,7 +5195,7 @@ SpinBox
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<layout class="QHBoxLayout" name="PaletteTabHLayout">
|
||||
<property name="spacing">
|
||||
<number>4</number>
|
||||
</property>
|
||||
@ -5280,7 +5289,7 @@ SpinBox
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QScrollArea" name="scrollArea_5">
|
||||
<widget class="QScrollArea" name="InfoTabScrollArea">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
@ -5302,7 +5311,7 @@ SpinBox
|
||||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents_6">
|
||||
<widget class="QWidget" name="InfoTabScrollWidgetContents">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
@ -6127,7 +6136,7 @@ SpinBox
|
||||
<tabstop>SaveCurrentToOpenedFileButton</tabstop>
|
||||
<tabstop>ParamsTabWidget</tabstop>
|
||||
<tabstop>LibraryTree</tabstop>
|
||||
<tabstop>scrollArea</tabstop>
|
||||
<tabstop>FlameTabScrollArea</tabstop>
|
||||
<tabstop>CurrentXformCombo</tabstop>
|
||||
<tabstop>AddXformButton</tabstop>
|
||||
<tabstop>DuplicateXformButton</tabstop>
|
||||
@ -6140,7 +6149,7 @@ SpinBox
|
||||
<tabstop>XformColorScroll</tabstop>
|
||||
<tabstop>XformColorValuesTable</tabstop>
|
||||
<tabstop>SoloXformCheckBox</tabstop>
|
||||
<tabstop>scrollArea_3</tabstop>
|
||||
<tabstop>AffineTabScrollArea</tabstop>
|
||||
<tabstop>PreAffineTable</tabstop>
|
||||
<tabstop>PreFlipVerticalButton</tabstop>
|
||||
<tabstop>PreResetButton</tabstop>
|
||||
@ -6186,13 +6195,13 @@ SpinBox
|
||||
<tabstop>VariationsTree</tabstop>
|
||||
<tabstop>PaletteAdjustTable</tabstop>
|
||||
<tabstop>PaletteListTable</tabstop>
|
||||
<tabstop>scrollArea_5</tabstop>
|
||||
<tabstop>InfoTabScrollArea</tabstop>
|
||||
<tabstop>InfoFileOpeningGroupBox</tabstop>
|
||||
<tabstop>InfoFileOpeningTextEdit</tabstop>
|
||||
<tabstop>InfoRenderingGroupBox</tabstop>
|
||||
<tabstop>InfoRenderingTextEdit</tabstop>
|
||||
<tabstop>PreAffineGroupBox</tabstop>
|
||||
<tabstop>scrollArea_4</tabstop>
|
||||
<tabstop>LibraryTabScrollArea</tabstop>
|
||||
<tabstop>InfoBoundsGroupBox</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
|
Reference in New Issue
Block a user