remove LFUN_DEPTH; some small work on icons and menu reorganization

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

diff --git a/images/ChangeLog b/images/ChangeLog
index 06f03f22feab5d1e378fe701e6817fed62b162e8..eacf338b869975694d6b24a253e188d5f398484b 100644 (file)
--- a/images/ChangeLog
+++ b/images/ChangeLog
@@ -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:

diff --git a/images/deco.xbm b/images/deco.xbm
index 252915723b435705550117149a2b936a0d74865e..3b369711f3ec5e08c05252917be0ce912579aaaa 100644 (file)
--- a/images/deco.xbm
+++ b/images/deco.xbm
@@ -1,4 +1,3 @@
-
 #define deco1_width 137
 #define deco1_height 120
 static unsigned char const deco1_bits[] = {

diff --git a/images/font.xbm b/images/font.xbm
index 27f3416f6426c9fe18636d0ee7ae9a37280be377..4329363e40efd1ec1000206e557b2382739c2efa 100644 (file)
--- a/images/font.xbm
+++ b/images/font.xbm
@@ -1,4 +1,3 @@
-
 #define font1_width 60
 #define font1_height 180
 static unsigned char const font1_bits[] = {

diff --git a/images/style.xbm b/images/style.xbm
index e0d078b6c263517231cc37c1c29f74c91504d5f5..454a7f60888e57ae48dd76c628be4b14e854893a 100644 (file)
--- a/images/style.xbm
+++ b/images/style.xbm
@@ -1,4 +1,3 @@
-
 #define style1_width 60
 #define style1_height 60
 static unsigned char const style1_bits[] = {

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 3dd889bf12a38134a0247900b04b163f4b690121..e9b9f5c377d866c5965030b291d2899e2e68b606 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -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.
 

diff --git a/lib/bind/sciword.bind b/lib/bind/sciword.bind
index 86afc57cbfa24f359537055b079f4df4285ae581..e201ec7d370d9c7bbae7d40768a4714a8bc732bf 100644 (file)
--- a/lib/bind/sciword.bind
+++ b/lib/bind/sciword.bind
@@ -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"
 
 

diff --git a/lib/bind/sv_menus.bind b/lib/bind/sv_menus.bind
index 774742b13f6b92746389e6008ebc6baa2bd53a79..bd97375908efe32ec67b359c901880b0aab2437f 100644 (file)
--- a/lib/bind/sv_menus.bind
+++ b/lib/bind/sv_menus.bind
@@ -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"
 

diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind
index 5f6620f828d5c3f996d842a42573425aa75c5b11..2c8b88824581d17cdef80da916f6be4d265366f4 100644 (file)
--- a/lib/bind/xemacs.bind
+++ b/lib/bind/xemacs.bind
@@ -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"

diff --git a/lib/images/depth-decrement.xpm b/lib/images/depth-decrement.xpm
new file mode 100644 (file)
index 0000000..a63f14d
--- /dev/null
+++ b/lib/images/depth-decrement.xpm
@@ -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."};

diff --git a/lib/images/depth-increment.xpm b/lib/images/depth-increment.xpm
new file mode 100644 (file)
index 0000000..a8c9d28
--- /dev/null
+++ b/lib/images/depth-increment.xpm
@@ -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."};

diff --git a/lib/images/depth-next.xpm b/lib/images/depth-next.xpm
deleted file mode 100644 (file)
index 11b9d76..0000000
--- a/lib/images/depth-next.xpm
+++ /dev/null
@@ -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.",
-"                    "};
-
-

diff --git a/lib/images/footnote-insert.xpm b/lib/images/footnote-insert.xpm
index 7972a0f4852e1f08e5eba51b0a55a9637a8de5eb..f3ce034d7af39b8033cb91228f9501a0fdabc40b 100644 (file)
--- a/lib/images/footnote-insert.xpm
+++ b/lib/images/footnote-insert.xpm
@@ -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#",
+"...................."};

diff --git a/lib/images/marginalnote-insert.xpm b/lib/images/marginalnote-insert.xpm
index 42a804538eea547991e8a3986c87fed3b4d27eba..ad33ae233c790077223383acbf8ba8a22a2c4ac4 100644 (file)
--- a/lib/images/marginalnote-insert.xpm
+++ b/lib/images/marginalnote-insert.xpm
@@ -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"};

diff --git a/lib/images/marginpar-insert.xpm b/lib/images/marginpar-insert.xpm
deleted file mode 100644 (file)
index 42a8045..0000000
--- a/lib/images/marginpar-insert.xpm
+++ /dev/null
@@ -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"};
-
-

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index 6d2ccd6a238b0fbabd8aa2bc84155488bff6f6ea..7781300158ff4282be0327f1a23257334d88396f 100644 (file)
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -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"

diff --git a/lib/ui/old-default.ui b/lib/ui/old-default.ui
index 1ae668abb39ae686e4c003282c19355cb68ff32a..fcc544cfdc2fd58533d6ebc17bf8716e8cab19d0 100644 (file)
--- a/lib/ui/old-default.ui
+++ b/lib/ui/old-default.ui
@@ -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"

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 15eaec939dcc6eca32ed40a8c44a53d099309276..ae3ee5e487429c3d77effd0e07f3701e015d9a5c 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -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;

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ba3c05c5041088df1dbd07416468c41e7a4e10c..e1f0d3ac50479a7b5e935b884581dc33a224d335 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 62f974547a677c29c262ac1020002da6e5459423..4fa9c9ef96ea2c5a0566aa7cf16bcbad51a7d98b 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -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",

diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index 594f4bf4f7a4d869ff9ebf6e2b0f3b888c16065a..37ea3a29ad4bd054dfb8f22b1a3789b1b6e6cc5d 100644 (file)
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -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);

diff --git a/src/commandtags.h b/src/commandtags.h
index 09f4d19fbe1859bb7702a20474e66ff2f1677721..a84313a032e324477dfce01835728fecf437a5ea 100644 (file)
--- a/src/commandtags.h
+++ b/src/commandtags.h
@@ -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

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 831cf24b93a02fbc6a4b1220f49cd5a55dba7f79..22424d09ffaac11b7ea1d1ec826c06f28a2d7acb 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -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);
 }
 

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index a7e0443845b04c4b02753a4a17427ffdc210e1d7..967b2587d733bf075eb4ba35a59fca91f4e68040 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -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;