From 174a85d96959c6f35f30cbc81da21faf4dff01aa Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 21 Feb 2010 12:28:35 +0200 Subject: [PATCH 01/12] Couple more visual tweaks, to make OpenLP look good in Windows. Print the location of file OpenLP is logging to in debug mode. --- openlp.pyw | 7 +++++-- openlp/core/ui/mainwindow.py | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index 5c18486b6..c7dbb77fe 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -47,9 +47,11 @@ QMainWindow::separator QDockWidget::title { - border: none; + /*background: palette(dark);*/ + border: 1px solid palette(dark); padding-left: 5px; - padding-top: 3px; + padding-top: 2px; + margin: 1px 0; } QToolBar @@ -169,6 +171,7 @@ def main(): qt_args = [] if options.loglevel.lower() in ['d', 'debug']: log.setLevel(logging.DEBUG) + print 'Logging to:', filename elif options.loglevel.lower() in ['w', 'warning']: log.setLevel(logging.WARNING) else: diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index df66d5e97..2e62398d9 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -39,16 +39,16 @@ from openlp.core.utils import check_latest_version media_manager_style = """ QToolBox::tab { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 palette(midlight), stop: 1.0 palette(mid)); + stop: 0 palette(button), stop: 1.0 palette(dark)); border-width: 1px; border-style: outset; - border-color: palette(midlight); + border-color: palette(dark); border-radius: 5px; } QToolBox::tab:selected { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 palette(light), stop: 1.0 palette(mid)); - border-color: palette(light); + stop: 0 palette(light), stop: 1.0 palette(button)); + border-color: palette(dark); } """ class versionThread(QtCore.QThread): From 6f4b4b2616cb3d7eb18920a087f066fec0133e14 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 21 Feb 2010 14:43:03 +0200 Subject: [PATCH 02/12] Moved all "get_xxxxx_directory" functions into one "AppLocation" class. Set the plugin manager to use this new AppLocation class as well. --- openlp.pyw | 5 +- openlp/core/lib/pluginmanager.py | 2 +- openlp/core/ui/mainwindow.py | 6 +-- openlp/core/utils/__init__.py | 82 ++++++++++++++++++------------- openlp/core/utils/confighelper.py | 6 +-- 5 files changed, 58 insertions(+), 43 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index c7dbb77fe..d748b339a 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -35,7 +35,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import Receiver, str_to_bool from openlp.core.resources import qInitResources from openlp.core.ui import MainWindow, SplashScreen, ScreenList -from openlp.core.utils import get_config_directory, ConfigHelper +from openlp.core.utils import AppLocation, ConfigHelper log = logging.getLogger() @@ -160,7 +160,8 @@ def main(): parser.add_option("-s", "--style", dest="style", help="Set the Qt4 style (passed directly to Qt4).") # Set up logging - filename = os.path.join(get_config_directory(), u'openlp.log') + filename = os.path.join(AppLocation.get_directory(AppLocation.ConfigDir), + u'openlp.log') logfile = FileHandler(filename, u'w') logfile.setFormatter(logging.Formatter( u'%(asctime)s %(name)-15s %(levelname)-8s %(message)s')) diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py index b06f23953..512b47870 100644 --- a/openlp/core/lib/pluginmanager.py +++ b/openlp/core/lib/pluginmanager.py @@ -77,7 +77,7 @@ class PluginManager(object): if name.endswith(u'.py') and not name.startswith(u'__'): path = os.path.abspath(os.path.join(root, name)) thisdepth = len(path.split(os.sep)) - if thisdepth-startdepth > 2: + if thisdepth - startdepth > 2: # skip anything lower down continue modulename, pyext = os.path.splitext(path) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 2e62398d9..88575b5ec 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -34,7 +34,7 @@ from openlp.core.ui import AboutForm, SettingsForm, \ PluginForm, MediaDockManager from openlp.core.lib import RenderManager, PluginConfig, build_icon, \ OpenLPDockWidget, SettingsManager, PluginManager, Receiver, str_to_bool -from openlp.core.utils import check_latest_version +from openlp.core.utils import check_latest_version, AppLocation media_manager_style = """ QToolBox::tab { @@ -434,9 +434,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.aboutForm = AboutForm(self, applicationVersion) self.settingsForm = SettingsForm(self.screens, self, self) # Set up the path with plugins - pluginpath = os.path.split(os.path.abspath(__file__))[0] - pluginpath = os.path.abspath( - os.path.join(pluginpath, u'..', u'..', u'plugins')) + pluginpath = AppLocation.get_directory(AppLocation.PluginsDir) self.plugin_manager = PluginManager(pluginpath) self.plugin_helpers = {} # Set up the interface diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index e85b2d939..187d85cd2 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -24,12 +24,60 @@ ############################################################################### import os +import sys import logging import urllib2 from datetime import datetime log = logging.getLogger(__name__) +class AppLocation(object): + """ + Retrieve a directory based on the directory type. + """ + AppDir = 1 + ConfigDir = 2 + DataDir = 3 + PluginsDir = 4 + + @staticmethod + def get_directory(dir_type): + if dir_type == AppLocation.AppDir: + return os.path.abspath(os.path.split(sys.argv[0])[0]) + elif dir_type == AppLocation.ConfigDir: + if os.name == u'nt': + path = os.path.join(os.getenv(u'APPDATA'), u'openlp') + elif os.name == u'mac': + path = os.path.join(os.getenv(u'HOME'), u'Library', + u'Application Support', u'openlp') + else: + try: + from xdg import BaseDirectory + path = os.path.join(BaseDirectory.xdg_config_home, u'openlp') + except ImportError: + path = os.path.join(os.getenv(u'HOME'), u'.openlp') + return path + elif dir_type == AppLocation.DataDir: + if os.name == u'nt': + path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data') + elif os.name == u'mac': + path = os.path.join(os.getenv(u'HOME'), u'Library', + u'Application Support', u'openlp', u'Data') + else: + try: + from xdg import BaseDirectory + path = os.path.join(BaseDirectory.xdg_data_home, u'openlp') + except ImportError: + path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data') + return path + elif dir_type == AppLocation.PluginsDir: + app_path = os.path.abspath(os.path.split(sys.argv[0])[0]) + if hasattr(sys, u'frozen') and sys.frozen == 1: + return os.path.join(app_path, u'plugins') + else: + return os.path.join(app_path, u'openlp', u'plugins') + + def check_latest_version(config, current_version): version_string = current_version #set to prod in the distribution confif file. @@ -50,39 +98,7 @@ def check_latest_version(config, current_version): log.exception(u'Reason for failure: %s', e.reason) return version_string -def get_config_directory(): - path = u'' - if os.name == u'nt': - path = os.path.join(os.getenv(u'APPDATA'), u'openlp') - elif os.name == u'mac': - path = os.path.join(os.getenv(u'HOME'), u'Library', - u'Application Support', u'openlp') - else: - try: - from xdg import BaseDirectory - path = os.path.join(BaseDirectory.xdg_config_home, u'openlp') - except ImportError: - path = os.path.join(os.getenv(u'HOME'), u'.openlp') - return path - -def get_data_directory(): - path = u'' - if os.name == u'nt': - # ask OS for path to application data, set on Windows XP and Vista - path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data') - elif os.name == u'mac': - path = os.path.join(os.getenv(u'HOME'), u'Library', - u'Application Support', u'openlp', u'Data') - else: - try: - from xdg import BaseDirectory - path = os.path.join(BaseDirectory.xdg_data_home, u'openlp') - except ImportError: - path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data') - return path - from registry import Registry from confighelper import ConfigHelper -__all__ = [u'Registry', u'ConfigHelper', u'get_config_directory', - u'get_data_directory', u'check_latest_version'] +__all__ = [u'Registry', u'ConfigHelper', u'AppLocations', u'check_latest_version'] diff --git a/openlp/core/utils/confighelper.py b/openlp/core/utils/confighelper.py index d49157f55..7920013f2 100644 --- a/openlp/core/utils/confighelper.py +++ b/openlp/core/utils/confighelper.py @@ -25,7 +25,7 @@ import os -from openlp.core.utils import get_data_directory, get_config_directory +from openlp.core.utils import AppLocation from openlp.core.utils.registry import Registry class ConfigHelper(object): @@ -36,7 +36,7 @@ class ConfigHelper(object): @staticmethod def get_data_path(): - path = get_data_directory() + path = AppLocation.get_directory(AppLocation.DataDir) if not os.path.exists(path): os.makedirs(path) return path @@ -70,7 +70,7 @@ class ConfigHelper(object): current operating system, and returns an instantiation of that class. """ if ConfigHelper.__registry__ is None: - config_path = get_config_directory() + config_path = AppLocation.get_directory(AppLocation.ConfigDir) ConfigHelper.__registry__ = Registry(config_path) return ConfigHelper.__registry__ From 0ddaa2bf4a52653c5372004dfe9c5804b5cd6662 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 24 Feb 2010 20:39:12 +0200 Subject: [PATCH 03/12] Some more visual tweaks. Fixes for older versions of PyQt4. --- openlp/core/ui/slidecontroller.py | 7 +++-- openlp/plugins/alerts/__init__.py | 2 +- .../plugins/bibles/forms/importwizardform.py | 26 +++++++++---------- openlp/plugins/bibles/lib/common.py | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index e88699b71..a8c7042a6 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -108,15 +108,14 @@ class SlideController(QtGui.QWidget): # Type label for the top of the slide controller self.TypeLabel = QtGui.QLabel(self.Panel) if self.isLive: - self.TypeLabel.setText(u'%s' % - self.trUtf8('Live')) + self.TypeLabel.setText(self.trUtf8('Live')) self.split = 1 prefix = u'live_slidecontroller' else: - self.TypeLabel.setText(u'%s' % - self.trUtf8('Preview')) + self.TypeLabel.setText(self.trUtf8('Preview')) self.split = 0 prefix = u'preview_slidecontroller' + self.TypeLabel.setStyleSheet(u'font-weight: bold; font-size: 12pt;') self.TypeLabel.setAlignment(QtCore.Qt.AlignCenter) self.PanelLayout.addWidget(self.TypeLabel) # Splitter diff --git a/openlp/plugins/alerts/__init__.py b/openlp/plugins/alerts/__init__.py index a78b7d0d7..bc50edda3 100644 --- a/openlp/plugins/alerts/__init__.py +++ b/openlp/plugins/alerts/__init__.py @@ -21,4 +21,4 @@ # You should have received a copy of the GNU General Public License along # # with this program; if not, write to the Free Software Foundation, Inc., 59 # # Temple Place, Suite 330, Boston, MA 02111-1307 USA # -############################################################################### +############################################################################### \ No newline at end of file diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py index a684c01a3..b4de19da2 100644 --- a/openlp/plugins/bibles/forms/importwizardform.py +++ b/openlp/plugins/bibles/forms/importwizardform.py @@ -237,22 +237,22 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): u'license_permission', self.PermissionEdit) def setDefaults(self): - self.setField(u'source_format', 0) - self.setField(u'osis_location', '') - self.setField(u'csv_booksfile', '') - self.setField(u'csv_versefile', '') - self.setField(u'opensong_file', '') - self.setField(u'web_location', DownloadLocation.Crosswalk) - self.setField(u'web_biblename', self.BibleComboBox) + self.setField(u'source_format', QtCore.QVariant(0)) + self.setField(u'osis_location', QtCore.QVariant('')) + self.setField(u'csv_booksfile', QtCore.QVariant('')) + self.setField(u'csv_versefile', QtCore.QVariant('')) + self.setField(u'opensong_file', QtCore.QVariant('')) + self.setField(u'web_location', QtCore.QVariant(DownloadLocation.Crosswalk)) + self.setField(u'web_biblename', QtCore.QVariant(self.BibleComboBox)) self.setField(u'proxy_server', - self.config.get_config(u'proxy address', '')) + QtCore.QVariant(self.config.get_config(u'proxy address', ''))) self.setField(u'proxy_username', - self.config.get_config(u'proxy username','')) + QtCore.QVariant(self.config.get_config(u'proxy username',''))) self.setField(u'proxy_password', - self.config.get_config(u'proxy password','')) - self.setField(u'license_version', self.VersionNameEdit) - self.setField(u'license_copyright', self.CopyrightEdit) - self.setField(u'license_permission', self.PermissionEdit) + QtCore.QVariant(self.config.get_config(u'proxy password',''))) + self.setField(u'license_version', QtCore.QVariant(self.VersionNameEdit)) + self.setField(u'license_copyright', QtCore.QVariant(self.CopyrightEdit)) + self.setField(u'license_permission', QtCore.QVariant(self.PermissionEdit)) self.onLocationComboBoxChanged(DownloadLocation.Crosswalk) def loadWebBibles(self): diff --git a/openlp/plugins/bibles/lib/common.py b/openlp/plugins/bibles/lib/common.py index 5152ca496..b8ad245bb 100644 --- a/openlp/plugins/bibles/lib/common.py +++ b/openlp/plugins/bibles/lib/common.py @@ -24,10 +24,10 @@ ############################################################################### import urllib2 -import chardet import logging import re import sqlite3 +import chardet only_verses = re.compile(r'([\w .]+)[ ]+([0-9]+)[ ]*[:|v|V][ ]*([0-9]+)' r'(?:[ ]*-[ ]*([0-9]+|end))?(?:[ ]*,[ ]*([0-9]+)(?:[ ]*-[ ]*([0-9]+|end))?)?', From 804b18b03426bfb919ec29d03c45fc6371c2d48a Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 24 Feb 2010 20:55:34 +0200 Subject: [PATCH 04/12] Add PyInstaller hooks. --- .../pyinstaller/hook-openlp.plugins.bibles.lib.common.py | 1 + ...ok-openlp.plugins.presentations.presentationplugin.py | 3 +++ resources/pyinstaller/hook-openlp.py | 9 +++++++++ 3 files changed, 13 insertions(+) create mode 100644 resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py create mode 100644 resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py create mode 100644 resources/pyinstaller/hook-openlp.py diff --git a/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py b/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py new file mode 100644 index 000000000..dc71dc088 --- /dev/null +++ b/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py @@ -0,0 +1 @@ +hiddenimports = ['chardet'] \ No newline at end of file diff --git a/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py b/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py new file mode 100644 index 000000000..8b7d6b8a2 --- /dev/null +++ b/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py @@ -0,0 +1,3 @@ +hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller', + 'openlp.plugins.presentations.lib.powerpointcontroller', + 'openlp.plugins.presentations.lib.pptviewcontroller'] \ No newline at end of file diff --git a/resources/pyinstaller/hook-openlp.py b/resources/pyinstaller/hook-openlp.py new file mode 100644 index 000000000..bd97e4aec --- /dev/null +++ b/resources/pyinstaller/hook-openlp.py @@ -0,0 +1,9 @@ +hiddenimports = ['plugins.songs.songsplugin', + 'plugins.bibles.bibleplugin', + 'plugins.presentations.presentationplugin', + 'plugins.media.mediaplugin', + 'plugins.images.imageplugin', + 'plugins.custom.customplugin', + 'plugins.songusage.songusageplugin', + 'plugins.remotes.remoteplugin', + 'plugins.alerts.alertsplugin'] \ No newline at end of file From 447446fe9e05fda4b15e60cf63e7597f564e4b54 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 28 Feb 2010 19:43:05 +0200 Subject: [PATCH 05/12] Changed location and name of version file. --- openlp.pyw | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index d748b339a..1bdfa8424 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -32,6 +32,7 @@ from logging import FileHandler from optparse import OptionParser from PyQt4 import QtCore, QtGui +import openlp from openlp.core.lib import Receiver, str_to_bool from openlp.core.resources import qInitResources from openlp.core.ui import MainWindow, SplashScreen, ScreenList @@ -79,8 +80,10 @@ class OpenLP(QtGui.QApplication): Run the OpenLP application. """ #Load and store current Application Version - filepath = os.path.split(os.path.abspath(__file__))[0] - filepath = os.path.abspath(os.path.join(filepath, u'version.txt')) + filepath = AppLocation.get_directory(AppLocation.AppDir) + if not hasattr(sys, u'frozen'): + filepath = os.path.join(filepath, u'openlp') + filepath = os.path.join(filepath, u'.version') fversion = None try: fversion = open(filepath, u'r') @@ -97,9 +100,9 @@ class OpenLP(QtGui.QApplication): app_version[u'version'], app_version[u'build'])) except: app_version = { - u'full': u'1.9.0-000', + u'full': u'1.9.0-bzr000', u'version': u'1.9.0', - u'build': u'000' + u'build': u'bzr000' } finally: if fversion: From 97fc65163a83259abf2aa8d939a62d5e9122a068 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 5 Mar 2010 20:34:19 +0200 Subject: [PATCH 06/12] Ignoring a few things. --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index e7b399b49..00884055d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -12,3 +12,5 @@ documentation/build/doctrees *.log* dist OpenLP.egg-info +build +resources/innosetup/Output From a355c381c2dfff3d3eecd4cd48edf836cb2e01fd Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 6 Mar 2010 01:03:00 +0200 Subject: [PATCH 07/12] Fixed up a bug introduced in the merge. --- openlp.pyw | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openlp.pyw b/openlp.pyw index ea30b6a28..c4a5fb428 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -32,6 +32,8 @@ from logging import FileHandler from optparse import OptionParser from PyQt4 import QtCore, QtGui +log = logging.getLogger() + import openlp from openlp.core.lib import Receiver, str_to_bool from openlp.core.resources import qInitResources From 61ff8ec91ae5358b7746367606259c0f75330b27 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 6 Mar 2010 01:09:18 +0200 Subject: [PATCH 08/12] Removed an unnecessary file. --- resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py diff --git a/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py b/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py deleted file mode 100644 index dc71dc088..000000000 --- a/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py +++ /dev/null @@ -1 +0,0 @@ -hiddenimports = ['chardet'] \ No newline at end of file From 16ea5dd0adf9614fca2b866262accdcf31341cb1 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 9 Mar 2010 22:26:12 +0200 Subject: [PATCH 09/12] Tidied up the tabs on the media manager. --- openlp/core/ui/mainwindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 6218e35aa..01f3cabbe 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -50,7 +50,7 @@ media_manager_style = """ QToolBox::tab:selected { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 palette(light), stop: 1.0 palette(button)); - border-color: palette(dark); + border-color: palette(button); } """ class versionThread(QtCore.QThread): From 1e79260c5c01aa0fe6947a8441097df519457188 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 9 Mar 2010 22:29:45 +0200 Subject: [PATCH 10/12] Renamed the versionThread class to VersionThread to fit with our coding standards. --- openlp/core/ui/mainwindow.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 01f3cabbe..41b6d245f 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -53,13 +53,21 @@ media_manager_style = """ border-color: palette(button); } """ -class versionThread(QtCore.QThread): +class VersionThread(QtCore.QThread): + """ + A special Qt thread class to fetch the version of OpenLP from the website. + This is threaded so that it doesn't affect the loading time of OpenLP. + """ def __init__(self, parent, app_version, generalConfig): QtCore.QThread.__init__(self, parent) self.parent = parent self.app_version = app_version self.generalConfig = generalConfig - def run (self): + + def run(self): + """ + Run the thread. + """ time.sleep(2) version = check_latest_version(self.generalConfig, self.app_version) #new version has arrived @@ -586,7 +594,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): def versionThread(self): app_version = self.applicationVersion[u'full'] - vT = versionThread(self, app_version, self.generalConfig) + vT = VersionThread(self, app_version, self.generalConfig) vT.start() def onHelpAboutItemClicked(self): From 92e515a7631b2a77a929b301dc67454ce89971f2 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 9 Mar 2010 22:32:13 +0200 Subject: [PATCH 11/12] Removed an unnecessary hook file. --- resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py diff --git a/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py b/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py deleted file mode 100644 index dc71dc088..000000000 --- a/resources/pyinstaller/hook-openlp.plugins.bibles.lib.common.py +++ /dev/null @@ -1 +0,0 @@ -hiddenimports = ['chardet'] \ No newline at end of file From ef48079c7924370739c6bde8ffc39aec37bc0cf4 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 9 Mar 2010 22:42:29 +0200 Subject: [PATCH 12/12] Remove now unnecessary and unused version.txt file. --- version.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 version.txt diff --git a/version.txt b/version.txt deleted file mode 100644 index fe8ffff0a..000000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.9.0-725