mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 13:10:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux.

Browse Source
This commit is contained in:
mfeemster 2014-12-12 02:37:29 -08:00
parent 713007dadd
commit c0f98bf632
4 changed files with 163 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
Source/Fractorium/Fractorium.ui
View File

@ -42,6 +42,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
@ -59,8 +62,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>923</width>
<height>942</height>
<width>926</width>
<height>941</height>
</rect>
</property>
<property name="sizePolicy">
@ -167,7 +170,7 @@
<bool>true</bool>
</property>
<property name="autoFillBackground">
<bool>false</bool>
<bool>true</bool>
</property>
</widget>
</widget>
@ -178,7 +181,7 @@
<x>0</x>
<y>0</y>
<width>1214</width>
<height>21</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="MenuFile">
@ -270,7 +273,7 @@
</property>
<property name="maximumSize">
<size>
<width>350</width>
<width>330</width>
<height>524287</height>
</size>
</property>
@ -319,6 +322,18 @@
</property>
<item>
<widget class="QPushButton" name="SaveCurrentAsXmlButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Save the current flame as an xml file</string>
</property>
@ -333,6 +348,18 @@
</item>
<item>
<widget class="QPushButton" name="SaveEntireFileAsXmlButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Save all flames as a single xml file</string>
</property>
@ -347,6 +374,18 @@
</item>
<item>
<widget class="QPushButton" name="SaveCurrentToOpenedFileButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Save the currently displayed flame back to the opened file in memory.&lt;/p&gt;&lt;p&gt;This overwrites the original flame but does not store the file back to disk.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
@ -435,8 +474,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>259</width>
<height>852</height>
<width>261</width>
<height>845</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_11">
@ -542,8 +581,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>259</width>
<height>852</height>
<width>261</width>
<height>845</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
@ -2114,7 +2153,13 @@
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
@ -2140,7 +2185,13 @@
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
@ -2166,7 +2217,13 @@
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
@ -2192,7 +2249,13 @@
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
@ -2218,13 +2281,13 @@
<property name="minimumSize">
<size>
<width>58</width>
<height>0</height>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>58</width>
<height>16777215</height>
<height>24</height>
</size>
</property>
<property name="baseSize">
@ -2839,8 +2902,8 @@ SpinBox
<rect>
<x>0</x>
<y>0</y>
<width>245</width>
<height>747</height>
<width>247</width>
<height>728</height>
</rect>
</property>
<property name="autoFillBackground">
@ -3039,7 +3102,7 @@ SpinBox
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_14" columnstretch="0,0,0,0,0">
<layout class="QGridLayout" name="PreAffineGridLayout" columnstretch="0,0,0,0,0">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
@ -3634,7 +3697,7 @@ SpinBox
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_15" columnstretch="0,0,0,0,0">
<layout class="QGridLayout" name="PostAffineGridLayout" columnstretch="0,0,0,0,0">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
@ -4952,6 +5015,18 @@ SpinBox
</property>
<item>
<widget class="QPushButton" name="PaletteRandomSelect">
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Select a random palette from the list</string>
</property>
@ -4962,6 +5037,18 @@ SpinBox
</item>
<item>
<widget class="QPushButton" name="PaletteRandomAdjust">
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Random Adjustment</string>
</property>
@ -5031,8 +5118,8 @@ SpinBox
<rect>
<x>0</x>
<y>0</y>
<width>259</width>
<height>853</height>
<width>98</width>
<height>470</height>
</rect>
</property>
<property name="sizePolicy">

3
Source/Fractorium/FractoriumRender.cpp
View File

