[Antiright-devel] antiright/lib menubar.c

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/11/21 21:44:52

Modified files:
        lib            : menubar.c 

Log message:
        Replaced program information items in help menu with the unified About 
button and dialog.  Condensed games and applications menus.  Added logic for 
determining correct tetris to run.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/menubar.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: antiright/lib/menubar.c
diff -u antiright/lib/menubar.c:1.12 antiright/lib/menubar.c:1.13
--- antiright/lib/menubar.c:1.12        Sun Sep  5 07:53:57 2004
+++ antiright/lib/menubar.c     Sun Nov 21 21:44:51 2004
@@ -143,35 +143,10 @@
 Widget
 antiright_help_about(Widget menu_widget)
 {
-  return(antiright_button(menu_widget, "About AntiRight", antiright_help_cb,
-                         "AntiRight_is_a_lightweight_desktop_environment."));
-}
-Widget
-antiright_help_copyright(Widget menu_widget)
-{
-  return(antiright_button(menu_widget, "Copyright", antiright_help_cb, 
-                         "Copyright_2002-2004,_Jeffrey_E._Bedard"));
-}
-Widget
-antiright_help_license(Widget menu_widget)
-{
-  return(antiright_button(menu_widget, "License", antiright_license_cb, 
-                         "License"));
-}
-Widget
-antiright_help_warranty(Widget menu_widget)
-{
-  return(antiright_button(menu_widget, "No Warranty", antiright_help_cb, 
-                         "There_is_NO_warranty.__USE_AT_YOUR_OWN_RISK!"));
-}
-Widget
-antiright_help_version(Widget menu_widget)
-{
-  return(antiright_button(menu_widget, "On Version", antiright_help_cb, 
-                         PACKAGE_STRING));
+  return(antiright_button(menu_widget, "About AntiRight", 
+                         antiright_about_dialog, NULL));
 }
 
