change the way kbd sequences are shown in minibuffer

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3625 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a54d70bed60e9845d8849d31f98c5c841469812..405652395de59fdbc6430d8e2827715653de6abe 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2002-03-01  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
+       * minibuffer.C (MiniBuffer): reset timout to 6000, as it was before.
+
+       * lyxfunc.C (processKeySym): print sequence also if it is
+       `deleted' (complete)
+
+       * kbsequence.C (print): print sequence even if it is deleted
+       (complete would be a better word, actually).
+
+       * lyxfunc.C (dispatch): print complete options after a prefix key
+
        * vspace.C (asLatexCommand): rewrite in a slightly different form.
 
 2002-03-01  Martin Vermeer  <martin.vermeer@hut.fi>

diff --git a/src/kbsequence.C b/src/kbsequence.C
index a56440dfdf14613d200f4cc0aeab8c0aa32cf8e8..29f2cdc80f22993d154b9b316124c0ee68bb5e36 100644 (file)
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -139,8 +139,8 @@ string const kb_sequence::print() const
 {
        string buf;
 
-       if (deleted_)
-               return buf;
+       //if (deleted_)
+       //      return buf;
        
        for (vector<unsigned int>::size_type i = 0; i < length_; ++i) {
                buf += kb_keymap::printKeysym(sequence[i], modifiers[i] & 0xffff);

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 5b8ea4cf835e07f4516797b6479e4cb7cd6671f1..5b44cf0157661aa8c6911a1b9a59854ed4708f59 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -302,7 +302,7 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state)
        // why not return already here if action == -1 and
        // num_bytes == 0? (Lgb)
 
-       if (keyseq.length() > 1 && !keyseq.deleted()) {
+       if (keyseq.length() > 1) {
                owner->message(keyseq.print());
        }
 
@@ -1019,7 +1019,7 @@ string const LyXFunc::dispatch(kb_action action, string argument)
                        owner->view()->update(TEXT(),
                                              BufferView::SELECT|BufferView::FITCUR);
                }
-               owner->message(keyseq.print());
+               owner->message(keyseq.printOptions());
        }
        break;
 

diff --git a/src/minibuffer.C b/src/minibuffer.C
index 5803739f9ce2cc03ca4ec2e0fb49a4ef91a98bcb..3f1ae5224e5dc511ac6fd60cc2860f337af5c1f4 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -63,7 +63,7 @@ MiniBuffer::MiniBuffer(LyXView * o, FL_Coord x, FL_Coord y,
 {
        add(FL_NORMAL_INPUT, x, y, h, w);
 
-       timer = new Timeout(600);
+       timer = new Timeout(6000);
        timer->timeout.connect(slot(this, &MiniBuffer::init));
 
        stored_timer = new Timeout(1500);