From 05009dc82f7c44f65e8e6adc0a9191029d543777 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 22 Feb 2009 07:44:08 +0000 Subject: [PATCH] Fix up copyright year. Yes I was bored ;-) bzr-revno: 340 --- openlp/plugins/bibles/bibleplugin.py | 2 +- .../plugins/bibles/forms/bibleimportform.py | 30 ++++++++++++++----- openlp/plugins/bibles/lib/bibleCSVimpl.py | 2 +- openlp/plugins/bibles/lib/bibleDBimpl.py | 2 +- openlp/plugins/bibles/lib/bibleHTTPimpl.py | 2 +- openlp/plugins/bibles/lib/bibleOSISimpl.py | 2 +- openlp/plugins/bibles/lib/classes.py | 2 +- openlp/plugins/bibles/lib/common.py | 2 +- openlp/plugins/bibles/lib/manager.py | 2 +- openlp/plugins/bibles/lib/tables.py | 2 +- 10 files changed, 31 insertions(+), 17 deletions(-) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index af81149e3..39a4148a7 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -3,7 +3,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 2e3d182f9..df96dcf4c 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -1,7 +1,21 @@ # -*- coding: utf-8 -*- - +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 """ -Module implementing BibleImportDialog. +OpenLP - Open Source Lyrics Projection +Copyright (c) 2008 Raoul Snyman +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +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 """ import sys import os, os.path @@ -37,9 +51,9 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils): self.bibleplugin = bibleplugin self.bible_type = None self.barmax = 0 - self.AddressEdit.setText(self.config.get_config("addressedit", "")) - self.UsernameEdit.setText(self.config.get_config("usernameedit", "")) - self.PasswordEdit.setText(self.config.get_config("passwordedit","")) + self.AddressEdit.setText(self.config.get_config("proxy_address", "")) + self.UsernameEdit.setText(self.config.get_config("proxy_username", "")) + self.PasswordEdit.setText(self.config.get_config("proxy_password","")) filepath = os.path.split(os.path.abspath(__file__))[0] filepath = os.path.abspath(os.path.join(filepath, '..', 'resources','crosswalkbooks.csv')) @@ -108,13 +122,13 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils): self.check_osis() def onProxyAddressEditLostFocus(self): - self.config.set_config("addressedit", str(self.AddressEdit.displayText())) + self.config.set_config("proxy_address", str(self.AddressEdit.displayText())) def onProxyUsernameEditLostFocus(self): - self.config.set_config("usernameedit", str(self.UsernameEdit.displayText())) + self.config.set_config("proxy_username", str(self.UsernameEdit.displayText())) def onProxyPasswordEditLostFocus(self): - self.config.set_config("passwordedit", str(self.PasswordEdit.displayText())) + self.config.set_config("proxy_password", str(self.PasswordEdit.displayText())) def onLocationComboBoxSelected(self): self.check_http() diff --git a/openlp/plugins/bibles/lib/bibleCSVimpl.py b/openlp/plugins/bibles/lib/bibleCSVimpl.py index c83e4fb40..e05b07a40 100644 --- a/openlp/plugins/bibles/lib/bibleCSVimpl.py +++ b/openlp/plugins/bibles/lib/bibleCSVimpl.py @@ -1,7 +1,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/plugins/bibles/lib/bibleDBimpl.py b/openlp/plugins/bibles/lib/bibleDBimpl.py index 71300effd..c0bb3e2a6 100644 --- a/openlp/plugins/bibles/lib/bibleDBimpl.py +++ b/openlp/plugins/bibles/lib/bibleDBimpl.py @@ -1,7 +1,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/plugins/bibles/lib/bibleHTTPimpl.py b/openlp/plugins/bibles/lib/bibleHTTPimpl.py index d47a1ff7e..381ad0c7c 100644 --- a/openlp/plugins/bibles/lib/bibleHTTPimpl.py +++ b/openlp/plugins/bibles/lib/bibleHTTPimpl.py @@ -1,7 +1,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/plugins/bibles/lib/bibleOSISimpl.py b/openlp/plugins/bibles/lib/bibleOSISimpl.py index 0f7dac2ab..d85098345 100644 --- a/openlp/plugins/bibles/lib/bibleOSISimpl.py +++ b/openlp/plugins/bibles/lib/bibleOSISimpl.py @@ -1,7 +1,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/plugins/bibles/lib/classes.py b/openlp/plugins/bibles/lib/classes.py index 6b6048faa..ab6f4e9ee 100644 --- a/openlp/plugins/bibles/lib/classes.py +++ b/openlp/plugins/bibles/lib/classes.py @@ -2,7 +2,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/plugins/bibles/lib/common.py b/openlp/plugins/bibles/lib/common.py index 790263371..0d0637388 100644 --- a/openlp/plugins/bibles/lib/common.py +++ b/openlp/plugins/bibles/lib/common.py @@ -1,7 +1,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 6ceb967f2..a998fc980 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -3,7 +3,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/openlp/plugins/bibles/lib/tables.py b/openlp/plugins/bibles/lib/tables.py index 4981ce57d..1fb7cbe9d 100644 --- a/openlp/plugins/bibles/lib/tables.py +++ b/openlp/plugins/bibles/lib/tables.py @@ -2,7 +2,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, +Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software