Bind riece-command-list-addons instead of riece-command-change-layout in tool-bar...

diff --git a/lisp/COMPILE b/lisp/COMPILE
index 5614b7a..86a3128 100644 (file)
--- a/lisp/COMPILE
+++ b/lisp/COMPILE
@@ -58,7 +58,7 @@
   '("riece-command-previous-channel.xpm"
     "riece-command-next-channel.xpm"
     "riece-command-configure-windows.xpm"
   '("riece-command-previous-channel.xpm"
     "riece-command-next-channel.xpm"
     "riece-command-configure-windows.xpm"

-    "riece-command-change-layout.xpm"
+    "riece-command-list-addons.xpm"

     "riece-command-join.xpm"
     "riece-command-part.xpm"
     "riece-command-quit.xpm"))
     "riece-command-join.xpm"
     "riece-command-part.xpm"
     "riece-command-quit.xpm"))

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index ddc2078..157ad55 100644 (file)
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST = COMPILE ChangeLog ChangeLog.Liece \
        riece-shrink-buffer.el riece-xfaceb.el riece-epg.el riece-twitter.el \
        url-riece.el \
        riece-command-previous-channel.xpm riece-command-next-channel.xpm \
        riece-shrink-buffer.el riece-xfaceb.el riece-epg.el riece-twitter.el \
        url-riece.el \
        riece-command-previous-channel.xpm riece-command-next-channel.xpm \

-       riece-command-configure-windows.xpm riece-command-change-layout.xpm \
+       riece-command-configure-windows.xpm riece-command-list-addons.xpm \

        riece-command-join.xpm riece-command-part.xpm riece-command-quit.xpm \
        server.rb aproxy.rb
 
        riece-command-join.xpm riece-command-part.xpm riece-command-quit.xpm \
        server.rb aproxy.rb
 

