Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20

1 files changed, 126 insertions, 14 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 8a2955654e..7a0a78bb50 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -9,11 +9,22 @@
  width="802">
     <menu
      create_jump_keys="true"
-     label="File"
+     label="Me"
      layout="topleft"
      name="File">
         <menu_item_call
-         label="Quit"
+         label="Preferences"
+         layout="topleft"
+         name="Preferences..."
+         shortcut="control|P">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="preferences" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_call
+         label="Quit [APP_NAME]"
          layout="topleft"
          name="Quit"
          shortcut="control|Q">
@@ -21,22 +32,15 @@
              function="File.Quit" />
         </menu_item_call>
     </menu>
+<!-- Edit menu merged into the Me menu above
     <menu
      create_jump_keys="true"
      label="Edit"
      layout="topleft"
      name="Edit"
      width="153">
-        <menu_item_call
-         label="Preferences..."
-         layout="topleft"
-         name="Preferences..."
-         shortcut="control|P">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="preferences" />
-        </menu_item_call>
     </menu>
+-->
     <menu
      create_jump_keys="true"
      label="Help"
@@ -51,6 +55,8 @@
              function="ShowFloater"
              parameter="help f1" />
         </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
         <menu_item_call
          label="About [APP_NAME]"
          layout="topleft"
@@ -64,9 +70,115 @@
      create_jump_keys="true"
      label="Debug"
      layout="topleft"
-     name="Debug">
+     name="Debug"
+     tear_off="true">
+      <!-- Need a copy of the edit menu here so keyboard shortcuts like
+           control-C work to copy text at login screen and About dialog (for QA)
+      -->
+      <menu
+       create_jump_keys="true"
+       label="Edit"
+       layout="topleft"
+       name="Edit"
+       tear_off="true">
+        <menu_item_call
+         label="Undo"
+         layout="topleft"
+         name="Undo"
+         shortcut="control|Z">
+          <menu_item_call.on_click
+           function="Edit.Undo" />
+          <menu_item_call.on_enable
+           function="Edit.EnableUndo" />
+        </menu_item_call>
+        <menu_item_call
+         label="Redo"
+         layout="topleft"
+         name="Redo"
+         shortcut="control|Y">
+          <menu_item_call.on_click
+           function="Edit.Redo" />
+          <menu_item_call.on_enable
+           function="Edit.EnableRedo" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
         <menu_item_call
-         label="Debug Settings"
+         label="Cut"
+         layout="topleft"
+         name="Cut"
+         shortcut="control|X">
+          <menu_item_call.on_click
+           function="Edit.Cut" />
+          <menu_item_call.on_enable
+           function="Edit.EnableCut" />
+        </menu_item_call>
+        <menu_item_call
+         label="Copy"
+         layout="topleft"
+         name="Copy"
+         shortcut="control|C">
+          <menu_item_call.on_click
+           function="Edit.Copy" />
+          <menu_item_call.on_enable
+           function="Edit.EnableCopy" />
+        </menu_item_call>
+        <menu_item_call
+         label="Paste"
+         layout="topleft"
+         name="Paste"
+         shortcut="control|V">
+          <menu_item_call.on_click
+           function="Edit.Paste" />
+          <menu_item_call.on_enable
+           function="Edit.EnablePaste" />
+        </menu_item_call>
+        <menu_item_call
+         label="Delete"
+         layout="topleft"
+         name="Delete"
+         shortcut="Del">
+          <menu_item_call.on_click
+           function="Edit.Delete" />
+          <menu_item_call.on_enable
+           function="Edit.EnableDelete" />
+        </menu_item_call>
+        <menu_item_call
+         label="Duplicate"
+         layout="topleft"
+         name="Duplicate"
+         shortcut="control|D">
+          <menu_item_call.on_click
+           function="Edit.Duplicate" />
+          <menu_item_call.on_enable
+           function="Edit.EnableDuplicate" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_call
+         label="Select All"
+         layout="topleft"
+         name="Select All"
+         shortcut="control|A">
+          <menu_item_call.on_click
+           function="Edit.SelectAll" />
+          <menu_item_call.on_enable
+           function="Edit.EnableSelectAll" />
+        </menu_item_call>
+        <menu_item_call
+         label="Deselect"
+         layout="topleft"
+         name="Deselect"
+         shortcut="control|E">
+          <menu_item_call.on_click
+           function="Edit.Deselect" />
+          <menu_item_call.on_enable
+           function="Edit.EnableDeselect" />
+        </menu_item_call>
+      </menu>
+      <menu_item_separator />
+      <menu_item_call
+         label="Debug Settings editor"
          layout="topleft"
          name="Debug Settings">
             <menu_item_call.on_click
@@ -83,7 +195,7 @@
         </menu_item_call>
         <menu_item_separator />
         <menu_item_call
-         label="UI Preview Tool"
+         label="XUI Preview Tool"
          layout="topleft"
          name="UI Preview Tool"
          shortcut="control|T">