commit bibletime for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bibletime for openSUSE:Factory checked in at 2021-08-31 19:55:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bibletime (Old)
and /work/SRC/openSUSE:Factory/.bibletime.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bibletime"
Tue Aug 31 19:55:37 2021 rev:20 rq:915208 version:3.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/bibletime/bibletime.changes 2021-08-10 10:27:47.829789534 +0200
+++ /work/SRC/openSUSE:Factory/.bibletime.new.1899/bibletime.changes 2021-08-31 19:56:29.974022636 +0200
@@ -1,0 +2,12 @@
+Mon Aug 30 20:16:11 UTC 2021 - Cor Blom
���������������������������������������������������</emphasis>���"
+"���������������������������������12���11���12������ <emphasis>��������������������������������������� / "
+"������������������������������ / ��������������������������������� / ������������������������������������������"
+"��������� / ��������������������������������������������������������� / ���������������������������������������"
+"��������������������� / ������������������������������������������������ / ������������������������������������"
+"���������������</emphasis>���"
#. type: Content of: <chapter><sect1><title>
#: docs/howto/en/docbook/howto-importance.docbook:288
msgid "Appendix: \"Once for All\""
-msgstr "������:������������������������"
+msgstr "������:������������������"
#. type: Content of: <chapter><sect1><blockquote><attribution>
#: docs/howto/en/docbook/howto-importance.docbook:290
@@ -1866,8 +1865,8 @@
#: docs/howto/en/docbook/howto-interpretation.docbook:276
msgid "Is.59:1 <quote>The Lord's hand is not short;</quote>"
msgstr ""
-"������������������������������59���1������<quote><b>���</b>������������������������������������������������"
-"</quote>���"
+"������������������������������59���1������<quote>���������������������������������������������������������"
+"quote>���"
#. type: Content of: <chapter><section><section><para>
#: docs/howto/en/docbook/howto-interpretation.docbook:278
@@ -2053,7 +2052,7 @@
#. type: Content of: <book><bookinfo><abstract><title>
#: docs/howto/en/docbook/index.docbook:39
msgid "Abstract"
-msgstr "������"
+msgstr "���������������"
#. type: Content of: <book><bookinfo><abstract><para>
#: docs/howto/en/docbook/index.docbook:40
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/i18n/messages/bibletime_ui_ko.ts new/bibletime-3.0.2/i18n/messages/bibletime_ui_ko.ts
--- old/bibletime-3.0.1/i18n/messages/bibletime_ui_ko.ts 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/i18n/messages/bibletime_ui_ko.ts 2021-08-30 21:42:50.000000000 +0200
@@ -819,7 +819,7 @@
<message>
<location filename="../../src/frontend/btaboutdialog.cpp" line="134"/>
<source>(c)1999-2020, The BibleTime Team</source>
- <translation type="unfinished"></translation>
+ <translation>(c)1999-2020, The BibleTime Team</translation>
</message>
<message>
<location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
@@ -1214,7 +1214,7 @@
<message>
<location filename="../../src/frontend/btcopybyreferencesdialog.cpp" line="45"/>
<source>Copy by References</source>
- <translation type="unfinished"></translation>
+ <translation>��������� ������</translation>
</message>
<message>
<location filename="../../src/frontend/btcopybyreferencesdialog.cpp" line="57"/>
@@ -1442,12 +1442,12 @@
<message>
<location filename="../../src/frontend/searchdialog/btindexdialog.cpp" line="114"/>
<source>%1 KiB</source>
- <translation type="unfinished"></translation>
+ <translation>%1 KiB</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/btindexdialog.cpp" line="120"/>
<source>0 KiB</source>
- <translation type="unfinished"></translation>
+ <translation>0 KiB</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/btindexdialog.cpp" line="128"/>
@@ -1578,7 +1578,7 @@
<message>
<location filename="../../src/frontend/btmoduleindexdialog.cpp" line="76"/>
<source><UNKNOWN EXCEPTION></source>
- <translation type="unfinished"></translation>
+ <translation><UNKNOWN EXCEPTION></translation>
</message>
<message>
<location filename="../../src/frontend/btmoduleindexdialog.cpp" line="80"/>
@@ -1927,12 +1927,12 @@
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="118"/>
<source>The currently active window can be auto scrolled up or down. Start scrolling by pressing Shift+Down. You can increase the scrolling speed by pressing Shift+Down multiple times. To pause scrolling press Space. To start scrolling again at the previous speed press Space again. To slow down scrolling or scroll the other direction press Shift+Up one or more times. Pressing any other key or changing the active window will stop the scrolling.</source>
- <translation type="unfinished"></translation>
+ <translation>������ ������ ������������ ������������ ��������� ������������ ���������������. Shift+Down��� ��������� ������������ ���������������. Shift+Down��� ��������� ��������� ��������� ��������� ������ ��� ������������. ������������ ������������ ��������������� ������������. ������ ��������� ������ ������������ ��������������� ��������������� ������ ��������� ���������. ��������� ��������� ������������ ������ ������������ ������������������ Shift+Up��� ��������� ���������. ������ ������ ������������ ������ ������������ ��������� ������������ ������������.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
<source>To add multiple Bible works in parallel in your active Bible or commentary window select this icon and choose another Bible or commentary work.</source>
- <translation type="unfinished"></translation>
+ <translation>������ ������ ��������� ���������������, ������ ������������ ������ ��������� ��� ������������ ������������ ������ ������ ������ ������ ������ ���������������.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
@@ -1982,7 +1982,7 @@
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="165"/>
<source>You can save personal notes for specific verse references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source, English as the language, and look under Commentary. Once installed, open it like any other window, or in parallel with a bible. Click a verse to edit it.</source>
- <translation type="unfinished"></translation>
+ <translation>������ ��������� ������������ ������ ��������� ��������� ��� ������������. ��� ��������� ��������������� ������ ������ ��������� ������������ ���������. ������ ������������ ������ ��������� Crosswire, ��������� English��� ������������ ������ ��������� ���������. ������ ������������ ������ ������ ��������� ��������� ��������� ������ ��� ��� ������������. ��������� ������������ ���������������.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
@@ -2378,7 +2378,7 @@
<message>
<location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="119"/>
<source>Did you know? You can help translating the GUI of BibleTime to your language at <a href="https://www.transifex.com/bibletime/bibletime/">Transifex</a>.</source>
- <translation type="unfinished"></translation>
+ <translation>������ ������������? BibleTime��� GUI��� ��������� ��������� ������������ ������ <a href="https://www.transifex.com/bibletime/bibletime/">Transifex</a>������ ������ ��� ������������ .</translation>
</message>
<message>
<location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="219"/>
@@ -2436,7 +2436,7 @@
<message>
<location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="214"/>
<source>Copy by references...</source>
- <translation type="unfinished"></translation>
+ <translation>��������� ������</translation>
</message>
<message>
<location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="218"/>
@@ -3219,22 +3219,22 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
<source>Zapotec, San Juan Guelav���</source>
- <translation type="unfinished"></translation>
+ <translation>Zapotec, San Juan Guelav���</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
<source>Zapotec, Amatl��n</source>
- <translation type="unfinished"></translation>
+ <translation>Zapotec, Amatl��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="422"/>
<source>Zapotec, Yal��lag</source>
- <translation type="unfinished"></translation>
+ <translation>Zapotec, Yal��lag</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="425"/>
<source>Zapotec, Quioquitani-Quier��</source>
- <translation type="unfinished"></translation>
+ <translation>Zapotec, Quioquitani-Quier��</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="282"/>
@@ -3270,7 +3270,7 @@
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="288"/>
<source>Kekch��</source>
<comment>kek</comment>
- <translation type="unfinished"></translation>
+ <translation>Kekch��</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="295"/>
@@ -3355,17 +3355,17 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
<source>Mam, Todos Santos Cuchumat��n</source>
- <translation type="unfinished"></translation>
+ <translation>Mam, Todos Santos Cuchumat��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
<source>Norwegian Bokm��l</source>
- <translation type="unfinished"></translation>
+ <translation>Norwegian Bokm��l</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="331"/>
<source>Nahuatl, Michoac��n</source>
- <translation type="unfinished"></translation>
+ <translation>Nahuatl, Michoac��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
@@ -3545,12 +3545,12 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
<source>Chinantec, Ozumac��n</source>
- <translation type="unfinished"></translation>
+ <translation>Chinantec, Ozumac��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
<source>Itz��</source>
- <translation type="unfinished"></translation>
+ <translation>Itz��</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
@@ -3560,7 +3560,7 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="348"/>
<source>Otomi, Quer��taro</source>
- <translation type="unfinished"></translation>
+ <translation>Otomi, Quer��taro</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="352"/>
@@ -3571,7 +3571,7 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
<source>Quich��, West Central</source>
- <translation type="unfinished"></translation>
+ <translation>Quich��, West Central</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
@@ -3581,7 +3581,7 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
<source>Tzotzil, Zinacant��n</source>
- <translation type="unfinished"></translation>
+ <translation>Tzotzil, Zinacant��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="414"/>
@@ -4669,7 +4669,7 @@
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="187"/>
<source><UNKNOWN EXCEPTION></source>
- <translation type="unfinished"></translation>
+ <translation><UNKNOWN EXCEPTION></translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="191"/>
@@ -4679,7 +4679,7 @@
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="192"/>
<source>An internal error occurred while executing your search:<br/><br/>%1</source>
- <translation type="unfinished"></translation>
+ <translation>������ ������ ������ ��� ������ ������ ������:<br/><br/>%1</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="243"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/i18n/messages/bibletime_ui_pt_BR.ts new/bibletime-3.0.2/i18n/messages/bibletime_ui_pt_BR.ts
--- old/bibletime-3.0.1/i18n/messages/bibletime_ui_pt_BR.ts 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/i18n/messages/bibletime_ui_pt_BR.ts 2021-08-30 21:42:50.000000000 +0200
@@ -1214,7 +1214,7 @@
<message>
<location filename="../../src/frontend/btcopybyreferencesdialog.cpp" line="45"/>
<source>Copy by References</source>
- <translation type="unfinished"></translation>
+ <translation>C��pia por refer��ncias</translation>
</message>
<message>
<location filename="../../src/frontend/btcopybyreferencesdialog.cpp" line="57"/>
@@ -1625,7 +1625,7 @@
<message>
<location filename="../../src/frontend/display/modelview/btqmlinterface.cpp" line="204"/>
<source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Editar</translation>
</message>
</context>
<context>
@@ -1927,12 +1927,12 @@
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="118"/>
<source>The currently active window can be auto scrolled up or down. Start scrolling by pressing Shift+Down. You can increase the scrolling speed by pressing Shift+Down multiple times. To pause scrolling press Space. To start scrolling again at the previous speed press Space again. To slow down scrolling or scroll the other direction press Shift+Up one or more times. Pressing any other key or changing the active window will stop the scrolling.</source>
- <translation type="unfinished"></translation>
+ <translation>A janela atualmente ativa pode rolar automaticamente para cima ou para baixo. Comece a rolagem pressionando Shift+Down. Voc�� pode aumentar a velocidade de rolagem pressionando Shift+Down v��rias vezes. Para parar a rolagem, pressione Espa��o. Para iniciar a rolagem novamente na velocidade anterior, pressione novamente Espa��o. Para diminuir a velocidade de rolagem ou rolar na outra dire����o, pressione Shift+Up uma ou mais vezes. Pressionar qualquer outra tecla ou mudar a janela ativa ir�� parar a rolagem.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
<source>To add multiple Bible works in parallel in your active Bible or commentary window select this icon and choose another Bible or commentary work.</source>
- <translation type="unfinished"></translation>
+ <translation>Para adicionar m��ltiplas obras b��blicas em paralelo em sua B��blia ativa ou janela de coment��rios, selecione este ��cone e escolha outra obra b��blica ou de coment��rios.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
@@ -1982,7 +1982,7 @@
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="165"/>
<source>You can save personal notes for specific verse references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source, English as the language, and look under Commentary. Once installed, open it like any other window, or in parallel with a bible. Click a verse to edit it.</source>
- <translation type="unfinished"></translation>
+ <translation>Voc�� pode salvar notas pessoais para refer��ncias de versos espec��ficos. Voc�� deve instalar o Coment��rio pessoal. Abra o Gerente da Estante, escolha Crosswire como fonte, ingl��s como idioma e veja em Coment��rio. Uma vez instalado, abra-o como qualquer outra janela, ou em paralelo com uma b��blia. Clique em um verso para edit��-lo.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
@@ -2378,7 +2378,7 @@
<message>
<location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="119"/>
<source>Did you know? You can help translating the GUI of BibleTime to your language at <a href="https://www.transifex.com/bibletime/bibletime/">Transifex</a>.</source>
- <translation type="unfinished"></translation>
+ <translation>Voc�� sabia? Voc�� pode ajudar a traduzir a GUI do BibleTime para seu idioma na <a href="https://www.transifex.com/bibletime/bibletime/"> Transifex</a>.</translation>
</message>
<message>
<location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="219"/>
@@ -2436,7 +2436,7 @@
<message>
<location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="214"/>
<source>Copy by references...</source>
- <translation type="unfinished"></translation>
+ <translation>Copiar por refer��ncias ...</translation>
</message>
<message>
<location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="218"/>
@@ -4699,12 +4699,12 @@
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="255"/>
<source>&Manage Indexes...</source>
- <translation type="unfinished"></translation>
+ <translation>&Gerenciar ��ndices...</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="256"/>
<source>Recreate search indexes</source>
- <translation type="unfinished"></translation>
+ <translation>Recriar ��ndices de pesquisa</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="260"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/src/backend/filters/teitohtml.cpp new/bibletime-3.0.2/src/backend/filters/teitohtml.cpp
--- old/bibletime-3.0.1/src/backend/filters/teitohtml.cpp 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/src/backend/filters/teitohtml.cpp 2021-08-30 21:42:50.000000000 +0200
@@ -127,7 +127,11 @@
//if the osisRef like "GerLut:key" contains a module, use that
int pos = ref.indexOf(":");
- if ((pos >= 0) && ref.at(pos - 1).isLetter() && ref.at(pos + 1).isLetter()) {
+ if ((pos > 0)
+ && (pos < ref.size() - 1)
+ && ref.at(pos - 1).isLetter()
+ && ref.at(pos + 1).isLetter())
+ {
QString newModuleName = ref.left(pos);
hrefRef = ref.mid(pos + 1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/src/frontend/display/modelview/DisplayView.qml new/bibletime-3.0.2/src/frontend/display/modelview/DisplayView.qml
--- old/bibletime-3.0.1/src/frontend/display/modelview/DisplayView.qml 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/src/frontend/display/modelview/DisplayView.qml 2021-08-30 21:42:50.000000000 +0200
@@ -36,6 +36,8 @@
property int column: 0 // Column containing selected text
property int indexFirst: -1 // Index of first delegate item with selected text
property int indexLast: -1 // Index of last delegate item with selected text
+ property Item itemFirst: null // First delegate item with selected text
+ property Item itemLast: null // Last delegate item with selected text
property int textPosFirst: -1 // Position of first selected character
property int textPosLast: -1 // Position of last selected character
@@ -60,6 +62,12 @@
// Save cursor position for later use
mousePressedX = x;
mousePressedY = y;
+
+ if (btQmlInterface.hasSelectedText()) {
+ deselectByItem();
+ return;
+ }
+
var delegateItem = listView.itemAt( x, y + listView.contentY);
if (delegateItem === null)
return;
@@ -90,7 +98,7 @@
column = Math.floor(mousePressedX / (listView.width / listView.columns));
sortMousePoints();
getSelectedTextPositions();
- selectByIndex();
+ selectByItem();
selectionInProgress = true;
}
}
@@ -106,7 +114,7 @@
return;
if (selectionInProgress)
return;
- deselectByIndex();
+ deselectByItem();
if (openPersonalCommentary(mousePressedX, mousePressedY))
return;
if (! isCrossReference(pressedLink))
@@ -147,54 +155,68 @@
return;
indexFirst = listView.indexAt(mouseUL.x, mouseUL.y + listView.contentY);
+ itemFirst = listView.itemAt(mouseUL.x, mouseUL.y + listView.contentY);
var delegateXFirst = listView.contentX + mouseUL.x - firstDelegateItem.x;
var delegateYFirst = listView.contentY + mouseUL.y - firstDelegateItem.y;
textPosFirst = firstDelegateItem.positionAt(delegateXFirst, delegateYFirst, column);
indexLast = listView.indexAt(mouseLR.x, mouseLR.y + listView.contentY);
+ itemLast = listView.itemAt(mouseLR.x, mouseLR.y + listView.contentY);
var delegateXLast = listView.contentX + mouseLR.x - lastDelegateItem.x;
var delegateYLast = listView.contentY + mouseLR.y - lastDelegateItem.y;
textPosLast = lastDelegateItem.positionAt(delegateXLast, delegateYLast, column);
}
- function selectDelegateItem(index, delegateItem) {
- if (delegateItem === null)
+ function selectDelegateItem(index, dItem) {
+ if (dItem === null || dItem === 0)
return;
- if (index === indexFirst && index === indexLast)
- delegateItem.selectSingle(column, textPosFirst, textPosLast);
- else if (index === indexFirst)
- delegateItem.selectFirst(column, textPosFirst);
- else if (index === indexLast)
- delegateItem.selectLast(column, textPosLast);
- else if (index > indexFirst && index < indexLast)
- delegateItem.selectAll(column);
+ if (dItem === itemFirst && dItem === itemLast)
+ dItem.selectSingle(column, textPosFirst, textPosLast);
+ else if (dItem === itemFirst)
+ dItem.selectFirst(column, textPosFirst);
+ else if (dItem === itemLast)
+ dItem.selectLast(column, textPosLast);
+ else if (dItem !== itemFirst && dItem !== itemLast)
+ dItem.selectAll(column);
else
return;
- var columnSelectedText = delegateItem.getSelectedText(column);
+ var columnSelectedText = dItem.getSelectedText(column);
btQmlInterface.saveSelectedText(index, columnSelectedText)
}
- function selectByIndex() {
- if (indexFirst < 0 || indexLast < 0 || indexFirst > indexLast)
- return;
-
- var index;
- for (index = indexFirst; index <= indexLast; index++) {
- var delegateItem = listView.itemAtIndex(index);
- selectDelegateItem(index, delegateItem);
+ function nextItem(currentItem) {
+ var nextY = currentItem.y+currentItem.height+listView.spacing;
+ var nextI = listView.itemAt(currentItem.x, nextY);
+ return nextI;
+ }
+
+ function selectByItem() {
+ var delegateItem = itemFirst;
+ var loopIndex = 0;
+ while (true) {
+ selectDelegateItem(loopIndex, delegateItem);
+ if (delegateItem == itemLast)
+ break;
+ delegateItem = nextItem(delegateItem);
+ loopIndex++;
}
}
- function deselectByIndex() {
- if (indexFirst < 0 || indexLast < 0 || indexFirst > indexLast)
- return;
- var index;
- for (index = indexFirst; index <= indexLast; index++) {
- var delegateItem = listView.itemAtIndex(index);
- if (delegateItem !== null)
- delegateItem.deselect(column);
- }
+ function deselectByItem() {
+ if (itemFirst == null)
+ return;
+ var delegateItem = itemFirst;
+ while (true) {
+ delegateItem.deselect(column);
+ if (delegateItem == itemLast)
+ break;
+ delegateItem = nextItem(delegateItem);
+ }
+ itemFirst = null;
+ itemLast = null
+ column = 0;
+ btQmlInterface.clearSelectedText();
}
function openPersonalCommentary(x, y) {
@@ -309,9 +331,9 @@
delegate: DisplayDelegate {
id: dd
- Component.onCompleted: {
- selectDelegateItem(index, dd);
- }
+// Component.onCompleted: {
+// selectDelegateItem(index, dd);
+// }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/src/frontend/display/modelview/bttextfilter.cpp new/bibletime-3.0.2/src/frontend/display/modelview/bttextfilter.cpp
--- old/bibletime-3.0.1/src/frontend/display/modelview/bttextfilter.cpp 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/src/frontend/display/modelview/bttextfilter.cpp 2021-08-30 21:42:50.000000000 +0200
@@ -30,9 +30,7 @@
fixDoubleBR();
if (m_showReferences) {
- int i = 0;
- int count = m_parts.count();
- do {
+ for (int i = 0; i < m_parts.count();) {
QString part = m_parts.at(i);
if (part.startsWith("<") && part.contains("class=\"footnote\"")) {
@@ -48,7 +46,7 @@
} else {
i++;
}
- } while (i < count);
+ }
}
return m_parts.join("");
@@ -96,7 +94,7 @@
// Output: <span class="footnote" note="ESV2011/Luke 11:37/1">1</span>
int BtTextFilter::rewriteFootnoteAsLink(int i, const QString& part) {
- if (i+2 > m_parts.count())
+ if (i + 2 >= m_parts.count())
return 1;
QRegExp rxlen("note=\"([^\"]*)");
@@ -137,6 +135,8 @@
// Typical input: <span lemma="H07225">God</span>
// Output: "<a href="sword://lemmamorph/lemma=H0430||/God" style="color: black">"
int BtTextFilter::rewriteLemmaOrMorphAsLink(int i, const QString& part) {
+ if (i + 2 >= m_parts.count())
+ return 1;
QString value;
QRegExp rx1("lemma=\"([^\"]*)*");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/src/frontend/settingsdialogs/btfontsettings.cpp new/bibletime-3.0.2/src/frontend/settingsdialogs/btfontsettings.cpp
--- old/bibletime-3.0.1/src/frontend/settingsdialogs/btfontsettings.cpp 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/src/frontend/settingsdialogs/btfontsettings.cpp 2021-08-30 21:42:50.000000000 +0200
@@ -94,7 +94,7 @@
work.settings.second = newFont;
});
BT_CONNECT(m_languageComboBox,
- qOverload<int>(&QComboBox::currentIndexChanged),
+ QOverload<int>::of(&QComboBox::currentIndexChanged),
[this](int const newIndex) {
auto const i = static_cast
participants (1)
-
Source-Sync