@ -434,7 +434,10 @@ bool FractoriumEmberController<T>::Render()
{
if (m_FinalImage.size() == m_Renderer->FinalBufferSize())//Make absolutely sure the correct amount of data is passed.
gl->repaint();
//gl->update();
//m_Fractorium->update();
//m_Fractorium->ui.GLParentScrollArea->update();
//Uncomment for debugging kernel build and execution errors.
//m_Fractorium->ui.InfoRenderingTextEdit->setText(QString::fromStdString(m_Fractorium->m_Wrapper.DumpInfo()));
//if (rendererCL)

10
Source/Fractorium/FractoriumXforms.cpp
View File

@ -30,6 +30,16 @@ void Fractorium::InitXformsUI()
connect(ui.XformWeightNameTable, SIGNAL(cellChanged(int, int)), this, SLOT(OnXformNameChanged(int, int)), Qt::QueuedConnection);
ui.CurrentXformCombo->setProperty("soloxform", -1);
#ifndef WIN32
//For some reason linux makes these 24x24, even though the designer explicitly says 16x16.
ui.AddXformButton->setIconSize(QSize(16, 16));
ui.DuplicateXformButton->setIconSize(QSize(16, 16));
ui.ClearXformButton->setIconSize(QSize(16, 16));
ui.DeleteXformButton->setIconSize(QSize(16, 16));
ui.AddFinalXformButton->setIconSize(QSize(16, 16));
ui.CurrentXformCombo->setIconSize(QSize(16, 16));
#endif
}
/// <summary>

42
Source/Fractorium/FractoriumXformsAffine.cpp
View File

@ -97,6 +97,48 @@ void Fractorium::InitXformsAffineUI()
connect(ui.ShowPostAffineAllRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection);
connect(ui.ShowPostAffineCurrentRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection);
#ifndef WIN32
//For some reason linux makes these 24x24, even though the designer explicitly says 16x16.
//Also, in order to get 4 pixels of spacing between elements in the grid layout, 0 must be specified.
ui.PreFlipHorizontalButton->setIconSize(QSize(16, 16));
ui.PreFlipVerticalButton->setIconSize(QSize(16, 16));
ui.PreRotate90CButton->setIconSize(QSize(16, 16));
ui.PreRotate90CcButton->setIconSize(QSize(16, 16));
ui.PreRotateCButton->setIconSize(QSize(16, 16));
ui.PreRotateCcButton->setIconSize(QSize(16, 16));
ui.PreMoveUpButton->setIconSize(QSize(16, 16));
ui.PreMoveDownButton->setIconSize(QSize(16, 16));
ui.PreMoveLeftButton->setIconSize(QSize(16, 16));
ui.PreMoveRightButton->setIconSize(QSize(16, 16));
ui.PreScaleDownButton->setIconSize(QSize(16, 16));
ui.PreScaleUpButton->setIconSize(QSize(16, 16));
ui.PreResetButton->setIconSize(QSize(16, 16));
ui.PreAffineGridLayout->setHorizontalSpacing(0);
ui.PreAffineGridLayout->setVerticalSpacing(0);
ui.PostFlipHorizontalButton->setIconSize(QSize(16, 16));
ui.PostFlipVerticalButton->setIconSize(QSize(16, 16));
ui.PostRotate90CButton->setIconSize(QSize(16, 16));
ui.PostRotate90CcButton->setIconSize(QSize(16, 16));
ui.PostRotateCButton->setIconSize(QSize(16, 16));
ui.PostRotateCcButton->setIconSize(QSize(16, 16));
ui.PostMoveUpButton->setIconSize(QSize(16, 16));
ui.PostMoveDownButton->setIconSize(QSize(16, 16));
ui.PostMoveLeftButton->setIconSize(QSize(16, 16));
ui.PostMoveRightButton->setIconSize(QSize(16, 16));
ui.PostScaleDownButton->setIconSize(QSize(16, 16));
ui.PostScaleUpButton->setIconSize(QSize(16, 16));
ui.PostResetButton->setIconSize(QSize(16, 16));
ui.PostAffineGridLayout->setHorizontalSpacing(0);
ui.PostAffineGridLayout->setVerticalSpacing(0);
//Further, the size of the dock widget won't be properly adjusted until the xforms tab is shown.
//So show it here and it will be switched back in Fractorium's constructor.
ui.ParamsTabWidget->setCurrentIndex(2);
ui.DockWidget->update();
#endif
ui.PostAffineGroupBox->setChecked(true);//Flip it once to force the disabling of the group box.
ui.PostAffineGroupBox->setChecked(false);
}