From c8652183519e2b4f728bb27904df58c316234894 Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 4 Jul 1999 20:43:53 +0000 Subject: [PATCH] Bug fixes. --- WPrefs.app/po/ru.po | 2 +- WindowMaker/menu.zh_CN | 57 ++++++++++++++++++++++++++++++-------- WindowMaker/plmenu.zh_CN | 59 ++++++++++++++++++++++++++++++++-------- wrlib/xpm.c | 48 +++++++++++++++++++++++++++++--- 4 files changed, 138 insertions(+), 28 deletions(-) diff --git a/WPrefs.app/po/ru.po b/WPrefs.app/po/ru.po index 73db8fef..f704856e 100644 --- a/WPrefs.app/po/ru.po +++ b/WPrefs.app/po/ru.po @@ -823,7 +823,7 @@ msgstr " #: ../../WPrefs.app/MenuPreferences.c:204 msgid "" "Always open submenus inside the screen, instead of scrolling.\n" -"Note: this can be an annoyance at some circumstances." +"Note: this can be an annoyance at some circumstances.\n" msgstr "" "÷ÓÅÇÄÁ ÏÔËÒÙ×ÁÔØ ÐÏÄÍÅÎÀ ×ÎÕÔÒÉ ÜËÒÁÎÁ, ×ÍÅÓÔÏ ÐÒÏËÒÕÔËÉ.\n" diff --git a/WindowMaker/menu.zh_CN b/WindowMaker/menu.zh_CN index ce98a4d2..9d860a2c 100644 --- a/WindowMaker/menu.zh_CN +++ b/WindowMaker/menu.zh_CN @@ -113,13 +113,49 @@ "½ø³ÌÁбí" EXEC xterm -e top "ÊÖ²áä¯ÀÀÆ÷" EXEC xman "ÐÅÏ¢" END - "ÔËÐÐ..." EXEC %a(Run,Type command to run:) + "ÔËÐÐ..." EXEC %a(ÔËÐÐ,ÒªÖ´ÐеÄÃüÁî:) "XTerm" EXEC xterm -sb "Rxvt" EXEC rxvt -bg black -fg white -fn fixed - - "³ÌÐò" OPEN_MENU | wmconfig --output wmaker 2>/dev/null - "¹¤×÷¿Õ¼ä" WORKSPACE_MENU + "Ó¦ÓóÌÐò" OPEN_MENU + "ͼÐÎ" MENU + "Gimp" SHEXEC gimp >/dev/null + "XV" EXEC xv + "XPaint" EXEC xpaint + "XFig" EXEC xfig + "ͼÐÎ" END + "XÎļþ¹ÜÀíÆ÷" EXEC xfm + "OffiX Files" EXEC files + "LyX" EXEC lyx + "Netscape" EXEC netscape + "Ghostview" EXEC ghostview %a(GhostView,ÊäÈëÒª²é¿´µÄÎļþÃû) + "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,ÊäÈëÒª²é¿´µÄPDFÎļþÃû) + "TkDesk" EXEC tkdesk + "Ó¦ÓóÌÐò" END + "±à¼­Æ÷" MENU + "XFte" EXEC xfte + "XEmacs" SHEXEC xemacs || emacs + "XJed" EXEC xjed + "NEdit" EXEC nedit + "Xedit" EXEC xedit + "VI" EXEC xterm -e vi + "±à¼­Æ÷" END + "ÆäËû" MENU + "Xmcd" SHEXEC xmcd 2> /dev/null + "Xplaycd" EXEC xplaycd + "Xmixer" EXEC xmixer + "ÆäËû" END + "¹¤¾ß" MENU + "¼ÆËãÆ÷" EXEC xcalc + "´°¿ÚÊôÐÔ" SHEXEC xprop | xmessage -center -title 'xpro +p' -file - + "×ÖÌåÑ¡Ôñ" EXEC xfontsel + "ÖÕ¶ËÄ£ÄâÆ÷" EXEC xminicom + "·Å´ó" EXEC xmag + "ÑÕÉ«±í" EXEC xcmap + "XKill" EXEC xkill + "¼ôÌù°å" EXEC xclipboard + "¹¤¾ß" END "Ñ¡Ôñ" MENU "¸´ÖÆ" SHEXEC echo '%s' | wxcopy @@ -165,19 +201,16 @@ "¹ý¶ÉÉ«" END "ͼÏñ" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t "±³¾°" END - "±£´æÖ÷Ìâ" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)" - "±£´æͼ±ê¼¯" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)" + "±£´æÖ÷Ìâ" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Ö÷ÌâÃû,ÊäÈëÎļþÃû:)" + "±£´æͼ±ê¼¯" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(ͼ±ê¼¯Ãû,ÊäÈëÎļþÃû:)" "Íâ¹Û" END "Í˳ö" MENU "ÖØÐÂÆô¶¯" RESTART - "Çл»µ½..." MENU - "AfterStep" RESTART /usr/X11R6/bin/RunWM.AfterStep - "Fvwm2 (Fvwm95Íâ¹Û)" RESTART /usr/X11R6/bin/RunWM.Fvwm95 - "Fvwm2 (MWMÍâ¹Û)" RESTART /usr/X11R6/bin/RunWM.MWM - "Çл»µ½..." END + "Æô¶¯ BlackBox" RESTART blackbox + "Æô¶¯ kwm" RESTART kwm + "Æô¶¯ IceWM" RESTART icewm "Í˳ö..." EXIT - "Ç¿ÖƽáÊø»á»°..." SHUTDOWN "Í˳ö" END "Ó¦ÓóÌÐò" END diff --git a/WindowMaker/plmenu.zh_CN b/WindowMaker/plmenu.zh_CN index d4575349..12d5251a 100644 --- a/WindowMaker/plmenu.zh_CN +++ b/WindowMaker/plmenu.zh_CN @@ -7,11 +7,51 @@ ("½ø³ÌÁбí", EXEC, "xterm -e top"), ("ÊÖ²áä¯ÀÀÆ÷", EXEC, "xman") ), - ("ÔËÐÐ...", SHEXEC, "%a(Run,Type command to run:)"), + ("ÔËÐÐ...", SHEXEC, "%a(ÔËÐÐ,ÒªÖ´ÐеÄÃüÁî:)"), ("XTerm", EXEC, "xterm -sb"), ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"), - ("³ÌÐò", OPEN_MENU, "| wmconfig --output wmaker 2>/dev/null"), ("¹¤×÷¿Õ¼ä", WORKSPACE_MENU), + ("Ó¦ÓóÌÐò", + ("ͼÐÎ", + ("Gimp", SHEXEC, "gimp >/dev/null"), + ("XV", EXEC, "xv"), + ("XPaint", EXEC, "xpaint"), + ("XFig", EXEC, "xfig") + ), + ("X Îļþ¹ÜÀíÆ÷", EXEC, "xfm"), + ("OffiX Files", EXEC, "files"), + ("LyX", EXEC, "lyx"), + ("Netscape", EXEC, "netscape"), + ("Ghostview", EXEC, "ghostview %a(ÊäÈëÒª²é¿´µÄÎļþÃû)"), + ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Òª²é¿´µÄPDFÎļþÃû)"), + ("TkDesk", EXEC, "tkdesk") + ), + ("±à¼­Æ÷", + ("XFte", EXEC, "xfte"), + ("XEmacs", SHEXEC, "xemacs || emacs"), + ("XJed", EXEC, "xjed"), + ("NEdit", EXEC, "nedit"), + ("Xedit", EXEC, "xedit"), + ("VI", EXEC, "xterm -e vi") + ), + ("ÆäËü", + ("Xmcd", SHEXEC, "xmcd 2> /dev/null"), + ("Xplaycd", EXEC, "xplaycd"), + ("Xmixer", EXEC, "xmixer") + ), + ("¹¤¾ß", + ("¼ÆËãÆ÷", EXEC, "xcalc"), + ("´°¿ÚÊôÐÔ", SHEXEC, "xprop | xmessage -center -title 'xprop' -file - +"), + ("×ÖÌåÑ¡Ôñ", EXEC, "xfontsel"), + ("ÖÕ¶ËÄ£ÄâÆ÷", EXEC, "xminicom"), + ("·Å´ó", EXEC, "xmag"), + ("ÑÕÉ«±í", EXEC, "xcmap"), + ("XKill", EXEC, "xkill"), + ("ASClock", EXEC, "asclock -shape"), + ("Clipboard", EXEC, "xclipboard") + ), + ("Ñ¡Ôñ", ("¸´ÖÆ", SHEXEC, "echo '%s' | wxcopy"), ("·¢ËÍÓʼþ", EXEC, "xterm -name mail -T Pine -e pine %s"), @@ -25,7 +65,7 @@ ("Ë¢ÐÂ", REFRESH), ("ËøסÆÁÄ»", EXEC, "xlock -allowroot -usefirst"), ("±£´æ»á»°", SAVE_SESSION), - ("Çå³ý±£´æµÄ¶Ô»°", CLEAR_SESSION) + ("Çå³ý±£´æµÄ»á»°", CLEAR_SESSION) ), ("Íâ¹Û", ("Ö÷Ìâ", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"), @@ -54,17 +94,14 @@ ), ("ͼÏñ", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") ), - ("±£´æÖ÷Ìâ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), - ("±£´æͼ±ê¼¯", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\"") + ("±£´æÖ÷Ìâ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Ö÷ÌâÃû)\""), + ("±£´æͼ±ê¼¯", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(ͼ±ê¼¯Ãû)\"") ), ("Í˳ö", ("ÖØÐÂÆô¶¯", RESTART), - ("Çл»µ½...", - ("AfterStep", RESTART, "/usr/X11R6/bin/RunWM.AfterStep"), - ("Fvwm2 (Fvwm95Íâ¹Û)", RESTART, "/usr/X11R6/bin/RunWM.Fvwm95"), - ("Fvwm2 (MWMÍâ¹Û)", RESTART, "/usr/X11R6/bin/RunWM.MWM") - ), + ("Æô¶¯ BlackBox", RESTART, blackbox), + ("Æô¶¯ kwm", RESTART, kwm), + ("Æô¶¯ IceWM", RESTART, icewm), ("Í˳ö...", EXIT), - ("Ç¿ÖƽáÊø»á»°...", SHUTDOWN) ) ) diff --git a/wrlib/xpm.c b/wrlib/xpm.c index d5f9c633..a0058639 100644 --- a/wrlib/xpm.c +++ b/wrlib/xpm.c @@ -96,15 +96,35 @@ RGetImageFromXPMData(RContext *context, char **data) for (i=0; i>8; color_table[1][i] = xcolor.green>>8; color_table[2][i] = xcolor.blue>>8; @@ -203,15 +223,35 @@ RLoadXPM(RContext *context, char *file, int index) for (i=0; i>8; color_table[1][i] = xcolor.green>>8; color_table[2][i] = xcolor.blue>>8;