diff --git a/lisp/riece-command-change-layout.xpm b/lisp/riece-command-change-layout.xpm
deleted file mode 100644 (file)
index a303b13..0000000
--- a/lisp/riece-command-change-layout.xpm
+++ /dev/null
@@ -1,223 +0,0 @@
-/* XPM */
-static char *riece_command_change_layout[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 193 2",
-"   c black",
-".  c #030000",
-"X  c #020201",
-"o  c #030302",
-"O  c #040000",
-"+  c #050000",
-"@  c #060100",
-"#  c #070500",
-"$  c #040403",
-"%  c #080000",
-"&  c #080100",
-"*  c #0C0303",
-"=  c #090806",
-"-  c #080807",
-";  c #12110F",
-":  c #131210",
-">  c #201A1A",
-",  c #332C2B",
-"<  c #2C2A30",
-"1  c #4F4D4A",
-"2  c #574F4F",
-"3  c #57514F",
-"4  c #575050",
-"5  c #585251",
-"6  c #5D5954",
-"7  c #615B50",
-"8  c #625A53",
-"9  c #645E53",
-"0  c #655F54",
-"q  c #625C59",
-"w  c #615C5B",
-"e  c #625C5B",
-"r  c #6B625A",
-"t  c #696764",
-"y  c #6D6767",
-"u  c #706760",
-"i  c #716860",
-"p  c #736961",
-"a  c #746C67",
-"s  c #766D68",
-"d  c #7D7668",
-"f  c #79736C",
-"g  c #7F766D",
-"h  c #7B7975",
-"j  c #807869",
-"k  c #847C6D",
-"l  c #857D6E",
-"z  c #877F70",
-"x  c #898172",
-"c  c #8C8475",
-"v  c #8D8576",
-"b  c #84817A",
-"n  c #8D8379",
-"m  c #938B7C",
-"M  c #948A7F",
-"N  c #948C7D",
-"B  c #8C9C7A",
-"V  c #E4C041",
-"C  c #E5C144",
-"Z  c #E9CB62",
-"A  c #E9CB64",
-"S  c #EBD072",
-"D  c #ECD175",
-"F  c #878786",
-"G  c #8C8782",
-"H  c #958C80",
-"J  c #928C84",
-"K  c #908C86",
-"L  c #988D82",
-"P  c #979082",
-"I  c #989183",
-"U  c #97938E",
-"Y  c #98948F",
-"T  c gray61",
-"R  c #A09489",
-"E  c #A09A8D",
-"W  c #A49D91",
-"Q  c #A59E92",
-"!  c #A69F93",
-"~  c #A09E97",
-"^  c #A7A094",
-"/  c #A8A199",
-"(  c #A9A398",
-")  c #ABA59A",
-"_  c #A3AB9C",
-"`  c #B8AB9D",
-"'  c #BAAD9E",
-"]  c #A3A3A2",
-"[  c #B3AEA4",
-"{  c #B5B0A6",
-"}  c #B6B1A7",
-"|  c #BEB0A2",
-" . c #BFB4A6",
-".. c #B7B2A8",
-"X. c #B8B3A9",
-"o. c #B9B4AA",
-"O. c #BBB6AC",
-"+. c #BBB7AE",
-"@. c #BCB8AF",
-"#. c #B7B5B0",
-"$. c #B8B6B1",
-"%. c #BDB9B0",
-"&. c #BFBBB2",
-"*. c #BCBCBC",
-"=. c #C2B5A7",
-"-. c #C9BBAC",
-";. c #C0BCB3",
-":. c #C1BDB4",
-">. c #C2BEB5",
-",. c #C4BFB7",
-"<. c #C8BFB4",
-"1. c #C0BDBA",
-"2. c #EED787",
-"3. c #EED88B",
-"4. c #C5C0B8",
-"5. c #C9C5BE",
-"6. c #CAC6BF",
-"7. c #D7C8B8",
-"8. c #D5CCBF",
-"9. c #D8C9B9",
-"0. c #D9CABB",
-"q. c #DECFBF",
-"w. c #F2E0A3",
-"e. c #F3E3AA",
-"r. c #F4E5B1",
-"t. c #F4E5B3",
-"y. c #F5E7B6",
-"u. c #C5C4C0",
-"i. c #CBC7C0",
-"p. c #CECAC3",
-"a. c #CFCCC6",
-"s. c #D9CEC2",
-"d. c #DDCFC4",
-"f. c #D2CFC9",
-"g. c #D5D2CC",
-"h. c #D6D3CD",
-"j. c #D7D4CE",
-"k. c #DAD3C9",
-"l. c #D8D5CF",
-"z. c #DFD7CD",
-"x. c #D7D6D4",
-"c. c gray84",
-"v. c #D8D1D0",
-"b. c #D8D6D1",
-"n. c #D9D5D2",
-"m. c #D9D7D2",
-"M. c #D8D7D5",
-"N. c #DED7D5",
-"B. c #DAD8D3",
-"V. c #DBD9D4",
-"C. c #D9D8D6",
-"Z. c #DAD9D7",
-"A. c #DCDAD5",
-"S. c #DDDBD6",
-"D. c #DEDCD7",
-"F. c #DBDAD8",
-"G. c #DCDBD9",
-"H. c #DFDDD8",
-"J. c #DEDDDB",
-"K. c #E3D3C2",
-"L. c #E0DBD7",
-"P. c #E0DED9",
-"I. c #E2DFDC",
-"U. c #F0E0CE",
-"Y. c #E2E0DD",
-"T. c #F6E9D8",
-"R. c #E5E3E0",
-"E. c #E8E5E2",
-"W. c #E9E6E3",
-"Q. c #ECE4E2",
-"!. c #ECEBE9",
-"~. c #EDECEA",
-"^. c #ECECEB",
-"/. c #EEEDEB",
-"(. c #EDEDEC",
-"). c #EFEEEC",
-"_. c #F1EDE7",
-"`. c #F9EFE3",
-"'. c #F9EEE4",
-"]. c #F9F0E4",
-"[. c #F2F1EF",
-"{. c #F9F1EA",
-"}. c #FBF3EA",
-"|. c #F2F2F1",
-" X c #F3F2F2",
-".X c #FDFAF8",
-"XX c #FCFBFA",
-"oX c #FCFCFB",
-"OX c #FDFDFC",
-"+X c #FEFDFC",
-"@X c #FEFDFD",
-"#X c #FFFEFD",
-"$X c None",
-/* pixels */
-"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X",
-"$X                                            $X",
-"$X  OX!.!.!.!.p.  V S S S D 3.  |.^.(.(.(.J.  $X",
-"$X  !.g.g.g.g.{   S r.r.r.r.t.  ^.x.x.M.C.#.  $X",
-"$X  !.g.g.g.g.{   S r.r.t.t.y.  (.x.M.C.C.$.  $X",
-"$X  !.g.g.g.g.{   S r.Z # A w.  ^.x.x.Z.Z.$.  $X",
-"$X  !.g.g.g.g.}   D e.2 OX  Z   G.C.C.Z.F.$.  $X",
-"$X  6.{ { { } l   2.2.4 .X  C   u.#.$.$.$.~   $X",
-"$X                    y {.                    $X",
-"$X  oX[.!.!.~.5.  c.*.e '.1       x [ Y./.a.  $X",
-"$X  !.h.j.j.l...  T   w ].a +X  #X:   k ,.%.  $X",
-"$X  !.j.j.l.l.X.     XY `.R @Xs +Xp ]   ! )   $X",
-"$X  ~.j.l.l.b.X.    E.U T.b }.K _.h F o c W   $X",
-"$X  ~.l.l.b.m.o.    I./ U.<.8.z.k.d.J o x Q   $X",
-"$X  p.X.X.o.o.m   O n.0.7.q.9.K.-.s.g o k I   $X",
-"$X                @ 1.G =. .` ' | M i o       $X",
-"$X  oX/./././.i.  ( , 6 f H n M L u   7 O.4.  $X",
-"$X  /.m.B.V.V.+.  &.d > 3 q 8 r 5 t $ 0 f.:.  $X",
-"$X  /.B.V.V.A.+.  m.;._ + * % & . < 9 j A.>.  $X",
-"$X  ).A.S.S.D.@.  H.p.O Q.N.v.L.W.XXX N H.,.  $X",
-"$X  ).S.S.D.D.%.  P.V.X - X ; . =     E Y.o.  $X",
-"$X  R.+.@.@.%.v   &.;.;.;...B   P P z N 4.^   $X",
-"$X                                            $X",
-"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X"
-};

