mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-23 21:41:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows.

Browse Source
This commit is contained in:
mfeemster 2014-12-12 00:54:03 -08:00
parent 2531b1215e
commit 713007dadd
13 changed files with 179 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Builds/MSVC/VS2013/Fractorium.vcxproj
View File

@ -731,6 +731,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"</
</CustomBuild> </CustomBuild>
<ClInclude Include="..\..\..\Source\EmberCommon\EmberCommon.h" /> <ClInclude Include="..\..\..\Source\EmberCommon\EmberCommon.h" />
<ClInclude Include="..\..\..\Source\Fractorium\FinalRenderEmberController.h" /> <ClInclude Include="..\..\..\Source\Fractorium\FinalRenderEmberController.h" />
<ClInclude Include="..\..\..\Source\Fractorium\FractoriumCommon.h" />
<ClInclude Include="..\..\..\Source\Fractorium\FractoriumEmberController.h" /> <ClInclude Include="..\..\..\Source\Fractorium\FractoriumEmberController.h" />
<ClInclude Include="..\..\..\Source\Fractorium\GLEmberController.h" /> <ClInclude Include="..\..\..\Source\Fractorium\GLEmberController.h" />
<ClInclude Include="..\..\..\Source\Fractorium\resource.h" /> <ClInclude Include="..\..\..\Source\Fractorium\resource.h" />

3
Builds/MSVC/VS2013/Fractorium.vcxproj.filters
View File

@ -270,6 +270,9 @@
<ClInclude Include="..\..\..\Source\EmberCommon\EmberCommon.h"> <ClInclude Include="..\..\..\Source\EmberCommon\EmberCommon.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\Source\Fractorium\FractoriumCommon.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\..\Source\Fractorium\Fractorium.qrc"> <CustomBuild Include="..\..\..\Source\Fractorium\Fractorium.qrc">

2
Source/Fractorium/AboutDialog.ui
View File

@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>488</width> <width>488</width>
<height>615</height> <height>617</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">

2
Source/Fractorium/DoubleSpinBox.h
View File

@ -30,7 +30,7 @@ public slots:
void onSpinBoxValueChanged(double d); void onSpinBoxValueChanged(double d);
protected: protected:
bool eventFilter(QObject* o, QEvent* e); virtual bool eventFilter(QObject* o, QEvent* e) override;
virtual void focusInEvent(QFocusEvent* e); virtual void focusInEvent(QFocusEvent* e);
virtual void focusOutEvent(QFocusEvent* e); virtual void focusOutEvent(QFocusEvent* e);
virtual void enterEvent(QEvent* e); virtual void enterEvent(QEvent* e);

23
Source/Fractorium/Fractorium.cpp
View File

