I got transparency to work!

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

diff --git a/ChangeLog b/ChangeLog
index a379b83890375a740def25c42e366124c711cbaa..4b877ee22d7fc821ee4fcd0506c234b605bdb137 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2000-07-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/Makefile.am (INCLUDES): remove image directory from include
+       path. 
+
+       * src/bullet_forms.C (create_form_form_bullet): small cleanup.
+       * src/bullet_forms_cb.C (BulletPanelCB): ditto.
+
+       * src/LyXView.C (create_form_form_main): read the application icon
+       from the disk.
+
+       * lib/images/*.xpm: change the icons to use transparent color for
+       background. 
+
+       * src/toolbar.C (update): change the color of the button when it
+       is toggled on.
+
 2000-07-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * src/lyxfunc.C (Dispatch): use LyXView::ShowState instead of

diff --git a/images/lyx.xpm b/images/lyx.xpm
deleted file mode 100644 (file)
index 8a8911a..0000000
--- a/images/lyx.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char const * lyx_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    48    48        7            1",
-/* colors */
-". c #000000",
-"# c #005e00",
-"a c #2696cd",
-"b s mask c none",
-"c c #be3f00",
-"d c #ffc647",
-"e c #ffffff",
-/* pixels */
-"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbbbb....bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbb.......bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbb........bbbbbbbbbbbbbbbabbbbbbbbccccc",
-"bbbbbbbbbb.........bbbbbbbbbbbbbbaabbbbbbbbccccb",
-"bbbbbbbbbb........bbbbbbbbbbbbbbbaabbbddbdbccccb",
-"bbbbbbbbb.......bbbbbbbbbbbbbbbbbbaabbdddddcccbb",
-"bbbbbbbbb.......bbbbbbbbbbbbbbbbbbaabadddddcccbb",
-"bbbbbbbbb.......bbbbbbbbbbbbbbbbbbaaaaddddccccbb",
-"bbbbbbbbb.......bbbbbbbbbbbbbbbbbbbaaabddbbbbccb",
-"bbbbbbbb........bbbbbbbbbbbbbbbbbbbbbbdddbbbbbbb",
-"bbbbbbbb........bbbbbbbbeeeeebbbbbbbbbddbbbbbbbb",
-"bbbbbbbb......bbbbbbbbeeedddddebbbbbbbbbbbbbbbbb",
-"bbbbbbbb....bbbbaaaaaaeeddd.ddeebbbbbbbbbbbbbbbb",
-"bbbbbbbb...bbbbeeeeaaaeddde...debbbbbbbbbbbbbbbb",
-"bbbbbbbb..bbbeeddddeeeed.ee...ddbbbbbbbbbbbbbbbb",
-"bbbbbbbb.bbaeeddddddeeed.......dbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbbeeddde..ddeed......ddbbbbbbbbbbbbcccc",
-"bbbbbbbbbaaedd.ee...ddedd.....debbbbbbccccccccbb",
-"bbbbbbbbbaaedd..e...ddedd.....debbbcccccccccccbb",
-"bbbbbbbbaaaedd......ddeeddddddebccccccccccccbbbb",
-"bbbbbbbbaaaeed......ddaeeeeccccccccccccccc.....b",
-"bbbbbbbbaaaeedd.....deaaecccccccccccccccc.....bb",
-"bbbbbbbbaaaeeedd...ddeaccccccccccccccccc.....bbb",
-"bbbbbbbbaaaaaeeddddeeacccccccccccccccc.....bbbbb",
-"bbbbbbbbaaaaaaeeeeeaaaaa....ccccccccc....bbbbbbb",
-"bbbbbbbbaaaaaaaeeeaaaaaaaaa.....cccc....bbbbbbbb",
-"bbbbbb####aaaaaaaaaaaaaaaaaaaaa##.....bbbbbbbbbb",
-"bbbbb#####aaaaaaaaaaaaaaaaaaaaa#####.bbbbbbbbbbb",
-"bbbb#####aaaaaaaaaaaaaaaaaaaaaa#####bbbbbbbbbbbb",
-"bb######caaaaaaaaaaaaacccaaaaaab######bbbbbbbbbb",
-"##########aaaaaaaaaaaacccccccaab########bbbbbbbb",
-"#############aaaaaaaaaddcccccc##########bbbbbbbb",
-"c##ccccdd##########aacdd################bbbbbbbb",
-"ccccdccddccaa#################cbbbbbbbbbbbbbbbbb",
-"ccccdddddccbaaa############cccccbbbbbbbbbbbbbbbb",
-"cddccdddddccccaaa#######dddcccccbbbbbbbbbbbbbbbb",
-"ccddddddddccccbbaac####ddddcddccbbbbbbbbbbbbbbbb",
-"cccdddddddccccbbbcc###ddddddddccbbbbbbbbbbbbbbbb",
-"cccccddddddccccbcccccddddddccccbbbbbbbbbbbbbbbbb",
-"bcccccdddddccccbcccccddddccccccbbbbbbbbbbbbbbbbb",
-"bbbccccddddccccbccccddddccccccbbbbbbbbbbbbbbbbbb",
-"bbbbbbcccccccccbccccccccccbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbcccccccbbccccccccbbbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbccccccbbbcccccccbbbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
-};

