From 8d47560151bcb8406f4d7f72cff2fb7e7e67be10 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Sun, 19 Aug 2018 17:51:54 -0300
Subject: [PATCH] Start: Fix for py3

---
 src/Mod/Start/StartPage/CMakeLists.txt |   3 -
 src/Mod/Start/StartPage/StartPage.py   |   3 +-
 src/Mod/Start/StartPage/preferences.ui | 462 -------------------------
 3 files changed, 2 insertions(+), 466 deletions(-)
 delete mode 100644 src/Mod/Start/StartPage/preferences.ui

diff --git a/src/Mod/Start/StartPage/CMakeLists.txt b/src/Mod/Start/StartPage/CMakeLists.txt
index 28accd8701..7c8a47a2d9 100644
--- a/src/Mod/Start/StartPage/CMakeLists.txt
+++ b/src/Mod/Start/StartPage/CMakeLists.txt
@@ -7,6 +7,3 @@ INSTALL(FILES ${StartPage_Resources}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage
 )
 
-INSTALL(DIRECTORY images/ 
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage/images
-)
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index 0f90d2a76d..ab0fba05bb 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -24,7 +24,8 @@
 # This is the start page template. It builds a HTML global variable that contains
 # the html code of the start page. It is built only once per FreeCAD session for now...
 
-import sys,os,FreeCAD,FreeCADGui,tempfile,time,zipfile,urllib,re,TranslationTexts
+import sys,os,FreeCAD,FreeCADGui,tempfile,time,zipfile,urllib,re
+from . import TranslationTexts
 from PySide import QtCore,QtGui
 
 FreeCADGui.addLanguagePath(":/translations")
diff --git a/src/Mod/Start/StartPage/preferences.ui b/src/Mod/Start/StartPage/preferences.ui
deleted file mode 100644
index 256534339a..0000000000
--- a/src/Mod/Start/StartPage/preferences.ui
+++ /dev/null
@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>500</width>
-    <height>507</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Start page options</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Start page template</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="Gui::PrefFileChooser" name="fileChooser_1">
-        <property name="toolTip">
-         <string>An optional HTML template that will be used instead of the default start page.</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>Template</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Start page options</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_7">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>the down gradient for the background color (currently unsupported)</string>
-        </property>
-        <property name="color">
-         <color>
-          <red>127</red>
-          <green>158</green>
-          <blue>181</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BackgroundColor2</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Link color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_3">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>the background of the main start page area</string>
-        </property>
-        <property name="color">
-         <color>
-          <red>255</red>
-          <green>255</green>
-          <blue>255</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>PageColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Box background color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_6">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>the color of the links</string>
-        </property>
-        <property name="color">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>255</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>LinkColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_2">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>the color of the version text</string>
-        </property>
-        <property name="color">
-         <color>
-          <red>255</red>
-          <green>251</green>
-          <blue>247</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BackgroundTextColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Background image</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Background color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Page text color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_4">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>the color of the text on he main pages</string>
-        </property>
-        <property name="color">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>PageTextColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="Gui::PrefFileChooser" name="fileChooser_2">
-        <property name="toolTip">
-         <string>an optional image to display as background</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BackgroundImage</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Page background color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="10" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>Show examples folder contents</string>
-        </property>
-       </widget>
-      </item>
-      <item row="11" column="1">
-       <widget class="Gui::PrefFileChooser" name="fileChooser_3">
-        <property name="toolTip">
-         <string>an optional custom folder to be displayed at the bottom of the first page</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowCustomFolder</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="11" column="0">
-       <widget class="QLabel" name="label_10">
-        <property name="text">
-         <string>Show additional folder</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_5">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>the background color of the boxes inside the pages</string>
-        </property>
-        <property name="color">
-         <color>
-          <red>221</red>
-          <green>221</green>
-          <blue>221</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BoxColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_1">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>the background color behind the panels</string>
-        </property>
-        <property name="color">
-         <color>
-          <red>79</red>
-          <green>88</green>
-          <blue>116</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BackgroundColor1</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="Gui::PrefRadioButton" name="radioButton_2">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>in same page</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>InBrowser</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Start</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="Gui::PrefRadioButton" name="radioButton_1">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>in external browser</string>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>InWeb</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Start</cstring>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="10" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox_1">
-        <property name="toolTip">
-         <string>if you want the examples to show on the first page</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowExamples</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Background text color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_gradientDown">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Background color gradient down</string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="0">
-       <widget class="QLabel" name="label_links">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Open links</string>
-        </property>
-       </widget>
-      </item>
-      <item row="12" column="0">
-       <widget class="QLabel" name="autoModuleLabel">
-        <property name="text">
-         <string>Switch workbench after loading a file</string>
-        </property>
-       </widget>
-      </item>
-      <item row="12" column="1">
-       <widget class="QComboBox" name="AutoloadModuleCombo"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <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>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>Gui::FileChooser</class>
-   <extends>QWidget</extends>
-   <header>Gui/FileDialog.h</header>
-  </customwidget>
-  <customwidget>
-   <class>Gui::ColorButton</class>
-   <extends>QPushButton</extends>
-   <header>Gui/Widgets.h</header>
-  </customwidget>
-  <customwidget>
-   <class>Gui::PrefFileChooser</class>
-   <extends>Gui::FileChooser</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
-  <customwidget>
-   <class>Gui::PrefColorButton</class>
-   <extends>Gui::ColorButton</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
-  <customwidget>
-   <class>Gui::PrefRadioButton</class>
-   <extends>QRadioButton</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
-  <customwidget>
-   <class>Gui::PrefCheckBox</class>
-   <extends>QCheckBox</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>