From 03124a7bc96b5bc878c8e18d5bf3cf2a759c2413 Mon Sep 17 00:00:00 2001
From: SeeLook <seelook@gmail.com>
Date: Wed, 10 Aug 2016 17:26:03 +0200
Subject: [PATCH] Scaling of certificate header if to wide, updated support
dialog
---
src/exam/tnootkacertificate.cpp | 7 ++++---
src/libs/misc/tsupportnootka.cpp | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/exam/tnootkacertificate.cpp b/src/exam/tnootkacertificate.cpp
index ca37a1912..5cd967fd7 100644
--- a/src/exam/tnootkacertificate.cpp
+++ b/src/exam/tnootkacertificate.cpp
@@ -75,8 +75,9 @@ TnootkaCertificate::TnootkaCertificate(QGraphicsView* view, Texam* exam) :
Fake = "<h3>Translators preview of</h3>";
m_certHeadI = createCertItem(Fake + tr("<h1>Certificate Of Exam Completion</h1>", "Main header - centered"));
TgraphicsTextTip::alignCenter(m_certHeadI);
-// m_certHeadI->setGraphicsEffect(new QGraphicsDropShadowEffect);
- m_certHeadI->setPos((width() - m_certHeadI->boundingRect().width()) / 2, height());
+ if (m_certHeadI->boundingRect().width() > width() - 2 * SPACER)
+ m_certHeadI->setScale((width() - 2 * SPACER) / m_certHeadI->boundingRect().width());
+ m_certHeadI->setPos((width() - m_certHeadI->boundingRect().width() * m_certHeadI->scale()) / 2, height());
m_height += m_certHeadI->boundingRect().height() + 2 * SPACER;
//-MARGIN-MARGIN-Exam results-----------------
//-MARGIN-MARGIN-Exam results-----------------
@@ -261,7 +262,7 @@ QString TnootkaCertificate::fillCert(QString entry) {
entry.replace("[LEVELNAME]", m_exam->level()->name);
entry.replace("[TOTALTIME]", TexamView::formatedTotalTime(m_exam->workTime() * 1000));
entry.replace("[SCORE]", QString("%1 %").arg(m_exam->effectiveness(), 0, 'f', 1, '0'));
- entry.replace("[QUESTNR]", QString("%1").arg(m_exam->count()));
+ entry.replace("[QUESTNR]", QString("<b>%1</b>").arg(m_exam->count()));
return entry;
}
diff --git a/src/libs/misc/tsupportnootka.cpp b/src/libs/misc/tsupportnootka.cpp
index bee75d998..cd5e9e7ea 100644
--- a/src/libs/misc/tsupportnootka.cpp
+++ b/src/libs/misc/tsupportnootka.cpp
@@ -66,8 +66,8 @@ TsupportNootka::TsupportNootka(QWidget *parent) :
+ tr("Through PayPal or a card") + QLatin1String("</a>")
+ QLatin1String("<p align=\"center\"><a href=\"mailto:seelook.gmail.com\">")
+ tr("or send email for an account number") + QLatin1String("</a></p>") + endLi;
- supp += coloredLi("#E57300", "Test Android version") + QLatin1String("Using <a href=\"http://sourceforge.net/p/nootka/bugs/\">bug tracker</a> or <a href=\"mailto:seelook.gmail.com\">email</a> send your phone/tablet model to inform that it works (or not)") + br + endLi;
supp += QLatin1String("<li><big><b style=\"color: #0000C0;\">Translate Nootka</b></big><br>It does not require any programming skills. Just read <a href=\"http://sourceforge.net/p/nootka/hg/ci/default/tree/lang/how-to-translate.txt\">the instructions</a>,<br>translate and send your work.<br></li>");
+ supp += coloredLi("#E57300", "Update German translation") + QLatin1String("It seems to be abandoned, so continue translating, please.") + br + endLi;
supp += QLatin1String("<li><big><b style=\"color: #FF0000;\">Report an issue</b></big><br>If you find any issue or a bug than request it through:<br><a href=\"http://sourceforge.net/p/nootka/bugs/\">bug tracker</a><br></li>");
supp += QLatin1String("<li><big><b style=\"color: #C000C0;\">Vote on Nootka</b></big><br>There are a lot of services. For example:<br>"
"<a href=\"https://play.google.com/store/apps/details?id=net.sf.nootka\">Google Play</a>, "
--
GitLab