No commit message

zccrs · Nov 5, 2014 · b59cac9 · b59cac9
1 parent 1a71bbd
commit b59cac9
Show file tree

Hide file tree

Showing 7 changed files with 437 additions and 175 deletions.
diff --git a/QQStars.pro b/QQStars.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = QQStars
-QT += widgets network webkit svg qml quick concurrent sql #widgets-private core-private gui-private
+QT += widgets network webkit svg qml quick concurrent sql quick-private#widgets-private core-private gui-private
 
 INCLUDEPATH += \
     src \

diff --git a/qml/Chat/ChatPage.qml b/qml/Chat/ChatPage.qml
@@ -119,9 +119,9 @@ Item{
             anchors.bottom: parent.bottom
             anchors.margins: 10
             text: "发送"
-
+            property int image_index: 0
             onClicked: {
-                inputBox.selectAll()//先选中全部
+                /*inputBox.selectAll()//先选中全部
                 var messageInfo = myinfo.getChatMessageInfoById(myinfo.getMessageIndex())
                 //创建一个新的聊天储存聊天内容各种信息的对象（例如发送时间等等）
                 messageInfo.contentData = input.selectedText
@@ -135,8 +135,9 @@ Item{
                 }
                 listModel.append(data)
                 inputBox.text = ""
-                scroll_list.contentAtEnd()//将内容放到最后
-
+                scroll_list.contentAtEnd()//将内容放到最后*/
+                var html = '<img width="25" src="qrc:/faces/classic/'+String(image_index++)+'.gif"'
+                input.append(html)
             }
         }
 

diff --git a/qml/Chat/MessageListComponent.qml b/qml/Chat/MessageListComponent.qml
@@ -111,7 +111,7 @@ Component{
 
                 TextEditPlayGif{
                     cachePath: myqq.getMovieImageFrameCachePath()
-                    target: mytext.textDocument
+                    target: mytext
                 }
             }
         }

diff --git a/qml/Login/main.qml b/qml/Login/main.qml
@@ -31,7 +31,6 @@ MyWindow{
     noNotifyIcon: true//隐藏任务栏图标
     windowGlow: false//是否开启阴影
     color: "transparent"
-
 
     function openSettingPage() {//进行设置
         settings_page.enabled = true