Changeset 4857

Timestamp:

02/16/07 05:47:30 (19 months ago)

Author:

flynd

Message:

Added option to use double Return instead of Ctrl+Return as requested in #1492.

Location:

trunk/qt-gui/src

Files:

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

trunk/qt-gui/src/mainwin.cpp

@@ -409 +409 @@
   delete MLEditWrap::editFont;
   MLEditWrap::editFont = new QFont(f);
+  licqConf.ReadBool("UseDoubleReturn", MLEditWrap::useDoubleReturn, false);
 
   licqConf.ReadBool("GridLines", m_bGridLines, false);
@@ -3535 +3536 @@
                      *MLEditWrap::editFont == defaultFont) ?
                      "default" : MLEditWrap::editFont->toString().latin1());
+  licqConf.WriteBool("UseDoubleReturn", MLEditWrap::useDoubleReturn);
   licqConf.WriteBool("GridLines", m_bGridLines);
   licqConf.WriteBool("FontStyles", m_bFontStyles);

trunk/qt-gui/src/mledit.cpp

@@ -33 +33 @@
 
 QFont *MLEditWrap::editFont = NULL;
+bool MLEditWrap::useDoubleReturn = false;
 
 MLEditWrap::MLEditWrap (bool wordWrap, QWidget* parent, bool /* doQuotes */, const char *name)
-  : MLEditWrapBase(parent, name), m_fixSetTextNewlines(true)
+  : MLEditWrapBase(parent, name),
+    m_fixSetTextNewlines(true),
+    m_lastKeyWasReturn(false)
 {
   setTextFormat(Qt::PlainText);
@@ -124 +127 @@
   const bool isControl = e->state() & ControlButton;
 
+  // Get flag from last time and reset it before any possible returns
+  bool lastKeyWasReturn = m_lastKeyWasReturn;
+  m_lastKeyWasReturn = false;
+
   if (isShift && e->key() == Key_Insert)
     return paste();
@@ -150 +157 @@
     case Key_Return:
     case Key_Enter:
-      emit signal_CtrlEnterPressed();
+      if (useDoubleReturn)
+        insert("\n");
+      else
+        emit signal_CtrlEnterPressed();
       break;
     default:
@@ -156 +166 @@
     }
     return;
+  }
+
+  if ((e->state() & Qt::KeyButtonMask) == 0)
+  {
+    switch (e->key())
+    {
+      case Key_Return:
+      case Key_Enter:
+        if (lastKeyWasReturn && useDoubleReturn)
+        {
+          // Return pressed twice, remove the previous line break and emit signal
+          moveCursor(QTextEdit::MoveBackward, true);
+          del();
+          emit signal_CtrlEnterPressed();
+          return;
+        }
+        else
+        {
+          // Return pressed once
+          m_lastKeyWasReturn = true;
+        }
+        break;
+    }
   }
 

trunk/qt-gui/src/mledit.h

@@ -68 +68 @@
 
   static QFont *editFont;
+  static bool useDoubleReturn;
 
 protected:
@@ -85 +86 @@
 private:
   bool m_fixSetTextNewlines;
+  bool m_lastKeyWasReturn;
 };
 

trunk/qt-gui/src/optionsdlg.cpp

@@ -250 +250 @@
   chkMsgWinSticky->setChecked(mainwin->m_bMsgWinSticky);
   chkSingleLineChatMode->setChecked(mainwin->m_bSingleLineChatMode);
+  chkUseDoubleReturn->setChecked(MLEditWrap::useDoubleReturn);
   popPicture->setChecked(mainwin->m_bPopPicture);
   popAlias->setChecked(mainwin->m_bPopAlias);
@@ -546 +547 @@
   mainwin->m_bMsgWinSticky = chkMsgWinSticky->isChecked();
   mainwin->m_bSingleLineChatMode = chkSingleLineChatMode->isChecked();
+  MLEditWrap::useDoubleReturn = chkUseDoubleReturn->isChecked();
 
   mainwin->m_bPopPicture = popPicture->isChecked();
@@ -832 +834 @@
     "and insert new lines with Ctrl+Enter, opposite of the normal mode"));
 
+  chkUseDoubleReturn = new QCheckBox(tr("Use double return"), boxMainWin);
+  QWhatsThis::add(chkUseDoubleReturn, tr("Hitting Return twice will be used instead of Ctrl+Return "
+    "to send messages and close input dialogs. Multiple new lines can be inserted with Ctrl+Return."));
+
   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

@@ -114 +114 @@
              *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin,
              *chkFlashTaskbar, *chkAutoSendThroughServer, *chkTabbedChatting,
-             *chkMainWinSticky, *chkMsgWinSticky, *chkSingleLineChatMode,
+             *chkMainWinSticky, *chkMsgWinSticky, *chkSingleLineChatMode, *chkUseDoubleReturn,
              *chkEnableMainwinMouseMovement, *chkShowHistory, *chkSendTN, *chkShowNotices;
    QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;