mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-16 13:14:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--User changes

Browse Source 
-Add a new dialog for editing QSS stylesheets. Allow for saving, reloading and setting styles as default.
  --Include a dark style with the installation called dark.qss.
  --Also add support for themes such as Fusion.
  --Resize some controls to better fit with the new style.
 -Add an option to specify the number of random embers generated on startup. 1 is the minimum and the default.

--Bug fixes
 -Properly enable/disable thread priority label in final render dialog in response to enable/disable of the OpenCL checkbox.
 -Remove all inline stylesheets.
 -Show xaos spinners with 6 decimal places.

--Code changes
 -Remove redundant comparisons to nullptr, use ! instead;
 -Give some controls valid names instead of the auto generated ones.
 -DoubleSpinBoxTableItemDelegate.h: Add virtual keyword to overridden functions.
This commit is contained in:
mfeemster
2015-10-26 21:31:35 -07:00
parent 9f524e1ad1
commit 04e72c27de
65 changed files with 7814 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
Source/Fractorium/QssDialog.ui Normal file
View File

@ -0,0 +1,160 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QssDialog</class>
<widget class="QDialog" name="QssDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1041</width>
<height>644</height>
</rect>
</property>
<property name="windowTitle">
<string>QSS Editor</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" name="QssHorizontalLayout">
<item>
<widget class="QssTextEdit" name="QssEdit"/>
</item>
<item>
<layout class="QVBoxLayout" name="QssVerticalLayout">
<item>
<widget class="QPushButton" name="QssLoadButton">
<property name="text">
<string>Load...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="QssSaveButton">
<property name="text">
<string>Save...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="QssSaveDefaultButton">
<property name="text">
<string>Save as default</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="QssBasicButton">
<property name="text">
<string>Basic</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="QssMediumButton">
<property name="text">
<string>Medium</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="QssAdvancedButton">
<property name="text">
<string>Advanced</string>
</property>
</widget>
</item>
<item>
<spacer name="QssVerticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="QssButtonBoxHorizontalLayout">
<item>
<widget class="QLabel" name="QssValidityLabel">
<property name="text">
<string>Valid Qss</string>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="QssButtonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QssTextEdit</class>
<extends>QTextEdit</extends>
<header>QssTextEdit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>QssButtonBox</sender>
<signal>accepted()</signal>
<receiver>QssDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>QssButtonBox</sender>
<signal>rejected()</signal>
<receiver>QssDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>