anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add encodings and languages to dist handle the locking inset in processkeysym only when we have a buffer

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1104 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-10-12 01:18:11 +00:00
parent 95fdfb772b
commit 85ddc48c4c
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2000-10-12 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/lyxfunc.C (processKeySym): only handle the
lockinginset/inset stuff if we have a buffer and text loaded...
* lib/Makefile.am (EXTRA_DIST): add encodings and languages
2000-10-12 <larsbj@baywatch.lyx.org>
* src/support/lyxfunctional.h: add operator= that takes a reference

3
lib/Makefile.am
View File

@ -33,7 +33,8 @@ LYXLIBDIRS = bind clipart doc examples images kbd layouts scripts \
templates tex ui
EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
external_templates $(LYXLIBDIRS) build-listerrors
external_templates $(LYXLIBDIRS) build-listerrors \
encodings languages
libinstalldirs:
for dir in $(LYXLIBDIRS) ; do \

34
src/lyxfunc.C
View File

@ -190,23 +190,25 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
//return 0;
return FL_PREEMPT;
}
// this function should be used always [asierra060396]
UpdatableInset * tli = owner->view()->theLockingInset();
if (owner->view()->available() && tli && (keysym == XK_Escape)) {
if (tli == tli->GetLockingInset()) {
owner->view()->unlockInset(tli);
owner->view()->text->CursorRight(owner->view());
moveCursorUpdate(false);
owner->showState();
} else {
tli->UnlockInsetInInset(owner->view(),
tli->GetLockingInset(),true);
}
//return 0;
return FL_PREEMPT;
}
if (owner->view()->available()) {
// this function should be used always [asierra060396]
UpdatableInset * tli = owner->view()->theLockingInset();
if (tli && (keysym == XK_Escape)) {
if (tli == tli->GetLockingInset()) {
owner->view()->unlockInset(tli);
owner->view()->text->CursorRight(owner->view());
moveCursorUpdate(false);
owner->showState();
} else {
tli->UnlockInsetInInset(owner->view(),
tli->GetLockingInset(),true);
}
//return 0;
return FL_PREEMPT;
}
}
// Can we be sure that this will work for all X-Windows
// implementations? (Lgb)
// This code snippet makes lyx ignore some keys. Perhaps