diff --git a/lisp/riece-command-list-addons.xpm b/lisp/riece-command-list-addons.xpm
new file mode 100644 (file)
index 0000000..31b3d9c
--- /dev/null
+++ b/lisp/riece-command-list-addons.xpm
@@ -0,0 +1,223 @@
+/* XPM */
+static char *riece_command_list_addons[] = {
+/* columns rows colors chars-per-pixel */
+"24 24 193 2",
+"   c black",
+".  c #030000",
+"X  c #020201",
+"o  c #030302",
+"O  c #040000",
+"+  c #050000",
+"@  c #060100",
+"#  c #070500",
+"$  c #040403",
+"%  c #080000",
+"&  c #080100",
+"*  c #0C0303",
+"=  c #090806",
+"-  c #080807",
+";  c #12110F",
+":  c #131210",
+">  c #201A1A",
+",  c #332C2B",
+"<  c #2C2A30",
+"1  c #4F4D4A",
+"2  c #574F4F",
+"3  c #57514F",
+"4  c #575050",
+"5  c #585251",
+"6  c #5D5954",
+"7  c #615B50",
+"8  c #625A53",
+"9  c #645E53",
+"0  c #655F54",
+"q  c #625C59",
+"w  c #615C5B",
+"e  c #625C5B",
+"r  c #6B625A",
+"t  c #696764",
+"y  c #6D6767",
+"u  c #706760",
+"i  c #716860",
+"p  c #736961",
+"a  c #746C67",
+"s  c #766D68",
+"d  c #7D7668",
+"f  c #79736C",
+"g  c #7F766D",
+"h  c #7B7975",
+"j  c #807869",
+"k  c #847C6D",
+"l  c #857D6E",
+"z  c #877F70",
+"x  c #898172",
+"c  c #8C8475",
+"v  c #8D8576",
+"b  c #84817A",
+"n  c #8D8379",
+"m  c #938B7C",
+"M  c #948A7F",
+"N  c #948C7D",
+"B  c #8C9C7A",
+"V  c #E4C041",
+"C  c #E5C144",
+"Z  c #E9CB62",
+"A  c #E9CB64",
+"S  c #EBD072",
+"D  c #ECD175",
+"F  c #878786",
+"G  c #8C8782",
+"H  c #958C80",
+"J  c #928C84",
+"K  c #908C86",
+"L  c #988D82",
+"P  c #979082",
+"I  c #989183",
+"U  c #97938E",
+"Y  c #98948F",
+"T  c gray61",
+"R  c #A09489",
+"E  c #A09A8D",
+"W  c #A49D91",
+"Q  c #A59E92",
+"!  c #A69F93",
+"~  c #A09E97",
+"^  c #A7A094",
+"/  c #A8A199",
+"(  c #A9A398",
+")  c #ABA59A",
+"_  c #A3AB9C",
+"`  c #B8AB9D",
+"'  c #BAAD9E",
+"]  c #A3A3A2",
+"[  c #B3AEA4",
+"{  c #B5B0A6",
+"}  c #B6B1A7",
+"|  c #BEB0A2",
+" . c #BFB4A6",
+".. c #B7B2A8",
+"X. c #B8B3A9",
+"o. c #B9B4AA",
+"O. c #BBB6AC",
+"+. c #BBB7AE",
+"@. c #BCB8AF",
+"#. c #B7B5B0",
+"$. c #B8B6B1",
+"%. c #BDB9B0",
+"&. c #BFBBB2",
+"*. c #BCBCBC",
+"=. c #C2B5A7",
+"-. c #C9BBAC",
+";. c #C0BCB3",
+":. c #C1BDB4",
+">. c #C2BEB5",
+",. c #C4BFB7",
+"<. c #C8BFB4",
+"1. c #C0BDBA",
+"2. c #EED787",
+"3. c #EED88B",
+"4. c #C5C0B8",
+"5. c #C9C5BE",
+"6. c #CAC6BF",
+"7. c #D7C8B8",
+"8. c #D5CCBF",
+"9. c #D8C9B9",
+"0. c #D9CABB",
+"q. c #DECFBF",
+"w. c #F2E0A3",
+"e. c #F3E3AA",
+"r. c #F4E5B1",
+"t. c #F4E5B3",
+"y. c #F5E7B6",
+"u. c #C5C4C0",
+"i. c #CBC7C0",
+"p. c #CECAC3",
+"a. c #CFCCC6",
+"s. c #D9CEC2",
+"d. c #DDCFC4",
+"f. c #D2CFC9",
+"g. c #D5D2CC",
+"h. c #D6D3CD",
+"j. c #D7D4CE",
+"k. c #DAD3C9",
+"l. c #D8D5CF",
+"z. c #DFD7CD",
+"x. c #D7D6D4",
+"c. c gray84",
+"v. c #D8D1D0",
+"b. c #D8D6D1",
+"n. c #D9D5D2",
+"m. c #D9D7D2",
+"M. c #D8D7D5",
+"N. c #DED7D5",
+"B. c #DAD8D3",
+"V. c #DBD9D4",
+"C. c #D9D8D6",
+"Z. c #DAD9D7",
+"A. c #DCDAD5",
+"S. c #DDDBD6",
+"D. c #DEDCD7",
+"F. c #DBDAD8",
+"G. c #DCDBD9",
+"H. c #DFDDD8",
+"J. c #DEDDDB",
+"K. c #E3D3C2",
+"L. c #E0DBD7",
+"P. c #E0DED9",
+"I. c #E2DFDC",
+"U. c #F0E0CE",
+"Y. c #E2E0DD",
+"T. c #F6E9D8",
+"R. c #E5E3E0",
+"E. c #E8E5E2",
+"W. c #E9E6E3",
+"Q. c #ECE4E2",
+"!. c #ECEBE9",
+"~. c #EDECEA",
+"^. c #ECECEB",
+"/. c #EEEDEB",
+"(. c #EDEDEC",
+"). c #EFEEEC",
+"_. c #F1EDE7",
+"`. c #F9EFE3",
+"'. c #F9EEE4",
+"]. c #F9F0E4",
+"[. c #F2F1EF",
+"{. c #F9F1EA",
+"}. c #FBF3EA",
+"|. c #F2F2F1",
+" X c #F3F2F2",
+".X c #FDFAF8",
+"XX c #FCFBFA",
+"oX c #FCFCFB",
+"OX c #FDFDFC",
+"+X c #FEFDFC",
+"@X c #FEFDFD",
+"#X c #FFFEFD",
+"$X c None",
+/* pixels */
+"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X",
+"$X                                            $X",
+"$X  OX!.!.!.!.p.  V S S S D 3.  |.^.(.(.(.J.  $X",
+"$X  !.g.g.g.g.{   S r.r.r.r.t.  ^.x.x.M.C.#.  $X",
+"$X  !.g.g.g.g.{   S r.r.t.t.y.  (.x.M.C.C.$.  $X",
+"$X  !.g.g.g.g.{   S r.Z # A w.  ^.x.x.Z.Z.$.  $X",
+"$X  !.g.g.g.g.}   D e.2 OX  Z   G.C.C.Z.F.$.  $X",
+"$X  6.{ { { } l   2.2.4 .X  C   u.#.$.$.$.~   $X",
+"$X                    y {.                    $X",
+"$X  oX[.!.!.~.5.  c.*.e '.1       x [ Y./.a.  $X",
+"$X  !.h.j.j.l...  T   w ].a +X  #X:   k ,.%.  $X",
+"$X  !.j.j.l.l.X.     XY `.R @Xs +Xp ]   ! )   $X",
+"$X  ~.j.l.l.b.X.    E.U T.b }.K _.h F o c W   $X",
+"$X  ~.l.l.b.m.o.    I./ U.<.8.z.k.d.J o x Q   $X",
+"$X  p.X.X.o.o.m   O n.0.7.q.9.K.-.s.g o k I   $X",
+"$X                @ 1.G =. .` ' | M i o       $X",
+"$X  oX/./././.i.  ( , 6 f H n M L u   7 O.4.  $X",
+"$X  /.m.B.V.V.+.  &.d > 3 q 8 r 5 t $ 0 f.:.  $X",
+"$X  /.B.V.V.A.+.  m.;._ + * % & . < 9 j A.>.  $X",
+"$X  ).A.S.S.D.@.  H.p.O Q.N.v.L.W.XXX N H.,.  $X",
+"$X  ).S.S.D.D.%.  P.V.X - X ; . =     E Y.o.  $X",
+"$X  R.+.@.@.%.v   &.;.;.;...B   P P z N 4.^   $X",
+"$X                                            $X",
+"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X"
+};

