diff --git a/manual/source/bibles.rst b/manual/source/bibles.rst index d7556a7..5d49c94 100644 --- a/manual/source/bibles.rst +++ b/manual/source/bibles.rst @@ -157,7 +157,7 @@ Importing CSV formatted Bibles If you have a Bible in .csv format OpenLP can import it. If you wish to create a bible in the CSV format yourself the format is documented in the -`OpenLP API documentation `_. +`OpenLP API documentation `_. CSV Bibles will consist of two files a `books` file and a `verse` file. Select CSV from the list of Bible types to import. diff --git a/manual/source/dualmonitors.rst b/manual/source/dualmonitors.rst index b040961..7aba402 100644 --- a/manual/source/dualmonitors.rst +++ b/manual/source/dualmonitors.rst @@ -149,10 +149,14 @@ assumes you have properly set up any proprietary drivers if needed. You should seek out your distributions documentation if this general guide does not work. -**Note to Ubuntu 11.04 Users:** Ubuntu 11.04 uses the new Unity interface. It -is recommended to use the *Classic Desktop* option. OpenLP and other -applications requiring dual monitors may not work well with Unity due to issues -experienced by other users with the Unity interface. +**Note to Ubuntu Users:** Standard Ubuntu uses the Unity interface. +Unfortunately we cannot recommend using Unity for a dual display setup with +OpenLP, since there seems to be no reliable way to hide the menubar from the +secondary display, as well as other issues. Instead we recommend using a +different desktop environment like GNOME, KDE or Xfce, all of which are +available from the Ubuntu repositories, and via special Ubuntu variants, such as +`Ubuntu GNOME `_, `Kubuntu `_ or +`Xubuntu `_. GNOME 3 ^^^^^^^ @@ -196,6 +200,34 @@ From here you will need to set up your projector with the appropriate resolution, and position. OpenLP works best projecting to the monitor on the right. +.. _xfce4display: + +Xfce4 +^^^^^ + +This guide is for users of the Xfce4 desktop. Open the Xfce4 menu and chose +:guilabel:`Settings Manager`. + +.. image:: pics/xfce4-settings.png + +Open :guilabel:`Display` to open the settings for displays. + +.. image:: pics/xfce4-display.png + +If the second display has not yet been enabled, enable it by selecting it in the +window and tick `Use this display`. + +There is an issue with the Xfce4 compositor that makes OpenLP freeze when using +a dual monitor setup. This issue can be worked around by disabling an option for +the compositor. To do this open :guilabel:`Settings Manager` and open +:guilabel:`Window Manager Tweaks`. + +.. image:: pics/xfce4-win-manager-tweaks-comp.png + +Go to the :guilabel:`Compositor` tab and disable :guilabel:`Display fullscreen +overlay windows directly`. Click :guilabel:`Close` and now OpenLP should run +without issues. + Linux Systems Using nVidia Drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/manual/source/faq.rst b/manual/source/faq.rst index b8dc787..bfb17b0 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -151,7 +151,7 @@ The Bible plugin has a `Import Wizard` which can import Bibles from a variety of sources. The following sources are supported: CSV - The format is documented in the `OpenLP API documentation `_. + The format is documented in the `OpenLP API documentation `_. OSIS An XML format for Bible. You can export Bibles from the `Sword Project `_ diff --git a/manual/source/install_linux.rst b/manual/source/install_linux.rst index 46ab548..52de413 100644 --- a/manual/source/install_linux.rst +++ b/manual/source/install_linux.rst @@ -13,59 +13,19 @@ Installation of OpenLP on Ubuntu can either be done through the Software Center or the command line. Command line instructions will be included at the end of this section on Ubuntu and its variants. -Ubuntu 12.04 or later -^^^^^^^^^^^^^^^^^^^^^^^^^ +OpenLP 2.2 supports Ubuntu 14.04 or later versions. There is currently an older +version of OpenLP available in the official Ubuntu repositories, which can be +found using the Software Center, but to get OpenLP 2.2 it is necessary to add +the OpenLP Personal Package Archive (PPA) to your system. -If you are using Ubuntu 12.10 or a more recent version then OpenLP is -included in the standard distribution. If you are using Ubuntu 12.04 then -OpenLP has been added to the backports packages and so is available -with the appropriate setting below. - -Open up the software center by clicking on the :guilabel:`Software Center` icon -in the Launcher if you are using the Unity desktop, or if you are using an -older version of Ubuntu, or the Classic Desktop go to :menuselection:`Applications` -and select the Software Center from the bottom of the menu. You will need to -be the administrator of the system to install OpenLP and will be asked for the -administrator password several times through this process. - -If using Ubuntu 12.04 then when you have the Software Center running you need to -turn on support for backports. From the menu choose Edit/Software Sources and -then the "Updates" tab. Now make sure that "Unsupported Updates -(precise-backports) is ticked. Then click :guilabel:`close`. - -.. image:: pics/ubuntu-backports.png - -Next in any of these versions simply search for OpenLP in the Software Center -and click :guilabel:`Install`. - -.. image:: pics/4searchopenlp.png - -You will see the install progress as OpenLP and the dependencies required for -it to run are downloaded. - -.. image:: pics/5installprogressubuntu.png - -After installation you should see that OpenLP is installed. - -.. image:: pics/6installcompleteubuntu.png - -You can now run OpenLP by either searching for it in the *Dash*, or clicking on -the category *Media Apps* in Unity. If you are running the Classic Desktop you -will have OpenLP available by clicking -:menuselection:`Applications --> Sound and Video --> OpenLP` - -Ubuntu older than 12.04 -^^^^^^^^^^^^^^^^^^^^^^^^ - -In older versions of Ubuntu you will first need to add the -OpenLP Personal Package Archive (PPA) to your system. +Ubuntu, Ubuntu GNOME, Xubuntu +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Open up the software center using :menuselection:`Applications` and select the Software Center from the bottom of the menu. You will need to be the administrator of the system to install OpenLP and will be asked for the administrator password several times through this process. - Then go to :menuselection:`Edit --> Software Sources` .. image:: pics/1softwaresources.png @@ -104,7 +64,7 @@ will have OpenLP available by clicking :menuselection:`Applications --> Sound and Video --> OpenLP` Kubuntu -------- +^^^^^^^ From the Kickoff Menu click :guilabel:`System Settings` Then click on :guilabel:`Software Management`. @@ -160,22 +120,10 @@ menu. .. image:: pics/kubuntuopenlplaunch.png Ubuntu Command Line Install ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ -If you are using Ubuntu 12.10 or a more recent version then OpenLP is included -in the standard distribution. To Install OpenLP open a terminal and type:: - - user@ubuntu:~$ sudo apt-get install openlp - -OpenLP should now be available in your desktop's menu system, but if you wish -to run OpenLP from the command line type:: - - user@ubuntu:~$ openlp - -If you are using an older Ubuntu that does not include OpenLP in the standard -distribution then the following install procedure should work across all Ubuntu -variants. First you will need to add the Personal Package Archive (PPA) to -Ubuntu's software sources. From a terminal type:: +First you will need to add the Personal Package Archive (PPA) to Ubuntu's +software sources. From a terminal type:: user@ubuntu:~$ sudo add-apt-repository ppa:openlp-core/release @@ -192,12 +140,18 @@ to run OpenLP from the command line type:: user@ubuntu:~$ openlp -Fedora (GNOME) --------------- +Fedora +------ + +To install OpenLP on Fedora follow the instructions below. The instructions +describes how to do the install when using GNOME, KDE or the command line. **Note** When installing OpenLP you will need to have administrator privileges. You will be asked for the administrator password to install. +Fedora (GNOME) +^^^^^^^^^^^^^^ + Installing with Fedora you will use the default Add/Remove Programs available from :menuselection:`System --> Administration --> Add/Remove Programs` in Fedora 14 and below or in :menuselection:`Applications --> System Tools --> @@ -229,10 +183,7 @@ later. OpenLP will be available in :menuselection:`Applications --> Sound & Video --> OpenLP` Fedora (KDE) ------------- - -**Note** when installing OpenLP you will need to have administrator privileges. -You will be asked for the administrator password to install. +^^^^^^^^^^^^ From the Kickoff open *Software Management*. Type OpenLP into the search box. Then click :guilabel:`Find by name` or press :kbd:`Enter`. @@ -254,7 +205,7 @@ install notification, or from the Kickoff menu. .. image:: pics/4fedoracompleted.png Fedora Command Line Install ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ To install OpenLP from the command line type:: @@ -269,9 +220,15 @@ Linux Mint ---------- The following instructions are for a standard Linux Mint install. These -instructions will not work with Linux Mint Debian Edition. If your are running -Linux Mint without the standard desktop please see the :ref:`mint-command` -install instructions. +instructions will not work with Linux Mint Debian Edition. Most users should +be able to follow the instructions for :ref:`mint-softman`, but if your are +running Linux Mint without the standard desktop please see the +:ref:`mint-command` install instructions. + +.. _mint-softman: + +Software Manager Install +^^^^^^^^^^^^^^^^^^^^^^^^ The administrator password will be required several times during the installation. To install OpenLP open the Software Manager from the Mint Menu. @@ -317,7 +274,7 @@ from the *Sound and Video* section of the Mint Menu. .. _mint-command: Linux Mint Command Line Install -------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ You will need to add the Personal Package Archive (PPA) to Linux Mint's software sources. From a terminal type:: diff --git a/manual/source/install_windows_mac.rst b/manual/source/install_windows_mac.rst index 8642a34..1cd2620 100644 --- a/manual/source/install_windows_mac.rst +++ b/manual/source/install_windows_mac.rst @@ -2,7 +2,7 @@ Installing OpenLP on Microsoft Windows ====================================== Installing OpenLP is identical over all supported versions of Windows. After -downloading the file from the `download page `_ +downloading the file from the `website `_ open the file by double clicking when the download is complete. After opening the downloaded file agree to open the unverified file if you are prompted. On Windows 8 you might have to click :guilabel:`More info` before you can @@ -63,22 +63,23 @@ Privacy Settings to run OpenLP. Click the Apple icon and open System Preferences -.. image:: pics/gatekeeper1.png +.. image:: pics/mac-os-x-system-menu.png Open the Security & Privacy settings -.. image:: pics/gatekeeper2.png +.. image:: pics/mac-os-x-settings.png Change the setting from Mac App Store to Anywhere. If the settings are grayed out click on the lock in the lower lefthand corner of the settings window to enable editing. -.. image:: pics/gatekeeper3.png +.. image:: pics/mac-os-x-security-and-privacy.png If you have not already downloaded the correct file from the OpenLP -`download page `_, download it now. -Then double click on the .dmg file. Drag the OpenLP icon over to the Applications -folder and you will be ready to use OpenLP. OpenLP will be available in your -Applications folder. +`website `_, download it now. Then double click on the +.dmg file. This will open a window with two icons: An OpenLP icon and an +Applications Folder icon. To install OpenLP, simply drag the OpenLP icon over to +the Applications folder icon and you will be ready to use OpenLP. OpenLP will be +available in your Applications folder. -.. image:: pics/osxinstall.png +.. image:: pics/mac-os-x-dnd-install.png diff --git a/manual/source/mediamanager.rst b/manual/source/mediamanager.rst index 7b612e5..e44e653 100644 --- a/manual/source/mediamanager.rst +++ b/manual/source/mediamanager.rst @@ -143,7 +143,7 @@ The following options are available on the quick search tab: A detailed description of the format and how it is parsed by OpenLP can be read `In the OpenLP API documentation - `_. + `_. If an invalid format is used for a search a popup window will show the examples also shown above. @@ -328,8 +328,7 @@ Clicking on *Media* in the :ref:`g-media-manager` will display the media item for media. The media item shows a list of imported audio or video files. **Note:** On some computers OpenLP has trouble displaying videos. Please read -the `Frequently Asked Questions `_ for tips on how -to resolve these issues. +the :ref:`troubleshooting` for tips on how to resolve these issues. .. image:: pics/mediamanager_media.png diff --git a/manual/source/pics/mac-os-x-dnd-install.png b/manual/source/pics/mac-os-x-dnd-install.png new file mode 100644 index 0000000..c0b2cbe Binary files /dev/null and b/manual/source/pics/mac-os-x-dnd-install.png differ diff --git a/manual/source/pics/mac-os-x-security-and-privacy.png b/manual/source/pics/mac-os-x-security-and-privacy.png new file mode 100644 index 0000000..589b223 Binary files /dev/null and b/manual/source/pics/mac-os-x-security-and-privacy.png differ diff --git a/manual/source/pics/xfce4-display.png b/manual/source/pics/xfce4-display.png new file mode 100644 index 0000000..9a64d40 Binary files /dev/null and b/manual/source/pics/xfce4-display.png differ diff --git a/manual/source/pics/xfce4-settings.png b/manual/source/pics/xfce4-settings.png new file mode 100644 index 0000000..f4c24ce Binary files /dev/null and b/manual/source/pics/xfce4-settings.png differ diff --git a/manual/source/pics/xfce4-win-manager-tweaks-comp.png b/manual/source/pics/xfce4-win-manager-tweaks-comp.png new file mode 100644 index 0000000..ff49add Binary files /dev/null and b/manual/source/pics/xfce4-win-manager-tweaks-comp.png differ diff --git a/manual/source/troubleshooting.rst b/manual/source/troubleshooting.rst index d571854..71993c9 100644 --- a/manual/source/troubleshooting.rst +++ b/manual/source/troubleshooting.rst @@ -1,3 +1,5 @@ +.. _troubleshooting: + =============== Troubleshooting =============== @@ -207,3 +209,10 @@ The `servicemanager` folder which can be found in OpenLP's data folder is used internally by OpenLP for temporary files and anything in there can and will be deleted by OpenLP. In general you should not modify or create files in OpenLP's data folder unless you know what you are doing. + +OpenLP freezes on Xfce4 in a dual monitor setup +----------------------------------------------- + +There is an issue with the Xfce4 compositor that makes OpenLP freeze when using +a dual monitor setup. See configuration of dual monitor for :ref:`xfce4display` +for a solution. diff --git a/scripts/batch-drop-shadow.scm b/scripts/batch-drop-shadow.scm index 6aaa637..6fbaf80 100644 --- a/scripts/batch-drop-shadow.scm +++ b/scripts/batch-drop-shadow.scm @@ -3,7 +3,7 @@ ; ; Place the script in your gimp scripts folder (eg. ~/.gimp-2.8/scripts) go to the ; folder with images you wish to add shadow to and execute like this: - ; gimp --no-data -i -b '(batch-drop-shadow "*.png" 8 8 10)' -b '(gimp-quit 0)' + ; gimp --no-data -i -b '(batch-drop-shadow "*.png" 3 3 5)' -b '(gimp-quit 0)' ; (define (batch-drop-shadow pattern