Skip to content

Commit 1312985

Browse files
GetToSetigorkulman
authored andcommitted
Allow closing editor from menu and open from dock
1 parent ec08412 commit 1312985

9 files changed

Lines changed: 35 additions & 0 deletions

File tree

sources/LocalizationEditor/AppDelegate.swift

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,26 @@ import Cocoa
1313
class AppDelegate: NSObject, NSApplicationDelegate {
1414
@IBOutlet weak var openFolderMenuItem: NSMenuItem!
1515

16+
private static var editorWindow: NSWindow? {
17+
return NSApp.windows.first(where: { $0.windowController is WindowController })
18+
}
19+
1620
func applicationDidFinishLaunching(_: Notification) {}
1721

1822
func applicationWillTerminate(_: Notification) {}
23+
24+
func applicationOpenUntitledFile(_ sender: NSApplication) -> Bool {
25+
showEditorWindow()
26+
return true
27+
}
28+
29+
private func showEditorWindow() {
30+
if let editorWindow = Self.editorWindow {
31+
editorWindow.makeKeyAndOrderFront(nil)
32+
} else {
33+
let mainStoryboard = NSStoryboard(name: NSStoryboard.Name("Main"), bundle: nil)
34+
let editorWindowController = mainStoryboard.instantiateInitialController() as! WindowController
35+
editorWindowController.showWindow(self)
36+
}
37+
}
1938
}

sources/LocalizationEditor/Resources/de.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"view" = "Ansicht";
1515
"file" = "Datei";
1616
"open_folder_with" = "Öffne einen Ordner mit Übersetzungsdateien …";
17+
"close" = "Schließen";
1718
"edit" = "Bearbeiten";
1819
"cut" = "Ausschneiden";
1920
"copy" = "Kopieren";

sources/LocalizationEditor/Resources/en.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"view" = "View";
1414
"file" = "File";
1515
"open_folder_with" = "Open folder with localization files...";
16+
"close" = "Close";
1617
"edit" = "Edit";
1718
"cut" = "Cut";
1819
"copy" = "Copy";

sources/LocalizationEditor/Resources/es.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"view" = "Vista";
1414
"file" = "Fichero";
1515
"open_folder_with" = "Abrir carpeta con ficheros de traducción...";
16+
"close" = "Cerrar";
1617
"edit" = "Editar";
1718
"cut" = "Cortar";
1819
"copy" = "Copiar";

sources/LocalizationEditor/Resources/hr.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"view" = "Prikaz";
1515
"file" = "Datoteka";
1616
"open_folder_with" = "Otvori mapu s prevodilačkim datotekama …";
17+
"close" = "Zatvori";
1718
"edit" = "Uredi";
1819
"cut" = "Izreži";
1920
"copy" = "Kopiraj";

sources/LocalizationEditor/Resources/ru.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"view" = "Вид";
1414
"file" = "Файл";
1515
"open_folder_with" = "Открыть папку с файлами локализации ...";
16+
"close" = "Закрыть";
1617
"edit" = "Правка";
1718
"cut" = "Вырезать";
1819
"copy" = "Скопировать";

sources/LocalizationEditor/Resources/zh-Hans.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"view" = "视图";
1414
"file" = "文件";
1515
"open_folder_with" = "打开带有本地化文件的文件夹...";
16+
"close" = "关闭";
1617
"edit" = "编辑";
1718
"cut" = "剪切";
1819
"copy" = "复制";

sources/LocalizationEditor/Resources/zh-Hant.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"add" = "增加";
1212
"all" = "全部語言";
1313
"bring_all_to_front" = "全部視窗往前";
14+
"close" = "關閉";
1415
"cancel" = "取消";
1516
"comment" = "註解";
1617
"copy" = "複製";

sources/LocalizationEditor/UI/Base.lproj/Main.storyboard

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@
8383
<userDefinedRuntimeAttribute type="string" keyPath="localizableString" value="open_folder_with"/>
8484
</userDefinedRuntimeAttributes>
8585
</menuItem>
86+
<menuItem isSeparatorItem="YES" id="LVj-0e-nvV"/>
87+
<menuItem title="Close" keyEquivalent="w" id="v5v-W3-iIa">
88+
<userDefinedRuntimeAttributes>
89+
<userDefinedRuntimeAttribute type="string" keyPath="localizableString" value="close"/>
90+
</userDefinedRuntimeAttributes>
91+
<connections>
92+
<action selector="performClose:" target="Ady-hI-5gd" id="VLN-3G-rEe"/>
93+
</connections>
94+
</menuItem>
8695
</items>
8796
<userDefinedRuntimeAttributes>
8897
<userDefinedRuntimeAttribute type="string" keyPath="localizableString" value="file"/>

0 commit comments

Comments
 (0)