No commit message

zccrs · Nov 10, 2014 · 7d8365d · 7d8365d
1 parent c01ef27
commit 7d8365d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/QQStars.pro b/QQStars.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = QQStars
 QT += widgets network webkit svg qml quick concurrent sql quick-private#widgets-private core-private gui-private
-
+QT += webkitwidgets
 INCLUDEPATH += \
     src \
     src/qxtglobalshortcut \
@@ -105,6 +105,7 @@ OTHER_FILES += \
     qml/Chat/DiscuChatPage.qml \
     qml/Chat/ChatPage.qml \
     qml/Utility/TrayMessageWindow.qml \
-    qml/Login/textedit.html
+    qml/Login/textedit.html \
+    qml/Utility/MyTextView.qml
 
 FORMS +=
diff --git a/src/main.cpp b/src/main.cpp
@@ -19,6 +19,7 @@
 #include "mymessagebox.h"
 #include "downloadimage.h"
 #include "texteditplaygif.h"
+#include <QWebView>
 
 int main(int argc, char *argv[])
 {
@@ -78,5 +79,6 @@ int main(int argc, char *argv[])
     engine->rootContext ()->setContextProperty ("systemTray", systemTray);//将程序托盘注册过去
     qqapi->loadLoginWindow ();//加载登录窗口
 
+
     return app.exec();
 }
diff --git a/src/qqstars/qqstars.cpp b/src/qqstars/qqstars.cpp
@@ -341,7 +341,7 @@ void QQCommand::loadApi()
 
 QString QQCommand::disposeMessage(QJsonObject &obj, ChatMessageInfo* message_info)
 {
-    QString result;
+    QString result="<html><body>";
     FontStyle font_style;
     QJsonArray content = obj["content"].toArray ();
     QJsonValue temp2 = content[0];
@@ -448,7 +448,7 @@ QString QQCommand::disposeMessage(QJsonObject &obj, ChatMessageInfo* message_inf
             }
         }
     }
-    return result;
+    return result+"</body></html>";
 }
 
 void QQCommand::disposeFriendStatusChanged(QJsonObject &obj)

diff --git a/src/utility/texteditplaygif.cpp b/src/utility/texteditplaygif.cpp
@@ -150,6 +150,7 @@ void TextEditPlayGif::addErrorUrl(const QString url)
 {
     if(!isErrorUrl (url))
         list_errorUrl<<url;
+    emit error (url+"文件读取失败");
 }
 
 void TextEditPlayGif::startAllMovie()
@@ -230,7 +231,10 @@ void TextEditPlayGif::onTextChanged()
                     gifName.append (ch);
             }
 
-            if(src.left (3)=="qrc")
+            QUrl url(src);
+            if(url.isLocalFile ())
+                src = url.toLocalFile ();
+            else if(src.left (3)=="qrc")
                 src=src.mid (3);
             if(isErrorUrl (src))
                 break;