Changeset 4474

Timestamp:

07/03/06 04:27:11 (2 years ago)

Author:

erijo

Message:

Single line chat mode: send messages with enter, insert new lines with
ctrl+enter. Defaults to off. Closes #676.

Location:

trunk/qt-gui/src

Files:

• mainwin.cpp (modified) (2 diffs)
• mainwin.h (modified) (1 diff)
• mledit.cpp (modified) (2 diffs)
• mledit.h (modified) (1 diff)
• optionsdlg.cpp (modified) (3 diffs)
• optionsdlg.h (modified) (1 diff)
• usereventdlg.cpp (modified) (5 diffs)
• usereventdlg.h (modified) (2 diffs)

trunk/qt-gui/src/mainwin.cpp

@@ -448 +448 @@
   licqConf.ReadBool("MainWinSticky", m_bMainWinSticky, false);
   licqConf.ReadBool("MsgWinSticky", m_bMsgWinSticky, false);
+  licqConf.ReadBool("SingleLineChatMode", m_bSingleLineChatMode, false);
 
   licqConf.ReadStr("ReceiveMessageColor", szTemp, "red");
@@ -3641 +3642 @@
   licqConf.WriteBool("MainWinSticky", m_bMainWinSticky);
   licqConf.WriteBool("MsgWinSticky", m_bMsgWinSticky);
+  licqConf.WriteBool("SingleLineChatMode", m_bSingleLineChatMode);
 
   licqConf.WriteNum("ChatMessageStyle", m_nMsgStyle);

trunk/qt-gui/src/mainwin.h

@@ -157 +157 @@
        m_bMainWinSticky,
        m_bMsgWinSticky,
+       m_bSingleLineChatMode,
        m_bShowUserIcons;
 

trunk/qt-gui/src/mledit.cpp

@@ -47 +47 @@
     setWordWrap(NoWrap);
   }
-
-  QAccel *a = new QAccel( this );
-  a->connectItem(a->insertItem(Key_Enter + CTRL),
-                 this, SIGNAL(signal_CtrlEnterPressed()));
-  a->connectItem(a->insertItem(Key_Return + CTRL),
-                 this, SIGNAL(signal_CtrlEnterPressed()));
 
   if (editFont)
@@ -183 +177 @@
       clear();
       break;
+    case Key_Return:
+    case Key_Enter:
+      emit signal_CtrlEnterPressed();
+      break;
     default:
       QMultiLineEdit::keyPressEvent(e);

trunk/qt-gui/src/mledit.h

@@ -15 +15 @@
   void GotoEnd();
 
-  using QMultiLineEdit::hasMarkedText;
-  using QMultiLineEdit::markedText;
+  using QMultiLineEdit::newLine; // make newLine() public
 
   void setBackground(const QColor&);

trunk/qt-gui/src/optionsdlg.cpp

@@ -243 +243 @@
   chkMainWinSticky->setChecked(mainwin->m_bMainWinSticky);
   chkMsgWinSticky->setChecked(mainwin->m_bMsgWinSticky);
+  chkSingleLineChatMode->setChecked(mainwin->m_bSingleLineChatMode);
   popEmail->setChecked(mainwin->m_bPopEmail);
   popPhone->setChecked(mainwin->m_bPopPhone);
@@ -541 +542 @@
   mainwin->changeMainWinSticky(chkMainWinSticky->isChecked());
   mainwin->m_bMsgWinSticky = chkMsgWinSticky->isChecked();
+  mainwin->m_bSingleLineChatMode = chkSingleLineChatMode->isChecked();
 
   mainwin->m_bPopEmail= popEmail->isChecked();
@@ -825 +827 @@
    "with your mouse"));
 
