diff --git a/manual/source/bibles.rst b/manual/source/bibles.rst index b45b05d..3bdc25e 100644 --- a/manual/source/bibles.rst +++ b/manual/source/bibles.rst @@ -24,7 +24,7 @@ You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:` You will see the Bible Importer window, click :guilabel:`Next`. -.. image:: pics/bibleimport01.png +.. image:: pics/import_bible_start.png After clicking :guilabel:`Next` you can select from the various types of software that OpenLP will convert Bibles from. Click on the file folder icon to @@ -32,7 +32,7 @@ choose the file(s) of the Bible database you want to import. See the sections below for more information on the different formats that OpenLP will import. Click :guilabel:`Next` to continue. -.. image:: pics/bibleimport02.png +.. image:: pics/import_bible_dropdown.png After selecting your file(s), you'll be asked to fill in the details of the Bible you are importing. Remember to check what information you need to display @@ -42,7 +42,7 @@ copyright notice. Click :guilabel:`Next` to continue. **Note:** You can use one blank space using the space bar in the copyright field to continue if you do not have or need copyright information. -.. image:: pics/bibleimportdetails1.png +.. image:: pics/import_bible_license.png After entering the license details, OpenLP will start to import your Bible. It may take some time to import your Bible so please be patient. @@ -58,6 +58,8 @@ Importing OSIS Bibles Importing OSIS files is very simple. Select OSIS as your import source, select your OSIS Bible file and continue the import process. +.. image:: pics/import_bible_osis.png + **About OSIS Formatted Bibles** The OSIS XML standard was designed to provide a common format for distribution @@ -102,6 +104,8 @@ by right clicking on the downloaded file and select `Extract` or `Extract Here`. Note that some of the bibles on OpenSongs webpage are actually in the Zefania format, which OpenLP can also import, see :ref:`zefaniaimport`. +.. image:: pics/import_bible_opensong.png + After selecting the OpenSong Bibles you want to import, follow the rest of the import process. When the import has finished you should be ready to use your OpenSong Bibles. @@ -119,17 +123,30 @@ as another option and does require an internet connection. To use the web download feature select web download from the import wizard. -You can select from several options of location to download from and also -what Bible translation you need. You will probably want to choose the location -from where you get the best performance or has the translation you need. +.. image:: pics/import_bible_web1.png -.. image:: pics/webbible1.png +First click :guilabel:`Download bible list` to download a list of available +bibles. + +.. image:: pics/import_bible_web2.png + +This will take a few moments depending on your internet connection and load on +the servers. + +.. image:: pics/import_bible_web3.png + +When the download is complete you can select from 3 different sources to +download from: `Crosswalk `_, `BibleServer +`_ and `BibleGateway +`_. From each source there are many Bible +translations available, so there is a good change that you will find what you +need. You can also select a proxy server if needed from the `Proxy Server` tab. Your network administrator will know if this is necessary, in most cases this will not be needed. -.. image:: pics/webbibleproxy1.png +.. image:: pics/import_bible_web_proxy.png After selecting your download location and the Bible you wish to use, click :guilabel:`Next` to continue the import process. When your import is completed @@ -148,7 +165,7 @@ Select CSV from the list of Bible types to import. You are now ready to select your .csv files. You will need to select both your books and verse file location. -.. image:: pics/csvimport1.png +.. image:: pics/import_bible_csv.png After you have selected the file locations you can continue with the import process. Once it is complete you should be ready to use your imported CSV Bible. @@ -164,6 +181,8 @@ Find the Bible you would like to import and download the file. The downloaded file is a zip-file from which the Bible must be extracted. This is usually done by right clicking on the downloaded file and select `Extract` or `Extract Here`. +.. image:: pics/import_bible_zefania.png + You can now simply select the extracted file for import and click :guilabel:`Next` to continue the import process. When your import is completed you should now be ready to use the imported Zefania Bible. diff --git a/manual/source/configure_shortcuts.rst b/manual/source/configure_shortcuts.rst index 6dbe53e..92e97ec 100644 --- a/manual/source/configure_shortcuts.rst +++ b/manual/source/configure_shortcuts.rst @@ -47,8 +47,6 @@ one you can click on |configshortcut| twice. This will remove the shortcut. All Actions that you click on will show either Default or Custom. -.. image:: pics/configure_shortcuts_bottom.png - If you change or add any shortcut the option button for Custom will be selected. Clicking the Default option button will restore the original shortcut. You can also click |clearshortcut| to change it back to default. @@ -63,4 +61,4 @@ save any of your changes click :guilabel:`Cancel` .. |clearshortcut| image:: pics/configure_shortcuts_clear.png -.. |configshortcut| image:: pics/configure_shortcuts_config.png \ No newline at end of file +.. |configshortcut| image:: pics/configure_shortcuts_config.png diff --git a/manual/source/pics/bibleimport01.png b/manual/source/pics/bibleimport01.png deleted file mode 100644 index be8bdfb..0000000 Binary files a/manual/source/pics/bibleimport01.png and /dev/null differ diff --git a/manual/source/pics/bibleimport02.png b/manual/source/pics/bibleimport02.png deleted file mode 100644 index d713b3b..0000000 Binary files a/manual/source/pics/bibleimport02.png and /dev/null differ diff --git a/manual/source/pics/bibleimportdetails1.png b/manual/source/pics/bibleimportdetails1.png deleted file mode 100644 index 519c369..0000000 Binary files a/manual/source/pics/bibleimportdetails1.png and /dev/null differ diff --git a/manual/source/pics/configure_shortcuts_bottom.png b/manual/source/pics/configure_shortcuts_bottom.png deleted file mode 100644 index 9f29cf8..0000000 Binary files a/manual/source/pics/configure_shortcuts_bottom.png and /dev/null differ diff --git a/manual/source/pics/configure_shortcuts_main.png b/manual/source/pics/configure_shortcuts_main.png index 2e0922c..87ab3be 100644 Binary files a/manual/source/pics/configure_shortcuts_main.png and b/manual/source/pics/configure_shortcuts_main.png differ diff --git a/manual/source/pics/csvimport1.png b/manual/source/pics/csvimport1.png deleted file mode 100644 index 9a4214a..0000000 Binary files a/manual/source/pics/csvimport1.png and /dev/null differ diff --git a/manual/source/pics/import_bible_csv.png b/manual/source/pics/import_bible_csv.png new file mode 100644 index 0000000..3f7c475 Binary files /dev/null and b/manual/source/pics/import_bible_csv.png differ diff --git a/manual/source/pics/import_bible_dropdown.png b/manual/source/pics/import_bible_dropdown.png new file mode 100644 index 0000000..3a61e32 Binary files /dev/null and b/manual/source/pics/import_bible_dropdown.png differ diff --git a/manual/source/pics/import_bible_license.png b/manual/source/pics/import_bible_license.png new file mode 100644 index 0000000..24223ab Binary files /dev/null and b/manual/source/pics/import_bible_license.png differ diff --git a/manual/source/pics/import_bible_opensong.png b/manual/source/pics/import_bible_opensong.png new file mode 100644 index 0000000..f76e61b Binary files /dev/null and b/manual/source/pics/import_bible_opensong.png differ diff --git a/manual/source/pics/import_bible_osis.png b/manual/source/pics/import_bible_osis.png new file mode 100644 index 0000000..a6a6afe Binary files /dev/null and b/manual/source/pics/import_bible_osis.png differ diff --git a/manual/source/pics/import_bible_start.png b/manual/source/pics/import_bible_start.png new file mode 100644 index 0000000..f58a557 Binary files /dev/null and b/manual/source/pics/import_bible_start.png differ diff --git a/manual/source/pics/import_bible_web1.png b/manual/source/pics/import_bible_web1.png new file mode 100644 index 0000000..2195e3c Binary files /dev/null and b/manual/source/pics/import_bible_web1.png differ diff --git a/manual/source/pics/import_bible_web2.png b/manual/source/pics/import_bible_web2.png new file mode 100644 index 0000000..2246d08 Binary files /dev/null and b/manual/source/pics/import_bible_web2.png differ diff --git a/manual/source/pics/import_bible_web3.png b/manual/source/pics/import_bible_web3.png new file mode 100644 index 0000000..055769e Binary files /dev/null and b/manual/source/pics/import_bible_web3.png differ diff --git a/manual/source/pics/import_bible_web_proxy.png b/manual/source/pics/import_bible_web_proxy.png new file mode 100644 index 0000000..e56fe56 Binary files /dev/null and b/manual/source/pics/import_bible_web_proxy.png differ diff --git a/manual/source/pics/import_bible_zefania.png b/manual/source/pics/import_bible_zefania.png new file mode 100644 index 0000000..032b9d7 Binary files /dev/null and b/manual/source/pics/import_bible_zefania.png differ diff --git a/manual/source/pics/mediamanager_custom_edit.png b/manual/source/pics/mediamanager_custom_edit.png index 0e467d9..af47ef8 100644 Binary files a/manual/source/pics/mediamanager_custom_edit.png and b/manual/source/pics/mediamanager_custom_edit.png differ diff --git a/manual/source/pics/rerunwizard.png b/manual/source/pics/rerunwizard.png index 49a7a10..c01b0e6 100644 Binary files a/manual/source/pics/rerunwizard.png and b/manual/source/pics/rerunwizard.png differ diff --git a/manual/source/pics/select_formatting.png b/manual/source/pics/select_formatting.png index 20429ce..16e592d 100644 Binary files a/manual/source/pics/select_formatting.png and b/manual/source/pics/select_formatting.png differ diff --git a/manual/source/pics/select_text.png b/manual/source/pics/select_text.png index 1a81461..e7f9d54 100644 Binary files a/manual/source/pics/select_text.png and b/manual/source/pics/select_text.png differ diff --git a/manual/source/pics/tags_inserted.png b/manual/source/pics/tags_inserted.png index 3755fba..bcc84ae 100644 Binary files a/manual/source/pics/tags_inserted.png and b/manual/source/pics/tags_inserted.png differ diff --git a/manual/source/pics/webbible1.png b/manual/source/pics/webbible1.png deleted file mode 100644 index 6ff1b65..0000000 Binary files a/manual/source/pics/webbible1.png and /dev/null differ diff --git a/manual/source/pics/webbibleproxy1.png b/manual/source/pics/webbibleproxy1.png deleted file mode 100644 index 23ba9ad..0000000 Binary files a/manual/source/pics/webbibleproxy1.png and /dev/null differ