diff --git a/lib/images/buffer-close.xpm b/lib/images/buffer-close.xpm
index 752a72c8e07255a81b01805d5bffba553724fd14..e6dfd86bbe8961c1936058d7967bb6de4d4aa702 100644 (file)
--- a/lib/images/buffer-close.xpm
+++ b/lib/images/buffer-close.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * close_xpm[] = {
 "20 20 5 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #7B7B00000000",
 "X     c #000000000000",
 "o     c #9A9A94949494",

diff --git a/lib/images/buffer-export_ascii.xpm b/lib/images/buffer-export_ascii.xpm
index a75398fd3de13086cdda63d3f42be7cd5f655d32..c19b1a837bd73a876c8c2b00ae58223868f99e1b 100644 (file)
--- a/lib/images/buffer-export_ascii.xpm
+++ b/lib/images/buffer-export_ascii.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * make_ascii_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c black",
 "                    ",
 " .................. ",

diff --git a/lib/images/buffer-export_latex.xpm b/lib/images/buffer-export_latex.xpm
index 088c96699b80e76e981386f174f22bd0b2b7fd68..984986d4f8de484f28352d16b4c4d932351368e2 100644 (file)
--- a/lib/images/buffer-export_latex.xpm
+++ b/lib/images/buffer-export_latex.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * make_latex_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c black",
 "                    ",
 " .................. ",

diff --git a/lib/images/buffer-open.xpm b/lib/images/buffer-open.xpm
index 591c8bcfad690243d242ae650d5c449c3a0fc458..90b133ab5a702e488f8cff4e6d9c1551b8a6f54a 100644 (file)
--- a/lib/images/buffer-open.xpm
+++ b/lib/images/buffer-open.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * open_xpm[] = {
 "20 20 5 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c navy",
 "X     c #000000000000",
 "o     c #9A9A94949494",

diff --git a/lib/images/buffer-print.xpm b/lib/images/buffer-print.xpm
index 21d823790bef39d490595186ad43c182bae2eb2c..3c5b8253ca8bdf85074ba2d0dbcf5d638037ed2c 100644 (file)
--- a/lib/images/buffer-print.xpm
+++ b/lib/images/buffer-print.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * print1_xpm[] = {
 "24 20 7 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "X     c #FFFFFFFFFFFF",
 "o     c #7B7B00000000",

diff --git a/lib/images/buffer-typeset-ps.xpm b/lib/images/buffer-typeset-ps.xpm
index 1deb0b0192d96860fa91b379234c2d972561f945..1c8c0a2676f0245394155519bf9953e4145d9bd7 100644 (file)
--- a/lib/images/buffer-typeset-ps.xpm
+++ b/lib/images/buffer-typeset-ps.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * update_ps_xpm[] = {
 "20 20 3 1",
-" c #BFBFBFBFBFBF",
+" c None",
 ".c navy",
 "Xc black",
 "        ...         ",

diff --git a/lib/images/buffer-typeset.xpm b/lib/images/buffer-typeset.xpm
index 6986dc6a789c7bcf37573c1eb03ba99b2041af03..524663100ebc57b3bf4e2a04ba288eb426e0bafc 100644 (file)
--- a/lib/images/buffer-typeset.xpm
+++ b/lib/images/buffer-typeset.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * run_latex_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "                    ",
 "  . .. .  . . ..    ",

diff --git a/lib/images/buffer-view-ps.xpm b/lib/images/buffer-view-ps.xpm
index 090086b1fa33e073676e17a26eb0b15536533821..6d9ec40f6b34374ac3ed28991f56c156c812f621 100644 (file)
--- a/lib/images/buffer-view-ps.xpm
+++ b/lib/images/buffer-view-ps.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * view_ps_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "                    ",
 "     .............. ",

diff --git a/lib/images/buffer-view.xpm b/lib/images/buffer-view.xpm
index d1b71b313f33c34706a7e77d3027a7639d5df50f..79dc0b2fd4ee06e548c8bf982b60de8047d16e4a 100644 (file)
--- a/lib/images/buffer-view.xpm
+++ b/lib/images/buffer-view.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * view_dvi_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "                    ",
 "     .............. ",

diff --git a/lib/images/buffer-write.xpm b/lib/images/buffer-write.xpm
index b60de2266819720866a5cd66b1caf1e46d124e4d..ef2ba02bb5befe1bbf54be278966013dbb27e952 100644 (file)
--- a/lib/images/buffer-write.xpm
+++ b/lib/images/buffer-write.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * save_xpm[] = {
 "20 20 5 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c black",
 "X     c gray70",
 "o     c gray90",

diff --git a/lib/images/build-program.xpm b/lib/images/build-program.xpm
index 6f091d5b0c377b1c0c466568c72fec3bf088beac..437dd197673815f92453b92c580d7a7a3dcbaf26 100644 (file)
--- a/lib/images/build-program.xpm
+++ b/lib/images/build-program.xpm
@@ -2,7 +2,7 @@
 static char const * build_xpm[] = {
 "20 20 4 1",
 ".     c black",
-"      c #BFBFBFBFBFBF",
+"      c None",
 "+     c white",
 "O     c red",
 "     ...            ",

diff --git a/lib/images/copy.xpm b/lib/images/copy.xpm
index f6e7abae1fa4eabb140f3e62cc0b876c7dbdc02c..81e5e9d36a3bb943405ff55a8d4eeba2f38a071a 100644 (file)
--- a/lib/images/copy.xpm
+++ b/lib/images/copy.xpm
@@ -2,7 +2,7 @@
 static char const * copy_xpm[] = {
 "20 20 5 1",
 "      c #000000000000",
-".     c #BFBFBFBFBFBF",
+".     c None",
 "X     c #FFFFFFFFFFFF",
 "o     c navy",
 "O     c #B2B2ABABACAC",

diff --git a/lib/images/cut.xpm b/lib/images/cut.xpm
index 0ea70262b089f79eb4b48b7faded93c23c31f390..f7925f47b788ed021074d47ae45b0739ec27ac92 100644 (file)
--- a/lib/images/cut.xpm
+++ b/lib/images/cut.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * cut_xpm[] = {
 "20 20 3 1",
-"     c #BFBFBFBFBFBF",
+"     c None",
 ".    c #000000000000",
 "X    c #7B7B00000000",
 "                    ",

diff --git a/lib/images/depth-next.xpm b/lib/images/depth-next.xpm
index 1acee58000aeb10c6f0a0a5e34737ca34a814437..11b9d764109c1abd717cd55f584e9245b00ed2b9 100644 (file)
--- a/lib/images/depth-next.xpm
+++ b/lib/images/depth-next.xpm
@@ -5,7 +5,7 @@ static char const * depth_xpm[] = {
 ".     c #000000000000",
 "X     c #FFFFFFFFFFFF",
 "o     c #7B7B00000000",
-"O     c #BFBFBFBFBFBF",
+"O     c None",
 "                    ",
 ".XXXXXXXXXXXXXXXXXX.",
 ".XX..............XX.",

diff --git a/lib/images/figure-insert.xpm b/lib/images/figure-insert.xpm
index 6a7c9bcf9ef75c5f92f9c5b32b74e073474b8fd5..9b3d06380a1e9720649ccce2c5111e1814070e24 100644 (file)
--- a/lib/images/figure-insert.xpm
+++ b/lib/images/figure-insert.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * fig_xpm[] = {
 "20 20 4 1",
-"      c #000000000000",
+"      c None",
 ".     c #FFFFFFFFFFFF",
 "X     c #7B7B00000000",
 "o     c gray70",

diff --git a/lib/images/font-bold.xpm b/lib/images/font-bold.xpm
index d484d886d22ff4f5b3de5219db1a8764c25435e5..46e86dc28af8e03ee4f69cf20b923681371113a5 100644 (file)
--- a/lib/images/font-bold.xpm
+++ b/lib/images/font-bold.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * bold_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "                    ",
 " ...           .... ",

diff --git a/lib/images/font-emph.xpm b/lib/images/font-emph.xpm
index 15439b3c428fe0eb334976139f26b88df64df3ff..92bbade7fec932a0ce567f45c08a95fae4335fce 100644 (file)
--- a/lib/images/font-emph.xpm
+++ b/lib/images/font-emph.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * emph_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "                    ",
 "         ..         ",

diff --git a/lib/images/font-free.xpm b/lib/images/font-free.xpm
index 3377eab419d24fcd5f659001546e0e5151bbdd99..124f93e442b1542386d4ff6e2cc0ecab271de38d 100644 (file)
--- a/lib/images/font-free.xpm
+++ b/lib/images/font-free.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * free_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "                    ",
 "                    ",

diff --git a/lib/images/font-noun.xpm b/lib/images/font-noun.xpm
index 0b0f40701c7c571e3972b5246ac9833246f08ea4..e6c016701a354c966567f24b27af9fbf8cbec6f1 100644 (file)
--- a/lib/images/font-noun.xpm
+++ b/lib/images/font-noun.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * noun_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "                    ",
 "         ..         ",

diff --git a/lib/images/font-sans.xpm b/lib/images/font-sans.xpm
index 3ec1a95833fe5a67eadd67ae5a2d933b5c430c58..1f1259bfaeacd3924ada6bde8e6eee969ea348c7 100644 (file)
--- a/lib/images/font-sans.xpm
+++ b/lib/images/font-sans.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * sans_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "                    ",
 "               .... ",

diff --git a/lib/images/layout_Scrap.xpm b/lib/images/layout_Scrap.xpm
index 49b0c5d701921f25113ab2570e5f2e356f2437dd..687eb4b239aae9813c96bdc63019974bdca60ee9 100644 (file)
--- a/lib/images/layout_Scrap.xpm
+++ b/lib/images/layout_Scrap.xpm
@@ -2,7 +2,7 @@
 static char const * layout_scrap_xpm[] = {
 " 20 20 3 1",
 ". c gray30",
-"  c #BFBFBFBFBFBF",
+"  c None",
 "c c black",
 "c                  c",
 " c           .c.c.. ",

diff --git a/lib/images/lyx-quit.xpm b/lib/images/lyx-quit.xpm
index c07adfde5d9a3eb8d2e393cc27f30d0a82b06426..82c0b8c552aab180c1d084bcaac759df2165ca5d 100644 (file)
--- a/lib/images/lyx-quit.xpm
+++ b/lib/images/lyx-quit.xpm
@@ -3,7 +3,7 @@ static char const * quit_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    20    20        7            1",
 /* colors */
-". c #b2c0dc",
+". c None",
 "# c #4d4d4d",
 "a c #000000",
 "b c #737373",

diff --git a/lib/images/lyx.xpm b/lib/images/lyx.xpm
new file mode 100644 (file)
index 0000000..8a8911a
--- /dev/null
+++ b/lib/images/lyx.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char const * lyx_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    48    48        7            1",
+/* colors */
+". c #000000",
+"# c #005e00",
+"a c #2696cd",
+"b s mask c none",
+"c c #be3f00",
+"d c #ffc647",
+"e c #ffffff",
+/* pixels */
+"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+"bbbbbbbbbbbbb....bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+"bbbbbbbbbbb.......bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+"bbbbbbbbbbb........bbbbbbbbbbbbbbbabbbbbbbbccccc",
+"bbbbbbbbbb.........bbbbbbbbbbbbbbaabbbbbbbbccccb",
+"bbbbbbbbbb........bbbbbbbbbbbbbbbaabbbddbdbccccb",
+"bbbbbbbbb.......bbbbbbbbbbbbbbbbbbaabbdddddcccbb",
+"bbbbbbbbb.......bbbbbbbbbbbbbbbbbbaabadddddcccbb",
+"bbbbbbbbb.......bbbbbbbbbbbbbbbbbbaaaaddddccccbb",
+"bbbbbbbbb.......bbbbbbbbbbbbbbbbbbbaaabddbbbbccb",
+"bbbbbbbb........bbbbbbbbbbbbbbbbbbbbbbdddbbbbbbb",
+"bbbbbbbb........bbbbbbbbeeeeebbbbbbbbbddbbbbbbbb",
+"bbbbbbbb......bbbbbbbbeeedddddebbbbbbbbbbbbbbbbb",
+"bbbbbbbb....bbbbaaaaaaeeddd.ddeebbbbbbbbbbbbbbbb",
+"bbbbbbbb...bbbbeeeeaaaeddde...debbbbbbbbbbbbbbbb",
+"bbbbbbbb..bbbeeddddeeeed.ee...ddbbbbbbbbbbbbbbbb",
+"bbbbbbbb.bbaeeddddddeeed.......dbbbbbbbbbbbbbbbb",
+"bbbbbbbbbbbeeddde..ddeed......ddbbbbbbbbbbbbcccc",
+"bbbbbbbbbaaedd.ee...ddedd.....debbbbbbccccccccbb",
+"bbbbbbbbbaaedd..e...ddedd.....debbbcccccccccccbb",
+"bbbbbbbbaaaedd......ddeeddddddebccccccccccccbbbb",
+"bbbbbbbbaaaeed......ddaeeeeccccccccccccccc.....b",
+"bbbbbbbbaaaeedd.....deaaecccccccccccccccc.....bb",
+"bbbbbbbbaaaeeedd...ddeaccccccccccccccccc.....bbb",
+"bbbbbbbbaaaaaeeddddeeacccccccccccccccc.....bbbbb",
+"bbbbbbbbaaaaaaeeeeeaaaaa....ccccccccc....bbbbbbb",
+"bbbbbbbbaaaaaaaeeeaaaaaaaaa.....cccc....bbbbbbbb",
+"bbbbbb####aaaaaaaaaaaaaaaaaaaaa##.....bbbbbbbbbb",
+"bbbbb#####aaaaaaaaaaaaaaaaaaaaa#####.bbbbbbbbbbb",
+"bbbb#####aaaaaaaaaaaaaaaaaaaaaa#####bbbbbbbbbbbb",
+"bb######caaaaaaaaaaaaacccaaaaaab######bbbbbbbbbb",
+"##########aaaaaaaaaaaacccccccaab########bbbbbbbb",
+"#############aaaaaaaaaddcccccc##########bbbbbbbb",
+"c##ccccdd##########aacdd################bbbbbbbb",
+"ccccdccddccaa#################cbbbbbbbbbbbbbbbbb",
+"ccccdddddccbaaa############cccccbbbbbbbbbbbbbbbb",
+"cddccdddddccccaaa#######dddcccccbbbbbbbbbbbbbbbb",
+"ccddddddddccccbbaac####ddddcddccbbbbbbbbbbbbbbbb",
+"cccdddddddccccbbbcc###ddddddddccbbbbbbbbbbbbbbbb",
+"cccccddddddccccbcccccddddddccccbbbbbbbbbbbbbbbbb",
+"bcccccdddddccccbcccccddddccccccbbbbbbbbbbbbbbbbb",
+"bbbccccddddccccbccccddddccccccbbbbbbbbbbbbbbbbbb",
+"bbbbbbcccccccccbccccccccccbbbbbbbbbbbbbbbbbbbbbb",
+"bbbbbbbcccccccbbccccccccbbbbbbbbbbbbbbbbbbbbbbbb",
+"bbbbbbbbccccccbbbcccccccbbbbbbbbbbbbbbbbbbbbbbbb",
+"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+};

diff --git a/lib/images/marginpar-insert.xpm b/lib/images/marginpar-insert.xpm
index 874e3d7b898ccf43278f1fd51406e0d8fa9db881..42a804538eea547991e8a3986c87fed3b4d27eba 100644 (file)
--- a/lib/images/marginpar-insert.xpm
+++ b/lib/images/marginpar-insert.xpm
@@ -3,7 +3,7 @@ static char const * margin_xpm[] = {
 "20 20 5 1",
 "      c gray60",
 ".     c #000000000000",
-"X     c #BFBFBFBFBFBF",
+"X     c None",
 "o     c #FFFFFFFFFFFF",
 "O     c #7B7B00000000",
 " .................XX",

diff --git a/lib/images/math-mode.xpm b/lib/images/math-mode.xpm
index 89a3d14f415194a45bdb519fe9a59d9a040b560b..60c3a0fe141645c9c1df42a6bd93693d1ca3088d 100644 (file)
--- a/lib/images/math-mode.xpm
+++ b/lib/images/math-mode.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * math_xpm[] = {
 "20 20 4 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #242423238E8E",
 "X     c #000000000000",
 "o     c #FFFFFFFFFFFF",

diff --git a/lib/images/melt.xpm b/lib/images/melt.xpm
index f2af56490196fb91c95a9b1765e24b3998235445..9b287f6aad1788f0ffc8c94e6a0f0e89409000d4 100644 (file)
--- a/lib/images/melt.xpm
+++ b/lib/images/melt.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * melt_xpm[] = {
 "20 20 5 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "X     c gray60",
 "o     c gray70",

diff --git a/lib/images/paste.xpm b/lib/images/paste.xpm
index 17eae2594f0993af123fe70a511b97d4a67eb50a..ca3748620858f630b1ef86a2b7c09177acc597c1 100644 (file)
--- a/lib/images/paste.xpm
+++ b/lib/images/paste.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * paste_xpm[] = {
 "20 20 6 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "X     c #E5E5E0E0E1E1",
 "o     c navy",

diff --git a/lib/images/redo.xpm b/lib/images/redo.xpm
index bebc8e7f7cdc63f841227822ef872d979f0fbd8e..7d1369ae35717e82930f3b29376a0d33ddbec7cd 100644 (file)
--- a/lib/images/redo.xpm
+++ b/lib/images/redo.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * redo_bw_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c black",
 "                    ",
 "                    ",

diff --git a/lib/images/table-insert.xpm b/lib/images/table-insert.xpm
index bd7e66e5aacfc275b5a3a12821d66c926346aa16..3287a1eca2bb646135d91108dd70a9e631b2df22 100644 (file)
--- a/lib/images/table-insert.xpm
+++ b/lib/images/table-insert.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * tab_xpm[] = {
 "20 20 3 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c #000000000000",
 "X     c #FFFFFFFFFFFF",
 "                    ",

diff --git a/lib/images/tex-mode.xpm b/lib/images/tex-mode.xpm
index d107cf90ab025523a974735e0043f375d59d4a80..96aa33d95bd9ef5794207deff41d4d9d2e7cd08e 100644 (file)
--- a/lib/images/tex-mode.xpm
+++ b/lib/images/tex-mode.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * tex_xpm[] = {
 "20 20 2 1",
-"      c #BEFBBEFBBEFB",
+"      c None",
 ".     c #7B7B00000000",
 "                    ",
 "                    ",

diff --git a/lib/images/undo.xpm b/lib/images/undo.xpm
index 1d68d8553c98ba57188b32b4adbd1babfef9308b..af1816fa4b6c360aed109cb85ffc90b756535d7c 100644 (file)
--- a/lib/images/undo.xpm
+++ b/lib/images/undo.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char const * undo_bw_xpm[] = {
 "20 20 2 1",
-"      c #BFBFBFBFBFBF",
+"      c None",
 ".     c black",
 "                    ",
 "                    ",

diff --git a/lib/images/unknown.xpm b/lib/images/unknown.xpm
index 4771cca01f7cca8b18570f34c3462b61681c172a..9a4a03d7993bd649dd5f07e16ef9f41cba4297e5 100644 (file)
--- a/lib/images/unknown.xpm
+++ b/lib/images/unknown.xpm
@@ -4,7 +4,7 @@ static char const * unknown_xpm[] = {
 "    20    20        2            1",
 /* colors */
 ". c #000000000000",
-"# c #befbbefbbefb",
+"# c None",
 /* pixels */
 "####################",
 "####################",

diff --git a/src/LyXView.C b/src/LyXView.C
index d9cdc70bbf09ec2e91b00b036975d0325628b2b9..b22acf6a7ec53cd5cb961ea0889d15ab1ad21ed1 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -24,7 +24,6 @@
 #include "toolbar.h"
 #include "minibuffer.h"
 #include "lyxfunc.h"
-#include "lyx.xpm"
 #include "debug.h"
 #include "layout_forms.h"
 #include "intl.h"
@@ -254,17 +253,20 @@ void LyXView::create_form_form_main(int width, int height)
        //
 
         //  assign an icon to main form
-        unsigned int w, h;
-        Pixmap lyx_p, lyx_mask;
-        lyx_p = fl_create_from_pixmapdata(fl_root,
-                                         const_cast<char**>(lyx_xpm),
-                                         &w,
-                                         &h,
-                                         &lyx_mask,
-                                         0,
-                                         0,
-                                         0); // this leaks
-        fl_set_form_icon(form_, lyx_p, lyx_mask);
+       string iconname = LibFileSearch("images", "lyx", "xpm");
+       if (!iconname.empty()) {
+               unsigned int w, h;
+               Pixmap lyx_p, lyx_mask;
+               lyx_p = fl_read_pixmapfile(fl_root,
+                                          iconname.c_str(),
+                                          &w,
+                                          &h,
+                                          &lyx_mask,
+                                          0,
+                                          0,
+                                          0); // this leaks
+               fl_set_form_icon(form_, lyx_p, lyx_mask);
+       }
 
        // set min size
        fl_set_form_minsize(form_, 50, 50);

diff --git a/src/Makefile.am b/src/Makefile.am
index 1fafd15471c224b19d5f56442e98d3964b105945..f44020a309e69d8f6af6ff9d508129e8a3a93d79 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
        @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 EXTRA_DIST = config.h.in stamp-h.in cheaders
 ETAGS_ARGS = --lang=c++
-INCLUDES = -I${top_srcdir}/images $(SIGC_CFLAGS) @FRONTEND_INCLUDES@
+INCLUDES = $(SIGC_CFLAGS) @FRONTEND_INCLUDES@
 localedir = $(datadir)/locale
 lyx_SOURCES = \
        BackStack.h \

diff --git a/src/bullet_forms.C b/src/bullet_forms.C
index 5518283ab0f6daa3dbd51b4a55d8eb6e74fb8c9a..301f80b98e3417cd294f8a5701ee8363ddcc4db8 100644 (file)
--- a/src/bullet_forms.C
+++ b/src/bullet_forms.C
@@ -29,7 +29,7 @@ FD_form_bullet *create_form_form_bullet(void)
      fl_set_object_boxtype(obj, FL_UP_BOX);
      fl_set_bmtable_pixmap_file(obj, 6, 6,
                                LibFileSearch("images",
-                                             "standard.xpm").c_str());
+                                             "standard", "xpm").c_str());
 
   fl_set_border_width(-1);
   obj = fl_add_frame(FL_ENGRAVED_FRAME, 95, 20, 255, 70, "");

diff --git a/src/bullet_forms_cb.C b/src/bullet_forms_cb.C
index 761f322514f53bf7040472ca21f4d5f9f0b14ea0..a8b37a5bed96c0caa37755c1628c6bc9befa4811 100644 (file)
--- a/src/bullet_forms_cb.C
+++ b/src/bullet_forms_cb.C
@@ -218,9 +218,10 @@ void BulletPanelCB(FL_OBJECT * /*ob*/, long data)
                        new_panel = "standard";
                        break;
                }
-               new_panel += ".xpm";
-               fl_set_bmtable_pixmap_file(fd_form_bullet->bmtable_bullet_panel, 6, 6,
-                                          LibFileSearch("images", new_panel.c_str()).c_str());
+               fl_set_bmtable_pixmap_file(fd_form_bullet->bmtable_bullet_panel, 
+                                          6, 6,
+                                          LibFileSearch("images", new_panel, 
+                                                        "xpm").c_str());
                fl_redraw_object(fd_form_bullet->bmtable_bullet_panel);
                fl_unfreeze_form(fd_form_bullet->form_bullet);
        }

diff --git a/src/toolbar.C b/src/toolbar.C
index fa756910d9c3f91351158d75a6562c78c407ce4c..01a88558f8a790f5ab2c2376fa2f06b23e6c99b0 100644 (file)
--- a/src/toolbar.C
+++ b/src/toolbar.C
@@ -145,8 +145,10 @@ void Toolbar::update()
                                // know how to use transparency with
                                // Xpm library. It seems pretty
                                // complicated to me (JMarc)
+                               fl_set_object_color(p->icon, FL_LEFT_BCOL, FL_BLUE);
                                fl_set_object_boxtype(p->icon, FL_DOWN_BOX);
                        } else {
+                               fl_set_object_color(p->icon, FL_MCOL, FL_BLUE);
                                fl_set_object_boxtype(p->icon, FL_UP_BOX);
                        }
 
@@ -287,7 +289,6 @@ void Toolbar::set(bool doingmain)
                                              NorthWestGravity);
                        fl_set_object_callback(obj, C_Toolbar_ToolbarCB,
                                               static_cast<long>(item->action));
-                       fl_set_object_color(obj, FL_MCOL, FL_BLUE);
                        // Remove the blue feedback rectangle
                        fl_set_pixmapbutton_focus_outline(obj, 0);