+  chkSingleLineChatMode = new QCheckBox(tr("Single line chat mode"), boxMainWin);
+  QWhatsThis::add(chkSingleLineChatMode, tr("In single line chat mode you send messages with Enter "
+    "and insert new lines with Ctrl+Enter, opposite of the normal mode"));
+
   chkMsgChatView = new QCheckBox(tr("Chatmode Messageview"), boxMainWin);
   QWhatsThis::add(chkMsgChatView, tr("Show the current chat history in Send Window"));

trunk/qt-gui/src/optionsdlg.h

@@ -94 +94 @@
              *chkAlwaysShowONU, *chkScrollBar, *chkShowExtIcons,
              *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin,
-         *chkFlashTaskbar, *chkAutoSendThroughServer, *chkTabbedChatting,
-         *chkMainWinSticky, *chkMsgWinSticky,
+             *chkFlashTaskbar, *chkAutoSendThroughServer, *chkTabbedChatting,
+             *chkMainWinSticky, *chkMsgWinSticky, *chkSingleLineChatMode,
              *chkEnableMainwinMouseMovement, *chkShowHistory, *chkSendTN;
    QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;

trunk/qt-gui/src/usereventdlg.cpp

@@ -32 +32 @@
 #include <qcheckbox.h>
 #include <qdatetime.h>
+#include <qevent.h>
 #include <qfileinfo.h>
 #include <qvbox.h>
@@ -1779 +1780 @@
 
   mleSend = new MLEditWrap(true, splView, true);
+  mleSend->installEventFilter(this); // Enables send with enter
+
   if (mainwin->m_bMsgChatView)
   {
@@ -1797 +1800 @@
 UserSendCommon::~UserSendCommon()
 {
+}
+
+#undef KeyPress
+bool UserSendCommon::eventFilter(QObject *watched, QEvent *e)
+{
+  if (watched == mleSend)
+  {
+    // If we're in single line chat mode we send messages with Enter and
+    // insert new lines with Ctrl+Enter.
+    if (mainwin->m_bSingleLineChatMode && e->type() == QEvent::KeyPress)
+    {
+      QKeyEvent *key = static_cast<QKeyEvent*>(e);
+      const bool isEnter = (key->key() == Key_Enter || key->key() == Key_Return);
+      if (isEnter)
+      {
+       if (key->state() & ControlButton)
+          mleSend->newLine();
+        else
+          btnSend->animateClick();
+        return true; // filter the event out
+      }
+    }
+    return false;
+  }
+  else
+    return UserEventCommon::eventFilter(watched, e);
 }
 
@@ -2835 +2864 @@
   edtItem = new CInfoField(mainWidget, false);
   h_lay->addWidget(edtItem);
+  edtItem->installEventFilter(this);
 
   m_sBaseTitle += tr(" - URL");
@@ -2848 +2878 @@
 UserSendUrlEvent::~UserSendUrlEvent()
 {
+}
+
+bool UserSendUrlEvent::eventFilter(QObject *watched, QEvent *e)
+{
+  if (watched == edtItem)
+  {
+    if (e->type() == QEvent::KeyPress)
+    {
+      QKeyEvent *key = static_cast<QKeyEvent*>(e);
+      const bool isEnter = (key->key() == Key_Enter || key->key() == Key_Return);
+      if (isEnter && (mainwin->m_bSingleLineChatMode || key->state() & ControlButton))
+      {
+        btnSend->animateClick();
+        return true; // filter the event out
+      }
+    }
+    return false;
+  }
+  else
+    return UserSendCommon::eventFilter(watched, e);
 }
 

trunk/qt-gui/src/usereventdlg.h

@@ -258 +258 @@
                  const char *name = 0);
   virtual ~UserSendCommon();
+  virtual bool eventFilter(QObject *watched, QEvent *e);
 
   void setText(const QString& txt);
@@ -356 +357 @@
                   const char *_szId, unsigned long _nPPID, QWidget *parent = 0);
   virtual ~UserSendUrlEvent();
+  virtual bool eventFilter(QObject *watched, QEvent *e);
 
   void setUrl(const QString& url, const QString& description);