diff --git a/Data/dark.qss b/Data/dark.qss
index 92a114c..8142bd1 100644
--- a/Data/dark.qss
+++ b/Data/dark.qss
@@ -308,6 +308,7 @@ QTreeView
{
border: 1px solid gray;
background-color: rgb(53, 53, 53);
+ font: 8pt "MS Shell Dlg";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
}
/*Setting this gives a more consistent look, but removes the ability to gray variations that are included in the xform*/
@@ -365,6 +366,7 @@ QTableView
color: darkgray;
selection-color: darkgray;
selection-background-color: rgb(53, 53, 53);
+ font: 8pt "MS Shell Dlg";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
}
QTableView QTableCornerButton::section:enabled
diff --git a/Source/Fractorium/FinalRenderDialog.ui b/Source/Fractorium/FinalRenderDialog.ui
index 7fea84b..79e463b 100644
--- a/Source/Fractorium/FinalRenderDialog.ui
+++ b/Source/Fractorium/FinalRenderDialog.ui
@@ -259,12 +259,6 @@
91
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -476,12 +470,6 @@
45
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -691,12 +679,6 @@
199
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui
index 4202860..f9e97e1 100644
--- a/Source/Fractorium/Fractorium.ui
+++ b/Source/Fractorium/Fractorium.ui
@@ -206,12 +206,6 @@
88
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -413,12 +407,6 @@
22
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -500,12 +488,6 @@
22
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -587,12 +569,6 @@
22
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -696,12 +672,6 @@
22
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -812,12 +782,6 @@
264
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -1150,12 +1114,6 @@
110
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -1356,12 +1314,6 @@
154
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -1607,12 +1559,6 @@
22
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -1710,12 +1656,6 @@
110
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -1967,8 +1907,6 @@
- MS Shell Dlg 2
- 8
true
@@ -2122,12 +2060,6 @@
21
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -2243,12 +2175,6 @@
-
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::StrongFocus
@@ -2351,12 +2277,6 @@
67
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -3024,8 +2944,6 @@
- MS Shell Dlg 2
- 8
true
@@ -3213,8 +3131,6 @@
- MS Shell Dlg 2
- 8
true
@@ -3545,8 +3461,7 @@
- MS Shell Dlg 2
- 8
+ true
@@ -3876,12 +3791,6 @@
90
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -4679,12 +4588,6 @@
90
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -5611,12 +5514,6 @@
0
-
-
- MS Shell Dlg 2
- 8
-
-
true
@@ -6114,12 +6011,6 @@
126
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -6258,12 +6149,6 @@
0
-
-
- MS Shell Dlg 2
- 8
-
-
QFrame::Plain
@@ -6635,8 +6520,6 @@
- MS Shell Dlg 2
- 8
true
@@ -7078,12 +6961,6 @@
Qt::Vertical
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::WheelFocus
@@ -7740,12 +7617,6 @@
0
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::WheelFocus
diff --git a/Source/Fractorium/OptionsDialog.ui b/Source/Fractorium/OptionsDialog.ui
index b7d5886..e1617d5 100644
--- a/Source/Fractorium/OptionsDialog.ui
+++ b/Source/Fractorium/OptionsDialog.ui
@@ -189,12 +189,6 @@
91
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -472,12 +466,6 @@ in interactive mode for each mouse movement
67
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
@@ -671,12 +659,6 @@ in interactive mode for each mouse movement
67
-
-
- MS Shell Dlg 2
- 8
-
-
Qt::NoFocus
diff --git a/Source/Fractorium/PaletteEditor.ui b/Source/Fractorium/PaletteEditor.ui
index c3c660c..0d2e06e 100644
--- a/Source/Fractorium/PaletteEditor.ui
+++ b/Source/Fractorium/PaletteEditor.ui
@@ -71,10 +71,6 @@
-
- MS Shell Dlg 2
- 8
-
QFrame::Panel
diff --git a/Source/Fractorium/PaletteEditor/PaletteEditor.cpp b/Source/Fractorium/PaletteEditor/PaletteEditor.cpp
index b367a84..52a8a6c 100644
--- a/Source/Fractorium/PaletteEditor/PaletteEditor.cpp
+++ b/Source/Fractorium/PaletteEditor/PaletteEditor.cpp
@@ -98,8 +98,12 @@ void PaletteEditor::SetPalette(const Palette& palette)
if (!arrows.empty())
m_ColorPicker->SetColorPanelColor(arrows.begin()->second.Color());//Will emit PaletteChanged() if color changed...
- QFileInfo info(QString::fromStdString(*palette.m_Filename.get()));
- combo->setCurrentIndex(combo->findData(info.fileName(), Qt::DisplayRole));
+ if (palette.m_Filename.get())
+ {
+ QFileInfo info(QString::fromStdString(*palette.m_Filename.get()));
+ combo->setCurrentIndex(combo->findData(info.fileName(), Qt::DisplayRole));
+ }
+
EnablePaletteControls();
EmitPaletteChanged();//...So emit here just to be safe.
}
diff --git a/Source/Fractorium/VariationsDialog.ui b/Source/Fractorium/VariationsDialog.ui
index 7391636..1ddf399 100644
--- a/Source/Fractorium/VariationsDialog.ui
+++ b/Source/Fractorium/VariationsDialog.ui
@@ -41,12 +41,6 @@
-
-
-
- MS Shell Dlg 2
- 8
-
-
false