anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change the way kbd sequences are shown in minibuffer

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3625 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-03-01 14:13:01 +00:00
parent d5c4ecc548
commit 31538bd39e
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -1,5 +1,15 @@
2002-03-01 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 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. * vspace.C (asLatexCommand): rewrite in a slightly different form.
2002-03-01 Martin Vermeer <martin.vermeer@hut.fi> 2002-03-01 Martin Vermeer <martin.vermeer@hut.fi>

4
src/kbsequence.C
View File

@ -139,8 +139,8 @@ string const kb_sequence::print() const
{ {
string buf; string buf;
if (deleted_) //if (deleted_)
return buf; // return buf;
for (vector<unsigned int>::size_type i = 0; i < length_; ++i) { for (vector<unsigned int>::size_type i = 0; i < length_; ++i) {
buf += kb_keymap::printKeysym(sequence[i], modifiers[i] & 0xffff); buf += kb_keymap::printKeysym(sequence[i], modifiers[i] & 0xffff);

4
src/lyxfunc.C
View File

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

2
src/minibuffer.C
View File

@ -63,7 +63,7 @@ MiniBuffer::MiniBuffer(LyXView * o, FL_Coord x, FL_Coord y,
{ {
add(FL_NORMAL_INPUT, x, y, h, w); add(FL_NORMAL_INPUT, x, y, h, w);
timer = new Timeout(600); timer = new Timeout(6000);
timer->timeout.connect(slot(this, &MiniBuffer::init)); timer->timeout.connect(slot(this, &MiniBuffer::init));
stored_timer = new Timeout(1500); stored_timer = new Timeout(1500);