From c194d708fd73da27c67e5d9623090b1000733585 Mon Sep 17 00:00:00 2001
From: Person <Person@QCP2>
Date: Tue, 6 Jun 2017 16:41:00 -0700
Subject: [PATCH] 06/6/2017 --Bug fixes  -Fix crash when opening palette editor
 with a flame whose palette specifies no originating file.

--Code changes
 -Revert font changes, only use qss for these now.
---
 Data/dark.qss                                 |   2 +
 Source/Fractorium/FinalRenderDialog.ui        |  18 ---
 Source/Fractorium/Fractorium.ui               | 131 +-----------------
 Source/Fractorium/OptionsDialog.ui            |  18 ---
 Source/Fractorium/PaletteEditor.ui            |   4 -
 .../PaletteEditor/PaletteEditor.cpp           |   8 +-
 Source/Fractorium/VariationsDialog.ui         |   6 -
 7 files changed, 9 insertions(+), 178 deletions(-)

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 @@
            <height>91</height>
           </size>
          </property>
-         <property name="font">
-          <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
-          </font>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -476,12 +470,6 @@
               <height>45</height>
              </size>
             </property>
-            <property name="font">
-             <font>
-              <family>MS Shell Dlg 2</family>
-              <pointsize>8</pointsize>
-             </font>
-            </property>
             <property name="focusPolicy">
              <enum>Qt::NoFocus</enum>
             </property>
@@ -691,12 +679,6 @@
            <height>199</height>
           </size>
          </property>
-         <property name="font">
-          <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
-          </font>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
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 @@
                <height>88</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -413,12 +407,6 @@
                <height>22</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -500,12 +488,6 @@
                <height>22</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -587,12 +569,6 @@
                <height>22</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -696,12 +672,6 @@
                <height>22</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -812,12 +782,6 @@
                <height>264</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -1150,12 +1114,6 @@
                <height>110</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -1356,12 +1314,6 @@
                <height>154</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -1607,12 +1559,6 @@
                <height>22</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -1710,12 +1656,6 @@
                <height>110</height>
               </size>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="focusPolicy">
               <enum>Qt::NoFocus</enum>
              </property>
@@ -1967,8 +1907,6 @@
          </property>
          <property name="font">
           <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
            <kerning>true</kerning>
           </font>
          </property>
@@ -2122,12 +2060,6 @@
            <height>21</height>
           </size>
          </property>
-         <property name="font">
-          <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
-          </font>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -2243,12 +2175,6 @@
        </item>
        <item row="8" column="0">
         <widget class="QTableWidget" name="PaletteListTable">
-         <property name="font">
-          <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
-          </font>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::StrongFocus</enum>
          </property>
@@ -2351,12 +2277,6 @@
            <height>67</height>
           </size>
          </property>
-         <property name="font">
-          <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
-          </font>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -3024,8 +2944,6 @@
          </property>
          <property name="font">
           <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
            <kerning>true</kerning>
           </font>
          </property>
@@ -3213,8 +3131,6 @@
              </property>
              <property name="font">
               <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
                <kerning>true</kerning>
               </font>
              </property>
@@ -3545,8 +3461,7 @@
              </property>
              <property name="font">
               <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
+               <kerning>true</kerning>
               </font>
              </property>
              <property name="focusPolicy">
@@ -3876,12 +3791,6 @@
                       <height>90</height>
                      </size>
                     </property>
-                    <property name="font">
-                     <font>
-                      <family>MS Shell Dlg 2</family>
-                      <pointsize>8</pointsize>
-                     </font>
-                    </property>
                     <property name="focusPolicy">
                      <enum>Qt::NoFocus</enum>
                     </property>
@@ -4679,12 +4588,6 @@
                       <height>90</height>
                      </size>
                     </property>
-                    <property name="font">
-                     <font>
-                      <family>MS Shell Dlg 2</family>
-                      <pointsize>8</pointsize>
-                     </font>
-                    </property>
                     <property name="focusPolicy">
                      <enum>Qt::NoFocus</enum>
                     </property>
@@ -5611,12 +5514,6 @@
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
-             <property name="font">
-              <font>
-               <family>MS Shell Dlg 2</family>
-               <pointsize>8</pointsize>
-              </font>
-             </property>
              <property name="mouseTracking">
               <bool>true</bool>
              </property>
@@ -6114,12 +6011,6 @@
                    <height>126</height>
                   </size>
                  </property>
-                 <property name="font">
-                  <font>
-                   <family>MS Shell Dlg 2</family>
-                   <pointsize>8</pointsize>
-                  </font>
-                 </property>
                  <property name="focusPolicy">
                   <enum>Qt::NoFocus</enum>
                  </property>
@@ -6258,12 +6149,6 @@
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
-                 <property name="font">
-                  <font>
-                   <family>MS Shell Dlg 2</family>
-                   <pointsize>8</pointsize>
-                  </font>
-                 </property>
                  <property name="frameShadow">
                   <enum>QFrame::Plain</enum>
                  </property>
@@ -6635,8 +6520,6 @@
                     </property>
                     <property name="font">
                      <font>
-                      <family>MS Shell Dlg 2</family>
-                      <pointsize>8</pointsize>
                       <kerning>true</kerning>
                      </font>
                     </property>
@@ -7078,12 +6961,6 @@
         <enum>Qt::Vertical</enum>
        </property>
        <widget class="LibraryTreeWidget" name="LibraryTree">
-        <property name="font">
-         <font>
-          <family>MS Shell Dlg 2</family>
-          <pointsize>8</pointsize>
-         </font>
-        </property>
         <property name="focusPolicy">
          <enum>Qt::WheelFocus</enum>
         </property>
@@ -7740,12 +7617,6 @@
               <height>0</height>
              </size>
             </property>
-            <property name="font">
-             <font>
-              <family>MS Shell Dlg 2</family>
-              <pointsize>8</pointsize>
-             </font>
-            </property>
             <property name="focusPolicy">
              <enum>Qt::WheelFocus</enum>
             </property>
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 @@
            <height>91</height>
           </size>
          </property>
-         <property name="font">
-          <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
-          </font>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -472,12 +466,6 @@ in interactive mode for each mouse movement</string>
            <height>67</height>
           </size>
          </property>
-         <property name="font">
-          <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
-          </font>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -671,12 +659,6 @@ in interactive mode for each mouse movement</string>
            <height>67</height>
           </size>
          </property>
-         <property name="font">
-          <font>
-           <family>MS Shell Dlg 2</family>
-           <pointsize>8</pointsize>
-          </font>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
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 @@
         </size>
        </property>
        <property name="font">
-        <font>
-         <family>MS Shell Dlg 2</family>
-         <pointsize>8</pointsize>
-        </font>
        </property>
        <property name="frameShape">
         <enum>QFrame::Panel</enum>
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<float>& 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 @@
    </item>
    <item row="3" column="0">
     <widget class="QTableWidget" name="VariationsTable">
-     <property name="font">
-      <font>
-       <family>MS Shell Dlg 2</family>
-       <pointsize>8</pointsize>
-      </font>
-     </property>
      <property name="mouseTracking">
       <bool>false</bool>
      </property>