@ -152,6 +152,7 @@ Fractorium::Fractorium(QWidget* p)
SetCoordinateStatus(0, 0, 0, 0); SetCoordinateStatus(0, 0, 0, 0);
SetTabOrders(); SetTabOrders();
ui.GLParentScrollArea->installEventFilter(this);
//At this point, everything has been setup except the renderer. Shortly after //At this point, everything has been setup except the renderer. Shortly after
//this constructor exits, GLWidget::initializeGL() will create the initial flock and start the rendering timer //this constructor exits, GLWidget::initializeGL() will create the initial flock and start the rendering timer
@ -249,8 +250,28 @@ void Fractorium::dockLocationChanged(Qt::DockWidgetArea area)
/// </summary> /// </summary>
/// <summary> /// <summary>
/// Resize event, change width and height double click values to match the window size. /// Event filter for taking special action on dock widget resize events,
/// which in turn trigger GLParentScrollArea events.
/// </summary> /// </summary>
/// <param name="o">The object</param>
/// <param name="e">The eevent</param>
/// <returns>false</returns>
bool Fractorium::eventFilter(QObject* o, QEvent* e)
{
if (o == ui.GLParentScrollArea && e->type() == QEvent::Resize)
{
m_WidthSpin->DoubleClickNonZero(ui.GLParentScrollArea->width());
m_HeightSpin->DoubleClickNonZero(ui.GLParentScrollArea->height());
}
return QMainWindow::eventFilter(o, e);
}
/// <summary>
/// Respond to a resize event which will set the double click default value
/// in the width and height spinners.
/// Note, this does not change the size of the ember being rendered or
/// the OpenGL texture it's being drawn on.
/// <param name="e">The event</param> /// <param name="e">The event</param>
void Fractorium::resizeEvent(QResizeEvent* e) void Fractorium::resizeEvent(QResizeEvent* e)
{ {

4
Source/Fractorium/Fractorium.h
View File

@ -262,6 +262,7 @@ public:
static int FlipDet(Affine2D<float>& affine); static int FlipDet(Affine2D<float>& affine);
protected: protected:
virtual bool eventFilter(QObject* o, QEvent* e) override;
virtual void resizeEvent(QResizeEvent* e) override; virtual void resizeEvent(QResizeEvent* e) override;
virtual void closeEvent(QCloseEvent* e) override; virtual void closeEvent(QCloseEvent* e) override;
virtual void dragEnterEvent(QDragEnterEvent* e) override; virtual void dragEnterEvent(QDragEnterEvent* e) override;
@ -406,8 +407,7 @@ private:
char m_URString[32]; char m_URString[32];
char m_LRString[32]; char m_LRString[32];
char m_LLString[32]; char m_LLString[32];
char m_WString[16]; char m_WHString[64];
char m_HString[16];
char m_DEString[16]; char m_DEString[16];
char m_CoordinateString[128]; char m_CoordinateString[128];
QColor m_XformComboColors[XFORM_COLOR_COUNT], m_FinalXformComboColor; QColor m_XformComboColors[XFORM_COLOR_COUNT], m_FinalXformComboColor;

139
Source/Fractorium/Fractorium.ui
View File

@ -37,7 +37,7 @@
</property> </property>
<widget class="QScrollArea" name="GLParentScrollArea"> <widget class="QScrollArea" name="GLParentScrollArea">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Ignored"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -59,12 +59,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>897</width> <width>923</width>
<height>941</height> <height>942</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Ignored"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -79,7 +79,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Ignored"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -178,7 +178,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1214</width> <width>1214</width>
<height>20</height> <height>21</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="MenuFile"> <widget class="QMenu" name="MenuFile">
@ -256,9 +256,15 @@
</property> </property>
</widget> </widget>
<widget class="QDockWidget" name="DockWidget"> <widget class="QDockWidget" name="DockWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>280</width> <width>287</width>
<height>561</height> <height>561</height>
</size> </size>
</property> </property>
@ -358,7 +364,7 @@
<item> <item>
<widget class="QTabWidget" name="ParamsTabWidget"> <widget class="QTabWidget" name="ParamsTabWidget">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -391,6 +397,9 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="LibraryTab"> <widget class="QWidget" name="LibraryTab">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<attribute name="title"> <attribute name="title">
<string>Library</string> <string>Library</string>
</attribute> </attribute>
@ -426,8 +435,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>290</width> <width>259</width>
<height>845</height> <height>852</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_11"> <layout class="QGridLayout" name="gridLayout_11">
@ -495,6 +504,9 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<attribute name="title"> <attribute name="title">
<string>Flame</string> <string>Flame</string>
</attribute> </attribute>
@ -530,8 +542,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>290</width> <width>259</width>
<height>845</height> <height>852</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -1901,6 +1913,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
@ -2238,7 +2253,7 @@
<item row="5" column="0" colspan="2"> <item row="5" column="0" colspan="2">
<widget class="QTabWidget" name="XformsTabWidget"> <widget class="QTabWidget" name="XformsTabWidget">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> <sizepolicy hsizetype="Ignored" vsizetype="MinimumExpanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -2284,11 +2299,11 @@ SpinBox
<enum>QTabWidget::Triangular</enum> <enum>QTabWidget::Triangular</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="ColorTab"> <widget class="QWidget" name="ColorTab">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -2778,7 +2793,7 @@ SpinBox
</widget> </widget>
<widget class="QWidget" name="AffineTab"> <widget class="QWidget" name="AffineTab">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -2824,8 +2839,8 @@ SpinBox
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>276</width> <width>245</width>
<height>728</height> <height>747</height>
</rect> </rect>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
@ -4610,6 +4625,9 @@ SpinBox
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="PaletteTab"> <widget class="QWidget" name="PaletteTab">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<attribute name="title"> <attribute name="title">
<string>Palette</string> <string>Palette</string>
</attribute> </attribute>
@ -4957,8 +4975,14 @@ SpinBox
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="InfoTab"> <widget class="QWidget" name="InfoTab">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>true</bool>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>Info</string> <string>Info</string>
@ -4971,7 +4995,7 @@ SpinBox
<number>5</number> <number>5</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>5</number> <number>4</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>5</number> <number>5</number>
@ -4981,6 +5005,12 @@ SpinBox
</property> </property>
<item> <item>
<widget class="QScrollArea" name="scrollArea_5"> <widget class="QScrollArea" name="scrollArea_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -5001,10 +5031,16 @@ SpinBox
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>290</width> <width>259</width>
<height>845</height> <height>853</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -5029,6 +5065,12 @@ SpinBox
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="InfoBoundsGroupBox"> <widget class="QGroupBox" name="InfoBoundsGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -5038,7 +5080,7 @@ SpinBox
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>257</height> <height>250</height>
</size> </size>
</property> </property>
<property name="baseSize"> <property name="baseSize">
@ -5119,6 +5161,12 @@ SpinBox
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="InfoBoundsLabelUL"> <widget class="QLabel" name="InfoBoundsLabelUL">
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="text"> <property name="text">
<string>UL:</string> <string>UL:</string>
</property> </property>
@ -5127,8 +5175,11 @@ SpinBox
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="2" column="1">
<widget class="QLabel" name="InfoBoundsLabelLR"> <widget class="QLabel" name="InfoBoundsLabelLR">
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="text"> <property name="text">
<string>LR:</string> <string>LR:</string>
</property> </property>
@ -5137,8 +5188,11 @@ SpinBox
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="1">
<widget class="QLabel" name="InfoBoundsLabelUR"> <widget class="QLabel" name="InfoBoundsLabelUR">
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="text"> <property name="text">
<string>UR:</string> <string>UR:</string>
</property> </property>
@ -5147,15 +5201,24 @@ SpinBox
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0" colspan="2">
<widget class="QLabel" name="InfoBoundsLabelH"> <widget class="QLabel" name="InfoBoundsLabelWH">
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="text"> <property name="text">
<string>H:</string> <string>W x H:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="InfoBoundsLabelLL"> <widget class="QLabel" name="InfoBoundsLabelLL">
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="text"> <property name="text">
<string>LL:</string> <string>LL:</string>
</property> </property>
@ -5164,16 +5227,6 @@ SpinBox
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QLabel" name="InfoBoundsLabelW">
<property name="text">
<string>W:</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -5351,7 +5404,7 @@ SpinBox
<item row="2" column="0"> <item row="2" column="0">
<widget class="QGroupBox" name="InfoRenderingGroupBox"> <widget class="QGroupBox" name="InfoRenderingGroupBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -5406,11 +5459,17 @@ SpinBox
<item row="1" column="0"> <item row="1" column="0">
<widget class="QGroupBox" name="InfoFileOpeningGroupBox"> <widget class="QGroupBox" name="InfoFileOpeningGroupBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>

6
Source/Fractorium/FractoriumInfo.cpp
View File

@ -14,15 +14,13 @@ void Fractorium::UpdateHistogramBounds()
sprintf_s(m_URString, 32, "UR: %3.3f, %3.3f", -r->LowerLeftX(), r->UpperRightY()); sprintf_s(m_URString, 32, "UR: %3.3f, %3.3f", -r->LowerLeftX(), r->UpperRightY());
sprintf_s(m_LRString, 32, "LR: %3.3f, %3.3f", -r->LowerLeftX(), r->LowerLeftY()); sprintf_s(m_LRString, 32, "LR: %3.3f, %3.3f", -r->LowerLeftX(), r->LowerLeftY());
sprintf_s(m_LLString, 32, "LL: %3.3f, %3.3f", r->LowerLeftX(), r->LowerLeftY()); sprintf_s(m_LLString, 32, "LL: %3.3f, %3.3f", r->LowerLeftX(), r->LowerLeftY());
sprintf_s(m_WString, 16, "W: %4lu" , r->SuperRasW()); sprintf_s(m_WHString, 32, "W x H: %4lu x %4lu", r->SuperRasW(), r->SuperRasH());
sprintf_s(m_HString, 16, "H: %4lu" , r->SuperRasH());
ui.InfoBoundsLabelUL->setText(QString(m_ULString)); ui.InfoBoundsLabelUL->setText(QString(m_ULString));
ui.InfoBoundsLabelUR->setText(QString(m_URString)); ui.InfoBoundsLabelUR->setText(QString(m_URString));
ui.InfoBoundsLabelLR->setText(QString(m_LRString)); ui.InfoBoundsLabelLR->setText(QString(m_LRString));
ui.InfoBoundsLabelLL->setText(QString(m_LLString)); ui.InfoBoundsLabelLL->setText(QString(m_LLString));
ui.InfoBoundsLabelW->setText(QString(m_WString)); ui.InfoBoundsLabelWH->setText(QString(m_WHString));
ui.InfoBoundsLabelH->setText(QString(m_HString));
ui.InfoBoundsTable->item(0, 1)->setText(ToString<qulonglong>(r->GutterWidth())); ui.InfoBoundsTable->item(0, 1)->setText(ToString<qulonglong>(r->GutterWidth()));

8
Source/Fractorium/GLWidget.cpp
View File

@ -717,10 +717,10 @@ void GLWidget::wheelEvent(QWheelEvent* e)
} }
/// <summary> /// <summary>
/// Respond to a resize event which will set the read only /// Respond to a resize event which will set the double click default value
/// main window width and height spinners. /// in the width and height spinners.
/// The main window will take care of stopping and restarting the /// Note, this does not change the size of the ember being rendered or
/// render timer. /// the OpenGL texture it's being drawn on.
/// </summary> /// </summary>
/// <param name="e">The event</param> /// <param name="e">The event</param>
void GLWidget::resizeEvent(QResizeEvent* e) void GLWidget::resizeEvent(QResizeEvent* e)