diff --git a/lisp/riece-mcat-japanese.el b/lisp/riece-mcat-japanese.el
index 2cf659a..cc15e2d 100644 (file)
--- a/lisp/riece-mcat-japanese.el
+++ b/lisp/riece-mcat-japanese.el
@@ -118,6 +118,7 @@
     ("Logging in to %s...done" . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to IRC server..." . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...")
     ("Logging in to IRC server...done" . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to %s...done" . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to IRC server..." . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...")
     ("Logging in to IRC server...done" . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")

+    ("Manage Add-ons" . nil)

     ("Mark As Away" . "\e$BN%@J>uBV$K$9$k\e(B")
     ("Message to user: " . "\e$B%f!<%6$X$N%a%C%;!<%8\e(B: ")
     ("Message: " . "\e$B%a%C%;!<%8\e(B")
     ("Mark As Away" . "\e$BN%@J>uBV$K$9$k\e(B")
     ("Message to user: " . "\e$B%f!<%6$X$N%a%C%;!<%8\e(B: ")
     ("Message: " . "\e$B%a%C%;!<%8\e(B")

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 19d98b4..a1524f3 100644 (file)
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -73,6 +73,7 @@
    (vector (riece-mcat "Invite User") 'riece-command-invite
           'riece-current-channel)
    "----"
    (vector (riece-mcat "Invite User") 'riece-command-invite
           'riece-current-channel)
    "----"

+   (vector (riece-mcat "Manage Add-ons") 'riece-command-list-addons t)

    (vector (riece-mcat "Version") 'riece-version t)
    (vector (riece-mcat "Submit Bug Report") 'riece-submit-bug-report t)
    "----"
    (vector (riece-mcat "Version") 'riece-version t)
    (vector (riece-mcat "Submit Bug Report") 'riece-submit-bug-report t)
    "----"

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index ea8f8ba..9d77ac8 100644 (file)
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.el
@@ -28,7 +28,7 @@
 ;; riece-command-next-channel.xpm      stock_next.png
 ;; riece-command-previous-channel.xpm  stock_previous.png
 ;; riece-command-configure-windows.xpm stock_refresh.png
 ;; riece-command-next-channel.xpm      stock_next.png
 ;; riece-command-previous-channel.xpm  stock_previous.png
 ;; riece-command-configure-windows.xpm stock_refresh.png

-;; riece-command-change-layout         stock_styles.png
+;; riece-command-list-addons           stock_styles.png

 ;; riece-command-join                  stock_people.png
 ;; riece-command-part                  stock_calc-cancel.png
 ;; riece-command-quit                  stock_exit.png
 ;; riece-command-join                  stock_people.png
 ;; riece-command-part                  stock_calc-cancel.png
 ;; riece-command-quit                  stock_exit.png

@@ -46,7 +46,7 @@
   '(riece-command-previous-channel
     riece-command-next-channel
     riece-command-configure-windows
   '(riece-command-previous-channel
     riece-command-next-channel
     riece-command-configure-windows

-    riece-command-change-layout
+    riece-command-list-addons

     riece-command-join
     riece-command-part
     riece-command-quit))
     riece-command-join
     riece-command-part
     riece-command-quit))