add default build type for cmake, improve SioChatDemo UI

melode11 · melode11 · commit 2f613819d25a · 2015-04-10T12:29:20.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,6 +30,10 @@ install(TARGETS sioclient
 endfunction()
 
 MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR})
+if(NOT CMAKE_BUILD_TYPE )
+MESSAGE(STATUS "not define build type, set to release" )
+set(CMAKE_BUILD_TYPE Release )
+endif()
 
 set(BOOST_VER "1.55.0" CACHE STRING "boost version" )
 set(BOOST_PATH "__boost__" CACHE STRING "boost root path" )
diff --git a/examples/QT/SioChatDemo/SioChatDemo.pro b/examples/QT/SioChatDemo/SioChatDemo.pro
@@ -32,17 +32,17 @@ DEPENDPATH += $$PWD/../../../build/lib
 
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/release/ -lsioclient
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/debug/ -lsioclient
-else:unix: LIBS += -L$$PWD/../../../build/lib/ -lsioclient
+else:unix: LIBS += -L$$PWD/../../../build/lib/release -lsioclient
 
 
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/release/ -lboost_random
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/debug/ -lboost_random
-else:unix: LIBS += -L$$PWD/../../../build/lib/ -lboost_random
+else:unix: LIBS += -L$$PWD/../../../build/lib/release -lboost_random
 
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/release/ -lboost_system
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/debug/ -lboost_system
-else:unix: LIBS += -L$$PWD/../../../build/lib/ -lboost_system
+else:unix: LIBS += -L$$PWD/../../../build/lib/release -lboost_system
 
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/release/ -lboost_date_time
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/debug/ -lboost_date_time
-else:unix: LIBS += -L$$PWD/../../../build/lib/ -lboost_date_time
+else:unix: LIBS += -L$$PWD/../../../build/lib/release -lboost_date_time
diff --git a/examples/QT/SioChatDemo/mainwindow.cpp b/examples/QT/SioChatDemo/mainwindow.cpp
@@ -19,6 +19,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     _io(new client()),
+    m_typingItem(NULL),
     m_dialog()
 {
     ui->setupUi(this);
@@ -39,6 +40,7 @@ MainWindow::MainWindow(QWidget *parent) :
     _io->set_fail_listener(std::bind(&MainWindow::OnFailed,this));
 
     connect(this,SIGNAL(RequestAddListItem(QListWidgetItem*)),this,SLOT(AddListItem(QListWidgetItem*)));
+    connect(this,SIGNAL(RequestRemoveListItem(QListWidgetItem*)),this,SLOT(RemoveListItem(QListWidgetItem*)));
     connect(this,SIGNAL(RequestToggleInputs(bool)),this,SLOT(ToggleInputs(bool)));
 }
 
@@ -58,7 +60,7 @@ void MainWindow::SendBtnClicked()
         QByteArray bytes = text.toUtf8();
         std::string msg(bytes.data(),bytes.length());
         _io->socket()->emit("new message",msg);
-        text.append(":You");
+        text.append(" : You");
         QListWidgetItem *item = new QListWidgetItem(text);
         item->setTextAlignment(Qt::AlignRight);
         Q_EMIT RequestAddListItem(item);
@@ -126,6 +128,14 @@ void MainWindow::AddListItem(QListWidgetItem* item)
     this->findChild<QListWidget*>("listView")->addItem(item);
 }
 
+void MainWindow::RemoveListItem(QListWidgetItem* item)
+{
+    QListWidget* list = this->findChild<QListWidget*>("listView");
+    int row = list->row(item);
+    delete list->takeItem(row);
+}
+
+
 void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
 {
 
@@ -134,7 +144,7 @@ void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,b
         std::string msg = data->get_map()["message"]->get_string();
         std::string username = data->get_map()["username"]->get_string();
         QString label = QString::fromUtf8(username.data(),username.length());
-        label.append(':');
+        label.append(" : ");
         label.append(QString::fromUtf8(msg.data(),msg.length()));
         QListWidgetItem *item= new QListWidgetItem(label);
         Q_EMIT RequestAddListItem(item);
@@ -200,12 +210,25 @@ void MainWindow::OnUserLeft(std::string const& name,message::ptr const& data,boo
 
 void MainWindow::OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
 {
-//Not implemented
+    if(m_typingItem == NULL)
+    {
+        std::string name = data->get_map()["username"]->get_string();
+        QString label = QString::fromUtf8(name.data(),name.length());
+        label.append("  is typing...");
+        QListWidgetItem *item = new QListWidgetItem(label);
+        item->setTextColor(QColor(200,200,200,255));
+        m_typingItem = item;
+        Q_EMIT RequestAddListItem(item);
+    }
 }
 
 void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
 {
-//Not implemented
+    if(m_typingItem != NULL)
+    {
+        Q_EMIT RequestRemoveListItem(m_typingItem);
+        m_typingItem = NULL;
+    }
 }
 
 void MainWindow::OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
diff --git a/examples/QT/SioChatDemo/mainwindow.h b/examples/QT/SioChatDemo/mainwindow.h
@@ -31,9 +31,11 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void RequestAddListItem(QListWidgetItem *item);
+    void RequestRemoveListItem(QListWidgetItem *item);
     void RequestToggleInputs(bool loginOrNot);
 private Q_SLOTS:
     void AddListItem(QListWidgetItem *item);
+    void RemoveListItem(QListWidgetItem *item);
     void ToggleInputs(bool loginOrNot);
     void TypingStop();
     void NicknameAccept();
@@ -59,6 +61,8 @@ private Q_SLOTS:
     QString m_name;
 
     std::unique_ptr<QTimer> m_timer;
+
+    QListWidgetItem *m_typingItem;
 };
 
 #endif // MAINWINDOW_H
diff --git a/examples/QT/SioChatDemo/nicknamedialog.ui b/examples/QT/SioChatDemo/nicknamedialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>405</width>
+    <width>366</width>
     <height>170</height>
    </rect>
   </property>
@@ -16,7 +16,7 @@
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>40</x>
+     <x>16</x>
      <y>110</y>
      <width>341</width>
      <height>32</height>
@@ -32,7 +32,7 @@
   <widget class="QLineEdit" name="nicknameEdit">
    <property name="geometry">
     <rect>
-     <x>36</x>
+     <x>11</x>
      <y>60</y>
      <width>341</width>
      <height>20</height>
@@ -45,7 +45,7 @@
   <widget class="QLabel" name="label">
    <property name="geometry">
     <rect>
-     <x>70</x>
+     <x>44</x>
      <y>20</y>
      <width>271</width>
      <height>21</height>
