Changeset 564:378697c2381b in qutecom-2.2

Timestamp:

Mar 9, 2010 3:06:53 AM (3 years ago)

Author:

laurent@…

Branch:

default

Message:

minor bug with google translation automator

Location:

wengophone/src/presentation/qt/chat

Files:

• QtChatHistoryWidget.cpp (modified) (4 diffs)
• QtChatWidget.cpp (modified) (2 diffs)

wengophone/src/presentation/qt/chat/QtChatHistoryWidget.cpp

@@ -59 +59 @@
         QWebFrame *     frame = page()->mainFrame (); 
         frame->setScrollBarPolicy(Qt::Horizontal,Qt::ScrollBarAlwaysOff);
-        
-        connect(this,SIGNAL(loadFinished(bool)),this,SLOT(slot_loadFinished(bool)));
 
         _avatarMap["defaut"] = QString::fromStdString(config.getResourcesDir()) + "pics/avatars/default-avatar.png";
@@ -138 +136 @@
                 QString lang = QString::fromStdString(config.getTranslationReceived());
                 QString script = QString("translate(\"%1\",\"%2\",\"%3\",\"%4\",\"%5\")").arg(contactId).arg(senderName).arg(text).arg(time.toString()).arg(lang);
-                qDebug() << script;
                 page ()->currentFrame ()->evaluateJavaScript(script);
         }
@@ -207 +204 @@
         page ()->currentFrame ()->evaluateJavaScript("insertMessage(\""+html+"\")");
         
-        scrollToBottom();
+        
+        //delay for QWebView to update itself
+        QTimer::singleShot(200,this,SLOT(scrollToBottom()));
 }
 
@@ -213 +212 @@
 {
         QString tmp = traduction.toString().replace("&#39;","'");
-        QTextDocument doc;
-        doc.setHtml(message.toString());
-        
-        QString str = "<div>"+tmp+"</div><div style=\"color:grey\">"+doc.toPlainText()+"</div>";
-        insertMessage2(contactId.toString(),senderName.toString(),str,time.toTime());
+        if(tmp.isEmpty())
+        {
+                insertMessage2(contactId.toString(),senderName.toString(),message.toString(),time.toTime());
+        }
+        else
+        {
+                
+                QTextDocument doc;
+                doc.setHtml(message.toString());
+                
+                QString str = "<div>"+tmp+"</div><div style=\"color:grey\">"+doc.toPlainText()+"</div>";
+                insertMessage2(contactId.toString(),senderName.toString(),str,time.toTime());
+        }
 }
 

wengophone/src/presentation/qt/chat/QtChatWidget.cpp

@@ -225 +225 @@
         text = text.replace("\'","\\\'");
         
-        QString script = QString("translate(\"\",\"\",\"%1\",\"\",\"%2\")").arg(text).arg(lang);
-        qDebug() << script;
+        QString script = QString("translate(\"\",\"\",\"%1\",\"\",\"%2\")").arg(text).arg(lang);;
         _webView->page ()->mainFrame ()->evaluateJavaScript(script);
 }
@@ -394 +393 @@
 {
         QString tmp = traduction.toString().replace("&#39;","'");
-        QTextDocument doc;
-        doc.setHtml(tmp);
-        QString msg = "<div>"+message.toString()+"</div><div style=\"color:grey\">"+doc.toPlainText()+"</div>";
+        IMAccount * imAccount = _cChatHandler.getCUserProfile().getUserProfile().getIMAccountManager().getIMAccount(_imChatSession->getIMChat().getIMAccountId());
+        QString msg;
+        
+        if(tmp.isEmpty())
+        {
+                msg = message.toString();
+                _imChatSession->sendMessage(QtChatUtils::encodeMessage(imAccount->getProtocol(), msg).toUtf8().constData());
+        }
+        else
+        {
+                QTextDocument doc;
+                doc.setHtml(tmp);
+                msg = "<div>"+message.toString()+"</div><div style=\"color:grey\">"+doc.toPlainText()+"</div>";
+                _imChatSession->sendMessage(QtChatUtils::encodeMessage(imAccount->getProtocol(), tmp).toUtf8().constData());
+        }
         
         addToHistory("self", _nickName, msg);
         
-        IMAccount * imAccount =
-        _cChatHandler.getCUserProfile().getUserProfile().getIMAccountManager().getIMAccount(_imChatSession->getIMChat().getIMAccountId());
-        _imChatSession->sendMessage(QtChatUtils::encodeMessage(imAccount->getProtocol(), tmp).toUtf8().constData());
+        
         OWSAFE_DELETE(imAccount);