Bug fixes.

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"
 

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 getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主题名,输入文件名:)"
-		"保存图标集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
+		"保存图标集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(图标集名,输入文件名:)"
 	"外观" END
 
 	"退出"	MENU
 		"重新启动" RESTART
-		"切换到..." MENU
+		"启动 BlackBox" RESTART blackbox
-			"AfterStep"             RESTART /usr/X11R6/bin/RunWM.AfterStep
+                "启动 kwm" RESTART kwm
-			"Fvwm2 (Fvwm95外观)"   RESTART /usr/X11R6/bin/RunWM.Fvwm95
+                "启动 IceWM" RESTART icewm
-			"Fvwm2 (MWM外观)"      RESTART /usr/X11R6/bin/RunWM.MWM
-		"切换到..." END                              
 		"退出..."  EXIT
-		"强制结束会话..." SHUTDOWN
 	"退出" END
 "应用程序" END
 

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, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(主题名)\""),
-  ("保存图标集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\"")
+  ("保存图标集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(图标集名)\"")
   ), 
  ("退出",
   ("重新启动", RESTART),
-  ("切换到...",
+  ("启动 BlackBox", RESTART, blackbox),
-    ("AfterStep", RESTART, "/usr/X11R6/bin/RunWM.AfterStep"),
+  ("启动 kwm", RESTART, kwm),
-    ("Fvwm2 (Fvwm95外观)", RESTART, "/usr/X11R6/bin/RunWM.Fvwm95"),
+  ("启动 IceWM", RESTART, icewm),
-    ("Fvwm2 (MWM外观)", RESTART, "/usr/X11R6/bin/RunWM.MWM")
-  ),
   ("退出...", EXIT),
-  ("强制结束会话...", SHUTDOWN)
  )
 )

wrlib/xpm.c

@@ -96,15 +96,35 @@ RGetImageFromXPMData(RContext *context, char **data)
 
     for (i=0; i<xpm.ncolors; i++) {
 	XColor xcolor;
+        char * color = NULL;
 
-	if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) {
+        if (xpm.colorTable[i].c_color)
+             color = xpm.colorTable[i].c_color;
+        else if (xpm.colorTable[i].g_color)
+             color = xpm.colorTable[i].g_color;
+        else if (xpm.colorTable[i].g4_color)
+             color = xpm.colorTable[i].g4_color;
+        else if (xpm.colorTable[i].m_color)
+             color = xpm.colorTable[i].m_color;
+        else if (xpm.colorTable[i].symbolic)
+             color = xpm.colorTable[i].symbolic;
+
+        if (!color) {
+	    color_table[0][i] = 0xbe;
+	    color_table[1][i] = 0xbe;
+	    color_table[2][i] = 0xbe;
+	    color_table[3][i] = 0xff;
+            continue;
+        }
+	
+	if (strncmp(color,"None",4)==0) {
 	    color_table[0][i]=0;
 	    color_table[1][i]=0;
 	    color_table[2][i]=0;
 	    color_table[3][i]=0;
 	    continue;
 	}
-	if (XParseColor(dpy, cmap, xpm.colorTable[i].c_color, &xcolor)) {
+	if (XParseColor(dpy, cmap, color, &xcolor)) {
 	    color_table[0][i] = xcolor.red>>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<xpm.ncolors; i++) {
 	XColor xcolor;
+        char * color = NULL;
+
+        if (xpm.colorTable[i].c_color)
+             color = xpm.colorTable[i].c_color;
+        else if (xpm.colorTable[i].g_color)
+             color = xpm.colorTable[i].g_color;
+        else if (xpm.colorTable[i].g4_color)
+             color = xpm.colorTable[i].g4_color;
+        else if (xpm.colorTable[i].m_color)
+             color = xpm.colorTable[i].m_color;
+        else if (xpm.colorTable[i].symbolic)
+             color = xpm.colorTable[i].symbolic;
+
+        if (!color) {
+	    color_table[0][i] = 0xbe;
+	    color_table[1][i] = 0xbe;
+	    color_table[2][i] = 0xbe;
+	    color_table[3][i] = 0xff;
+            continue;
+        }
 	
-	if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) {
+	if (strncmp(color,"None",4)==0) {
 	    color_table[0][i]=0;
 	    color_table[1][i]=0;
 	    color_table[2][i]=0;
 	    color_table[3][i]=0;
 	    continue;
 	}
-	if (XParseColor(dpy, cmap, xpm.colorTable[i].c_color, &xcolor)) {
+	if (XParseColor(dpy, cmap, color, &xcolor)) {
 	    color_table[0][i] = xcolor.red>>8;
 	    color_table[1][i] = xcolor.green>>8;
 	    color_table[2][i] = xcolor.blue>>8;