-
 Widget 
 antiright_help_manual_menu(Widget help_widget)
 {
@@ -192,14 +167,8 @@
 {
   Widget menu_widget;
   menu_widget=antiright_create_help_menu(menubar_widget);
-  antiright_help_manual_menu(menu_widget);
-  antiright_separator(menu_widget);
   antiright_help_about(menu_widget);
-  antiright_help_copyright(menu_widget);
-  antiright_help_license(menu_widget);
-  antiright_help_warranty(menu_widget);
-  antiright_help_version(menu_widget);
-  
+  antiright_help_manual_menu(menu_widget);
   return(menu_widget);
 }
 
@@ -224,85 +193,45 @@
 antiright_setup_games_menu(Widget parent)
 {
   Widget submenu_widget=antiright_menu(parent, "Games");
-   antiright_button(submenu_widget,
-                   "Adventure",
-                   antiright_system_cb,
+   antiright_button(submenu_widget,"Adventure",antiright_system_cb,
                    "xterm -e /usr/games/adventure &");
-  antiright_button(submenu_widget,
-                   "Arithmetic",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Arithmetic",antiright_system_cb,
                    "xterm -e /usr/games/arithmetic &");
-  antiright_button(submenu_widget,
-                   "Air Traffic Command",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Air Traffic Command",antiright_system_cb,
                    "xterm -e /usr/games/atc &");
-  antiright_button(submenu_widget,
-                   "Battlestar",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Battlestar",antiright_system_cb,
                    "xterm -e /games/battlestar &");
-  antiright_button(submenu_widget,
-                   "Boggle",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Boggle",antiright_system_cb,
                    "xterm -e /usr/games/boggle &");
-  antiright_button(submenu_widget,
-                   "Canfield",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Canfield",antiright_system_cb,
                    "xterm -e /usr/games/canfield &");
-  antiright_button(submenu_widget,
-                   "Cribbage",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Cribbage",antiright_system_cb,
                    "xterm -e /usr/games/cribbage &");
-  antiright_button(submenu_widget,
-                   "Fish",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Fish",antiright_system_cb,
                    "xterm -e /usr/games/fish &");
-  antiright_button(submenu_widget,
-                   "Gomoku",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Gomoku",antiright_system_cb,
                    "xterm -e /usr/games/gomoku &");
-  antiright_button(submenu_widget,
-                   "Hangman",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Hangman",antiright_system_cb,
                    "xterm -e /usr/games/hangman &");
-  antiright_button(submenu_widget,
-                   "Mille",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Mille",antiright_system_cb,
                    "xterm -e /usr/games/mille &");
-  antiright_button(submenu_widget,
-                   "Phantasia",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Phantasia",antiright_system_cb,
                    "xterm -e/usr/games/ phantasia &");
-  antiright_button(submenu_widget,
-                   "Quiz",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Quiz",antiright_system_cb,
                    "xterm -e /usr/games/quiz &");
-  antiright_button(submenu_widget,
-                   "Robots",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Robots",antiright_system_cb,
                    "xterm -e /usr/games/robots &");
-  antiright_button(submenu_widget,
-                   "Rogue",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Rogue",antiright_system_cb,
                    "xterm -e /usr/games/rogue &");
-  antiright_button(submenu_widget,
-                   "Sail",
-                   antiright_system_cb,
-                   "xterm -e /usr/games/sail &");
-  antiright_button(submenu_widget,
-                   "Tetris",
-                   antiright_system_cb,
-                   "xterm -e /usr/games/tetris &");
-  antiright_button(submenu_widget,
-                   "Trek",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Sail",antiright_system_cb,
+                  "xterm -e /usr/games/sail &");
+  antiright_button(submenu_widget, "Tetris", antiright_system_cb,
+     "xterm -e sh -c 'if [ -f /usr/games/tetris ]; then tetris; else 
/usr/games/tetris-bsd; fi' &");
+  antiright_button(submenu_widget,"Trek",antiright_system_cb,
                    "xterm -e /usr/games/trek &");
-  antiright_button(submenu_widget,
-                   "Worm",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Worm",antiright_system_cb,
                    "xterm -e /usr/games/worm &");
-  antiright_button(submenu_widget,
-                   "Wump",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Wump",antiright_system_cb,
                    "xterm -e /usr/games/wump &");
 }
 
@@ -310,54 +239,21 @@
 antiright_setup_applications_menu(Widget parent)
 {
   Widget submenu_widget=antiright_menu(parent, "Applications");
-  antiright_button(submenu_widget,
-                   "Firefox",
-                   antiright_system_cb,
-                   "firefox &");
-  antiright_button(submenu_widget,
-                   "GIMP",
-                   antiright_system_cb,
-                   "gimp &");
-  antiright_button(submenu_widget,
-                   "GNU Emacs",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Firefox",antiright_system_cb,"firefox &");
+  antiright_button(submenu_widget,"GIMP",antiright_system_cb,"gimp &");
+  antiright_button(submenu_widget,"GNU Emacs",antiright_system_cb,
                    "nice emacs &");
-  antiright_button(submenu_widget,
-                   "Mozilla",
-                   antiright_system_cb,
-                   "mozilla &");
-  antiright_button(submenu_widget,
-                   "NEdit",
-                   antiright_system_cb,
-                   "nedit &");
-  antiright_button(submenu_widget,
-                   "Open/Star Office",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"Mozilla",antiright_system_cb,"mozilla &");
+  antiright_button(submenu_widget,"NEdit",antiright_system_cb,"nedit &");
+  antiright_button(submenu_widget,"Open/Star Office",antiright_system_cb,
                    "soffice &");
-  antiright_button(submenu_widget,
-                   "RealPlayer",
-                   antiright_system_cb,
+  antiright_button(submenu_widget,"RealPlayer",antiright_system_cb,
                    "realplay &");
-  antiright_button(submenu_widget,
-                   "VI",
-                   antiright_system_cb,
-                   "xterm -e vi &");
-  antiright_button(submenu_widget,
-                   "XClock",
-                   antiright_system_cb,
-                   "xclock &");
-  antiright_button(submenu_widget,
-                   "XLoad",
-                   antiright_system_cb,
-                   "xload &");
-  antiright_button(submenu_widget,
-                   "XMan",
-                   antiright_system_cb,
-                   "xman &");
-  antiright_button(submenu_widget,
-                   "XMMS",
-                   antiright_system_cb,
-                   "xmms &");
+  antiright_button(submenu_widget,"VI",antiright_system_cb,"xterm -e vi &");
+  antiright_button(submenu_widget,"XClock",antiright_system_cb,"xclock &");
+  antiright_button(submenu_widget,"XLoad",antiright_system_cb,"xload &");
+  antiright_button(submenu_widget,"XMan",antiright_system_cb,"xman &");
+  antiright_button(submenu_widget,"XMMS",antiright_system_cb,"xmms &");
 }
 
 void