Merge remote-tracking branch 'origin/master'

# Conflicts:
#	resources/__init__.py
#	resources/runtime/maskfunctions.py
#	resources/runtime/savestate.py
#	resources/runtime/textfiles/fileedit.py
#	resources/runtime/textlists/package.py
#	resources/runtime/textlists/program.py
#	resources/uis/settings.ui

Author: witheria

resources/test.py

@@ -0,0 +1,44 @@
+from PyQt5.QtWidgets import QApplication, QMainWindow, QPushButton, QLabel, QVBoxLayout, QWidget
+
+import sys
+
+from qtpy import uic
+
+from resources.runtime import savestate
+
+
+class AnotherWindow(QWidget):
+    """
+    This "window" is a QWidget. If it has no parent, it
+    will appear as a free-floating window as we want.
+    """
+
+    def __init__(self):
+        super().__init__()
+        self.ui = uic.loadUi('uis' + savestate.symbol + 'settings.ui')
+        self.ui.setWindowTitle("Spoon")
+
+
+class MainWindow(QMainWindow):
+
+    def __init__(self):
+        super().__init__()
+        self.w = None  # No external window yet.
+        self.button = QPushButton("Push for Window")
+        self.button.clicked.connect(self.show_new_window)
+        self.setCentralWidget(self.button)
+
+    def show_new_window(self, checked):
+        if self.w is None:
+            self.w = AnotherWindow()
+            self.w.ui.show()
+
+        else:
+            self.w.close()  # Close window.
+            self.w = None  # Discard reference.
+
+
+app = QApplication(sys.argv)
+w = MainWindow()
+w.show()
+app.exec_()

resources/uis/main.ui

@@ -57,7 +57,7 @@
         <string>LoL Overlay</string>
        </property>
        <property name="currentIndex">
-        <number>0</number>
+        <number>1</number>
        </property>
        <property name="documentMode">
         <bool>false</bool>
@@ -1661,5 +1661,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionMain_Settings</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>hide()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>399</x>
+     <y>299</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>