From 236bc73e59d3d53b78a6c2601d6861ba3e9febbf Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 6 May 2019 22:06:29 -0700 Subject: [PATCH] Fix an issue with changing the data folder; Include QDarkStyle when building Windows installer --- openlp/core/ui/mainwindow.py | 2 +- scripts/appveyor.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 874ab754b..a945f06b7 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -1332,7 +1332,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert self.show_status_message( translate('OpenLP.MainWindow', 'Copying OpenLP data to new data directory location - {path} ' '- Please wait for copy to finish').format(path=self.new_data_path)) - dir_util.copy_tree(old_data_path, self.new_data_path) + dir_util.copy_tree(str(old_data_path), str(self.new_data_path)) self.log_info('Copy successful') except (OSError, DistutilsFileError) as why: self.application.set_normal_cursor() diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 4e5914b8a..2634958e6 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -16,7 +16,7 @@ environment: install: # Install dependencies from pypi - - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock pyodbc psycopg2 pypiwin32 websockets asyncio waitress six webob requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF" + - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock pyodbc psycopg2 pypiwin32 websockets asyncio waitress six webob requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF QDarkStyle" build: off @@ -72,5 +72,3 @@ artifacts: name: Portable-installer - path: openlp-branch\dist\*.msi name: Installer - - path: packaging\windows\OpenLP.wxs - name: Generated-XML