Changeset 6431

Timestamp:

07/07/08 06:05:09 (5 months ago)

Author:

flynd

Message:

Change back to text message automatically after sending URI/File/ChatRequest/Contacts as that's probably what most users want.

Location:

trunk

Files:

• qt-gui/src/usereventdlg.cpp (modified) (1 diff)
• qt4-gui/src/userevents/usersendcommon.cpp (modified) (1 diff)

trunk/qt-gui/src/usereventdlg.cpp

@@ -2431 +2431 @@
     return;
   }*/
-  else
-  {
-    emit autoCloseNotify();
-    if (sendDone(e))
-    {
-      emit mainwin->signal_sentevent(e);
-      if (mainwin->m_bMsgChatView && mleHistory != NULL)
-      {
-        mleHistory->GotoEnd();
-        resetSettings();
-      }
-      else
-        close();
-    }
+
+  emit autoCloseNotify();
+  if (sendDone(e))
+  {
+    emit mainwin->signal_sentevent(e);
+    if (mainwin->m_bMsgChatView && mleHistory != NULL)
+    {
+      mleHistory->GotoEnd();
+      resetSettings();
+
+      // After sending URI/File/Contact/ChatRequest switch back to text message
+      if (!isType(UC_MESSAGE))
+        changeEventType(UC_MESSAGE);
+    }
+    else
+      close();
   }
 }

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -1189 +1189 @@
     return;
   }
-  else
-  {
-    emit autoCloseNotify();
-    if (sendDone(e))
-    {
-      emit eventSent(e);
-      if (Config::Chat::instance()->msgChatView() && myHistoryView != NULL)
-      {
-        myHistoryView->GotoEnd();
-        resetSettings();
-      }
-      else
-        close();
-    }
+
+  emit autoCloseNotify();
+  if (sendDone(e))
+  {
+    emit eventSent(e);
+    if (Config::Chat::instance()->msgChatView() && myHistoryView != NULL)
+    {
+      myHistoryView->GotoEnd();
+      resetSettings();
+
+      // After sending URI/File/Contact/ChatRequest switch back to text message
+      if (myType != MessageEvent)
+        changeEventType(MessageEvent);
+    }
+    else
+      close();
   }
 }