Browse Source

Merge pull request #128 from rsredsq/master

Few editor additions
JoshEngebretson 10 years ago
parent
commit
b557ab6979

+ 2 - 0
AUTHORS.md

@@ -9,6 +9,8 @@
 
 
 - marynate (https://github.com/marynate)
 - marynate (https://github.com/marynate)
 
 
+- rsredsq (https://github.com/rsredsq)
+
 
 
 ### Contribution Copyright and Licensing
 ### Contribution Copyright and Licensing
 
 

+ 14 - 7
Script/AtomicEditor/ui/EditorStrings.ts

@@ -33,15 +33,22 @@ export class EditorString {
 
 
         var lookup = EditorString.lookup;
         var lookup = EditorString.lookup;
 
 
-        var shortcutKey = "⌘";
+        var lookup = EditorString.lookup;
 
 
-        lookup[StringID.RevealInFinder] = "Reveal in Finder";
+        var shortcutKey;
+        if (Atomic.platform == "MacOSX") {
+            shortcutKey = "⌘";
+        } else { // Windows and Linux
+            shortcutKey = "CTRL + "
+        }
 
 
-        // Mac
-        lookup[StringID.ShortcutRedo] = "⇧⌘Z";
-        lookup[StringID.ShortcutFindNext] = "⌘G";
-        lookup[StringID.ShortcutFindPrev] = "⇧⌘G";
-        lookup[StringID.ShortcutBuildSettings] = "⇧⌘B";
+        lookup[StringID.RevealInFinder] = "Reveal in Finder";
+        
+        // Mac, Windows and Linux
+        lookup[StringID.ShortcutRedo] = "⇧" + shortcutKey + "Z";
+        lookup[StringID.ShortcutFindNext] = shortcutKey + "G";
+        lookup[StringID.ShortcutFindPrev] = "⇧" + shortcutKey + "G";
+        lookup[StringID.ShortcutBuildSettings] = "⇧" + shortcutKey + "B";
 
 
         // General
         // General
         lookup[StringID.ShortcutUndo] = shortcutKey + "Z";
         lookup[StringID.ShortcutUndo] = shortcutKey + "Z";

+ 5 - 0
Script/AtomicEditor/ui/ProjectFrameMenu.ts

@@ -63,6 +63,11 @@ class ProjectFrameMenus extends Atomic.ScriptObject {
                 return true;
                 return true;
             }
             }
 
 
+            if (refid == "reveal_folder") {
+                var utils = new Editor.FileUtils();
+                utils.revealInFinder(path);
+                return true;
+            }
         }
         }
 
 
     }
     }