2
Source/Fractorium/Main.cpp
View File

@ -30,6 +30,7 @@ int main(int argc, char *argv[])
putenv(const_cast<char*>("GPU_MAX_ALLOC_PERCENT=100")); putenv(const_cast<char*>("GPU_MAX_ALLOC_PERCENT=100"));
#endif #endif
#ifndef WIN32
//a.setStyle("motif"); //a.setStyle("motif");
//a.setStyleSheet("QGroupBox { border: 1px solid gray; border-radius: 3px; margin-top: 1em; } "); //a.setStyleSheet("QGroupBox { border: 1px solid gray; border-radius: 3px; margin-top: 1em; } ");
@ -44,6 +45,7 @@ int main(int argc, char *argv[])
" padding: 0 3px 0 3px;" " padding: 0 3px 0 3px;"
//" padding: 2px;" //" padding: 2px;"
"}" ); "}" );
#endif
Fractorium w; Fractorium w;
w.show(); w.show();

12
Source/Fractorium/OptionsDialog.ui
View File

@ -55,6 +55,9 @@
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="tabShape"> <property name="tabShape">
<enum>QTabWidget::Triangular</enum> <enum>QTabWidget::Triangular</enum>
</property> </property>
@ -62,6 +65,9 @@
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="OptionsInteractiveRenderingTab"> <widget class="QWidget" name="OptionsInteractiveRenderingTab">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<attribute name="title"> <attribute name="title">
<string>Interactive Rendering</string> <string>Interactive Rendering</string>
</attribute> </attribute>
@ -297,6 +303,9 @@ in interactive mode for each mouse movement</string>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="OptionsXmlSavingTab"> <widget class="QWidget" name="OptionsXmlSavingTab">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<attribute name="title"> <attribute name="title">
<string>Xml Saving</string> <string>Xml Saving</string>
</attribute> </attribute>
@ -480,6 +489,9 @@ in interactive mode for each mouse movement</string>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="OptionsIdentityTab"> <widget class="QWidget" name="OptionsIdentityTab">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<attribute name="title"> <attribute name="title">
<string>Identity</string> <string>Identity</string>
</attribute> </attribute>

2
Source/Fractorium/TwoButtonWidget.cpp
View File

@ -1,2 +0,0 @@
#include "FractoriumPch.h"
#include "TwoButtonComboWidget.h"