From aa01777060c82fb447d66bd95fbd39c8da7a8199 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Thu, 20 Sep 2007 18:02:39 +0000 Subject: [PATCH] Change LFUN_FONT_CODE to LFUN_FONT_TYPEWERITER, possibly in preparation for a move to character-style-based font changes, etc. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20381 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/bind/cua.bind | 2 +- src/LyXAction.cpp | 2 +- src/Text3.cpp | 4 ++-- src/insets/InsetERT.cpp | 2 +- src/insets/InsetTabular.cpp | 2 +- src/lfuns.h | 2 +- src/mathed/InsetMathNest.cpp | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind index 3ee574ef43..0c684d8b94 100644 --- a/lib/bind/cua.bind +++ b/lib/bind/cua.bind @@ -60,7 +60,7 @@ # used below for line-delete-forward #\bind "C-k" "font-noun" # 'k' for capitals \bind "C-u" "font-underline" -\bind "C-S-P" "font-code" # 'P' for program +\bind "C-S-P" "font-typewriter" # 'P' for Program \bind "C-m" "math-mode" \bind "C-S-M" "math-display" diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 6dad0b688c..65a10b2108 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -169,7 +169,7 @@ void LyXAction::init() { LFUN_FLOAT_WIDE_INSERT, "float-wide-insert", Noop }, { LFUN_WRAP_INSERT, "wrap-insert", Noop }, { LFUN_FONT_BOLD, "font-bold", Noop }, - { LFUN_FONT_CODE, "font-code", Noop }, + { LFUN_FONT_TYPEWRITER, "font-typewriter", Noop }, { LFUN_FONT_DEFAULT, "font-default", Noop }, { LFUN_FONT_EMPH, "font-emph", Noop }, { LFUN_FONT_FREE_APPLY, "font-free-apply", Noop }, diff --git a/src/Text3.cpp b/src/Text3.cpp index a7186bc64f..c6f1e707b7 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -1302,7 +1302,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; } - case LFUN_FONT_CODE: { + case LFUN_FONT_TYPEWRITER: { Font font(Font::ALL_IGNORE); font.setFamily(Font::TYPEWRITER_FAMILY); // no good toggleAndShow(cur, this, font); @@ -1770,7 +1770,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, flag.setOnOff(font.family() == Font::ROMAN_FAMILY); return true; - case LFUN_FONT_CODE: + case LFUN_FONT_TYPEWRITER: flag.setOnOff(font.family() == Font::TYPEWRITER_FAMILY); return true; diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp index 077e8870ed..3d6c13bf8b 100644 --- a/src/insets/InsetERT.cpp +++ b/src/insets/InsetERT.cpp @@ -301,7 +301,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_FLOAT_WIDE_INSERT: case LFUN_WRAP_INSERT: case LFUN_FONT_BOLD: - case LFUN_FONT_CODE: + case LFUN_FONT_TYPEWRITER: case LFUN_FONT_DEFAULT: case LFUN_FONT_EMPH: case LFUN_FONT_FREE_APPLY: diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 285abd2881..7d7318606c 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -3447,7 +3447,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_FONT_NOUN: case LFUN_FONT_ITAL: case LFUN_FONT_FRAK: - case LFUN_FONT_CODE: + case LFUN_FONT_TYPEWRITER: case LFUN_FONT_SANS: case LFUN_FONT_FREE_APPLY: case LFUN_FONT_FREE_UPDATE: diff --git a/src/lfuns.h b/src/lfuns.h index 52b6bfa6ac..49e7280e09 100644 --- a/src/lfuns.h +++ b/src/lfuns.h @@ -199,7 +199,7 @@ enum kb_action { LFUN_LAYOUT, LFUN_LAYOUT_PARAGRAPH, LFUN_DROP_LAYOUTS_CHOICE, // used in bindings as of 20060905 - LFUN_FONT_CODE, + LFUN_FONT_TYPEWRITER, // changed from FONT_CODE 20070920 // 125 LFUN_FONT_SANS, LFUN_FONT_DEFAULT, diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index 9006dadc51..d4c280a7c5 100644 --- a/src/mathed/InsetMathNest.cpp +++ b/src/mathed/InsetMathNest.cpp @@ -813,7 +813,7 @@ goto_char_backwards: else handleFont(cur, cmd.argument(), "mathrm"); break; - case LFUN_FONT_CODE: + case LFUN_FONT_TYPEWRITER: if (currentMode() == TEXT_MODE) handleFont(cur, cmd.argument(), "texttt"); else @@ -1043,7 +1043,7 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_FONT_BOLD: case LFUN_FONT_SANS: case LFUN_FONT_EMPH: - case LFUN_FONT_CODE: + case LFUN_FONT_TYPEWRITER: case LFUN_FONT_NOUN: case LFUN_FONT_ROMAN: case LFUN_FONT_DEFAULT: -- 2.39.2