linguist: Show context in guesses

Context for each Guess entry from "Phrases and guesses" is shown.
This is quite convenient since context provides valuable information.
Same source phrase could be in different contexts and the translation
for each of them can be potentially different.

For example, it would be useful in this situation (English-Spanish):

Source phrase | Translation | Definition
Add             Añadir        Guess from 'ButtonToolbar' (Ctrl+1)
Add             Sumar         Guess from 'CalculatorDialog' (Ctrl+2)
Addition:       Ampliación:   Guess from 'SizeEditorDisplay' (Ctrl+3)

This is more helpful than:

Source phrase | Translation | Definition
Add             Añadir        Guess (Ctrl+1)
Add             Sumar         Guess (Ctrl+2)
Addition:       Ampliación:   Guess (Ctrl+3)

Change-Id: I0b77cef0ea5fef95400ea60758cb0a96862e5bef
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

3 files changed, 9 insertions, 6 deletions

diff --git a/src/linguist/linguist/phraseview.cpp b/src/linguist/linguist/phraseview.cpp
index 244457034..e1d31954e 100644
--- a/src/linguist/linguist/phraseview.cpp
+++ b/src/linguist/linguist/phraseview.cpp
@@ -179,7 +179,7 @@ static CandidateList similarTextHeuristicCandidates(MultiDataModel *model, int m
         if (candidates.count() == maxCandidates && score > scores[maxCandidates - 1])
             candidates.removeLast();
         if (candidates.count() < maxCandidates && score >= textSimilarityThreshold ) {
-            Candidate cand(s, mtm.translation());
+            Candidate cand(s, mtm.translation(), mtm.context());
 
             int i;
             for (i = 0; i < candidates.size(); ++i) {
@@ -222,7 +222,9 @@ void PhraseView::setSourceText(int model, const QString &sourceText)
         foreach (const Candidate &candidate, cl) {
             QString def;
             if (n < 9)
-                def = tr("Guess (%1)").arg(QKeySequence(Qt::CTRL | (Qt::Key_0 + (n + 1))).toString(QKeySequence::NativeText));
+                def = tr("Guess from '%1' (%2)")
+                      .arg(candidate.context, QKeySequence(Qt::CTRL | (Qt::Key_0 + (n + 1)))
+                                              .toString(QKeySequence::NativeText));
             else
                 def = tr("Guess");
             Phrase *guess = new Phrase(candidate.source, candidate.target, def, n);
diff --git a/src/linguist/shared/simtexth.cpp b/src/linguist/shared/simtexth.cpp
index c38a274a3..6ef575a2e 100644
--- a/src/linguist/shared/simtexth.cpp
+++ b/src/linguist/shared/simtexth.cpp
@@ -202,7 +202,7 @@ CandidateList similarTextHeuristicCandidates(const Translator *tor,
             candidates.removeLast();
 
         if (candidates.size() < maxCandidates && score >= textSimilarityThreshold) {
-            Candidate cand( s, mtm.translation() );
+            Candidate cand(s, mtm.translation(), mtm.context());
 
             int i;
             for (i = 0; i < candidates.size(); i++) {
diff --git a/src/linguist/shared/simtexth.h b/src/linguist/shared/simtexth.h
index 997867f30..0ba8f2e51 100644
--- a/src/linguist/shared/simtexth.h
+++ b/src/linguist/shared/simtexth.h
@@ -41,16 +41,17 @@ class Translator;
 struct Candidate
 {
     Candidate() {}
-    Candidate(const QString& source0, const QString &target0)
-        : source(source0), target(target0)
+    Candidate(const QString& source0, const QString &target0, const QString &context0)
+        : source(source0), target(target0), context(context0)
     {}
 
     QString source;
     QString target;
+    QString context;
 };
 
 inline bool operator==( const Candidate& c, const Candidate& d ) {
-    return c.target == d.target && c.source == d.source;
+    return c.target == d.target && c.source == d.source && c.context == d.context;
 }
 inline bool operator!=( const Candidate& c, const Candidate& d ) {
     return !operator==( c, d );