diff options
| author | Unit 193 <unit193@ubuntu.com> | 2017-07-04 22:37:44 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-07-04 22:37:44 -0400 |
| commit | 941f1092f86b6b52f27881e24bfd1395c4d4c070 (patch) | |
| tree | 015c5ebb3c0c5839c39103e27defa917b6a4b6ac | |
| parent | b46786d2013adf438a981f1fe895dc36f15996fd (diff) | |
New upstream version 4.0.5+dfsg1
228 files changed, 793 insertions, 557 deletions
@@ -1,6 +1,41 @@ +2017-04-23 karl <charcoal@users.sf.net> + + * 4.0.5 release. + +2017-04-23 karl <charcoal@users.sf.net> + + * update win32 packaging. + * fix lack of collator in mod.mgr on first run. + * restore proper formatting of code in biblesync glue. + +2017-02-06 karl <charcoal@users.sf.net> + + * readaloud: speak verse# per showversenum (audible matches visible). + +2016-08-25 karl <charcoal@users.sf.net> + + * add Alt-T toggle transliteration. + +2016-03-02 karl <charcoal@users.sf.net> + + * add pixmaps/screenshots directory, using images from sourceforge. + * fix #749: annotation dialog tooltips. + +2016-02-15 karl <charcoal@users.sf.net> + + * move to github: import source, add .gitignore & others, change + some text files to *.md names, update refs sourceforge->github. + * delint a warning in parallel_view.cc. + * add language abbrevs from IBT modules. + * disable "match case" in searches when in clucene mode. + +2016-01-13 karl <charcoal@users.sf.net> + + * change module lang sort from strcmp/strcoll to ICU ucol_strcollUTF8. + 2015-08-30 karl <charcoal@users.sf.net> - * 4.0.3 release. + * 4.0.4 release. 2015-08-17 karl <charcoal@users.sf.net> @@ -3,28 +3,27 @@ Installation instructions On Linux install Xiphos through you package manager, for example on Fedora: - $ sudo yum install xiphos + $ sudo dnf install xiphos-gtk3 Or on Debian, Ubuntu, or Linux Mint: $ sudo apt-get update $ sudo apt-get install xiphos -If you use Windows download the .exe file from -http://sourceforge.net/projects/gnomesword/files/Xiphos/3.2.2/xiphos-3.2.2-win32.exe/download +If you use Windows download the .exe file from: http://xiphos.org/download/ Compile Xiphos from source ========================== To compile Xiphos from source you will need to get a checkout of Xiphos from -Sourceforge. To do so, do: +GitHub. To do so, do: - $ svn checkout svn://svn.code.sf.net/p/gnomesword/code/trunk xiphos + $ git clone https://github.com/crosswire/xiphos.git Now to compile the GTK3 version of Xiphos you need to make sure you have these packages installed: - $ sudo yum install gcc-c++ intltool gtk3-devel dbus-glib-devel gtkhtml3-devel webkitgtk4-devel libxml2-devel libgsf-devel gconfmm26-devel sword-devel libuuid-devel gnome-doc-utils rarian rarian-compat biblesync-devel + $ sudo dnf install gcc-c++ intltool gtk3-devel dbus-glib-devel gtkhtml3-devel webkitgtk4-devel libxml2-devel libgsf-devel gconfmm26-devel sword-devel libuuid-devel gnome-doc-utils rarian rarian-compat biblesync-devel Or for ubuntu, both GTK3 and GTK2 versions, install: @@ -1,25 +1,21 @@ -Xiphos -====== +# Xiphos Xiphos is a Bible study application for Linux, UNIX, and Windows operating systems. It uses Sword to display Bibles, commentaries, dictionary, and other texts and images. Xiphos includes features such as, searching, biblesync, bookmarks, parallel study, and original language study. -To install Xiphos, search in you package manager for xiphos and install the +To install Xiphos, search in your package manager for xiphos and install the package. If you are using Windows, please download the exe from here: -http://sourceforge.net/projects/gnomesword/files/Xiphos/4.0.0/xiphos-4.0.0-win32.exe/download +http://xiphos.org/download/ - -Building Xiphos -=============== +## Building Xiphos Please see the INSTALL file. -History and Acknowledgements -============================ +## History and Acknowledgements Xiphos started life as the Sword Project's Cheatah program. @@ -30,8 +26,8 @@ We wish to thank the folks who have put so much time and work into the Sword Project and then giving it to the world! God Bless you! -Developing Xiphos -================= +## Developing Xiphos + If you want to help develop Xiphos your help will be very appreciated! @@ -50,8 +46,8 @@ Where /path/to/edited.c, the C or C++ file you edited. The option '-style=file' uses a predefined style file called .clang-format in the source tree. -Thank you! -========== +## Thank you! + We hope that your Bible study will be enhanced by Xiphos! diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 61f3b28..c9a5a80 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -3,6 +3,13 @@ ____________________ XIPHOS RELEASE NOTES ____________________ +Release 4.0.5 +23 Apr 2017 + +- ReadAloud: Speak verse# only if we are showing verse#s in text as well. +- Fix crash caused by lack of collator during mod.mgr in first run. +________________________________________________________________ + Release 4.0.4 30 Aug 2015 @@ -1,8 +1,6 @@ -TODO: - * Completion of Sword 1.6's av11n integration. +* Abbreviation support + * remove inconsistent use cases + * add manual abbrev choice -For more information on feature requests: -http://sourceforge.net/tracker/?group_id=5528&atid=355528 - -For more bug information: -http://sourceforge.net/tracker/?atid=105528&group_id=5528&func=browse +For more information on bugs and feature requests: +https://github.com/crosswire/xiphos/issues diff --git a/TRANSLATION-HOWTO b/TRANSLATION-HOWTO index 8f874cb..a68aa78 100644 --- a/TRANSLATION-HOWTO +++ b/TRANSLATION-HOWTO @@ -14,7 +14,7 @@ Preparation Make sure you have the GNU gettext package installed. Grab the latest versions of the source files of Xiphos in Subversion : -$ svn co https://gnomesword.svn.sourceforge.net/svnroot/gnomesword/trunk xiphos +$ git clone https://github.com/crosswire/xiphos.git Translating Xiphos Application ---------------------------------- @@ -88,7 +88,7 @@ directory. $ xml2po -e -u YOUR-LANG.po ../C/*xml -Don't forget to send YOUR-LANG.po files to gnomesword-developers@lists.sourceforge.net. +Don't forget to send YOUR-LANG.po files to xiphos-devel@crosswire.org. "..and ye shall be witnesses unto me both in Jerusalem, and in all diff --git a/help/C/interface.xml b/help/C/interface.xml index 4c7c470..316c9b0 100644 --- a/help/C/interface.xml +++ b/help/C/interface.xml @@ -778,6 +778,9 @@ <listitem> <para><guibutton>Alt-R</guibutton>: Toggle "red words of Christ" display.</para> </listitem> + <listitem> + <para><guibutton>Alt-T</guibutton>: Toggle transliteration.</para> + </listitem> </itemizedlist> <para> Opening special windows: diff --git a/help/C/introduction.xml b/help/C/introduction.xml index 088f8f2..10e3df5 100644 --- a/help/C/introduction.xml +++ b/help/C/introduction.xml @@ -77,8 +77,8 @@ <warning> <para>&app; is currently in development, so this manual may not reflect the program as you see it. If it does not, please file a - bug at the <ulink type="http" url="http://sourceforge.net/projects/xiphos"> - project website</ulink>, or email <email>xiphos-developers@lists.sourceforge.net</email>. + bug at the <ulink type="http" url="https://github.com/crosswire/xiphos"> + project website</ulink>, or email <email>xiphos-devel@crosswire.org</email>. All help is appreciated, as it will improve the software.</para> </warning> diff --git a/help/C/onlinehelp.xml b/help/C/onlinehelp.xml index 02753e6..ca93ff1 100644 --- a/help/C/onlinehelp.xml +++ b/help/C/onlinehelp.xml @@ -3,7 +3,7 @@ <sect2 id="xiphos-mailing-list"> <title>Users Mailing List</title> <para>One way you can get help with Xiphos is using our low-traffic users' mailing list. - You can sign up by clicking <ulink url="https://lists.sourceforge.net/lists/listinfo/gnomesword-users/"> + You can sign up by clicking <ulink url="http://www.crosswire.org/mailman/listinfo/xiphos-users/"> this link</ulink>. Once you are signed up, you can email the list with any problems you are having and other users or the developers will respond, typically within a day. </para> diff --git a/help/C/xiphos.xml b/help/C/xiphos.xml index 35f801d..e43a822 100644 --- a/help/C/xiphos.xml +++ b/help/C/xiphos.xml @@ -86,9 +86,9 @@ Template last modified Apr 11, 2002 <para>To report a bug or make a suggestion regarding the &appname; application or this manual, Use - the <ulink url="http://sourceforge.net/tracker/?group_id=5528"> - Tracker on SourceForge</ulink> or the mailing - lists <email>gnomesword-developers@lists.sourceforge.net</email> + the <ulink url="https://github.com/crosswire/xiphos/issues"> + Tracker on GitHub</ulink> or the mailing + lists <email>xiphos-devel@crosswire.org</email> </para> </legalnotice> diff --git a/help/Guidelines b/help/Guidelines index 76ce6a0..6676912 100644 --- a/help/Guidelines +++ b/help/Guidelines @@ -6,7 +6,7 @@ This document will contain some guidelines for writing/submitting a good patch to the Xiphos documentation project. Any new features or large scale work should first be discussed on the -xiphos-developers mailing-list first. This will ensure the idea fits in the +xiphos-devel mailing-list first. This will ensure the idea fits in the direction we wish to take Xiphos, and also that the effort is not duplicated. diff --git a/help/fa/fa.po b/help/fa/fa.po index e4aaa01..2419bce 100644 --- a/help/fa/fa.po +++ b/help/fa/fa.po @@ -1071,7 +1071,7 @@ msgid "" "<application>Xiphos</application> is currently in development, so this " "manual may not reflect the program as you see it. If it does not, please " "file a bug at the <ulink type=\"http\" url=\"http://sourceforge.net/projects/" -"xiphos\"> project website</ulink>, or email <email>xiphos-developers@lists." +"xiphos\"> project website</ulink>, or email <email>xiphos-devel@lists." "sourceforge.net</email>. All help is appreciated, as it will improve the " "software." msgstr "" @@ -1079,7 +1079,7 @@ msgstr "" "ممکن است در بخشی از برنامه مشکلاتی به چشمتان بخورد، که در اینصورت لطفاً آن " "مورد را از لینک زیر به ما اطلاع دهید <ulink type=\"http\" url=\"http://" "sourceforge.net/projects/xiphos\"> وبسایت پروژه</ulink>، یا ایمیل " -"<email>xiphos-developers@lists.sourceforge.net</email>. از هرگونه راهنمایی و " +"<email>xiphos-devel@lists.sourceforge.net</email>. از هرگونه راهنمایی و " "کمک شما پیشاپیش سپاسگزاریم" #: C/xiphos.xml:207(title) @@ -3664,7 +3664,7 @@ msgstr "" #: C/xiphos.xml:38(para) msgid "" "Please send all comments and suggestions regarding this manual to Xiphos " -"Development list <email>xiphos-developers@lists.sourceforge.net</email>. " +"Development list <email>xiphos-devel@lists.sourceforge.net</email>. " "Comments may also be submitted via the project trackers at SourceForge." msgstr "" diff --git a/help/fr/fr.po b/help/fr/fr.po index f2cdcb9..2d62d4a 100644 --- a/help/fr/fr.po +++ b/help/fr/fr.po @@ -295,12 +295,12 @@ msgid "" "To report a bug or make a suggestion regarding the Xiphos application or " "this manual, Use the <ulink url=\"http://sourceforge.net/tracker/?" "group_id=5528\"> Tracker on SourceForge</ulink> or the mailing lists " -"<email>gnomesword-developers@lists.sourceforge.net</email>" +"<email>xiphos-devel@crosswire.org</email>" msgstr "" "Les rapports de bogue ou les suggestions à propos de Xiphos ou de ce manuel " "d'aide sont à envoyer au <ulink type=\"http\" url=\"http://sourceforge.net/" "tracker/?group_id=5528\">Tracker de SourceForge</ulink> ou à la liste de " -"diffusion <email>gnomesword-developers@lists.sourceforge.net</email>" +"diffusion <email>xiphos-devel@crosswire.org</email>" #: ../C/xiphos.xml:2(para) ../C/legal.xml:2(para) msgid "" @@ -563,15 +563,15 @@ msgid "" "<application>Xiphos</application> is currently in development, so this " "manual may not reflect the program as you see it. If it does not, please " "file a bug at the <ulink type=\"http\" url=\"http://sourceforge.net/projects/" -"xiphos\"> project website</ulink>, or email <email>xiphos-developers@lists." -"sourceforge.net</email>. All help is appreciated, as it will improve the " +"xiphos\"> project website</ulink>, or email <email>xiphos-devel@crosswire." +"org</email>. All help is appreciated, as it will improve the " "software." msgstr "" "<application>&appname;</application> est en cours de développement, il se " "peut donc que des différences apparaissent entre le logiciel et le contenu " "de ce manuel. Si cela est le cas, envoyez un rapport de bogue au <ulink type=" "\"http\" url=\"http://sourceforge.net/projects/xiphos\"> site web du projet</" -"ulink>, ou un email à\t<email>xiphos-developers@lists.sourceforge.net</" +"ulink>, ou un email à\t<email>xiphos-devel@crosswire.org</" "email> Toute aide est appréciée et permet d'améliorer <application>&appname;" "</application>." @@ -3928,15 +3928,15 @@ msgstr "Liste de diffusion des utilisateurs" #: ../C/xiphos.xml:5(para) ../C/onlinehelp.xml:5(para) msgid "" "One way you can get help with Xiphos is using our low-traffic users' mailing " -"list. You can sign up by clicking <ulink url=\"https://lists.sourceforge.net/" -"lists/listinfo/gnomesword-users/\"> this link</ulink>. Once you are signed " +"list. You can sign up by clicking <ulink url=\"http://www.crosswire.org/mailman/" +"listinfo/xiphos-devel/\"> this link</ulink>. Once you are signed " "up, you can email the list with any problems you are having and other users " "or the developers will respond, typically within a day." msgstr "" "Une façon d'obtenir de l'aide au sujet de <application>&appname;</" "application> est d'utiliser nos listes de diffusion à faible trafic. il " -"suffit de s'abonner en sélectionnant <ulink url=\"https://lists.sourceforge." -"net/lists/listinfo/gnomesword-users/\"> ce lien</ulink>. Une fois inscrit, " +"suffit de s'abonner en sélectionnant <ulink url=\"http://www.crosswire.org/mailman/" +"listinfo/xiphos-devel/\"> ce lien</ulink>. Une fois inscrit, " "un simple e-mail envoyé sur la liste décrivant les problèmes rencontrés " "amènera une réponse des autres utilisateurs ou des développeurs généralement " "dans la journée.<para>[NDT : La liste de diffusion est en langue anglaise]</" @@ -5322,13 +5322,13 @@ msgstr "Accréditions aux traducteurs" #~ msgid "" #~ "Please send all comments and suggestions regarding this manual to Xiphos " -#~ "Development list <email>xiphos-developers@lists.sourceforge.net</email>. " +#~ "Development list <email>xiphos-devel@crosswire.org</email>. " #~ "Comments may also be submitted via the project trackers at SourceForge." #~ msgstr "" #~ "Vos commentaires et suggestions à propos du manuel de " #~ "<application>&appname;</application> sont à envoyer à la liste de " -#~ "développement de &appname; <email>xiphos-developers@lists.sourceforge." -#~ "net</email>. Les commentaires peuvent aussi être envoyés via le tracker " +#~ "développement de &appname; <email>xiphos-devel@crosswire.org" +#~ "</email>. Les commentaires peuvent aussi être envoyés via le tracker " #~ "du projet à SourceForge." #~ msgid "License" diff --git a/help/translating/manual.xml b/help/translating/manual.xml index 02ffe39..c9aced9 100644 --- a/help/translating/manual.xml +++ b/help/translating/manual.xml @@ -51,7 +51,7 @@ </itemizedlist> </para> -<para>Don't forget to send YOUR-LANG.po files to gnomesword-developers@lists.sourceforge.net.</para> +<para>Don't forget to send YOUR-LANG.po files to xiphos-devel@crosswire.org.</para> <para>"..and ye shall be witnesses unto me both in Jerusalem, and in all Judaea, and in Samaria, and unto the uttermost part of the earth." -- Acts 1:8</para> diff --git a/help/translating/xiphossvn.xml b/help/translating/xiphossvn.xml index b19cf62..da42b83 100644 --- a/help/translating/xiphossvn.xml +++ b/help/translating/xiphossvn.xml @@ -5,7 +5,7 @@ <para>Make sure that you have the GNU gettext package installed. Grab the latest versions of the source files of &app; in Subversion: </para> <para><command> - svn co https://gnomesword.svn.sourceforge.net/svnroot/gnomesword/trunk xiphos</command> + git clone https://github.com/crosswire/xiphos.git</command> </para> </sect2> diff --git a/pixmaps/screenshots/README.md b/pixmaps/screenshots/README.md new file mode 100644 index 0000000..5cf15be --- /dev/null +++ b/pixmaps/screenshots/README.md @@ -0,0 +1,5 @@ +# Screenshots + +These are screenshots previously used in our SourceForge development site. +GitHub does not provide for the same "demo" kind of display, but nonetheless +they are useful to provide visual summaries of how Xiphos looks. diff --git a/pixmaps/screenshots/advanced-search.jpg b/pixmaps/screenshots/advanced-search.jpg Binary files differnew file mode 100644 index 0000000..30a4663 --- /dev/null +++ b/pixmaps/screenshots/advanced-search.jpg diff --git a/pixmaps/screenshots/global-display-options.jpg b/pixmaps/screenshots/global-display-options.jpg Binary files differnew file mode 100644 index 0000000..bb135aa --- /dev/null +++ b/pixmaps/screenshots/global-display-options.jpg diff --git a/pixmaps/screenshots/main-window.jpg b/pixmaps/screenshots/main-window.jpg Binary files differnew file mode 100644 index 0000000..508d004 --- /dev/null +++ b/pixmaps/screenshots/main-window.jpg diff --git a/pixmaps/screenshots/module-display-options.jpg b/pixmaps/screenshots/module-display-options.jpg Binary files differnew file mode 100644 index 0000000..ebb25f5 --- /dev/null +++ b/pixmaps/screenshots/module-display-options.jpg diff --git a/pixmaps/screenshots/module-manager.jpg b/pixmaps/screenshots/module-manager.jpg Binary files differnew file mode 100644 index 0000000..0da9e57 --- /dev/null +++ b/pixmaps/screenshots/module-manager.jpg diff --git a/pixmaps/screenshots/parallel-display.jpg b/pixmaps/screenshots/parallel-display.jpg Binary files differnew file mode 100644 index 0000000..3a36b21 --- /dev/null +++ b/pixmaps/screenshots/parallel-display.jpg @@ -326,8 +326,8 @@ msgstr "Xiphos التنمية" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "حقوق الطبع والنشر 2000-2015 فريق التطوير Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "حقوق الطبع والنشر 2000-2016 فريق التطوير Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -290,7 +290,7 @@ msgid "Xiphos development" msgstr "" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" msgstr "" #: ../src/gnome2/about_xiphos.c:131 @@ -334,8 +334,8 @@ msgid "Xiphos development" msgstr "Vývoj aplikace Xiphos" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright © 2000-2015 Xiphos Vývojový tým" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright © 2000-2016 Xiphos Vývojový tým" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -319,8 +319,8 @@ msgstr "Datblygiad Xiphos" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Hawlfraint 2000-2015 Tîm Datblygu Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Hawlfraint 2000-2016 Tîm Datblygu Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -302,8 +302,8 @@ msgstr "Xiphos udvikling" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Ophavsret 2000-2015 Xiphos udviklinger holdet" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Ophavsret 2000-2016 Xiphos udviklinger holdet" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -337,8 +337,8 @@ msgid "Xiphos development" msgstr "Xiphos Entwicklung" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright © 2000-2015 Xiphos Entwickler-Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright © 2000-2016 Xiphos Entwickler-Team" #: ../src/gnome2/about_xiphos.c:131 msgid "" diff --git a/po/en_GB.po b/po/en_GB.po index f2203b4..d357251 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-21 09:46-0500\n" "Last-Translator: Thomas Abthorpe <thomas@goodking.ca>\n" -"Language-Team: British English <gnomesword-devel@lists.sourceforge.net>\n" +"Language-Team: British English <xiphos-devel@crosswire.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -333,8 +333,8 @@ msgid "Xiphos development" msgstr "Xiphos development" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright © 2000-2015 Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright © 2000-2016 Xiphos Development Team" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -335,8 +335,8 @@ msgid "Xiphos development" msgstr "Desarrollo de Xiphos" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright 2000-2015 El Equipo de Desarrollo de Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright 2000-2016 El Equipo de Desarrollo de Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -335,8 +335,8 @@ msgid "Xiphos development" msgstr "بسط و گسترش زیفوس" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "حق چاپ برای تیم گسترش زیفوس محفوظ میباشد 2000-2015" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "حق چاپ برای تیم گسترش زیفوس محفوظ میباشد 2000-2016" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -328,8 +328,8 @@ msgstr "Xiphoksen kehittäminen" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright 2000-2015 Xiphoksen kehitystiimi" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright 2000-2016 Xiphoksen kehitystiimi" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -317,8 +317,8 @@ msgid "Xiphos development" msgstr "SIte de développement de Xiphos" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright © 2000-2015 Équipe de développement Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright © 2000-2016 Équipe de développement Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -332,8 +332,8 @@ msgstr "פיתוח Xiphos" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "זכויות היוצרים (2000-2015) שמורות לצוות הפיתוח של Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "זכויות היוצרים (2000-2016) שמורות לצוות הפיתוח של Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -334,8 +334,8 @@ msgstr "Xiphos fejlesztés" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Minden jog fenntartva 2000-2015 A Xiphos Fejlesztői csapat" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Minden jog fenntartva 2000-2016 A Xiphos Fejlesztői csapat" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -306,7 +306,7 @@ msgid "Xiphos development" msgstr "Xiphos開発" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" msgstr "" #: ../src/gnome2/about_xiphos.c:131 diff --git a/po/ko_KR.po b/po/ko_KR.po index 501e427..d1be3a1 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1,5 +1,5 @@ # Korean translarion for the Xiphos. -# Copyright (C) 2015 Xiphos Developer Team and the Korean Translator. +# Copyright (C) 2016 Xiphos Developer Team and the Korean Translator. # This file is distributed under the same license as the Xiphos package. # Seong-ho Cho <shcho@gnome.org>, 2015. # @@ -302,8 +302,8 @@ msgid "Xiphos development" msgstr "xiphos 개발" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright © 2000-2015 Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright © 2000-2016 Xiphos Development Team" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -334,8 +334,8 @@ msgid "Xiphos development" msgstr "Xiphos kūrimas" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Autorinės Teisės © 2000-2015 Xiphos Kūrėjų Komanda" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Autorinės Teisės © 2000-2016 Xiphos Kūrėjų Komanda" #: ../src/gnome2/about_xiphos.c:131 #, fuzzy @@ -297,7 +297,7 @@ msgid "Xiphos development" msgstr "" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" msgstr "" #: ../src/gnome2/about_xiphos.c:131 @@ -339,8 +339,8 @@ msgstr "Xiphos utvikling" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright·2000-2015·The·Xiphos·Development·Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright·2000-2016·The·Xiphos·Development·Team" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2015-01-18 19:40-0500\n" "Last-Translator: Peter von Kaehne <refdoc@crosswire.org>\n" -"Language-Team: Xiphos-developers <xiphos-developers@lists>\n" +"Language-Team: xiphos-devel <xiphos-devel@lists>\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -311,8 +311,8 @@ msgid "Xiphos development" msgstr "Xiphos ontwikkeling" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Auteursrecht 2000-2015 Het ontwikkelteam van Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Auteursrecht 2000-2016 Het ontwikkelteam van Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -321,8 +321,8 @@ msgstr "Rozwój Xiphos" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Prawa autorskie 2000-2015 Zespół Rozwojowy Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Prawa autorskie 2000-2016 Zespół Rozwojowy Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -332,8 +332,8 @@ msgid "Xiphos development" msgstr "Desenvolvimento de Xiphos" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright 2000-2015 Equipa de Desenvolvimento Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright 2000-2016 Equipa de Desenvolvimento Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index e3eb20e..394d943 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -308,8 +308,8 @@ msgstr "Desenvolvimento do Xiphos" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright 2000-2015 Equipe de Desenvolvimento do Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright 2000-2016 Equipe de Desenvolvimento do Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -325,8 +325,8 @@ msgstr "Dezvoltarea Xiphos" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright 2000-2015 Echipa de Developeri Xiphos" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright 2000-2016 Echipa de Developeri Xiphos" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -323,8 +323,8 @@ msgstr "Разработка Xiphos" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Копирайт 2000-2015 The Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Копирайт 2000-2016 The Xiphos Development Team" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -1,6 +1,6 @@ # translation of sk.po to Slovak # Slovak translation for Xiphos -# Copyright (C) 2001-2015 Zdenko Podobný +# Copyright (C) 2000-2016 Zdenko Podobný # # Zdenko Podobný <zdpo@mailbox.sk>, 2001. # Zdenko Podobny <zdposter@gmail.com>, 2009, 2014, 2015. @@ -302,8 +302,8 @@ msgid "Xiphos development" msgstr "Xiphos vývoj" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Copyright © 2000-2015 Xiphos vývojový Tím" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Copyright © 2000-2016 Xiphos vývojový Tím" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -10,8 +10,7 @@ msgstr "" "POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2015-06-04 12:39+0000\n" "Last-Translator: Marjan Šavli <marjan.savli@gmail.com>\n" -"Language-Team: Slovenščina (Slovene) <gnomesword-devel@lists.sourceforge." -"net>\n" +"Language-Team: Slovenščina (Slovene) <xiphos-devel@crosswire.org>\n" "Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -338,8 +337,8 @@ msgstr "Xiphos razvoj" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Avtorske pravice © 2000-2015 Xiphos razvojna skupina" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Avtorske pravice © 2000-2016 Xiphos razvojna skupina" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -5,8 +5,7 @@ msgstr "" "POT-Creation-Date: 2015-06-16 13:36-0400\n" "PO-Revision-Date: 2014-12-23 20:47+0100\n" "Last-Translator: Matthew Talbert <ransom1982@gmail.com>\n" -"Language-Team: Xiphos Dev Team <gnomesword-developers@lists.sourceforge." -"net>\n" +"Language-Team: Xiphos Dev Team <xiphos-devel@crosswire.org>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -332,8 +331,8 @@ msgid "Xiphos development" msgstr "Xiphos-utveckling" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Upphovsrätt © 2000-2015 Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Upphovsrätt © 2000-2016 Xiphos Development Team" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -328,8 +328,8 @@ msgstr "Xiphos gelişme" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "Telif hakkı 2000-2015 Xiphos Geliştirme Ekibi" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "Telif hakkı 2000-2016 Xiphos Geliştirme Ekibi" #: ../src/gnome2/about_xiphos.c:131 msgid "" @@ -308,7 +308,7 @@ msgid "Xiphos development" msgstr "" #: ../src/gnome2/about_xiphos.c:129 -msgid "Copyright © 2000-2015 Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" msgstr "" #: ../src/gnome2/about_xiphos.c:131 diff --git a/po/zh_CN.po b/po/zh_CN.po index 15fb481..ef54ef8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -320,8 +320,8 @@ msgstr "Xiphos 开发项目" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" -msgstr "版权所有 2000-2015 Xiphos 开发项目组" +msgid "Copyright © 2000-2016 Xiphos Development Team" +msgstr "版权所有 2000-2016 Xiphos 开发项目组" #: ../src/gnome2/about_xiphos.c:131 msgid "" diff --git a/po/zh_TW.po b/po/zh_TW.po index df292cf..53bad3c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -294,7 +294,7 @@ msgstr "開發 Xiphos" #: ../src/gnome2/about_xiphos.c:129 #, fuzzy -msgid "Copyright © 2000-2015 Xiphos Development Team" +msgid "Copyright © 2000-2016 Xiphos Development Team" msgstr "Xiphos 開發團隊版權所有 2000 - 2015" #: ../src/gnome2/about_xiphos.c:131 diff --git a/src/backend/gs_stringmgr.cpp b/src/backend/gs_stringmgr.cpp index 1bb9a31..e653408 100644 --- a/src/backend/gs_stringmgr.cpp +++ b/src/backend/gs_stringmgr.cpp @@ -6,7 +6,7 @@ * gs_stringmgr was mostly inspired by BTSringMgr from BibleTime * Credits to the BibleTime Team (http://www.bibletime.info) * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/backend/gs_stringmgr.h b/src/backend/gs_stringmgr.h index 5777f88..b14efda 100644 --- a/src/backend/gs_stringmgr.h +++ b/src/backend/gs_stringmgr.h @@ -5,7 +5,7 @@ * gs_stringmgr was mostly inspired by BTSringMgr from BibleTime * Credits to the BibleTime Team (http://www.bibletime.info) * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/backend/module_manager.cc b/src/backend/module_manager.cc index 7015941..2c171e4 100644 --- a/src/backend/module_manager.cc +++ b/src/backend/module_manager.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * module_manager.cc * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/backend/module_manager.hh b/src/backend/module_manager.hh index 2d9dc4c..9fab1c0 100644 --- a/src/backend/module_manager.hh +++ b/src/backend/module_manager.hh @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * module_manager.hh * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/backend/sword_main.cc b/src/backend/sword_main.cc index ee4c24c..27278b4 100644 --- a/src/backend/sword_main.cc +++ b/src/backend/sword_main.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword_main.cc - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/backend/sword_main.hh b/src/backend/sword_main.hh index 345e0bb..6eefb84 100644 --- a/src/backend/sword_main.hh +++ b/src/backend/sword_main.hh @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword_main.hh - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/editor.c b/src/editor/editor.c index fa3b8ac..fd4c5ea 100644 --- a/src/editor/editor.c +++ b/src/editor/editor.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * editor.c - webkit stuff * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/editor.h b/src/editor/editor.h index 8a44de2..109dc40 100644 --- a/src/editor/editor.h +++ b/src/editor/editor.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * editor.h - webkit stuff * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/link_dialog.c b/src/editor/link_dialog.c index 05c0467..d044eaa 100644 --- a/src/editor/link_dialog.c +++ b/src/editor/link_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * link_dialog.c - dialog for inserting a link * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/link_dialog.h b/src/editor/link_dialog.h index ee26b14..dc9aed6 100644 --- a/src/editor/link_dialog.h +++ b/src/editor/link_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * link_dialog.f - dialog for inserting a link * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/slib-editor.c b/src/editor/slib-editor.c index e28f048..81c4b3d 100644 --- a/src/editor/slib-editor.c +++ b/src/editor/slib-editor.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * html-editor.c - the html editor * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/slib-editor.h b/src/editor/slib-editor.h index 88e853b..9df49e2 100644 --- a/src/editor/slib-editor.h +++ b/src/editor/slib-editor.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * slib-editor.h - the html editor using gtkhtml-editor (slib) * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/template.h b/src/editor/template.h index 47583af..4a25a5a 100644 --- a/src/editor/template.h +++ b/src/editor/template.h @@ -4,7 +4,7 @@ * * ** this is used by settings only if studypad.spt does not exist ** * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/webkit_editor.c b/src/editor/webkit_editor.c index 740dfe1..1cf69b5 100644 --- a/src/editor/webkit_editor.c +++ b/src/editor/webkit_editor.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * webkit_editor.c - html editor using webkit * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/editor/webkit_editor.h b/src/editor/webkit_editor.h index 31aa2b4..33ed281 100644 --- a/src/editor/webkit_editor.h +++ b/src/editor/webkit_editor.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * webkit_editor.h - html editor using webkit * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/examples/xiphos-nav.c b/src/examples/xiphos-nav.c index 11dc7e7..5c6c512 100644 --- a/src/examples/xiphos-nav.c +++ b/src/examples/xiphos-nav.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos.c - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/about_modules.c b/src/gnome2/about_modules.c index 1069009..92243e2 100644 --- a/src/gnome2/about_modules.c +++ b/src/gnome2/about_modules.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_modules.c - Sword modules about dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/about_sword.c b/src/gnome2/about_sword.c index 689941b..56be1d2 100644 --- a/src/gnome2/about_sword.c +++ b/src/gnome2/about_sword.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_sword.c - Xiphos "About Sword" dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/about_trans.c b/src/gnome2/about_trans.c index f942db3..1a898f3 100644 --- a/src/gnome2/about_trans.c +++ b/src/gnome2/about_trans.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_trans.c - About Translation * - * Copyright (C) 2008-2015 Xiphos Developer Team + * Copyright (C) 2008-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/about_xiphos.c b/src/gnome2/about_xiphos.c index 07f5610..ac582f8 100644 --- a/src/gnome2/about_xiphos.c +++ b/src/gnome2/about_xiphos.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_xiphos.c - Xiphos about dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -126,7 +126,7 @@ GtkWidget *gui_create_about_xiphos(void) gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about1), versionbuild); gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about1), - _("Copyright © 2000-2015 Xiphos Development Team")); + _("Copyright © 2000-2016 Xiphos Development Team")); gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about1), _("\nPowered by The SWORD Project.\nWe would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project.")); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about1), diff --git a/src/gnome2/bibletext.c b/src/gnome2/bibletext.c index a354df6..261803f 100644 --- a/src/gnome2/bibletext.c +++ b/src/gnome2/bibletext.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bibletext.c - gui for Bible text modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -107,20 +107,28 @@ _popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) GtkWidget *gui_create_bible_pane(void) { GtkWidget *vbox; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow; +#endif UI_VBOX(vbox, FALSE, 0); gtk_widget_show(vbox); +#ifndef USE_WEBKIT2 scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, TRUE, 0); +#endif widgets.html_text = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, TEXT_TYPE)); gtk_widget_show(widgets.html_text); +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(vbox), widgets.html_text, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolledwindow), widgets.html_text); +#endif g_signal_connect((gpointer)widgets.html_text, "popupmenu_requested", diff --git a/src/gnome2/bibletext_dialog.c b/src/gnome2/bibletext_dialog.c index 459d491..0a817fb 100644 --- a/src/gnome2/bibletext_dialog.c +++ b/src/gnome2/bibletext_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bibletext_dialog.c - view Bible text module in a dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/bookmark_dialog.c b/src/gnome2/bookmark_dialog.c index 9f65b3f..991c114 100644 --- a/src/gnome2/bookmark_dialog.c +++ b/src/gnome2/bookmark_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmark_dialog.c - gui to popup a dialog for adding a bookmark * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/bookmarks_menu.c b/src/gnome2/bookmarks_menu.c index 6a64121..a5dc83c 100644 --- a/src/gnome2/bookmarks_menu.c +++ b/src/gnome2/bookmarks_menu.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmarks_menu.c - gui for bookmarks using menu * - * Copyright (C) 2003-2015 Xiphos Developer Team + * Copyright (C) 2003-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/bookmarks_treeview.c b/src/gnome2/bookmarks_treeview.c index 1c2ad3e..ab50681 100644 --- a/src/gnome2/bookmarks_treeview.c +++ b/src/gnome2/bookmarks_treeview.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmarks_treeview.c - gui for bookmarks using treeview * - * Copyright (C) 2003-2015 Xiphos Developer Team + * Copyright (C) 2003-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/cipher_key_dialog.c b/src/gnome2/cipher_key_dialog.c index 4108ad8..04bfaa8 100644 --- a/src/gnome2/cipher_key_dialog.c +++ b/src/gnome2/cipher_key_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * cipher_key_dialog.c - asks for key to unlock sword module * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/commentary.c b/src/gnome2/commentary.c index d6e0d2d..5b86314 100644 --- a/src/gnome2/commentary.c +++ b/src/gnome2/commentary.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * commentary.c - gui for commentary modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -124,27 +124,37 @@ _popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) GtkWidget *gui_create_commentary_pane(void) { GtkWidget *box_comm; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow; +#endif UI_VBOX(box_comm, FALSE, 0); gtk_widget_show(box_comm); +#ifndef USE_WEBKIT2 scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(box_comm), scrolledwindow, TRUE, TRUE, 0); +#endif widgets.html_comm = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, COMMENTARY_TYPE)); gtk_widget_show(widgets.html_comm); +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(box_comm), widgets.html_comm, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolledwindow), widgets.html_comm); +#endif g_signal_connect((gpointer)widgets.html_comm, "popupmenu_requested", G_CALLBACK(_popupmenu_requested_cb), NULL); +#ifndef USE_WEBKIT2 g_signal_connect((gpointer)scrolledwindow, "enter_notify_event", G_CALLBACK(on_enter_notify_event), NULL); +#endif return box_comm; } diff --git a/src/gnome2/commentary_dialog.c b/src/gnome2/commentary_dialog.c index aba8eea..797c764 100644 --- a/src/gnome2/commentary_dialog.c +++ b/src/gnome2/commentary_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * commentary_dialog.c - dialog for a commentary module * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -207,7 +207,9 @@ void gui_create_commentary_dialog(DIALOG_DATA *d, gboolean do_edit) GtkWidget *vbox_toolbars; GtkWidget *toolbar_nav; GtkWidget *frame19; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow38; +#endif cur_d = d; d->dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -242,6 +244,7 @@ void gui_create_commentary_dialog(DIALOG_DATA *d, gboolean do_edit) gtk_box_pack_start(GTK_BOX(vbox30), frame19, TRUE, TRUE, 0); gtk_frame_set_shadow_type(GTK_FRAME(frame19), GTK_SHADOW_IN); +#ifndef USE_WEBKIT2 scrolledwindow38 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow38); gtk_container_add(GTK_CONTAINER(frame19), scrolledwindow38); @@ -251,13 +254,17 @@ void gui_create_commentary_dialog(DIALOG_DATA *d, gboolean do_edit) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow38, settings.shadow_type); +#endif d->html = GTK_WIDGET(XIPHOS_HTML_NEW(((DIALOG_DATA *)d), TRUE, DIALOG_COMMENTARY_TYPE)); - - gtk_container_add(GTK_CONTAINER(scrolledwindow38), d->html); gtk_widget_show(d->html); +#ifdef USE_WEBKIT2 + gtk_container_add(GTK_CONTAINER(frame19), d->html); +#else + gtk_container_add(GTK_CONTAINER(scrolledwindow38), d->html); +#endif g_signal_connect((gpointer)d->html, "popupmenu_requested", G_CALLBACK(_popupmenu_requested_cb), diff --git a/src/gnome2/dialog.c b/src/gnome2/dialog.c index 50a3e99..50cd182 100644 --- a/src/gnome2/dialog.c +++ b/src/gnome2/dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dialog.c - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/dictlex.c b/src/gnome2/dictlex.c index d4af940..c468535 100644 --- a/src/gnome2/dictlex.c +++ b/src/gnome2/dictlex.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dictlex.c - gui for commentary modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -358,7 +358,9 @@ GtkWidget *gui_create_dictionary_pane(void) GtkWidget *image2; GtkWidget *arrow1; GtkWidget *dict_drop_down; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow; +#endif UI_VBOX(box_dict, FALSE, 0); gtk_widget_show(box_dict); @@ -420,6 +422,7 @@ GtkWidget *gui_create_dictionary_pane(void) gtk_widget_show(image2); gtk_container_add(GTK_CONTAINER(button11), image2); +#ifndef USE_WEBKIT2 scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(box_dict), scrolledwindow, TRUE, TRUE, @@ -428,12 +431,17 @@ GtkWidget *gui_create_dictionary_pane(void) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow, settings.shadow_type); +#endif widgets.html_dict = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, DICTIONARY_TYPE)); gtk_widget_show(widgets.html_dict); +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(box_dict), widgets.html_dict, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolledwindow), widgets.html_dict); +#endif g_signal_connect((gpointer)widgets.html_dict, "popupmenu_requested", G_CALLBACK(_popupmenu_requested_cb), NULL); diff --git a/src/gnome2/dictlex_dialog.c b/src/gnome2/dictlex_dialog.c index 6c58b90..9bb6c19 100644 --- a/src/gnome2/dictlex_dialog.c +++ b/src/gnome2/dictlex_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dictlex_dialog.c - dialog for displaying a dictlex module * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -308,7 +308,9 @@ void gui_create_dictlex_dialog(DIALOG_DATA *dlg) GtkWidget *btnSyncDL; // GtkWidget *label205; GtkWidget *frameDictHTML; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindowDictHTML; +#endif GtkWidget *scrolledwindow; // GtkWidget *label; GtkListStore *model; @@ -395,6 +397,7 @@ void gui_create_dictlex_dialog(DIALOG_DATA *dlg) gtk_widget_show(frameDictHTML); gtk_paned_pack2(GTK_PANED(hpaned7), frameDictHTML, TRUE, TRUE); +#ifndef USE_WEBKIT2 scrolledwindowDictHTML = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindowDictHTML); gtk_container_add(GTK_CONTAINER(frameDictHTML), @@ -405,13 +408,17 @@ void gui_create_dictlex_dialog(DIALOG_DATA *dlg) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindowDictHTML, settings.shadow_type); +#endif dlg->html = GTK_WIDGET(XIPHOS_HTML_NEW((DIALOG_DATA *)dlg, TRUE, DIALOG_DICTIONARY_TYPE)); - +#ifdef USE_WEBKIT2 + gtk_container_add(GTK_CONTAINER(frameDictHTML), dlg->html); +#else gtk_container_add(GTK_CONTAINER(scrolledwindowDictHTML), dlg->html); +#endif gtk_widget_show(dlg->html); g_signal_connect((gpointer)dlg->html, "popupmenu_requested", diff --git a/src/gnome2/display_info.c b/src/gnome2/display_info.c index 9e32fc1..9f3a67b 100644 --- a/src/gnome2/display_info.c +++ b/src/gnome2/display_info.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * display_info.c - display information (ie strongs) in a dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/export_bookmarks.c b/src/gnome2/export_bookmarks.c index dd1918e..b154f1b 100644 --- a/src/gnome2/export_bookmarks.c +++ b/src/gnome2/export_bookmarks.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_bookmarks.c - * - * Copyright (C) 2003-2015 Xiphos Developer Team + * Copyright (C) 2003-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/export_dialog.c b/src/gnome2/export_dialog.c index cd8d910..630c72f 100644 --- a/src/gnome2/export_dialog.c +++ b/src/gnome2/export_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_dialog.c - * - * Copyright (C) 2008-2015 Xiphos Developer Team + * Copyright (C) 2008-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/find_dialog.c b/src/gnome2/find_dialog.c index 3dbe77f..a69016e 100644 --- a/src/gnome2/find_dialog.c +++ b/src/gnome2/find_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * find_dialog.c * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/font_dialog.c b/src/gnome2/font_dialog.c index 2b777b2..f0d7300 100644 --- a/src/gnome2/font_dialog.c +++ b/src/gnome2/font_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * font_dialog.c - dialog to set module font * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/gbs.c b/src/gnome2/gbs.c index a196135..405a44e 100644 --- a/src/gnome2/gbs.c +++ b/src/gnome2/gbs.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gbs.c - generic book support - the gui * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -160,7 +160,9 @@ _popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) GtkWidget *gui_create_book_pane(void) { GtkWidget *box; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow; +#endif GtkWidget *navbar; UI_VBOX(box, FALSE, 0); @@ -168,18 +170,24 @@ GtkWidget *gui_create_book_pane(void) navbar = gui_navbar_book_new(); gtk_box_pack_start(GTK_BOX(box), navbar, FALSE, FALSE, 0); +#ifndef USE_WEBKIT2 scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(box), scrolledwindow, TRUE, TRUE, 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#endif widgets.html_book = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, BOOK_TYPE)); gtk_widget_show(widgets.html_book); +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(box), widgets.html_book, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolledwindow), widgets.html_book); +#endif g_signal_connect((gpointer)widgets.html_book, "popupmenu_requested", diff --git a/src/gnome2/gbs_dialog.c b/src/gnome2/gbs_dialog.c index ed12087..a65709b 100644 --- a/src/gnome2/gbs_dialog.c +++ b/src/gnome2/gbs_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gbs_dialog.c - dialog for displaying a gbs module * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -252,7 +252,9 @@ void gui_create_gbs_dialog(DIALOG_DATA *dlg) GtkWidget *navbar; GtkWidget *hpaned; GtkWidget *scrolledwindow_ctree; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow_html; +#endif GObject *selection; dlg->dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -297,6 +299,7 @@ void gui_create_gbs_dialog(DIALOG_DATA *dlg) selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(dlg->tree))); +#ifndef USE_WEBKIT2 scrolledwindow_html = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow_html); gtk_paned_pack2(GTK_PANED(hpaned), scrolledwindow_html, FALSE, @@ -307,11 +310,16 @@ void gui_create_gbs_dialog(DIALOG_DATA *dlg) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow_html, settings.shadow_type); +#endif dlg->html = GTK_WIDGET(XIPHOS_HTML_NEW(((DIALOG_DATA *)dlg), TRUE, DIALOG_BOOK_TYPE)); - gtk_container_add(GTK_CONTAINER(scrolledwindow_html), dlg->html); gtk_widget_show(dlg->html); +#ifdef USE_WEBKIT2 + gtk_paned_pack2(GTK_PANED(hpaned), dlg->html, FALSE, TRUE); +#else + gtk_container_add(GTK_CONTAINER(scrolledwindow_html), dlg->html); +#endif g_signal_connect((gpointer)dlg->html, "popupmenu_requested", G_CALLBACK(_popupmenu_requested_cb), diff --git a/src/gnome2/gui.c b/src/gnome2/gui.c index 70ff0b8..70a7dbe 100644 --- a/src/gnome2/gui.c +++ b/src/gnome2/gui.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gui.c - The heart of the gui. * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/ipc.c b/src/gnome2/ipc.c index f4c1d98..cbca805 100644 --- a/src/gnome2/ipc.c +++ b/src/gnome2/ipc.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * ipc.c - Interprocess Communication - dbus integration * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/main_menu.c b/src/gnome2/main_menu.c index 0cb549a..0c6f1b5 100644 --- a/src/gnome2/main_menu.c +++ b/src/gnome2/main_menu.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main_menu.c - creation of and call backs for xiphos main menu * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -142,7 +142,7 @@ on_help_contents_activate(GtkMenuItem *menuitem, gpointer user_data) G_MODULE_EXPORT void on_mailing_list_activate(GtkMenuItem *menuitem, gpointer user_data) { - xiphos_open_default("https://lists.sourceforge.net/lists/listinfo/gnomesword-users/"); + xiphos_open_default("http://www.crosswire.org/mailman/listinfo/xiphos-users/"); } /****************************************************************************** @@ -208,7 +208,7 @@ on_live_chat_activate(GtkMenuItem *menuitem, gpointer user_data) * gpointer user_data) * * Description - * open web browser to sourceforge bug tracker + * open web browser to github bug tracker * * Return value * void diff --git a/src/gnome2/main_window.c b/src/gnome2/main_window.c index ac7f43f..2e9e8b8 100644 --- a/src/gnome2/main_window.c +++ b/src/gnome2/main_window.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main_window.c - main window gui * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -690,10 +690,9 @@ static gboolean on_vbox1_key_press_event(GtkWidget *widget, GdkEventKey *event, case XK_M: if (state == GDK_MOD1_MASK) // Alt-M morph { - kbd_toggle_option((main_check_for_global_option(sM, "GBFMorph") || main_check_for_global_option(sM, - "ThMLMorph") || - main_check_for_global_option(sM, - "OSISMorph")), + kbd_toggle_option((main_check_for_global_option(sM, "GBFMorph") || + main_check_for_global_option(sM, "ThMLMorph") || + main_check_for_global_option(sM, "OSISMorph")), "Morphological Tags"); } break; @@ -771,8 +770,10 @@ static gboolean on_vbox1_key_press_event(GtkWidget *widget, GdkEventKey *event, case XK_t: case XK_T: - if (state == GDK_CONTROL_MASK) // open a new tab + if (state == GDK_CONTROL_MASK) // Ctrl-T open a new tab on_notebook_main_new_tab_clicked(NULL, NULL); + else if (state == GDK_MOD1_MASK) // Alt-T transliteration + kbd_toggle_option(true, "Transliteration"); break; case XK_z: @@ -879,7 +880,9 @@ void create_mainwindow(void) GtkWidget *hbox25; GtkWidget *tab_button_icon; GtkWidget *label; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow; +#endif GtkWidget *box_book; GdkPixbuf *pixbuf; /* @@ -896,301 +899,240 @@ void create_mainwindow(void) widgets.studypad_dialog = NULL; - widgets.app = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(widgets.app), - _("Xiphos - Bible Study Software")); + /* A rough scektch of the main window (widgets.app) and it's children + * widgets.app + * | + * vbox_gs + * | + * +--|----+ + * | | + * menu hbox25 + * | + * widgets.epaned + * | + * widgets.vboxMain + * | | + * widgets.hboxtb widgets.page + * | | + * widgets.hpaned nav_toolbar + * | | + * widgets.vpaned---+ +----------------------------widgets.vpaned2---------------+ + * | | | | + * widgets.vbox_previewer widgets.vbox_text widgets.notebook_comm_book widgets.box_dict + * | | | + * widgets.notebook_bible_parallel widgets.box_comm box_book + * | + * widgets.notebook_text + * + */ - g_object_set_data(G_OBJECT(widgets.app), - "widgets.app", widgets.app); + // The toplevel Xiphos window + widgets.app = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(widgets.app), _("Xiphos - Bible Study Software")); + g_object_set_data(G_OBJECT(widgets.app), "widgets.app", widgets.app); gtk_widget_set_size_request(widgets.app, 680, 425); gtk_widget_set_can_focus(widgets.app, 1); gtk_window_set_resizable(GTK_WINDOW(widgets.app), TRUE); + // The app icon. + // FIXME:: This should be a big copy of the logo because GTK does the scaling (GTK 3.16?) imagename = image_locator("gs2-48x48.png"); pixbuf = gdk_pixbuf_new_from_file(imagename, NULL); g_free(imagename); gtk_window_set_icon(GTK_WINDOW(widgets.app), pixbuf); + // The main box for our toplevel window. UI_VBOX(vbox_gs, FALSE, 0); gtk_widget_show(vbox_gs); gtk_container_add(GTK_CONTAINER(widgets.app), vbox_gs); + // Add the main menu. menu = gui_create_main_menu(); - gtk_box_pack_start(GTK_BOX(vbox_gs), menu, FALSE, TRUE, 0); + // Another box UI_HBOX(hbox25, FALSE, 0); gtk_widget_show(hbox25); gtk_box_pack_start(GTK_BOX(vbox_gs), hbox25, TRUE, TRUE, 0); - /**widgets.epaned********/ + // widgets.epaned widgets.epaned = UI_HPANE(); gtk_widget_show(widgets.epaned); -#ifdef HAVE_GTK_314 - gtk_container_set_border_width(GTK_CONTAINER(widgets.epaned), 0); -#else +#ifndef HAVE_GTK_314 gtk_container_set_border_width(GTK_CONTAINER(widgets.epaned), 4); #endif gtk_box_pack_start(GTK_BOX(hbox25), widgets.epaned, TRUE, TRUE, 0); - + // Another box UI_VBOX(widgets.vboxMain, FALSE, 0); gtk_widget_show(widgets.vboxMain); gtk_paned_pack2(GTK_PANED(widgets.epaned), widgets.vboxMain, TRUE, TRUE); -#ifdef HAVE_GTK_314 - gtk_container_set_border_width(GTK_CONTAINER(widgets.vboxMain), 0); -#else +#ifndef HAVE_GTK_314 gtk_container_set_border_width(GTK_CONTAINER(widgets.vboxMain), 2); #endif /* - * notebook to have separate passages opened at once - * the passages are not actually open but are switched - * between similar to bookmarks + * Notebook to have separate passages opened at once the passages are not + * actually open but are switched between similar to bookmarks */ UI_HBOX(widgets.hboxtb, FALSE, 0); if (settings.browsing) gtk_widget_show(widgets.hboxtb); - gtk_box_pack_start(GTK_BOX(widgets.vboxMain), widgets.hboxtb, - FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(widgets.vboxMain), widgets.hboxtb, FALSE, FALSE, 0); widgets.button_new_tab = gtk_button_new(); - //don't show button here in case !settings.browsing + // Don't show button here in case !settings.browsing - tab_button_icon = #ifdef HAVE_GTK_310 - gtk_image_new_from_icon_name("tab-new-symbolic", - GTK_ICON_SIZE_SMALL_TOOLBAR); + tab_button_icon = gtk_image_new_from_icon_name("tab-new-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR); #else - gtk_image_new_from_stock(GTK_STOCK_ADD, - GTK_ICON_SIZE_SMALL_TOOLBAR); + tab_button_icon = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR); #endif gtk_widget_show(tab_button_icon); - gtk_container_add(GTK_CONTAINER(widgets.button_new_tab), - tab_button_icon); - gtk_button_set_relief(GTK_BUTTON(widgets.button_new_tab), - GTK_RELIEF_NONE); - gtk_box_pack_start(GTK_BOX(widgets.hboxtb), widgets.button_new_tab, - FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(widgets.button_new_tab, - _("Open a new tab")); + gtk_container_add(GTK_CONTAINER(widgets.button_new_tab), tab_button_icon); + gtk_button_set_relief(GTK_BUTTON(widgets.button_new_tab), GTK_RELIEF_NONE); + gtk_box_pack_start(GTK_BOX(widgets.hboxtb), widgets.button_new_tab, FALSE, FALSE, 0); + gtk_widget_set_tooltip_text(widgets.button_new_tab, _("Open a new tab")); widgets.notebook_main = gtk_notebook_new(); gtk_widget_show(widgets.notebook_main); - gtk_box_pack_start(GTK_BOX(widgets.hboxtb), - widgets.notebook_main, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(widgets.hboxtb), widgets.notebook_main, TRUE, TRUE, 0); gtk_widget_set_size_request(widgets.notebook_main, -1, 25); - gtk_notebook_set_scrollable(GTK_NOTEBOOK(widgets.notebook_main), - TRUE); + gtk_notebook_set_scrollable(GTK_NOTEBOOK(widgets.notebook_main), TRUE); gtk_notebook_popup_enable(GTK_NOTEBOOK(widgets.notebook_main)); - gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_main), - FALSE); - /* main passage tabbed notebook end */ + gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_main), FALSE); + // Main passage tabbed notebook end + // Another box UI_VBOX(widgets.page, FALSE, 0); gtk_widget_show(widgets.page); - gtk_box_pack_start(GTK_BOX(widgets.vboxMain), widgets.page, TRUE, - TRUE, 0); - /* - * nav toolbar - */ + gtk_box_pack_start(GTK_BOX(widgets.vboxMain), widgets.page, TRUE, TRUE, 0); + + //nav toolbar nav_toolbar = gui_navbar_versekey_new(); - gtk_box_pack_start(GTK_BOX(widgets.page), nav_toolbar, FALSE, - FALSE, 0); - /* - * end nav toolbar - */ + gtk_box_pack_start(GTK_BOX(widgets.page), nav_toolbar, FALSE, FALSE, 0); - /**widgets.hpaned********/ + // widgets.hpaned widgets.hpaned = UI_HPANE(); gtk_widget_show(widgets.hpaned); - gtk_box_pack_start(GTK_BOX(widgets.page), widgets.hpaned, TRUE, - TRUE, 0); + gtk_box_pack_start(GTK_BOX(widgets.page), widgets.hpaned, TRUE, TRUE, 0); - /**widgets.vpaned********/ + // widgets.vpaned widgets.vpaned = UI_VPANE(); gtk_widget_show(widgets.vpaned); gtk_widget_set_size_request(widgets.vpaned, 50, -1); - gtk_paned_pack1(GTK_PANED(widgets.hpaned), widgets.vpaned, TRUE, - FALSE); + gtk_paned_pack1(GTK_PANED(widgets.hpaned), widgets.vpaned, TRUE, FALSE); + // widgets.vpaned2 widgets.vpaned2 = UI_VPANE(); gtk_widget_show(widgets.vpaned2); gtk_widget_set_size_request(widgets.vpaned2, 50, -1); - gtk_paned_pack2(GTK_PANED(widgets.hpaned), widgets.vpaned2, TRUE, - FALSE); + gtk_paned_pack2(GTK_PANED(widgets.hpaned), widgets.vpaned2, TRUE, FALSE); - /**widgets.hpaned********/ + // widgets.vbox_text UI_VBOX(widgets.vbox_text, FALSE, 0); gtk_widget_show(widgets.vbox_text); - gtk_paned_pack1(GTK_PANED(widgets.vpaned), - widgets.vbox_text, TRUE, TRUE); + gtk_paned_pack1(GTK_PANED(widgets.vpaned), widgets.vbox_text, TRUE, TRUE); - /* - * bible/parallel notebook - */ + // Bible/parallel notebook widgets.notebook_bible_parallel = gtk_notebook_new(); gtk_widget_show(widgets.notebook_bible_parallel); - gtk_box_pack_start(GTK_BOX(widgets.vbox_text), - widgets.notebook_bible_parallel, TRUE, TRUE, 0); - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - GTK_POS_BOTTOM); - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - TRUE); - gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - FALSE); - gtk_container_set_border_width(GTK_CONTAINER(widgets.notebook_bible_parallel), - 1); - - g_signal_connect(G_OBJECT(widgets.notebook_bible_parallel), - "change-current-page", - G_CALLBACK(on_notebook_bible_parallel_switch_page), NULL); - /* - * text notebook - */ - widgets.notebook_text = gui_create_bible_pane(); + gtk_box_pack_start(GTK_BOX(widgets.vbox_text), widgets.notebook_bible_parallel, TRUE, TRUE, 0); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widgets.notebook_bible_parallel), GTK_POS_BOTTOM); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), TRUE); + gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_bible_parallel), FALSE); + gtk_container_set_border_width(GTK_CONTAINER(widgets.notebook_bible_parallel), 1); - gtk_container_add(GTK_CONTAINER(widgets.notebook_bible_parallel), - widgets.notebook_text); + g_signal_connect(G_OBJECT(widgets.notebook_bible_parallel), "change-current-page", G_CALLBACK(on_notebook_bible_parallel_switch_page), NULL); + + // Text notebook (The bible text show in the standard view) + widgets.notebook_text = gui_create_bible_pane(); + gtk_container_add(GTK_CONTAINER(widgets.notebook_bible_parallel), widgets.notebook_text); label = gtk_label_new(_("Standard View")); gtk_widget_show(label); - gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), - 0), - label); + gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_bible_parallel), gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_bible_parallel), 0), label); - /* - * previewer - */ + // Another box (For the previewer?) UI_VBOX(widgets.vbox_previewer, FALSE, 0); gtk_widget_show(widgets.vbox_previewer); - gtk_container_set_border_width(GTK_CONTAINER(widgets.vbox_previewer), 1); - gtk_paned_pack2(GTK_PANED(widgets.vpaned), widgets.vbox_previewer, - TRUE, TRUE); - + gtk_paned_pack2(GTK_PANED(widgets.vpaned), widgets.vbox_previewer, TRUE, TRUE); gtk_container_set_border_width(GTK_CONTAINER(widgets.vbox_previewer), 2); +#ifndef USE_WEBKIT2 scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); - gtk_box_pack_start(GTK_BOX(widgets.vbox_previewer), scrolledwindow, - TRUE, TRUE, 0); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) - scrolledwindow, - settings.shadow_type); + gtk_box_pack_start(GTK_BOX(widgets.vbox_previewer), scrolledwindow, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow, settings.shadow_type); +#endif widgets.html_previewer_text = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, VIEWER_TYPE)); - gtk_container_add(GTK_CONTAINER(scrolledwindow), - widgets.html_previewer_text); - gtk_widget_show(widgets.html_previewer_text); +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(widgets.vbox_previewer), widgets.html_previewer_text, TRUE, TRUE, 0); +#else + gtk_container_add(GTK_CONTAINER(scrolledwindow), widgets.html_previewer_text); +#endif - /* - * commentary/book notebook - */ + // Commentary/book notebook widgets.notebook_comm_book = gtk_notebook_new(); gtk_widget_show(widgets.notebook_comm_book); - gtk_paned_pack1(GTK_PANED(widgets.vpaned2), - widgets.notebook_comm_book, TRUE, TRUE); + gtk_paned_pack1(GTK_PANED(widgets.vpaned2), widgets.notebook_comm_book, TRUE, TRUE); gtk_container_set_border_width(GTK_CONTAINER(widgets.notebook_comm_book), 1); - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widgets.notebook_comm_book), - GTK_POS_BOTTOM); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widgets.notebook_comm_book), GTK_POS_BOTTOM); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_comm_book), TRUE); gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_comm_book), FALSE); - /* - * commentary pane - */ + // Commentary pane widgets.box_comm = gui_create_commentary_pane(); - - gtk_container_add(GTK_CONTAINER(widgets.notebook_comm_book), - widgets.box_comm); + gtk_container_add(GTK_CONTAINER(widgets.notebook_comm_book), widgets.box_comm); label = gtk_label_new(_("Commentary View")); gtk_widget_show(label); - gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_comm_book), - gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_comm_book), - 0), - label); + gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_comm_book), gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_comm_book), 0), label); - /* - * book pane - */ + // Book pane box_book = gui_create_book_pane(); - gtk_container_add(GTK_CONTAINER(widgets.notebook_comm_book), - box_book); + gtk_container_add(GTK_CONTAINER(widgets.notebook_comm_book), box_book); label = gtk_label_new(_("Book View")); gtk_widget_show(label); - gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_comm_book), - gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_comm_book), - 1), - label); + gtk_notebook_set_tab_label(GTK_NOTEBOOK(widgets.notebook_comm_book), gtk_notebook_get_nth_page(GTK_NOTEBOOK(widgets.notebook_comm_book), 1), label); - /* - * dict/lex - */ + // Dict/lex widgets.box_dict = gui_create_dictionary_pane(); - gtk_paned_pack2(GTK_PANED(widgets.vpaned2), - widgets.box_dict, TRUE, TRUE); - /* - * end dict/lex - */ + gtk_paned_pack2(GTK_PANED(widgets.vpaned2), widgets.box_dict, TRUE, TRUE); + // Statusbar widgets.appbar = gtk_statusbar_new(); - if (settings.statusbar) { gtk_widget_show(widgets.appbar); } #ifndef USE_GTK_3 - gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(widgets.appbar), - TRUE); + gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(widgets.appbar), TRUE); #endif - gtk_box_pack_start(GTK_BOX(vbox_gs), widgets.appbar, FALSE, TRUE, - 0); + gtk_box_pack_start(GTK_BOX(vbox_gs), widgets.appbar, FALSE, TRUE, 0); gui_set_statusbar(_("Welcome to Xiphos")); - g_signal_connect((gpointer)vbox_gs, "key_press_event", - G_CALLBACK(on_vbox1_key_press_event), NULL); - g_signal_connect((gpointer)vbox_gs, "key_release_event", - G_CALLBACK(on_vbox1_key_release_event), NULL); - - g_signal_connect(G_OBJECT(widgets.notebook_comm_book), - "switch_page", - G_CALLBACK(on_notebook_comm_book_switch_page), NULL); - - g_signal_connect(G_OBJECT(widgets.app), "delete_event", - G_CALLBACK(delete_event), NULL); - - g_signal_connect((gpointer)widgets.app, - "configure_event", - G_CALLBACK(on_configure_event), NULL); - g_signal_connect(G_OBJECT(widgets.epaned), - "button_release_event", - G_CALLBACK(epaned_button_release_event), - (gchar *)"epaned"); - g_signal_connect(G_OBJECT(widgets.vpaned), - "button_release_event", - G_CALLBACK(epaned_button_release_event), - (gchar *)"vpaned"); - g_signal_connect(G_OBJECT(widgets.vpaned2), - "button_release_event", - G_CALLBACK(epaned_button_release_event), - (gchar *)"vpaned2"); - g_signal_connect(G_OBJECT(widgets.hpaned), - "button_release_event", - G_CALLBACK(epaned_button_release_event), - (gchar *)"hpaned1"); + g_signal_connect((gpointer)vbox_gs, "key_press_event", G_CALLBACK(on_vbox1_key_press_event), NULL); + g_signal_connect((gpointer)vbox_gs, "key_release_event", G_CALLBACK(on_vbox1_key_release_event), NULL); + + g_signal_connect(G_OBJECT(widgets.notebook_comm_book), "switch_page", G_CALLBACK(on_notebook_comm_book_switch_page), NULL); + + g_signal_connect(G_OBJECT(widgets.app), "delete_event", G_CALLBACK(delete_event), NULL); + + g_signal_connect((gpointer)widgets.app, "configure_event", G_CALLBACK(on_configure_event), NULL); + g_signal_connect(G_OBJECT(widgets.epaned), "button_release_event", G_CALLBACK(epaned_button_release_event), (gchar *)"epaned"); + g_signal_connect(G_OBJECT(widgets.vpaned), "button_release_event", G_CALLBACK(epaned_button_release_event), (gchar *)"vpaned"); + g_signal_connect(G_OBJECT(widgets.vpaned2), "button_release_event", G_CALLBACK(epaned_button_release_event), (gchar *)"vpaned2"); + g_signal_connect(G_OBJECT(widgets.hpaned), "button_release_event", G_CALLBACK(epaned_button_release_event), (gchar *)"hpaned1"); gtk_widget_grab_focus(navbar_versekey.lookup_entry); - gtk_window_set_default_size((GtkWindow *)widgets.app, - settings.gs_width, settings.gs_height); + gtk_window_set_default_size((GtkWindow *)widgets.app, settings.gs_width, settings.gs_height); main_window_created = TRUE; } diff --git a/src/gnome2/menu_popup.c b/src/gnome2/menu_popup.c index 4cb4b43..2968940 100644 --- a/src/gnome2/menu_popup.c +++ b/src/gnome2/menu_popup.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * menu_popup.c - main window panes and dialogs popup menus * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/mod_mgr.c b/src/gnome2/mod_mgr.c index 76f05e7..3523d53 100644 --- a/src/gnome2/mod_mgr.c +++ b/src/gnome2/mod_mgr.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gnome2/mod_mgr.c * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/navbar_book.c b/src/gnome2/navbar_book.c index bac09fb..740d67b 100644 --- a/src/gnome2/navbar_book.c +++ b/src/gnome2/navbar_book.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book.c - navigation bar for genbook modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -357,8 +357,11 @@ GtkWidget *gui_navbar_book_new(void) gtk_button_set_relief(GTK_BUTTON(navbar_book.button_left), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_left), - FALSE); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(navbar_book.button_left), FALSE); +#else + gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_left), FALSE); +#endif image1 = #ifdef HAVE_GTK_310 @@ -377,8 +380,11 @@ GtkWidget *gui_navbar_book_new(void) _("Go to previous item")); gtk_button_set_relief(GTK_BUTTON(navbar_book.button_up), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_up), - FALSE); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(navbar_book.button_up), FALSE); +#else + gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_up), FALSE); +#endif image1 = #ifdef HAVE_GTK_310 @@ -397,8 +403,11 @@ GtkWidget *gui_navbar_book_new(void) _("Go to next item")); gtk_button_set_relief(GTK_BUTTON(navbar_book.button_down), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_down), - FALSE); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(navbar_book.button_down), FALSE); +#else + gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_down), FALSE); +#endif image2 = #ifdef HAVE_GTK_310 @@ -419,8 +428,11 @@ GtkWidget *gui_navbar_book_new(void) gtk_button_set_relief(GTK_BUTTON(navbar_book.button_right), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_right), - FALSE); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(navbar_book.button_right), FALSE); +#else + gtk_button_set_focus_on_click(GTK_BUTTON(navbar_book.button_right), FALSE); +#endif image1 = #ifdef HAVE_GTK_310 diff --git a/src/gnome2/navbar_book_dialog.c b/src/gnome2/navbar_book_dialog.c index 2b95b0f..9e25e41 100644 --- a/src/gnome2/navbar_book_dialog.c +++ b/src/gnome2/navbar_book_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book_dialog.c - navigation bar for genbook dialog modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -301,7 +301,11 @@ GtkWidget *gui_navbar_book_dialog_new(DIALOG_DATA *d) gtk_button_set_relief(GTK_BUTTON(d->navbar_book.button_left), GTK_RELIEF_NONE); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(d->navbar_book.button_left), FALSE); +#else gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_left), FALSE); +#endif #ifdef HAVE_GTK_310 image1 = gtk_image_new_from_icon_name("go-previous", @@ -322,8 +326,12 @@ GtkWidget *gui_navbar_book_dialog_new(DIALOG_DATA *d) _("Go to previous item")); gtk_button_set_relief(GTK_BUTTON(d->navbar_book.button_up), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_up), - FALSE); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(d->navbar_book.button_up), FALSE); +#else + gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_up), FALSE); +#endif + #ifdef HAVE_GTK_310 image1 = gtk_image_new_from_icon_name("go-up", GTK_ICON_SIZE_BUTTON); @@ -342,7 +350,11 @@ GtkWidget *gui_navbar_book_dialog_new(DIALOG_DATA *d) _("Go to next item")); gtk_button_set_relief(GTK_BUTTON(d->navbar_book.button_down), GTK_RELIEF_NONE); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(d->navbar_book.button_down), FALSE); +#else gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_down), FALSE); +#endif image2 = #ifdef HAVE_GTK_310 gtk_image_new_from_icon_name("go-down", GTK_ICON_SIZE_BUTTON); @@ -363,8 +375,11 @@ GtkWidget *gui_navbar_book_dialog_new(DIALOG_DATA *d) gtk_button_set_relief(GTK_BUTTON(d->navbar_book.button_right), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_right), - FALSE); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(d->navbar_book.button_right), FALSE); +#else + gtk_button_set_focus_on_click(GTK_BUTTON(d->navbar_book.button_right), FALSE); +#endif #ifdef HAVE_GTK_310 image1 = gtk_image_new_from_icon_name("go-next", GTK_ICON_SIZE_BUTTON); diff --git a/src/gnome2/navbar_versekey.c b/src/gnome2/navbar_versekey.c index 54df3f0..6e9544b 100644 --- a/src/gnome2/navbar_versekey.c +++ b/src/gnome2/navbar_versekey.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_verse.c - navigation bar for versekey modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/navbar_versekey_dialog.c b/src/gnome2/navbar_versekey_dialog.c index c49b1e6..c16baa1 100644 --- a/src/gnome2/navbar_versekey_dialog.c +++ b/src/gnome2/navbar_versekey_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_verse_dialog.c - navigation bar for versekey modules in dialogs * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/navbar_versekey_editor.c b/src/gnome2/navbar_versekey_editor.c index 9edb964..3a3fbae 100644 --- a/src/gnome2/navbar_versekey_editor.c +++ b/src/gnome2/navbar_versekey_editor.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_verse_editor.c - navigation bar for versekey modules in the editor * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/navbar_versekey_parallel.c b/src/gnome2/navbar_versekey_parallel.c index 8e06361..3d8da8a 100644 --- a/src/gnome2/navbar_versekey_parallel.c +++ b/src/gnome2/navbar_versekey_parallel.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey_parallel.c - navigation bar for the parallel dialog * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/parallel_dialog.c b/src/gnome2/parallel_dialog.c index 9b50393..77070be 100644 --- a/src/gnome2/parallel_dialog.c +++ b/src/gnome2/parallel_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_dialog.c - dialog for detached parallel * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -340,7 +340,9 @@ static GtkWidget *create_parallel_dialog(void) GtkWidget *dialog_action_area25; GtkWidget *hbuttonbox4; GtkWidget *btnDockInt; +#ifndef USE_WEBKIT2 GtkWidget *scrolled_window; +#endif gchar title[256]; sprintf(title, "%s - %s", settings.program_title, _("Parallel")); @@ -399,6 +401,7 @@ static GtkWidget *create_parallel_dialog(void) } #endif /* 0 */ +#ifndef USE_WEBKIT2 scrolled_window = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolled_window); gtk_box_pack_start(GTK_BOX(vboxInt), scrolled_window, TRUE, TRUE, @@ -409,13 +412,17 @@ static GtkWidget *create_parallel_dialog(void) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolled_window, settings.shadow_type); +#endif widgets.html_parallel_dialog = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); gtk_widget_show(widgets.html_parallel_dialog); - +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(vboxInt), widgets.html_parallel_dialog, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolled_window), widgets.html_parallel_dialog); +#endif g_signal_connect((gpointer)widgets.html_parallel_dialog, "popupmenu_requested", diff --git a/src/gnome2/parallel_tab.c b/src/gnome2/parallel_tab.c index 7ca2368..ae46dec 100644 --- a/src/gnome2/parallel_tab.c +++ b/src/gnome2/parallel_tab.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_dialog.c - dialog for parallel in a tab * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -239,7 +239,9 @@ GtkWidget *_create_parallel_tab(void) { GtkWidget *toolbar29; GtkWidget *box_parallel_labels; +#ifndef USE_WEBKIT2 GtkWidget *scrolled_window; +#endif gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), FALSE); @@ -290,6 +292,7 @@ GtkWidget *_create_parallel_tab(void) } #endif /* 0 */ +#ifndef USE_WEBKIT2 scrolled_window = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolled_window); gtk_box_pack_start(GTK_BOX(parallel_vbox), scrolled_window, TRUE, @@ -300,13 +303,17 @@ GtkWidget *_create_parallel_tab(void) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolled_window, settings.shadow_type); +#endif widgets.html_parallel_dialog = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); gtk_widget_show(widgets.html_parallel_dialog); - +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(parallel_vbox), widgets.html_parallel_dialog, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolled_window), widgets.html_parallel_dialog); +#endif g_signal_connect((gpointer)widgets.html_parallel_dialog, "popupmenu_requested", diff --git a/src/gnome2/parallel_view.c b/src/gnome2/parallel_view.c index 8b8ec62..7e2b2ae 100644 --- a/src/gnome2/parallel_view.c +++ b/src/gnome2/parallel_view.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gs_parallel.c - support for displaying multiple modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -176,13 +176,16 @@ _popupmenu_requested_cb(XiphosHtml *html, gchar *uri, gpointer user_data) void gui_create_parallel_page(void) { GtkWidget *label; +#ifndef USE_WEBKIT2 GtkWidget *scrolled_window; +#endif /* * parallel page */ settings.dockedInt = TRUE; +#ifndef USE_WEBKIT2 scrolled_window = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolled_window); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), @@ -190,14 +193,18 @@ void gui_create_parallel_page(void) GTK_POLICY_ALWAYS); gtk_container_add(GTK_CONTAINER(widgets.notebook_bible_parallel), scrolled_window); +#endif widgets.html_parallel = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); gtk_widget_show(widgets.html_parallel); - +#ifdef USE_WEBKIT2 + gtk_container_add(GTK_CONTAINER(widgets.notebook_bible_parallel), widgets.html_parallel); +#else widgets.frame_parallel = scrolled_window; gtk_container_add(GTK_CONTAINER(scrolled_window), widgets.html_parallel); +#endif g_signal_connect((gpointer)widgets.html_parallel, "popupmenu_requested", diff --git a/src/gnome2/preferences_dialog.c b/src/gnome2/preferences_dialog.c index abddf2b..5fc2c43 100644 --- a/src/gnome2/preferences_dialog.c +++ b/src/gnome2/preferences_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * preferences_dialog.c - get user preferences * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -266,8 +266,12 @@ static gint string_is_color(gchar *color) return 0; } for (i = 1; i < 7; i++) { - if ((color[i] > 102) || (color[i] < 48) || ((color[i] > 57) && (color[i] < 65)) || ((color[i] > 70) && (color[i] < 97))) { - XI_warning(("string_is_color, %d in %s is not from a color, it is %d\n", i, color, color[i])); + if ((color[i] > 102) || + (color[i] < 48) || + ((color[i] > 57) && (color[i] < 65)) || + ((color[i] > 70) && (color[i] < 97))) { + XI_warning(("string_is_color, %d in %s is not from a color, it is %d\n", + i, color, color[i])); return 0; } } @@ -935,27 +939,21 @@ on_radiobutton_biblesync_mode(GtkToggleButton *togglebutton, "again to see why.")); settings.bs_mode = new_mode; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_off), - (settings.bs_mode == - 0)); + (settings.bs_mode == 0)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_personal), - (settings.bs_mode == - 1)); + (settings.bs_mode == 1)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_speaker), - (settings.bs_mode == - 2)); + (settings.bs_mode == 2)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button.bs_mode_audience), - (settings.bs_mode == - 3)); + (settings.bs_mode == 3)); } if (biblesync_personal()) { - gtk_widget_set_sensitive(check_button.bs_privacy, - TRUE); + gtk_widget_set_sensitive(check_button.bs_privacy, TRUE); on_checkbutton_biblesync_toggled(GTK_TOGGLE_BUTTON(check_button.bs_privacy), &settings.bs_privacy); } else { - gtk_widget_set_sensitive(check_button.bs_privacy, - FALSE); + gtk_widget_set_sensitive(check_button.bs_privacy, FALSE); } } } diff --git a/src/gnome2/search_dialog.c b/src/gnome2/search_dialog.c index fcf2377..536c9fc 100644 --- a/src/gnome2/search_dialog.c +++ b/src/gnome2/search_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_dialog.c - gui for searching Sword modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -815,10 +815,13 @@ void mod_list_toggled(GtkToggleButton *togglebutton, gpointer user_data) void optimized_toggled(GtkToggleButton *togglebutton, gpointer user_data) { - if (gtk_toggle_button_get_active(togglebutton)) + if (gtk_toggle_button_get_active(togglebutton)) { gtk_widget_show(search1.button_intro_lucene); - else + gtk_widget_set_sensitive(search1.cb_case_sensitive, FALSE); + } else { gtk_widget_hide(search1.button_intro_lucene); + gtk_widget_set_sensitive(search1.cb_case_sensitive, TRUE); + } } /****************************************************************************** @@ -1643,6 +1646,7 @@ on_toolbutton12_clicked(GtkToolButton *toolbutton, gpointer user_data) /* add html widgets */ static void _add_html_widget(GtkWidget *vbox) { +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, TRUE, 0); @@ -1652,13 +1656,19 @@ static void _add_html_widget(GtkWidget *vbox) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow, settings.shadow_type); +#endif + search1.preview_html = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, DIALOG_SEARCH_PREVIEW_TYPE)); + gtk_widget_show(search1.preview_html); +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(vbox), search1.preview_html, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolledwindow), search1.preview_html); gtk_box_pack_start(GTK_BOX(scrolledwindow), search1.preview_html, TRUE, TRUE, 0); - gtk_widget_show(search1.preview_html); +#endif } /****************************************************************************** @@ -1949,6 +1959,9 @@ static void _create_search_dialog(void) settings.display_advsearch = 1; xml_set_value("Xiphos", "layout", "advsearchopen", "1"); + /* disable match case initially */ + gtk_widget_set_sensitive(search1.cb_case_sensitive, FALSE); + /* * (from xiphos.c) * a little paranoia: diff --git a/src/gnome2/search_sidebar.c b/src/gnome2/search_sidebar.c index 3dfda0a..d6f5680 100644 --- a/src/gnome2/search_sidebar.c +++ b/src/gnome2/search_sidebar.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * shortcutbar_search.c - create search group gui * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -133,6 +133,32 @@ static void on_rrbUseBounds_toggled(GtkToggleButton *togglebutton, /****************************************************************************** * Name + * sidebar_optimized_toggled + * + * Synopsis + * #include "gui/search_dialog.h" + * + * void sidebar_optimized_toggled(GtkToggleButton *togglebutton, + * gpointer user_data) + * + * Description + * + * + * Return value + * void + */ + +void sidebar_optimized_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + if (gtk_toggle_button_get_active(togglebutton)) { + gtk_widget_set_sensitive(ss.ckbCaseSensitive, FALSE); + } else { + gtk_widget_set_sensitive(ss.ckbCaseSensitive, TRUE); + } +} + +/****************************************************************************** + * Name * gui_create_shortcutbar_search * * Synopsis @@ -295,7 +321,7 @@ void gui_create_search_sidebar(void) gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); ss.rbMultiword = - gtk_radio_button_new_with_label(NULL, _("Multi word")); + gtk_radio_button_new_with_label(NULL, _("Optimized (\"Lucene\")")); gtk_widget_show(ss.rbMultiword); gtk_box_pack_start(GTK_BOX(vbox2), ss.rbMultiword, FALSE, FALSE, 0); @@ -498,4 +524,10 @@ void gui_create_search_sidebar(void) g_signal_connect(G_OBJECT(ss.advanced_search), "clicked", G_CALLBACK(main_open_search_dialog), NULL); + + /* prep for toggle case sensitive availability per optimized */ + g_signal_connect(ss.rbMultiword, "toggled", + G_CALLBACK(sidebar_optimized_toggled), NULL); + /* initialize it off */ + gtk_widget_set_sensitive(ss.ckbCaseSensitive, FALSE); } diff --git a/src/gnome2/sidebar.c b/src/gnome2/sidebar.c index 14c2759..e10ae11 100644 --- a/src/gnome2/sidebar.c +++ b/src/gnome2/sidebar.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar.c - create and maintain the new sidebar bar * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -1442,7 +1442,9 @@ GtkWidget *gui_create_sidebar(GtkWidget *paned) GtkWidget *scrolledwindow4; GtkWidget *scrolledwindow_bm; GtkWidget *title_label = NULL; +#ifndef USE_WEBKIT2 GtkWidget *scrolledwindow; +#endif GtkWidget *table2; @@ -1465,6 +1467,7 @@ GtkWidget *gui_create_sidebar(GtkWidget *paned) (gchar *)"paned_sidebar"); widgets.shortcutbar = widgets.paned_sidebar; +#ifndef USE_WEBKIT2 scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow); gtk_box_pack_start(GTK_BOX(widgets.box_side_preview), @@ -1475,12 +1478,17 @@ GtkWidget *gui_create_sidebar(GtkWidget *paned) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolledwindow, settings.shadow_type); +#endif sidebar.html_viewer_widget = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE)); + gtk_widget_show(sidebar.html_viewer_widget); +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(widgets.box_side_preview), sidebar.html_viewer_widget, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolledwindow), sidebar.html_viewer_widget); - gtk_widget_show(sidebar.html_viewer_widget); +#endif /* ---------------------------------------------------------------- */ /* 2x2 button box set: modules/bookmarks/search/vlist */ @@ -1502,26 +1510,42 @@ GtkWidget *gui_create_sidebar(GtkWidget *paned) gtk_grid_attach(GTK_GRID(table2), button_bookmarks, 1, 0, 1, 1); gtk_button_set_relief(GTK_BUTTON(button_bookmarks), GTK_RELIEF_HALF); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(button_bookmarks), FALSE); +#else gtk_button_set_focus_on_click(GTK_BUTTON(button_bookmarks), FALSE); +#endif button_search = gtk_toggle_button_new_with_mnemonic(_("Search")); gtk_widget_show(button_search); gtk_grid_attach(GTK_GRID(table2), button_search, 0, 1, 1, 1); gtk_button_set_relief(GTK_BUTTON(button_search), GTK_RELIEF_HALF); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(button_search), FALSE); +#else gtk_button_set_focus_on_click(GTK_BUTTON(button_search), FALSE); +#endif button_v_lists = gtk_toggle_button_new_with_mnemonic(_("Verse List")); gtk_widget_show(button_v_lists); gtk_grid_attach(GTK_GRID(table2), button_v_lists, 1, 1, 1, 1); gtk_button_set_relief(GTK_BUTTON(button_v_lists), GTK_RELIEF_HALF); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(button_v_lists), FALSE); +#else gtk_button_set_focus_on_click(GTK_BUTTON(button_v_lists), FALSE); +#endif button_modules = gtk_toggle_button_new_with_mnemonic(_("Modules")); gtk_widget_show(button_modules); gtk_grid_attach(GTK_GRID(table2), button_modules, 0, 0, 1, 1); gtk_button_set_relief(GTK_BUTTON(button_modules), GTK_RELIEF_HALF); +#ifdef HAVE_GTK_320 + gtk_widget_set_focus_on_click(GTK_WIDGET(button_modules), FALSE); +#else gtk_button_set_focus_on_click(GTK_BUTTON(button_modules), FALSE); +#endif #else diff --git a/src/gnome2/sidebar_dialog.c b/src/gnome2/sidebar_dialog.c index 97bbd35..d3d79a0 100644 --- a/src/gnome2/sidebar_dialog.c +++ b/src/gnome2/sidebar_dialog.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar_dialog.c - dialog for detached sidebar * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/splash.c b/src/gnome2/splash.c index 9116416..dcdbc67 100644 --- a/src/gnome2/splash.c +++ b/src/gnome2/splash.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * splash.c - Splash related functions * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/tabbed_browser.c b/src/gnome2/tabbed_browser.c index 1c1e23f..65bc4b4 100644 --- a/src/gnome2/tabbed_browser.c +++ b/src/gnome2/tabbed_browser.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * tabbed_browser.c - functions to facilitate tabbed browsing of different passages at once * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -858,18 +858,16 @@ static GtkWidget *tab_widget_new(PASSAGE_TAB_INFO *tbinf, g_return_val_if_fail(label_text != NULL, NULL); #ifdef HAVE_GTK_310 - tbinf->button_close = - gtk_button_new_from_icon_name("window-close-symbolic", - GTK_ICON_SIZE_MENU); + tbinf->button_close = gtk_button_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_MENU); +#ifdef HAVE_GTK_320 + gtk_button_set_relief(GTK_BUTTON(tbinf->button_close), GTK_RELIEF_NONE); #else - GtkWidget *tmp_toolbar_icon = - gtk_image_new_from_stock(GTK_STOCK_CLOSE, - GTK_ICON_SIZE_MENU); +#endif +#else + GtkWidget *tmp_toolbar_icon = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); tbinf->button_close = gtk_button_new(); - gtk_button_set_image(GTK_BUTTON(tbinf->button_close), - tmp_toolbar_icon); - gtk_button_set_relief(GTK_BUTTON(tbinf->button_close), - GTK_RELIEF_NONE); + gtk_button_set_image(GTK_BUTTON(tbinf->button_close), tmp_toolbar_icon); + gtk_button_set_relief(GTK_BUTTON(tbinf->button_close), GTK_RELIEF_NONE); #endif #ifndef USE_GTK_3 diff --git a/src/gnome2/treekey-editor.c b/src/gnome2/treekey-editor.c index a6b98a7..489837c 100644 --- a/src/gnome2/treekey-editor.c +++ b/src/gnome2/treekey-editor.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * treekey-editor.c - functions to manage a treeview of keys * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gnome2/utilities.c b/src/gnome2/utilities.c index 94674a6..55d4854 100644 --- a/src/gnome2/utilities.c +++ b/src/gnome2/utilities.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * utilities.c - support functions * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -1094,14 +1094,19 @@ static void language_add(const char *language, int module_type) ++(language_set[module_type].count); } -/* comparator function pulled verbatim from qsort(3). */ +/* comparator function pulled verbatim from qsort(3) */ +/* but with function changed to ucol_strcollUTF8(3). */ +/* http://icu-project.org/apiref/icu4c/ucol_8h.html */ static int cmpstringp(const void *p1, const void *p2) { /* The actual arguments to this function are "pointers to pointers to char", but strcmp(3) arguments are "pointers to char", hence the following cast plus dereference */ - return strcmp(*(char *const *)p1, *(char *const *)p2); + return ucol_strcollUTF8(collator, + *(char *const *)p1, -1, + *(char *const *)p2, -1, + &collator_status); } /* retrieve the language set specific to the module type requested */ @@ -1173,6 +1178,18 @@ language_make_list(GList *modlist, modlist = g_list_next(modlist); } + /* self-defense, prior to qsort(3). */ + /* if this is 1st run, then we have not yet init'd the sword engine, + * in turn we do not have sword_locale or collator. we need collator + * in order to use qsort(3). it's a gross, unreliable hack, but we + * will simply use $LANG in this one instance, un-massaged by the + * more correct set_sword_locale(). + */ + if (!collator) { + char *locale = getenv("LANG"); + collator = ucol_open((locale ? locale : ""), &collator_status); + } + /* sort */ for (i = 0; i < N_LANGSET_MODTYPES; ++i) { qsort(language_set[i].ptr, @@ -1666,7 +1683,7 @@ void ReadAloud(unsigned int verse, const char *suppliedtext) return; GString *text = g_string_new(NULL); - if (verse != 0) + if ((settings.showversenum) && (verse != 0)) g_string_printf(text, "%d. ... %s", verse, suppliedtext); // use of ". ..." is to induce proper pauses. diff --git a/src/gnome2/xiphos.c b/src/gnome2/xiphos.c index 2309e26..480b27b 100644 --- a/src/gnome2/xiphos.c +++ b/src/gnome2/xiphos.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos.c - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/about_modules.h b/src/gui/about_modules.h index 444233c..4ab51f6 100644 --- a/src/gui/about_modules.h +++ b/src/gui/about_modules.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_modules.h - About dialogs for modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/about_sword.h b/src/gui/about_sword.h index 3b3fba5..f11492d 100644 --- a/src/gui/about_sword.h +++ b/src/gui/about_sword.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_sword.h - About dialogs for Sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/about_trans.h b/src/gui/about_trans.h index a495660..ba2316b 100644 --- a/src/gui/about_trans.h +++ b/src/gui/about_trans.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_trans.h - About Translation * - * Copyright (C) 2008-2015 Xiphos Developer Team + * Copyright (C) 2008-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/about_xiphos.h b/src/gui/about_xiphos.h index d6a1e41..7104033 100644 --- a/src/gui/about_xiphos.h +++ b/src/gui/about_xiphos.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * about_xiphos.h - About dialogs for Xiphos * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/bibletext.h b/src/gui/bibletext.h index d2d8f00..535803b 100644 --- a/src/gui/bibletext.h +++ b/src/gui/bibletext.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bibletext.h - gui for Bible text modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/bibletext_dialog.h b/src/gui/bibletext_dialog.h index 5223ab3..33a1295 100644 --- a/src/gui/bibletext_dialog.h +++ b/src/gui/bibletext_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bibletext_dialog.h - view Bible text module in a dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/bookmark_dialog.h b/src/gui/bookmark_dialog.h index 597c636..b2f1155 100644 --- a/src/gui/bookmark_dialog.h +++ b/src/gui/bookmark_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmark_dialog.h - gui to popup a dialog for adding a bookmark * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/bookmarks.h b/src/gui/bookmarks.h index 3f09f21..9d80fef 100644 --- a/src/gui/bookmarks.h +++ b/src/gui/bookmarks.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmarks.h - gui for bookmarks * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/bookmarks_menu.h b/src/gui/bookmarks_menu.h index 736896d..e73bad4 100644 --- a/src/gui/bookmarks_menu.h +++ b/src/gui/bookmarks_menu.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmarks_menu.h - gui for bookmarks in a menu * - * Copyright (C) 2003-2015 Xiphos Developer Team + * Copyright (C) 2003-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/bookmarks_treeview.h b/src/gui/bookmarks_treeview.h index 27117e8..f4367d6 100644 --- a/src/gui/bookmarks_treeview.h +++ b/src/gui/bookmarks_treeview.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * bookmarks_treeview.h - gui for bookmarks in treeview * - * Copyright (C) 2003-2015 Xiphos Developer Team + * Copyright (C) 2003-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/cipher_key_dialog.h b/src/gui/cipher_key_dialog.h index f2f8425..c60930f 100644 --- a/src/gui/cipher_key_dialog.h +++ b/src/gui/cipher_key_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * cipher_key_dialog.h - asks for key to unlock sword module * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/commentary.h b/src/gui/commentary.h index e51d6f9..1752434 100644 --- a/src/gui/commentary.h +++ b/src/gui/commentary.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * commentary.h - gui for commentary modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/commentary_dialog.h b/src/gui/commentary_dialog.h index 4ffac6f..17803b4 100644 --- a/src/gui/commentary_dialog.h +++ b/src/gui/commentary_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * commentary_dialog.h - dialog for a commentary module * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/debug_glib_null.h b/src/gui/debug_glib_null.h index ca479b9..17cb59f 100644 --- a/src/gui/debug_glib_null.h +++ b/src/gui/debug_glib_null.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * debug_glib_null.h - support to find NULL parms in glib printf() calls. * - * Copyright (C) 2010-2015 Xiphos Developer Team + * Copyright (C) 2010-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/dialog.h b/src/gui/dialog.h index 1abd6ef..c79d35d 100644 --- a/src/gui/dialog.h +++ b/src/gui/dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dialog.h - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/dictlex.h b/src/gui/dictlex.h index 6cd267b..3676b86 100644 --- a/src/gui/dictlex.h +++ b/src/gui/dictlex.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dictlex.h - gui for dictionary/lexicon modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/dictlex_dialog.h b/src/gui/dictlex_dialog.h index 73a164f..823f662 100644 --- a/src/gui/dictlex_dialog.h +++ b/src/gui/dictlex_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * dictlex_dialog.h - dialog for displaying a dictlex module * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/display_info.h b/src/gui/display_info.h index 8f4628a..5a7fb5a 100644 --- a/src/gui/display_info.h +++ b/src/gui/display_info.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * display_info.h - display information (ie strongs) in a dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/export_bookmarks.h b/src/gui/export_bookmarks.h index 6c025d0..357ffd8 100644 --- a/src/gui/export_bookmarks.h +++ b/src/gui/export_bookmarks.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_bookmarks.h - * - * Copyright (C) 2003-2015 Xiphos Developer Team + * Copyright (C) 2003-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/export_dialog.h b/src/gui/export_dialog.h index da8af4a..b40974b 100644 --- a/src/gui/export_dialog.h +++ b/src/gui/export_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_dialog.h - * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/find_dialog.h b/src/gui/find_dialog.h index 2b40022..f94a051 100644 --- a/src/gui/find_dialog.h +++ b/src/gui/find_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * find_dialog.h - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/font_dialog.h b/src/gui/font_dialog.h index 5057400..e792593 100644 --- a/src/gui/font_dialog.h +++ b/src/gui/font_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * font_dialog.h - dialog to set module font * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/gbs.h b/src/gui/gbs.h index 1c6c5b1..520b6c0 100644 --- a/src/gui/gbs.h +++ b/src/gui/gbs.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gbs.h - generic book support - the gui * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/gbs_dialog.h b/src/gui/gbs_dialog.h index 133fe3b..7e8029f 100644 --- a/src/gui/gbs_dialog.h +++ b/src/gui/gbs_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gbs_dialog.h - dialog for displaying a gbs module * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/ipc.h b/src/gui/ipc.h index 43cb8ca..16a3f9e 100644 --- a/src/gui/ipc.h +++ b/src/gui/ipc.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * ipc.h - Interprocess Communication - dbus integration * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/main_menu.h b/src/gui/main_menu.h index 4881620..272ae47 100644 --- a/src/gui/main_menu.h +++ b/src/gui/main_menu.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main_menu.h - creation of and call backs for xiphos main menu * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/main_window.h b/src/gui/main_window.h index 5988c00..d444d39 100644 --- a/src/gui/main_window.h +++ b/src/gui/main_window.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main_window.h - main window gui * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/menu_popup.h b/src/gui/menu_popup.h index ff02252..c4cf14f 100644 --- a/src/gui/menu_popup.h +++ b/src/gui/menu_popup.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * menu_popup.h - creation of (and call backs) for xiphos popup menus * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/mod_mgr.h b/src/gui/mod_mgr.h index 1165cec..f92f356 100644 --- a/src/gui/mod_mgr.h +++ b/src/gui/mod_mgr.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * mod_mgr.h * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/navbar_book.h b/src/gui/navbar_book.h index 435561d..2fbb12e 100644 --- a/src/gui/navbar_book.h +++ b/src/gui/navbar_book.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book.h - navigation bar for genbook modules * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/navbar_book_dialog.h b/src/gui/navbar_book_dialog.h index b1dd393..ce3d6fc 100644 --- a/src/gui/navbar_book_dialog.h +++ b/src/gui/navbar_book_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book_dialog.h - navigation bar for genbook dialog modules * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/navbar_versekey.h b/src/gui/navbar_versekey.h index 85f5a57..9b60db2 100644 --- a/src/gui/navbar_versekey.h +++ b/src/gui/navbar_versekey.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey.h - navigation bar for bible references * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/navbar_versekey_dialog.h b/src/gui/navbar_versekey_dialog.h index 1906d61..6da3883 100644 --- a/src/gui/navbar_versekey_dialog.h +++ b/src/gui/navbar_versekey_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey_dialog.h - navigation bar for bible references * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/navbar_versekey_editor.h b/src/gui/navbar_versekey_editor.h index 04df772..6c4a8e5 100644 --- a/src/gui/navbar_versekey_editor.h +++ b/src/gui/navbar_versekey_editor.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey_editor.h - navigation bar for bible references in editor * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/navbar_versekey_parallel.h b/src/gui/navbar_versekey_parallel.h index 2707e8b..9832f62 100644 --- a/src/gui/navbar_versekey_parallel.h +++ b/src/gui/navbar_versekey_parallel.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey_parallel.h - navigation bar for the parallel dialog * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/parallel_dialog.h b/src/gui/parallel_dialog.h index 11cc91e..ab81335 100644 --- a/src/gui/parallel_dialog.h +++ b/src/gui/parallel_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_dialog.h - dialog for detached parallel * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/parallel_tab.h b/src/gui/parallel_tab.h index c6a1de7..3a3eeb8 100644 --- a/src/gui/parallel_tab.h +++ b/src/gui/parallel_tab.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_tab.h - view parallel passages in a tab * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/parallel_view.h b/src/gui/parallel_view.h index 6fe892b..4f949ad 100644 --- a/src/gui/parallel_view.h +++ b/src/gui/parallel_view.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_view.h - support for displaying multiple modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/preferences_dialog.h b/src/gui/preferences_dialog.h index 89f1815..79d5576 100644 --- a/src/gui/preferences_dialog.h +++ b/src/gui/preferences_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * preferences_dialog.h - get user preferences * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/search_dialog.h b/src/gui/search_dialog.h index 05ef93e..438d197 100644 --- a/src/gui/search_dialog.h +++ b/src/gui/search_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_dialog.h - gui for searching Sword modules * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/search_sidebar.h b/src/gui/search_sidebar.h index d1eca62..e50ed3c 100644 --- a/src/gui/search_sidebar.h +++ b/src/gui/search_sidebar.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_sidebar.h - sidebar search gui * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -50,6 +50,7 @@ extern SIDESEARCH ss; void gui_search_update_sidebar(char percent, void *userData); void gui_create_search_sidebar(void); +void sidebar_optimized_toggled(GtkToggleButton *togglebutton, gpointer user_data); #ifdef __cplusplus } diff --git a/src/gui/sidebar.h b/src/gui/sidebar.h index 850174b..d92b73e 100644 --- a/src/gui/sidebar.h +++ b/src/gui/sidebar.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar.h - create and maintain the sidebar * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/sidebar_dialog.h b/src/gui/sidebar_dialog.h index 75b4f21..0a42838 100644 --- a/src/gui/sidebar_dialog.h +++ b/src/gui/sidebar_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar_dialog.h - dialog for detached sidebar * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/tabbed_browser.h b/src/gui/tabbed_browser.h index 37faae7..9055ca5 100644 --- a/src/gui/tabbed_browser.h +++ b/src/gui/tabbed_browser.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * tabbed_browser.h - functions to facilitate tabbed browsing of different passages at once * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/treekey-editor.h b/src/gui/treekey-editor.h index 36a45ba..d3db5cb 100644 --- a/src/gui/treekey-editor.h +++ b/src/gui/treekey-editor.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * treekey-editor.h - * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/utilities.h b/src/gui/utilities.h index c28f690..00d3314 100644 --- a/src/gui/utilities.h +++ b/src/gui/utilities.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * utilities.h - support functions * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -27,6 +27,18 @@ #include "main/module_dialogs.h" #include <gsf/gsf-outfile.h> +/* Unicode collation necessities */ +#include "unicode/utypes.h" +#include "unicode/unorm.h" +#include "unicode/localpointer.h" +#include "unicode/parseerr.h" +#include "unicode/uloc.h" +#include "unicode/uset.h" +#include "unicode/uscript.h" +#include "unicode/ucol.h" +extern UCollator* collator; +extern UErrorCode collator_status; + #ifdef __cplusplus extern "C" { #endif diff --git a/src/gui/widgets.h b/src/gui/widgets.h index 49c3d71..c732860 100644 --- a/src/gui/widgets.h +++ b/src/gui/widgets.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * widgets.h - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/gui/xiphos.h b/src/gui/xiphos.h index 15e78b4..953b629 100644 --- a/src/gui/xiphos.h +++ b/src/gui/xiphos.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos.h - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/biblesync_glue.cc b/src/main/biblesync_glue.cc index 1a597a2..dff4e86 100644 --- a/src/main/biblesync_glue.cc +++ b/src/main/biblesync_glue.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * biblesync_glue.cc * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -101,12 +101,18 @@ biblesync_navigate(char cmd, string speaker_uuid, // mismatch case 'M': if (settings.bs_mismatch) { - message = BSP + (string)_("Mismatched packet\n\n") + info + ((info.substr(0, 8) == "announce") - ? ("\nMessage: " + presence) - : ("\nBible: " + bible + "; Ref: " + ref + "; Alt: " + alt + "\nGroup: " + group + "; Domain: " + domain)) + - (settings.bs_debug - ? ("\n\n" + (string)dump) - : ""); + message = BSP + (string)_("Mismatched packet\n\n") + + info + + ((info.substr(0, 8) == "announce") + ? ("\nMessage: " + presence) + : ("\nBible: " + bible + + "; Ref: " + ref + + "; Alt: " + alt + + "\nGroup: " + group + + "; Domain: " + domain)) + + (settings.bs_debug + ? ("\n\n" + (string)dump) + : ""); gui_generic_warning((char *)message.c_str()); } break; @@ -252,7 +258,17 @@ biblesync_navigate(char cmd, string speaker_uuid, break; default: - message = _("ERROR: unknown BibleSync indicator: ") + cmd + (string) ".\n" + (string)_("Other indications are:") + "\nbible: " + bible + "\nref: " + ref + "\nalt: " + alt + "\ngroup: " + group + "\ndomain: " + domain + "\ninfo: " + info + "\ndump:\n" + dump; + message = _("ERROR: unknown BibleSync indicator: ") + + cmd + + (string) ".\n" + + (string)_("Other indications are:") + + "\nbible: " + bible + + "\nref: " + ref + + "\nalt: " + alt + + "\ngroup: " + group + + "\ndomain: " + domain + + "\ninfo: " + info + + "\ndump:\n" + dump; gui_generic_warning((char *)message.c_str()); break; } diff --git a/src/main/biblesync_glue.h b/src/main/biblesync_glue.h index 4dc18cf..701286f 100644 --- a/src/main/biblesync_glue.h +++ b/src/main/biblesync_glue.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * biblesync_glue.h * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/configs.cc b/src/main/configs.cc index 33cd09c..b86a2bf 100644 --- a/src/main/configs.cc +++ b/src/main/configs.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * configs.c - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/configs.h b/src/main/configs.h index 27f727a..0d648bd 100644 --- a/src/main/configs.h +++ b/src/main/configs.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * configs.h - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/display.cc b/src/main/display.cc index 7179356..795a756 100644 --- a/src/main/display.cc +++ b/src/main/display.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * display.cc - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/display.hh b/src/main/display.hh index f94b000..5ff540f 100644 --- a/src/main/display.hh +++ b/src/main/display.hh @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * display.hh - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/export_passage.cc b/src/main/export_passage.cc index d07d6dc..faf7510 100644 --- a/src/main/export_passage.cc +++ b/src/main/export_passage.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_passage.cc - * - * Copyright (C) 2008-2015 Xiphos Developer Team + * Copyright (C) 2008-2016 Xiphos Developer Team * * 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 diff --git a/src/main/export_passage.h b/src/main/export_passage.h index 37be60c..e34f705 100644 --- a/src/main/export_passage.h +++ b/src/main/export_passage.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * export_passage.h - * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/main/global_ops.cc b/src/main/global_ops.cc index 0364a85..b3230e5 100644 --- a/src/main/global_ops.cc +++ b/src/main/global_ops.cc @@ -3,7 +3,7 @@ * mod_global_ops.c - setup for SWORD global options and * a few of our own in the gui * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/global_ops.hh b/src/main/global_ops.hh index 49e391c..8455ea5 100644 --- a/src/main/global_ops.hh +++ b/src/main/global_ops.hh @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * mod_global_ops.h - setup for SWORD global options in the gui * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/gtk_compat.h b/src/main/gtk_compat.h index 91b5f0f..2e03ca4 100644 --- a/src/main/gtk_compat.h +++ b/src/main/gtk_compat.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * gtk_compat.h - * - * Copyright (C) 2011-2015 Xiphos Developer Team + * Copyright (C) 2011-2016 Xiphos Developer Team * * 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 diff --git a/src/main/lists.cc b/src/main/lists.cc index 07e0c05..059cd66 100644 --- a/src/main/lists.cc +++ b/src/main/lists.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * lists.c - glists of module names and descriptions, bible books etc. * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/lists.h b/src/main/lists.h index a70a2d8..e5469e3 100644 --- a/src/main/lists.h +++ b/src/main/lists.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * lists.h glists of module names and descriptions, bible books etc. * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/main.c b/src/main/main.c index bbf11db..4e1c10f 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * main.c - In the beginning... ;o) * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/mod_mgr.cc b/src/main/mod_mgr.cc index ca820a0..40f5340 100644 --- a/src/main/mod_mgr.cc +++ b/src/main/mod_mgr.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * mod_mgr.cc * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/mod_mgr.h b/src/main/mod_mgr.h index 4d7ec1f..9d368a0 100644 --- a/src/main/mod_mgr.h +++ b/src/main/mod_mgr.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * mod_mgr.h * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/module_dialogs.cc b/src/main/module_dialogs.cc index 5c0c7a4..c26a246 100644 --- a/src/main/module_dialogs.cc +++ b/src/main/module_dialogs.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * module_dialogs.cc - view module in a dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/module_dialogs.h b/src/main/module_dialogs.h index 6bd305f..41f5c72 100644 --- a/src/main/module_dialogs.h +++ b/src/main/module_dialogs.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * module_dialog.h - view module in a dialog * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/modulecache.cc b/src/main/modulecache.cc index b6b1e34..fa4015c 100644 --- a/src/main/modulecache.cc +++ b/src/main/modulecache.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * modulecache.cc - * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/main/modulecache.hh b/src/main/modulecache.hh index bef06b6..25499ac 100644 --- a/src/main/modulecache.hh +++ b/src/main/modulecache.hh @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * modulecache.hh - * - * Copyright (C) 2007-2015 Xiphos Developer Team + * Copyright (C) 2007-2016 Xiphos Developer Team * * 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 diff --git a/src/main/navbar.cc b/src/main/navbar.cc index 5273702..124cd1e 100644 --- a/src/main/navbar.cc +++ b/src/main/navbar.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar.cc - glue between all navbars and sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/navbar.h b/src/main/navbar.h index 3453e0b..40562a0 100644 --- a/src/main/navbar.h +++ b/src/main/navbar.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar.h - glue between all navbars and sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/navbar_book.cc b/src/main/navbar_book.cc index b29bcba..4b65e3e 100644 --- a/src/main/navbar_book.cc +++ b/src/main/navbar_book.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book.cc - glue between all navbar_book and sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/navbar_book.h b/src/main/navbar_book.h index b45ddab..578fe53 100644 --- a/src/main/navbar_book.h +++ b/src/main/navbar_book.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book.h - glue between all navbar_book and sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/navbar_book_dialog.cc b/src/main/navbar_book_dialog.cc index d5e66cc..8ac661a 100644 --- a/src/main/navbar_book_dialog.cc +++ b/src/main/navbar_book_dialog.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book_dialog.cc - glue between all navbar_book_dialog and sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/navbar_book_dialog.h b/src/main/navbar_book_dialog.h index d0f0742..2b7c2ef 100644 --- a/src/main/navbar_book_dialog.h +++ b/src/main/navbar_book_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_book_dialog.h - glue between all navbar_book and sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/navbar_versekey.cc b/src/main/navbar_versekey.cc index 4fc7527..678ae1d 100644 --- a/src/main/navbar_versekey.cc +++ b/src/main/navbar_versekey.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey.cc - glue between all navbar_versekey and sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/navbar_versekey.h b/src/main/navbar_versekey.h index f5ce265..a9f8a7b 100644 --- a/src/main/navbar_versekey.h +++ b/src/main/navbar_versekey.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * navbar_versekey.h - glue between all navbar_versekey and sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/parallel_view.cc b/src/main/parallel_view.cc index d34881f..2f2af9b 100644 --- a/src/main/parallel_view.cc +++ b/src/main/parallel_view.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_view.cc - support for displaying multiple modules * - * Copyright (C) 2004-2015 Xiphos Developer Team + * Copyright (C) 2004-2016 Xiphos Developer Team * * 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 @@ -665,7 +665,7 @@ void main_update_parallel_page(void) if (settings.parallel_list) { gchar *mod_name; for (modidx = 0; - mod_name = settings.parallel_list[modidx]; + (mod_name = settings.parallel_list[modidx]); modidx++) { const gchar *rowcolor; const char *real_mod = main_get_name(mod_name); diff --git a/src/main/parallel_view.h b/src/main/parallel_view.h index 4491ff6..9dce37b 100644 --- a/src/main/parallel_view.h +++ b/src/main/parallel_view.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_view.h - support for displaying multiple modules * - * Copyright (C) 2004-2015 Xiphos Developer Team + * Copyright (C) 2004-2016 Xiphos Developer Team * * 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 diff --git a/src/main/prayerlists.cc b/src/main/prayerlists.cc index 354bd17..1a53462 100644 --- a/src/main/prayerlists.cc +++ b/src/main/prayerlists.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * prayerlists.cc - code to create several different prayer lists * - * Copyright (C) 2008-2015 Xiphos Developer Team + * Copyright (C) 2008-2016 Xiphos Developer Team * * 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 diff --git a/src/main/prayerlists.h b/src/main/prayerlists.h index c49599b..012f2f0 100644 --- a/src/main/prayerlists.h +++ b/src/main/prayerlists.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * prayerlists.h - code to create several different prayer lists * - * Copyright (C) 2008-2015 Xiphos Developer Team + * Copyright (C) 2008-2016 Xiphos Developer Team * * 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 diff --git a/src/main/previewer.cc b/src/main/previewer.cc index f4f9185..5932be7 100644 --- a/src/main/previewer.cc +++ b/src/main/previewer.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * previewer.cc - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/previewer.h b/src/main/previewer.h index b94e35b..2d7addd 100644 --- a/src/main/previewer.h +++ b/src/main/previewer.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * previewer.h - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/search_dialog.cc b/src/main/search_dialog.cc index 2f21a8e..c8f5fea 100644 --- a/src/main/search_dialog.cc +++ b/src/main/search_dialog.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_dialog.cc - glue (: very sticky :) * - * Copyright (C) 2004-2015 Xiphos Developer Team + * Copyright (C) 2004-2016 Xiphos Developer Team * * 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 diff --git a/src/main/search_dialog.h b/src/main/search_dialog.h index 2713230..da22a85 100644 --- a/src/main/search_dialog.h +++ b/src/main/search_dialog.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_dialog.h - glue * - * Copyright (C) 2004-2015 Xiphos Developer Team + * Copyright (C) 2004-2016 Xiphos Developer Team * * 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 diff --git a/src/main/search_sidebar.cc b/src/main/search_sidebar.cc index 0f1729b..37da4c9 100644 --- a/src/main/search_sidebar.cc +++ b/src/main/search_sidebar.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_sidebar.cc - glue (: very sticky :) * - * Copyright (C) 2004-2015 Xiphos Developer Team + * Copyright (C) 2004-2016 Xiphos Developer Team * * 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 diff --git a/src/main/search_sidebar.h b/src/main/search_sidebar.h index e182a07..2f76eef 100644 --- a/src/main/search_sidebar.h +++ b/src/main/search_sidebar.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * search_sidebar.h - glue * - * Copyright (C) 2004-2015 Xiphos Developer Team + * Copyright (C) 2004-2016 Xiphos Developer Team * * 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 diff --git a/src/main/settings.c b/src/main/settings.c index c804002..b2aaa33 100644 --- a/src/main/settings.c +++ b/src/main/settings.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * settings.c - Guess what? * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/settings.h b/src/main/settings.h index 948605b..ed63018 100644 --- a/src/main/settings.h +++ b/src/main/settings.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * settings.h - structure definitions * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/sidebar.cc b/src/main/sidebar.cc index c7bf8d2..f373bdb 100644 --- a/src/main/sidebar.cc +++ b/src/main/sidebar.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar.cc - sidebar interface to sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/sidebar.h b/src/main/sidebar.h index 5a6148c..85194b3 100644 --- a/src/main/sidebar.h +++ b/src/main/sidebar.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sidebar.h - sidebar interface to sword * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/sword.cc b/src/main/sword.cc index 704b446..9abce65 100644 --- a/src/main/sword.cc +++ b/src/main/sword.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword.cc - glue * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 @@ -88,6 +88,10 @@ using namespace sword; char *sword_locale = NULL; gboolean companion_activity = FALSE; +/* Unicode collation necessities. */ +UCollator* collator; +UErrorCode collator_status; + extern gboolean valid_scripture_key; // these track together. when one changes, so does the other. @@ -787,6 +791,7 @@ void main_init_backend(void) if (!lang) lang = "C"; sword_locale = set_sword_locale(lang); + collator = ucol_open(sword_locale, &collator_status); lang = LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName(); backend = new BackEnd(); diff --git a/src/main/sword.h b/src/main/sword.h index 0e206bf..0a470ad 100644 --- a/src/main/sword.h +++ b/src/main/sword.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword.h - glue * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/sword_treekey.cc b/src/main/sword_treekey.cc index 577d7fd..4020a0c 100644 --- a/src/main/sword_treekey.cc +++ b/src/main/sword_treekey.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword_treekey.cc - treekey stuff for book editor * - * Copyright (C) 2008-2015 Xiphos Developer Team + * Copyright (C) 2008-2016 Xiphos Developer Team * * 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 diff --git a/src/main/sword_treekey.h b/src/main/sword_treekey.h index 3adf086..37e5bda 100644 --- a/src/main/sword_treekey.h +++ b/src/main/sword_treekey.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * sword_treekey.h - treekey stuff for book editor * - * Copyright (C) 2008-2015 Xiphos Developer Team + * Copyright (C) 2008-2016 Xiphos Developer Team * * 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 diff --git a/src/main/tab_history.c b/src/main/tab_history.c index 0841e13..1c2d569 100644 --- a/src/main/tab_history.c +++ b/src/main/tab_history.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * tab_history.c - add, remove and navigate history * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/main/tab_history.h b/src/main/tab_history.h index 8767d85..004c671 100644 --- a/src/main/tab_history.h +++ b/src/main/tab_history.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * tab_history.h - add, remove and navigate history * - * Copyright (C) 2005-2015 Xiphos Developer Team + * Copyright (C) 2005-2016 Xiphos Developer Team * * 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 diff --git a/src/main/url.cc b/src/main/url.cc index d59c304..2b35bef 100644 --- a/src/main/url.cc +++ b/src/main/url.cc @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * url.cc - support functions * - * Copyright (C) 2004-2015 Xiphos Developer Team + * Copyright (C) 2004-2016 Xiphos Developer Team * * 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 diff --git a/src/main/url.hh b/src/main/url.hh index d8f3b76..8bfa137 100644 --- a/src/main/url.hh +++ b/src/main/url.hh @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * url.h - support functions * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/xml.c b/src/main/xml.c index 522221b..570c954 100644 --- a/src/main/xml.c +++ b/src/main/xml.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xml.c - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/main/xml.h b/src/main/xml.h index 62a69a1..95e70bc 100644 --- a/src/main/xml.h +++ b/src/main/xml.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xml.h - * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * 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 diff --git a/src/webkit/wk-html.c b/src/webkit/wk-html.c index 35669b8..a5e931d 100644 --- a/src/webkit/wk-html.c +++ b/src/webkit/wk-html.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * wk-html.c - webkit-specific html support * - * Copyright (C) 2010-2015 Xiphos Developer Team + * Copyright (C) 2010-2016 Xiphos Developer Team * * 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 diff --git a/src/webkit/wk-html.h b/src/webkit/wk-html.h index e8f1dfb..fd64d3d 100644 --- a/src/webkit/wk-html.h +++ b/src/webkit/wk-html.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * wk-html.h - webkit-specific html support * - * Copyright (C) 2010-2015 Xiphos Developer Team + * Copyright (C) 2010-2016 Xiphos Developer Team * * 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 diff --git a/src/xiphos_html/xiphos_html.c b/src/xiphos_html/xiphos_html.c index 35c05aa..3143fbc 100644 --- a/src/xiphos_html/xiphos_html.c +++ b/src/xiphos_html/xiphos_html.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos_html.c - toolkit-generalized html support * - * Copyright (C) 2010-2015 Xiphos Developer Team + * Copyright (C) 2010-2016 Xiphos Developer Team * * 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 diff --git a/src/xiphos_html/xiphos_html.h b/src/xiphos_html/xiphos_html.h index c8ee40d..8d191c9 100644 --- a/src/xiphos_html/xiphos_html.h +++ b/src/xiphos_html/xiphos_html.h @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * xiphos_html.h - toolkit-generalized html support * - * Copyright (C) 2010-2015 Xiphos Developer Team + * Copyright (C) 2010-2016 Xiphos Developer Team * * 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 diff --git a/ui/languages b/ui/languages index 87921e0..63d67a5 100644 --- a/ui/languages +++ b/ui/languages @@ -131,8 +131,9 @@ gd Gàidhlig gl Galego # Gujarati gn ગુજરાતી -# Gothic (missing font: untranslated) 𐌲𐌿𐍄𐌹𐍃𐌺𐌰 𐍂𐌰𐌶𐌳𐌰 -got Gothic +# Gothic +#got Gothic +got 𐌲𐌿𐍄𐌹𐍃𐌺𐌰 𐍂𐌰𐌶𐌳𐌰 # Manx gv Gaelg # Greek, Ancient (to 1453) @@ -206,6 +207,8 @@ kw Kernewek # Kirghiz ky Кыргызча ky-Arab Кыргызча +# addition from IBT modules +ky-Cyrl кыргызча # Latin la Latina # Letzeburgesch @@ -993,6 +996,8 @@ bag Tuki bah Bahamas Creole English baj Barakai bak Bashkir +# addition from IBT modules +bak-Cyrl Башкиры bal Baluchi bam Bambara ban Balinese @@ -1764,6 +1769,8 @@ cjo Ashéninka Pajonal cjp Cabécar cjr Chorotega cjs Shor +# addition from IBT modules +cjs-Cyrl Шор тили cjv Chuave cjy Jinyu Chinese cka Khumi Awa Chin @@ -1782,6 +1789,8 @@ ckq Kajakse ckr Kairak cks Tayo ckt Chukot +# addition from IBT modules +ckt-Cyrl Чуко́тский cku Koasati ckv Kavalan ckw Western Cakchiquel @@ -1844,6 +1853,8 @@ con Cofán coo Comox # enabled plain latin name because font-specific name causes grief. cop Coptic +# addition from Sahidic module, name determined from wikipedia. +copt ⲙⲛⲧⲣⲙⲛⲕⲏⲙⲉ coq Coquille cor Cornish cos Corsican @@ -1874,7 +1885,8 @@ cre Cree crf Caramanta crg Michif crh Crimean Tatar -crh-Cyrl Crimean Tatar +# addition from IBT modules +crh-Cyrl Къырымтатарджа cri Sãotomense crj Southern East Cree crk Plains Cree @@ -1982,6 +1994,8 @@ dao Daai Chin dap Nisi (India) daq Dandami Maria dar Dargwa +# addition from IBT modules +dar-Cyrl дарганти das Daho-Doo dau Dar Sila Daju dav Taita @@ -2666,7 +2680,7 @@ gop Yeretuar goq Gorap gor Gorontalo gos Gronings -got Gothic +#got Gothic // dup gou Gavar gow Gorowa gox Gobu @@ -3269,6 +3283,10 @@ jya Jiarong jye Judeo-Yemeni Arabic jyy Jaya kaa Kara-Kalpak +# addition from IBT modules +kaa-Latn Kara-Kalpak +# addition from IBT modules +kaa-Cyrl Қарақалпақ kab Kabyle kac Kachin kad Kadara @@ -3285,6 +3303,8 @@ kam Kamba (Kenya) kan ಕನ್ನಡ kao Xaasongaxango kap Bezhta +# addition from IBT modules +kap-Cyrl бежкьалас kaq Capanahua kas Kashmiri kat Georgian @@ -4259,7 +4279,7 @@ lww Lewo lya Layakha lyg Lyngngam # added due to module ChiUnL: "literary chinese". -lzh 文學中國 +lzh 中文（文言） lyn Luyana lzl Litzlitz lzn Leinong Naga diff --git a/ui/markverse.glade b/ui/markverse.glade index 9541b92..0c3a4e1 100644 --- a/ui/markverse.glade +++ b/ui/markverse.glade @@ -13,7 +13,7 @@ <widget class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <accessibility> - <atkproperty name="AtkObject::accessible-name" translatable="yes">Bookmark Dialog</atkproperty> + <atkproperty name="AtkObject::accessible-name" translatable="yes">Annotation Dialog</atkproperty> </accessibility> <child> <widget class="GtkVBox" id="vbox1"> @@ -124,9 +124,9 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Create new folder</property> + <property name="tooltip" translatable="yes">Add annotation. The verse will display with highlight colors and a *u marker to show content.</property> <accessibility> - <atkproperty name="AtkObject::accessible-name" translatable="yes">New Folder</atkproperty> + <atkproperty name="AtkObject::accessible-name" translatable="yes">New Annotation</atkproperty> </accessibility> <child> <widget class="GtkAlignment" id="alignment1"> @@ -181,6 +181,7 @@ <property name="can_default">True</property> <property name="receives_default">False</property> <property name="use_stock">True</property> + <property name="tooltip" translatable="yes">Remove annotation.</property> <accessibility> <atkproperty name="AtkObject::accessible-name" translatable="yes">Unmark</atkproperty> </accessibility> @@ -201,7 +202,7 @@ <property name="receives_default">False</property> <property name="use_stock">True</property> <accessibility> - <atkproperty name="AtkObject::accessible-name" translatable="yes">Cancel Bookmark</atkproperty> + <atkproperty name="AtkObject::accessible-name" translatable="yes">Cancel Annotation</atkproperty> </accessibility> </widget> <packing> diff --git a/ui/markverse.gtkbuilder b/ui/markverse.gtkbuilder index 7ab6a0b..60ee4fe 100644 --- a/ui/markverse.gtkbuilder +++ b/ui/markverse.gtkbuilder @@ -25,7 +25,7 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Create new folder</property> + <property name="tooltip_text" translatable="yes">Add annotation. The verse will display with highlight colors and a *u marker to show content.</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> @@ -68,7 +68,7 @@ </child> <child internal-child="accessible"> <object class="AtkObject" id="button1-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">New Folder</property> + <property name="AtkObject::accessible-name" translatable="yes">New Annotation</property> </object> </child> </object> @@ -86,6 +86,7 @@ <property name="can_default">True</property> <property name="receives_default">False</property> <property name="use_stock">True</property> + <property name="tooltip_text" translatable="yes">Remove annotation.</property> <child internal-child="accessible"> <object class="AtkObject" id="button3-atkobject"> <property name="AtkObject::accessible-name" translatable="yes">Unmark</property> @@ -108,7 +109,7 @@ <property name="use_stock">True</property> <child internal-child="accessible"> <object class="AtkObject" id="button2-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Cancel Bookmark</property> + <property name="AtkObject::accessible-name" translatable="yes">Cancel Annotation</property> </object> </child> </object> @@ -244,7 +245,7 @@ </child> <child internal-child="accessible"> <object class="AtkObject" id="dialog-vbox1-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Bookmark Dialog</property> + <property name="AtkObject::accessible-name" translatable="yes">Annotation Dialog</property> </object> </child> </object> diff --git a/ui/markverse_old.gtkbuilder b/ui/markverse_old.gtkbuilder index 8f05c11..b8d8291 100644 --- a/ui/markverse_old.gtkbuilder +++ b/ui/markverse_old.gtkbuilder @@ -137,7 +137,7 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip-text" translatable="yes">Create new folder</property> + <property name="tooltip-text" translatable="yes">Add annotation. The verse will display with highlight colors and a *u marker to show content.</property> <accessibility> </accessibility> @@ -180,7 +180,7 @@ </child> <child internal-child="accessible"> <object class="AtkObject" id="a11y-button11"> - <property name="AtkObject::accessible-name" translatable="yes">New Folder</property> + <property name="AtkObject::accessible-name" translatable="yes">New Annotation</property> </object> </child> </object> @@ -198,6 +198,7 @@ <property name="can_default">True</property> <property name="receives_default">False</property> <property name="use_stock">True</property> + <property name="tooltip-text" translatable="yes">Remove annotation.</property> <accessibility> </accessibility> @@ -226,7 +227,7 @@ </accessibility> <child internal-child="accessible"> <object class="AtkObject" id="a11y-button21"> - <property name="AtkObject::accessible-name" translatable="yes">Cancel Bookmark</property> + <property name="AtkObject::accessible-name" translatable="yes">Cancel Annotation</property> </object> </child> </object> @@ -245,7 +246,7 @@ </child> <child internal-child="accessible"> <object class="AtkObject" id="a11y-dialog-vbox11"> - <property name="AtkObject::accessible-name" translatable="yes">Bookmark Dialog</property> + <property name="AtkObject::accessible-name" translatable="yes">Annotation Dialog</property> </object> </child> </object> diff --git a/waffles/documentation.py b/waffles/documentation.py index 7c102fe..ef12b53 100644 --- a/waffles/documentation.py +++ b/waffles/documentation.py @@ -217,4 +217,4 @@ def detect(conf): if conf.env['IS_WIN32']: xsltproc = conf.find_program('xsltproc', var='XSLTPROC') htmlhelpc = conf.find_program('hhc', var='HTMLHELPC') - + @@ -14,7 +14,7 @@ preproc.strict_quotes=0 import waffles.misc import waffles.gnome as gnome -VERSION='4.0.4' +VERSION='4.0.5' APPNAME='xiphos' PACKAGE='xiphos' @@ -288,7 +288,7 @@ def configure(conf): define('INSTALL_PREFIX', conf.escpath(sub('${PREFIX}/', env))) #dfn('LT_OBJDIR', '.libs') - what's the purpose? - define('PACKAGE_BUGREPORT','http://sourceforge.net/tracker/?group_id=5528&atid=105528' ) + define('PACKAGE_BUGREPORT','https://github.com/crosswire/xiphos/issues' ) define('PACKAGE_DATA_DIR', conf.escpath(sub('${DATAROOTDIR}/${PACKAGE}', env))) define('PACKAGE_DOC_DIR', conf.escpath(env['DOCDIR'])) define('PACKAGE_HELP_DIR', conf.escpath(sub('${DATAROOTDIR}/gnome/help/${PACKAGE}', env))) @@ -361,6 +361,9 @@ def configure(conf): conf.check_cfg(package="gtk+-3.0", atleast_version = "3.14", uselib_store="GTK_314") + conf.check_cfg(package="gtk+-3.0", + atleast_version = "3.20", + uselib_store="GTK_320") conf.define('USE_GTK_3', 1) conf.define('USE_GTKBUILDER', 1) if opt.webkit_editor: @@ -411,6 +414,13 @@ def configure(conf): mandatory=True) env.append_value('ALL_LIBS', 'SWORD') + conf.check_cfg(package='icu-i18n', + args='--cflags --libs', + uselib_store='ICUI18N', + errmsg='fail', + mandatory=True) + env.append_value('ALL_LIBS', 'ICUI18N') + conf.check_cfg(package='biblesync', args='"biblesync >= 1.1.2" --cflags --libs', uselib_store='BIBLESYNC', @@ -499,12 +509,12 @@ def build(bld): bld.install_files('${PACKAGE_DOC_DIR}', """ - README + README.md RELEASE-NOTES COPYING AUTHORS ChangeLog - INSTALL + INSTALL.md TODO Xiphos.ogg """) @@ -42,8 +42,8 @@ The full documentation for can be found online at http://xiphos.org/manual/ or on your system through the help menu in .SH "BUGS" -Please report bugs online at: https://sourceforge.net/p/gnomesword/bugs/ +Please report bugs online at: https://github.com/crosswire/xiphos/issues .SH "AUTHOR" .B xiphos -was written by the Xiphos Developer Team. <xiphos-developers@lists.sourceforge.net> +was written by the Xiphos Developer Team. <xiphos-devel@crosswire.org> .PP diff --git a/xiphos.appdata.xml b/xiphos.appdata.xml index a38932b..f7004ed 100644 --- a/xiphos.appdata.xml +++ b/xiphos.appdata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright © 2014-2015 Xiphos Development Team <gnomesword-developers@lists.sourceforge.net> --> +<!-- Copyright © 2014-2016 Xiphos Development Team <xiphos-devel@crosswire.org> --> <component type="desktop"> <id>xiphos.desktop</id> <metadata_license>CC0-1.0</metadata_license> @@ -48,7 +48,7 @@ <caption>Module-specific display choices</caption> </screenshot> </screenshots> - <url type="homepage">https://sourceforge.net/projects/gnomesword/</url> - <updatecontact>gnomesword-developers@lists.sourceforge.net</updatecontact> + <url type="homepage">https://github.com/crosswire/xiphos/</url> + <updatecontact>xiphos-devel@crosswire.org</updatecontact> <project_group>GNOME</project_group> </component> |
