Give y'all a graphics icon on the toolbar again.

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 11c8a93ce2f49046a7e90f4947e9ca72444e6a7e..4a26b4f0427a5bccaa8bbaeeb7ec9def752f931d 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-10  Angus Leeming  <leeming@lyx.org>
+
+       * images/graphics-insert.xpm: rename as
+       dialog-show-new-inset_graphics.xpm.
+
 2003-03-05  Angus Leeming  <leeming@lyx.org>
 
        * ui/default.ui: use 'dialog-show-new-inset "graphics"' instead

diff --git a/lib/images/dialog-show-new-inset_graphics.xpm b/lib/images/dialog-show-new-inset_graphics.xpm
new file mode 100644 (file)
index 0000000..9b3d063
--- /dev/null
+++ b/lib/images/dialog-show-new-inset_graphics.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char const * fig_xpm[] = {
+"20 20 4 1",
+"      c None",
+".     c #FFFFFFFFFFFF",
+"X     c #7B7B00000000",
+"o     c gray70",
+"                    ",
+" .................. ",
+" ..              .. ",
+" .................. ",
+" ..              .. ",
+" .................. ",
+" ....XXXXXXXXXX.... ",
+" ....X........X.... ",
+" ....X....  ..X.... ",
+" ....X... .. .X.... ",
+" ....X.. oooo X.... ",
+" ....X. ooooooX.... ",
+" ....X oooooooX.... ",
+" ....XXXXXXXXXX.... ",
+" .................. ",
+" ..              .. ",
+" .................. ",
+" ..              .. ",
+" .................. ",
+"                    "};
+
+

diff --git a/lib/images/graphics-insert.xpm b/lib/images/graphics-insert.xpm
deleted file mode 100644 (file)
index 9b3d063..0000000
--- a/lib/images/graphics-insert.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char const * fig_xpm[] = {
-"20 20 4 1",
-"      c None",
-".     c #FFFFFFFFFFFF",
-"X     c #7B7B00000000",
-"o     c gray70",
-"                    ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ....XXXXXXXXXX.... ",
-" ....X........X.... ",
-" ....X....  ..X.... ",
-" ....X... .. .X.... ",
-" ....X.. oooo X.... ",
-" ....X. ooooooX.... ",
-" ....X oooooooX.... ",
-" ....XXXXXXXXXX.... ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-"                    "};
-
-

diff --git a/src/ChangeLog b/src/ChangeLog
index 4815a810a88672ca82f84b68cfa3a17e1c8e682e..b26cb0e3d9b84bfcf6970ca9119009a2b1f3942b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-10  Angus Leeming  <leeming@lyx.org>
+
+       * LyXAction.C (init): fix bug in poplating array with multiple entries
+       with the same LFUN (spotted by JMarc).
+
 2003-03-10  John Levon  <levon@movementarian.org>
 
        * text.C:

diff --git a/src/LyXAction.C b/src/LyXAction.C
index c15a482846785485c4d524d308fd315039196e02..1f59de6fe743ab1d39f05375b832882309fec427 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -404,7 +404,7 @@ void LyXAction::init()
 
                { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset",
                  N_("Show the inset's dialog"), Noop },
-               { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-next-inset",
+               { LFUN_DIALOG_SHOW_NEXT_INSET, "dialog-show-next-inset",
                  N_("Show the inset's dialog"), Noop },
                { LFUN_DIALOG_UPDATE, "dialog-update",
                  N_("Update the dialog"), Noop },