Head r1452

2011-04-11 17:49:11 +01:00 · 2011-04-11 17:49:11 +01:00 · d99a78837c
commit d99a78837c
parent 20dc7846ce d43a652791
5 changed files with 30 additions and 65 deletions
--- a/documentation/manual/source/faq.rst
+++ b/documentation/manual/source/faq.rst
@ -5,32 +5,6 @@ Frequently Asked Questions
 General Questions
 =================

-What is OpenLP?
---------------
-
-
-OpenLP stands for "Open source Lyric Projection" and is presentation software 
-developed for Churches to provide a single easy to use interface for the 
-projection needs of a typical act of Worship. First created in 2004, it has 
-steadily grown in features and maturity such that is it now a mainstay in 
-hundreds of churches around the world. 
-
-It can hold a searchable database of song lyrics and Bible verses allowing them 
-to be projected instantly or saved in a pre-prepared order of service file. 
-Themes allow song backgrounds to be changed instantly. PowerPoint presentations, 
-videos and audio files can be run from within the program removing the need to 
-switch between different programs. Alert messages can be displayed so the 
-Nursery or Car park stewards can notify the congregation easily. Remote 
-capability allows the worship leader to change songs, or for alert messages to 
-be sent from anywhere on the network, even via a phone.
-
-Being free, this software can be installed on as many computers as required,
-even on the home computers of worship leaders without additional cost. Compared
-to the expensive site licenses or restrictions of commercial software we believe
-OpenLP cannot be beaten for value. Still in active development by a growing team
-of enthusiastic developers, features are being added all the time, meaning the 
-software just improves all the time.
-
 When is the release date for OpenLP 2.0?
 ----------------------------------------

@ -67,7 +41,7 @@ A variety of places!
  it, then perhaps review the software or ask others to review it.

 What operating systems will OpenLP 2.0 support?
-===============================================
+-----------------------------------------------

 OpenLP 2.0 is designed to be cross platform. Currently it has been known to run 
 on Windows (XP, Vista, 7), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OSX. 
@ -377,7 +351,7 @@ please post a new bug report.
   ``bugs (at) openlp.org``.

 What information should I include in a bug report?
-==================================================
+--------------------------------------------------

 Since OpenLP 1.9.4, there is a bug report dialog which automatically opens when
 OpenLP hits a serious bug. However, this doesn't appear all the time, and in
--- a/documentation/manual/source/introduction.rst
+++ b/documentation/manual/source/introduction.rst
@ -8,7 +8,7 @@ About
 OpenLP stands for "Open Source Lyrics Projection" and is presentation software
 developed for churches to provide a single easy to use interface for the
 projection needs of a typical worship service. First created in 2004, it has
-steadily grown in features and maturity such that is it now a mainstay in
+steadily grown in features and maturity such that it is now a mainstay in
 hundreds of churches around the world.

 OpenLP has searchable databases of songs and Bible verses allowing them to be
@ -40,5 +40,4 @@ to charge for the software, and that you have to distribute the source code as
 well.

 You can find a copy of the GNU General Public License from the Help menu 
-selecting about OpenLP or on-line at:
-`<http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>`_.
+selecting about OpenLP or `view the license on-line <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>`_.
--- a/documentation/manual/source/themes.rst
+++ b/documentation/manual/source/themes.rst
@ -1,3 +1,5 @@
+.. _themes:
+
 ======
 Themes
 ======
--- a/documentation/manual/source/troubleshooting.rst
+++ b/documentation/manual/source/troubleshooting.rst
@ -126,7 +126,7 @@ I can not see the book, chapter, and verse when I display scripture

 The book, chapter, and verse should be displayed when you display scripture. If
 you can not see this your theme probably has the text size too small for the 
-info to be seen. See the section of the manual on themes if you need more info
+info to be seen. See the section of the manual on :ref:`themes` if you need more info
 on text sizes in themes.

 I am running Mac OS X and I do not have a presentations plugin
@ -173,4 +173,5 @@ I chose to use a web Bible but it did not download the entire Bible
 Due to copyright restrictions OpenLP cannot download an entire Bible. It can
 only download the section you search for. If you do not have an internet 
 connection where you intend to use OpenLP you will need another scripture
