anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove LFUN_DEPTH; some small work on icons and menu reorganization

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3776 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-03-19 11:17:46 +00:00
parent 9fd0b17bd4
commit ff86a01601
23 changed files with 153 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
images/ChangeLog
View File

@ -1,3 +1,9 @@
2002-03-18 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* style.xbm:
* font.xbm:
* deco.xbm: remove first, empty line (again!)
2002-03-07 Martin Vermeer <martin.vermeer@hut.fi>
* style.xbm:

1
images/deco.xbm
View File

@ -1,4 +1,3 @@
#define deco1_width 137
#define deco1_height 120
static unsigned char const deco1_bits[] = {

1
images/font.xbm
View File

@ -1,4 +1,3 @@
#define font1_width 60
#define font1_height 180
static unsigned char const font1_bits[] = {

1
images/style.xbm
View File

@ -1,4 +1,3 @@
#define style1_width 60
#define style1_height 60
static unsigned char const style1_bits[] = {

22
lib/ChangeLog
View File

@ -1,4 +1,26 @@
2002-03-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* ui/default.ui: small cleanup: move Tex info and childs to View,
remove Edit>Floats menu, fix a few shortcuts.
2002-03-18 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* images/depth-increment.xpm:
* images/depth-decrement.xpm: new icons
* images/footnote-insert.xpm:
* images/marginalnote.xpm: small facelift
* images/depth-next.xpm:
* images/marginpar-insert.xpm: removed
* bind/sv_menus.bind:
* bind/sciword.bind:
* ui/old-default.ui:
* ui/default.ui: replace depth-next with depth-increment
2002-03-14 Kayvan A. Sylvan <kayvan@sylvan.com>
* examples/Literate.lyx: Small fix to make sure build-listerrors
still works.

2
lib/bind/sciword.bind
View File

@ -298,7 +298,7 @@
#\bind "M-l n" "font-smallcaps"
#\bind "M-l b" "font-bold"
#\bind "M-l t" "ert-insert"
#\bind "M-l v" "depth-next"
#\bind "M-l v" "depth-increment"
#\bind "M-l space" "menu-open Layout"

2
lib/bind/sv_menus.bind
View File

@ -97,7 +97,7 @@
#\bind "M-s n" "font-noun"
#\bind "M-s b" "font-bold"
#\bind "M-s t" "ert-insert"
#\bind "M-s v" "depth-next"
#\bind "M-s v" "depth-increment"
#\bind "M-s space" "menu-open Stil"
#\bind "M-s i" "buffer-itemize-bullets-select"

2
lib/bind/xemacs.bind
View File

@ -154,7 +154,7 @@
\bind "Next" "screen-down"
# A bit like autoindent in c-mode
\bind "Tab" "depth-next"
\bind "Tab" "depth-increment"
\bind "C-~S-greater" "reference-goto"
\bind "C-~S-less" "bookmark-goto 0"

27
lib/images/depth-decrement.xpm Normal file
View File

@ -0,0 +1,27 @@
/* XPM */
static char *depth[]={
"20 20 4 1",
"# c None",
". c #000000",
"b c #7b0000",
"a c #ffffff",
".##a##a##a##a##a##a.",
".aaaaaaaaaaaaaaaaaa.",
".aa..............aa.",
".aaaaaaaaaaaaaaaaaa.",
".aa..............aa.",
".aaaaaaaaaaaaaaaaaa.",
".aaaaaaabbbbbbbbbaa.",
".aa.aaaaaaaaaaaaaaa.",
"#a..aaaabbbbbbbbbaa.",
"#......aaaaaaaaaaaa.",
"#a..aaaabbbbbbbbbaa.",
".aa.aaaaaaaaaaaaaaa.",
".aaaaaaabbbbbbbbbaa.",
".aaaaaaaaaaaaaaaaaa.",
".aaaaaaaaaaaaaaaaaa.",
".aa..............aa.",
".aaaaaaaaaaaaaaaaaa.",
".aa..............aa.",
".aaaaaaaaaaaaaaaaaa.",
".##a##a##a##a##a##a."};

27
lib/images/depth-increment.xpm Normal file
View File

@ -0,0 +1,27 @@
/* XPM */
static char *depth[]={
"20 20 4 1",
"# c None",
". c #000000",
"b c #7b0000",
"a c #ffffff",
".##a##a##a##a##a##a.",
".aaaaaaaaaaaaaaaaaa.",
".aa..............aa.",
".aaaaaaaaaaaaaaaaaa.",
".aa..............aa.",
".aaaaaaaaaaaaaaaaaa.",
".aaaaaaabbbbbbbbbaa.",
".aaa.aaaaaaaaaaaaaa.",
"#aaa..aabbbbbbbbbaa.",
"#......aaaaaaaaaaaa.",
"#aaa..aabbbbbbbbbaa.",
".aaa.aaaaaaaaaaaaaa.",
".aaaaaaabbbbbbbbbaa.",
".aaaaaaaaaaaaaaaaaa.",
".aaaaaaaaaaaaaaaaaa.",
".aa..............aa.",
".aaaaaaaaaaaaaaaaaa.",
".aa..............aa.",
".aaaaaaaaaaaaaaaaaa.",
".##a##a##a##a##a##a."};

30
lib/images/depth-next.xpm
View File

@ -1,30 +0,0 @@
/* XPM */
static char const * depth_xpm[] = {
"20 20 5 1",
" c gray60",
". c #000000000000",
"X c #FFFFFFFFFFFF",
"o c #7B7B00000000",
"O c None",
" ",
".XXXXXXXXXXXXXXXXXX.",
".XX..............XX.",
".XXXXXXXXXXXXXXXXXX.",
".XX..............XX.",
".XXXXXXXXXXXXXXXXXX.",
".XXXXXXooooooXXXXXX.",
".XX.XXXXXXXXXXXX.XX.",
"OX..XXXooooooXXX..XO",
"O.....XXXXXXXX.....O",
"OX..XXXooooooXXX..XO",
".XX.XXXXXXXXXXXX.XX.",
".XXXXXXooooooXXXXXX.",
".XXXXXXXXXXXXXXXXXX.",
".XXXXXXXXXXXXXXXXXX.",
".XX..............XX.",
".XXXXXXXXXXXXXXXXXX.",
".XX..............XX.",
".XXXXXXXXXXXXXXXXXX.",
" "};

52
lib/images/footnote-insert.xpm
View File

@ -1,29 +1,27 @@
/* XPM */
static char const * foot_xpm[] = {
static char *footnote[]={
"20 20 4 1",
" c gray60",
". c #000000000000",
"X c #FFFFFFFFFFFF",
"o c #7B7B00000000",
" ",
".XXXXXXXXXXXXXXXXXX ",
".XXX............... ",
".XXXXXXXXXXXXXXXXXX ",
".XXX............... ",
".XXXXXXXXXXXXXXXXXX ",
".XXX............... ",
".XXXXXXXXXXXXXXXXXX ",
".XXX............... ",
".XXXXXXXXXXXXXXXXXX ",
".XXXXXXXXXXXXXXXXXX ",
".XXXXXXXXXXXXXXXXXX ",
".XXXXXXXXXXXXXXX.XX ",
".XXXooooooooXXX..XX ",
".XXXXXXXXXXXXX..... ",
".XXXooooooooXXX..XX ",
".XXXXXXXXXXXXXXX.XX ",
".XXXXXXXXXXXXXXXXXX ",
".XXXXXXXXXXXXXXXXXX ",
"................... "};
"# c None",
". c #000000",
"b c #7b0000",
"a c #ffffff",
".##a##a##a##a##a##a#",
".aaaaaaaaaaaaaaaaaa#",
".aaa...............a",
".aaaaaaaaaaaaaaaaaa#",
".aaa...............#",
".aaaaaaaaaaaaaaaaaaa",
".aaa...............#",
".aaaaaaaaaaaaaaaaaa#",
".aaa...............a",
".aaaaaaaaaaaaaaaaaa#",
".aaaaaaaaaaaaaaaaaa#",
".aaaaaaaaaaaaaaaaaaa",
".aaaaaaaaaaaaaaa.aa#",
".aaabbbbbbbbaaa..aa#",
".aaaaaaaaaaaaa.....a",
".aaabbbbbbbbaaa..aa#",
".aaaaaaaaaaaaaaa.aa#",
".aaaaaaaaaaaaaaaaaaa",
".aaaaaaaaaaaaaaaaaa#",
"...................."};

55
lib/images/marginalnote-insert.xpm
View File

@ -1,30 +1,27 @@
/* XPM */
static char const * margin_xpm[] = {
"20 20 5 1",
" c gray60",
". c #000000000000",
"X c None",
"o c #FFFFFFFFFFFF",
"O c #7B7B00000000",
" .................XX",
" oooooooooooooooo.XX",
" oooooooooooooooo.XX",
" oooooooooooooooo.XX",
" .......ooOOOOOoo.XX",
" oooooooooooooooo.XX",
" .......ooOOOOOoo.XX",
" oooooooooooooooo.XX",
" .......ooOOOOOoo.XX",
" oooooooooooooooo.XX",
" .......ooooooooo.XX",
" ooooooooooo.oooo.XX",
" ..oooooooo...ooo.XX",
" ooooooooo.....oo.XX",
" .......oooo.oooo.XX",
" ooooooooooo.oooo.XX",
" .......ooooooooo.XX",
" oooooooooooooooo.XX",
" oooooooooooooooo.XX",
" XX"};
static char *marginalnote[]={
"20 20 4 1",
". c None",
"a c #000000",
"b c #7b0000",
"# c #ffffff",
".#..#..#..#..#..#..a",
".##################a",
"###################a",
".##################a",
".aaaaaaaaa##bbbbb##a",
"###################a",
".aaaaaaaaa##bbbbb##a",
".##################a",
"aaaaaaaaaa##bbbbb##a",
".##################a",
".aaaaaaaaa####a####a",
"#############aaa###a",
".aa#########aaaaa##a",
".#############a####a",
"aaaaaaaaaa####a####a",
".##################a",
".aaaaaaaaa########.a",
"###################a",
".##################a",
".#..#..#..#..#..#..a"};

30
lib/images/marginpar-insert.xpm
View File

@ -1,30 +0,0 @@
/* XPM */
static char const * margin_xpm[] = {
"20 20 5 1",
" c gray60",
". c #000000000000",
"X c None",
"o c #FFFFFFFFFFFF",
"O c #7B7B00000000",
" .................XX",
" oooooooooooooooo.XX",
" oooooooooooooooo.XX",
" oooooooooooooooo.XX",
" .......ooOOOOOoo.XX",
" oooooooooooooooo.XX",
" .......ooOOOOOoo.XX",
" oooooooooooooooo.XX",
" .......ooOOOOOoo.XX",
" oooooooooooooooo.XX",
" .......ooooooooo.XX",
" ooooooooooo.oooo.XX",
" ..oooooooo...ooo.XX",
" ooooooooo.....oo.XX",
" .......oooo.oooo.XX",
" ooooooooooo.oooo.XX",
" .......ooooooooo.XX",
" oooooooooooooooo.XX",
" oooooooooooooooo.XX",
" XX"};

22
lib/ui/default.ui
View File

@ -31,7 +31,6 @@ Menuset
Item "Open...|O" "file-open"
Separator
Submenu "Import|I" "file_import"
Item "Child processes|h" "show-forks"
Separator
Item "Exit|x" "lyx-quit"
Separator
@ -53,7 +52,6 @@ Menuset
Submenu "Export|E" "file_export"
Item "Print...|P" "buffer-print"
OptItem "Fax...|F" "buffer-export fax"
Item "Child processes|h" "show-forks"
Separator
Item "Exit|x" "lyx-quit"
Separator
@ -97,7 +95,6 @@ Menuset
Separator
Item "Find & Replace...|F" "find-replace"
Submenu "Tabular|T" "edit_tabular"
Submenu "Floats & Insets|I" "edit_floats"
Submenu "Math|M" "edit_math"
Separator
#Item "Read Only" "buffer-toggle-read-only"
@ -105,6 +102,7 @@ Menuset
Item "Thesaurus..." "thesaurus-entry"
Item "Check TeX|h" "buffer-chktex"
Item "Remove All Error Boxes|E" "error-remove-all"
Item "Open/Close float|l" "inset-toggle"
Separator
Item "Preferences...|P" "dialog-preferences"
Item "Reconfigure|R" "reconfigure"
@ -115,15 +113,6 @@ Menuset
Item "as Paragraphs|P" "primary-selection-paste paragraph"
End
Menu "edit_floats"
Item "Open/Close|O" "inset-toggle"
# Item "Melt|M" "melt"
# Item "Open All Figures/Tables|F" "floats-operate openfig"
# Item "Close All Figures/Tables|T" "floats-operate closefig"
# Item "Open All Footnotes/Marginal Notes|A" "floats-operate openfoot"
# Item "Close All Footnotes/Marginal Notes|C" "floats-operate closefoot"
End
Menu "edit_tabular"
Item "Multicolumn|M" "tabular-feature multicolumn"
Separator
@ -285,6 +274,8 @@ Menuset
Separator
Item "LaTeX Logfile|L" "latex-view-log"
Item "Table of Contents|T" "toc-view"
Item "Child processes|C" "show-forks"
Item "TeX Information|X" "help-Texinfo"
End
Menu "update"
@ -325,7 +316,8 @@ Menuset
# HELP MENU
#
Menu "help"
Item "What's This|W" "toggle-tooltips"
Item "What's this?|W" "toggle-tooltips"
Separator
Item "Introduction|I" "help-open Intro"
Item "Tutorial|T" "help-open Tutorial"
Item "User's Guide|U" "help-open UserGuide"
@ -337,8 +329,6 @@ Menuset
Item "LaTeX Configuration|L" "help-open LaTeXConfig"
Separator
Item "About LyX|X" "help-aboutlyx"
Separator
Item "TeX Information" "help-Texinfo"
End
End
@ -383,7 +373,7 @@ Toolbar
Separator
Icon "footnote-insert"
Icon "marginalnote-insert"
Icon "depth-next"
Icon "depth-increment"
Separator
Icon "graphics-insert"
Icon "dialog-tabular-insert"

2
lib/ui/old-default.ui
View File

@ -314,7 +314,7 @@ Toolbar
Separator
Icon "footnote-insert"
Icon "marginpar-insert"
Icon "depth-next"
Icon "depth-increment"
Separator
Icon "tex-mode"
Icon "math-mode"

4
src/BufferView_pimpl.C
View File

@ -1644,10 +1644,6 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
hfill();
break;
case LFUN_DEPTH:
changeDepth(bv_, bv_->getLyXText(), 0);
break;
case LFUN_DEPTH_MIN:
changeDepth(bv_, bv_->getLyXText(), -1);
break;

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2002-03-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* ToolbarDefaults.C (init):
* LyXAction.C (init):
* commandtags.h:
* BufferView_pimpl.C (Dispatch):
* lyxfunc.C (dispatch): remove LFUN_DEPTH
2002-03-19 Allan Rae <rae@lyx.org>
* exporter.C (Export): removeAutoInsets before doing anything else.

2
src/LyXAction.C
View File

@ -178,8 +178,6 @@ void LyXAction::init()
N_("Decrement environment depth"), Noop },
{ LFUN_DEPTH_PLUS, "depth-increment",
N_("Increment environment depth"), Noop },
{ LFUN_DEPTH, "depth-next",
N_("Change environment depth"), Noop },
{ LFUN_LDOTS, "dots-insert", N_("Insert ... dots"), Noop },
{ LFUN_DOWN, "down", N_("Go down"), ReadOnly },
{ LFUN_DOWNSEL, "down-select",

2
src/ToolbarDefaults.C
View File

@ -84,7 +84,7 @@ void ToolbarDefaults::init()
add(LFUN_INSET_FOOTNOTE);
add(LFUN_INSET_MARGINAL);
add(LFUN_DEPTH);
add(LFUN_DEPTH_PLUS);
add(SEPARATOR);
add(LFUN_MATH_MODE);

1
src/commandtags.h
View File

@ -48,7 +48,6 @@ enum kb_action {
LFUN_HYPHENATION,
LFUN_LIGATURE_BREAK,
LFUN_HFILL,
LFUN_DEPTH,
LFUN_FREE, // 30
#if 0
LFUN_FOOTMELT, // schedule for deletion

3
src/lyx_gui.C
View File

@ -255,8 +255,7 @@ void LyXGUI::init()
// Initialize the views.
lyxViews->init();
// in 0.12 the initialisation of the LyXServer must be done here
// 0.13 it should be moved again...
// this should be moved ...
lyxserver = new LyXServer(lyxViews->getLyXFunc(), lyxrc.lyxpipes);
}

4
src/lyxfunc.C
View File

@ -1182,10 +1182,6 @@ string const LyXFunc::dispatch(kb_action action, string argument)
}
break;
case LFUN_DEPTH:
changeDepth(owner->view(), TEXT(false), 0);
break;
case LFUN_DEPTH_MIN:
changeDepth(owner->view(), TEXT(false), -1);
break;