diff options
Diffstat (limited to 'src/frontend/htmldialogs')
-rw-r--r-- | src/frontend/htmldialogs/btaboutdialog.cpp | 29 | ||||
-rw-r--r-- | src/frontend/htmldialogs/bttabhtmldialog.cpp | 4 |
2 files changed, 18 insertions, 15 deletions
diff --git a/src/frontend/htmldialogs/btaboutdialog.cpp b/src/frontend/htmldialogs/btaboutdialog.cpp index f8e6666..528d9d5 100644 --- a/src/frontend/htmldialogs/btaboutdialog.cpp +++ b/src/frontend/htmldialogs/btaboutdialog.cpp @@ -24,7 +24,6 @@ static QString make_head(const QString& content); static QString make_html(const QString& content); static QString make_file_icon(const QString& icon); static QString make_link(const QString& link, const QString& text); -static QString make_version(); // Implements the Help > About dialog box @@ -48,7 +47,7 @@ void BtAboutDialog::init_bt_tab() { QString content; content = make_file_icon("bibletime"); content += " "; - content += make_bold("BibleTime " + make_version()); + content += make_bold("BibleTime " BT_VERSION); content = make_center(content) + make_br(); content += tr("BibleTime is an easy to use but powerful Bible study tool."); content += make_br() + make_br(); @@ -68,7 +67,10 @@ void BtAboutDialog::init_contributors_tab() { setTabText(tr("Contributors")); QString content; content += make_bold(tr("The following people contributed to BibleTime:")) + make_br(); - // sorted alphabetically (last name) + + /**************************************************************************************** + *** NB!!! Credits are sorted alphabetically by last name! *** + ****************************************************************************************/ content += "<ul>"; content += "<li>Thomas Abthorpe (" + tr("documentation and translation manager") + ")</li>"; content += "<li>Joachim Ansorg (" + tr("project founder, developer") + ")</li>"; @@ -89,18 +91,26 @@ void BtAboutDialog::init_contributors_tab() { content += "<li>Mark Lybarger (" + tr("developer") + ")</li>"; content += "<li>Luke Mauldin (" + tr("developer") + ")</li>"; content += "<li>James Ots (" + tr("designer") + ")</li>"; + /** \todo BibleTime 2.6: Add tr("artist"): */ + content += "<li>Andrus Raag</li>"; + content += "<li>Jaak Ristioja (" + tr("developer") + ")</li>"; content += "<li>Fred Saalbach (" + tr("documentation") + ")</li>"; content += "<li>Gary Sims (" + tr("developer") + ")</li>"; content += "<li>Wolfgang Stradner (" + tr("tester, usability expert") + ")</li>"; + content += "<li>Kang Sun (" + tr("developer") + ")</li>"; content += "<li>Thorsten Uhlmann (" + tr("developer") + ")</li>"; content += "<li>David White (" + tr("developer") + ")</li>"; content += "<li>Mark Zealey (" + tr("developer") + ")</li>"; content += "</ul>"; content += make_bold(tr("The following people translated BibleTime into their language:")) + make_br(); - // sorted alphabetically (last name) + + /**************************************************************************************** + *** NB!!! Credits are sorted alphabetically by last name! *** + ****************************************************************************************/ content += "<ul>"; content += "<li>Horatiu Alexe</li>"; + content += "<li>Luis Barron</li>"; content += "<li>Jan Bělohoubek</li>"; content += "<li>Chun-shek Chan</li>"; content += "<li>Nouhoun Y. Diarra</li>"; @@ -230,15 +240,10 @@ static QString make_link(const QString& link, const QString& text) { return "<a href=\"" + link + "\">" + text + "</a>"; } -static QString make_version() { -// return ""; - return BT_VERSION; -} - static QString make_file_icon(const QString& icon) { namespace DU = util::directory; - - QString dir("<img src=file://" + DU::getIconDir().path()); - return dir + "/" + icon + ".png >"; + QUrl url = QUrl::fromLocalFile( DU::getIconDir().path() + "/" + icon + ".svg"); + QString html = "<img src=\"" + url.toString() + "\">"; + return html; } diff --git a/src/frontend/htmldialogs/bttabhtmldialog.cpp b/src/frontend/htmldialogs/bttabhtmldialog.cpp index 74a2b20..bd52464 100644 --- a/src/frontend/htmldialogs/bttabhtmldialog.cpp +++ b/src/frontend/htmldialogs/bttabhtmldialog.cpp @@ -93,11 +93,9 @@ QWebView* BtTabHtmlDialog::webView() { void BtTabHtmlDialog::setHtml(const QString& html, const QUrl& baseUrl) { namespace DU = util::directory; - QUrl url = baseUrl; if (url == QUrl()) { - QString dir("file://" + DU::getIconDir().path()); - url.setUrl(dir); + QUrl url = QUrl::fromLocalFile(DU::getIconDir().path()); } webView()->setHtml(html, url); } |