-source. For more information about acquiring bibles please see :ref:`bibleimporter`.
+source. For more information about acquiring Bibles please see :ref:`bibleimporter`.
+
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@ -63,26 +63,19 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
            QtCore.SIGNAL(u'currentIndexChanged(int)'),
            self.onGradientComboBoxCurrentIndexChanged)
        QtCore.QObject.connect(self.colorButton,
-            QtCore.SIGNAL(u'clicked()'),
-            self.onColorButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onColorButtonClicked)
        QtCore.QObject.connect(self.gradientStartButton,
-            QtCore.SIGNAL(u'clicked()'),
-            self.onGradientStartButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onGradientStartButtonClicked)
        QtCore.QObject.connect(self.gradientEndButton,
-            QtCore.SIGNAL(u'clicked()'),
-            self.onGradientEndButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onGradientEndButtonClicked)
        QtCore.QObject.connect(self.imageBrowseButton,
-            QtCore.SIGNAL(u'clicked()'),
-            self.onImageBrowseButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onImageBrowseButtonClicked)
        QtCore.QObject.connect(self.mainColorButton,
-            QtCore.SIGNAL(u'clicked()'),
-            self.onMainColorButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onMainColorButtonClicked)
        QtCore.QObject.connect(self.outlineColorButton,
-            QtCore.SIGNAL(u'clicked()'),
-            self.onOutlineColorButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onOutlineColorButtonClicked)
        QtCore.QObject.connect(self.shadowColorButton,
-            QtCore.SIGNAL(u'clicked()'),
-            self.onShadowColorButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onShadowColorButtonClicked)
        QtCore.QObject.connect(self.outlineCheckBox,
            QtCore.SIGNAL(u'stateChanged(int)'),
            self.onOutlineCheckCheckBoxStateChanged)
@ -90,8 +83,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
            QtCore.SIGNAL(u'stateChanged(int)'),
            self.onShadowCheckCheckBoxStateChanged)
        QtCore.QObject.connect(self.footerColorButton,
-            QtCore.SIGNAL(u'clicked()'),
-            self.onFooterColorButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onFooterColorButtonClicked)
        QtCore.QObject.connect(self.mainPositionCheckBox,
            QtCore.SIGNAL(u'stateChanged(int)'),
            self.onMainPositionCheckBoxStateChanged)
@ -99,26 +91,23 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
            QtCore.SIGNAL(u'stateChanged(int)'),
            self.onFooterPositionCheckBoxStateChanged)
        QtCore.QObject.connect(self,
-            QtCore.SIGNAL(u'currentIdChanged(int)'),
-            self.onCurrentIdChanged)
+            QtCore.SIGNAL(u'currentIdChanged(int)'), self.onCurrentIdChanged)
        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'theme_line_count'),
-            self.updateLinesText)
+            QtCore.SIGNAL(u'theme_line_count'), self.updateLinesText)
        QtCore.QObject.connect(self.mainSizeSpinBox,
-            QtCore.SIGNAL(u'valueChanged(int)'),
-            self.calculateLines)
+            QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
        QtCore.QObject.connect(self.lineSpacingSpinBox,
-            QtCore.SIGNAL(u'valueChanged(int)'),
-            self.calculateLines)
+            QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
        QtCore.QObject.connect(self.outlineSizeSpinBox,
-            QtCore.SIGNAL(u'valueChanged(int)'),
-            self.calculateLines)
+            QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
        QtCore.QObject.connect(self.shadowSizeSpinBox,
-            QtCore.SIGNAL(u'valueChanged(int)'),
-            self.calculateLines)
+            QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
        QtCore.QObject.connect(self.mainFontComboBox,
-            QtCore.SIGNAL(u'activated(int)'),
-            self.calculateLines)
+            QtCore.SIGNAL(u'activated(int)'), self.calculateLines)
+        QtCore.QObject.connect(self.footerFontComboBox,
+            QtCore.SIGNAL(u'activated(int)'), self.updateTheme)
+        QtCore.QObject.connect(self.footerSizeSpinBox,
+            QtCore.SIGNAL(u'valueChanged(int)'), self.updateTheme)

    def setDefaults(self):
        """
@ -389,7 +378,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
        Handle the display and state of the Footer Area page.
        """
        self.footerFontComboBox.setCurrentFont(
-            QtGui.QFont(self.theme.font_main_name))
+            QtGui.QFont(self.theme.font_footer_name))
        self.footerColorButton.setStyleSheet(u'background-color: %s' %
            self.theme.font_footer_color)
        self.setField(u'footerSizeSpinBox',