Changeset 4857 for trunk/qt-gui/src/mledit.cpp

Timestamp:

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

Author:

flynd

Message:

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

Files:

• trunk/qt-gui/src/mledit.cpp (modified) (4 diffs)

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;
+    }
   }