twingle/twingle/content/menu commandset.xul,NONE,1.1 menuoverlay.xul,1.1.1.1,1.2

Update of /cvs/root/twingle/twingle/content/menu
In directory alpha.oscom.org:/tmp/cvs-serv518/content/menu

Modified Files:
	menuoverlay.xul 
Added Files:
	commandset.xul 
Log Message:
Major cleanup after the sprint.  Also:

1) Started menu/commandset.xul to centralize the commands between 
menus, buttons, and keys.

2) Major cleanup of menu items and buttons, removing things that
   weren't implemented.

3) Added Tasks and Window menus from standard Moz.

4) The "New Site" approach is now a wizard that does some
   user-friendly sniffing at the response.



--- NEW FILE: commandset.xul ---
<?xml version="1.0"?>

<overlay id="CommandSetOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
  <commandset id="twingle-commands">

    <command id="twingle-menu-file-new-site:command" 
           oncommand="window.
           openDialog('chrome://twingle/content/workspace/newsite.xul',
!                              'New Site', 'chrome',sitesds);"/>

    <command id="twingle-menu-file-new-article:command"
      oncommand="window
	.openDialog('chrome://twingle/content/workspace/newarticle.xul',
        'newcontent','chrome',sitesds);"/>

    <command id="twingle-menu-file-reload-site:command" 
	     oncommand="sitesds.reloadSelectedSite();"/> 

    <command id="twingle-menu-file-close:command" 
	     oncommand="closeWindow();"/> 

    <command id="twingle-menu-edit-delete:command" 
	     oncommand="sitesds.deleteResource();"/> 

    <command id="twingle-menu-debug-dump:command" 
	     oncommand="dumpDataSourceManagers();"/> 

   <command id="twingle-menu-help-about:command" oncommand="showAboutTwingle();"/>

   <commandset id="tasksCommands"/>

   </commandset> 

</overlay>

Index: menuoverlay.xul
===================================================================
RCS file: /cvs/root/twingle/twingle/content/menu/menuoverlay.xul,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** menuoverlay.xul	5 Mar 2003 19:30:31 -0000	1.1.1.1
--- menuoverlay.xul	19 Mar 2003 17:38:39 -0000	1.2
***************
*** 1,64 ****
  <?xml version="1.0"?>
  
! <overlay id="menuoverlay"
           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
    <menubar id="twingle-menu">
!     <menu id="file-menu" label="File">
!       <menupopup id="file-popup">
!         <menu id="new-menu" label="New">
!           <menupopup id="new-popup">
!             <menuitem label="Site"/>
              <menuseparator/>
!             <menuitem label="Article"/>
!             <menuitem label="Folder"/>
!             <menuitem label="File"/>
!             <menuitem label="Image"/>
            </menupopup>
          </menu>
!         <menuitem label="Connect" key="close-key"
! 		  command="sitesmanager.connectSelectedSite();"/>
!         <menuitem label="Disconnect" key="quit-key"/>
!         <menuseparator/>
! 				
!         <menuitem label="Quit" key="quit-key" 
!                   command="menu-file-close:command" /> 
!       </menupopup>
!     </menu>
!     <menu id="edit-menu" label="Edit">
!       <menupopup id="edit-popup">
!         <menuitem label="Undo"/>
!         <menuitem label="Redo"/>
!         <menuseparator/>
!         <menuitem label="Copy"/>
!         <menuitem label="Cut"/>
!         <menuitem label="Paste"/>
          <menuseparator/>
!         <menuitem label="Preferences"/>
        </menupopup>
      </menu>
!     <menu id="edit-menu" label="View">
!       <menupopup id="edit-popup">
!         <menuitem label="Reload Sites"/>
!         <menuitem id="history-view" label="History" type="checkbox"/>
        </menupopup>
      </menu>
  
!     <menu id="debug-menu" label="Debug">
!       <menupopup id="debug-popup">
  	<menuitem label="Dump Datasources" 
! 		  command="menu-debug-dump:command"/>
        </menupopup>
      </menu>
  
!     <menu id="edit-menu" label="Help">
!       <menupopup id="edit-popup">
!         <menuitem label="Index"/>
!         <menuitem label="Search"/>
!         <menuseparator/>
!         <menuitem label="About Twingle"
!                   command="menu-help-about:command" /> 
        </menupopup>
      </menu>
    </menubar>
  
--- 1,57 ----
  <?xml version="1.0"?>
+ <?xul-overlay href="chrome://global/content/globalOverlay.xul"?> 
+ <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?> 
+ <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?> 
  
! <!DOCTYPE window [ 
! <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > 
! %brandDTD; 
! ]>
! <overlay id="twingle-menuoverlay"
           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
    <menubar id="twingle-menu">
! 
!     <menu id="twingle-file-menu" label="File">
!       <menupopup id="twingle-menu-file-popup">
!         <menu id="twingle-menu-new" label="New">
!           <menupopup id="twingle-menu-new-popup">
!             <menuitem label="Article" command="twingle-menu-file-new-article:command"/>
              <menuseparator/>
!             <menuitem label="Site" command="twingle-menu-file-new-site:command"/>
            </menupopup>
          </menu>
!         <menuitem label="Reload Site" 
! 		  command="twingle-menu-file-reload-site:command"/>
          <menuseparator/>
!         <menuitem label="Close" key="close-key" 
!                   command="twingle-menu-file-close:command" /> 
        </menupopup>
      </menu>
! 
!     <menu id="twingle-menu-edit" label="Edit">
!       <menupopup id="twingle-menu-edit-popup-popup">
! 	<menuitem label="Delete" 
! 		  command="twingle-menu-edit-delete:command"/>
        </menupopup>
      </menu>
  
!     <menu id="twingle-menu-debug" label="Debug">
!       <menupopup id="twingle-menu-debug-popup">
  	<menuitem label="Dump Datasources" 
! 		  command="twingle-menu-debug-dump:command"/>
        </menupopup>
      </menu>
  
!    <menu id="tasksMenu"/> 
!    <menu id="windowMenu"/> 
! 
!     <menu id="twingle-menu-help" label="Help">
!       <menupopup id="twingle-help-popup">
! 	<menuitem label="About Twingle" 
! 		  command="twingle-menu-help-about:command"/>
        </menupopup>
      </menu>
+ 
    </menubar>