From 63ad13af8761de8b4118338882ee4af077790962 Mon Sep 17 00:00:00 2001
From: qinyuhang <qinyuhangxiaoxiang@gmail.com>
Date: Tue, 30 Aug 2016 17:49:55 +0800
Subject: [PATCH] Make import and export panel top window

Make import and export panel top window
---
 ShadowsocksX-NG/BunchImportUtils.swift | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ShadowsocksX-NG/BunchImportUtils.swift b/ShadowsocksX-NG/BunchImportUtils.swift
index d7ee534..7e9d3a6 100644
--- a/ShadowsocksX-NG/BunchImportUtils.swift
+++ b/ShadowsocksX-NG/BunchImportUtils.swift
@@ -17,7 +17,7 @@ func showExampleConfigFile() {
     //copy file to ~/Downloads folder
     let filePath:String = NSBundle.mainBundle().bundlePath + "/Contents/Resources/example-gui-config.json"
     let fileMgr = NSFileManager.defaultManager()
-    let dataPath = NSHomeDirectory().stringByAppendingString("/Downloads")
+    let dataPath = NSHomeDirectory() + "/Downloads"
     let destPath = dataPath + "/example-gui-config.json"
     //检测文件是否已经存在，如果存在直接用sharedWorkspace显示
     if fileMgr.fileExistsAtPath(destPath) {
@@ -36,6 +36,7 @@ func importConfigFile() {
     openPanel.canChooseDirectories = false
     openPanel.canCreateDirectories = false
     openPanel.canChooseFiles = true
+    openPanel.becomeKeyWindow()
     openPanel.beginWithCompletionHandler { (result) -> Void in
         if (result == NSFileHandlingPanelOKButton && (openPanel.URL) != nil) {
             let fileManager = NSFileManager.defaultManager()
@@ -112,13 +113,13 @@ func exportConfigFile() {
         configProfile.setValue(profile.remark, forKey: "remarks")
         configProfile.setValue(profile.remark.dataUsingEncoding(NSUTF8StringEncoding)?.base64EncodedStringWithOptions(NSDataBase64EncodingOptions(rawValue: 0)), forKey: "remarks_base64")
         //ssr
-        if  1 == 1 {
+        if  profile.ssrObfs != "" {
             configProfile.setValue(profile.ssrObfs, forKey: "obfs")
             configProfile.setValue(profile.ssrProtocol, forKey: "protocol")
-            if 2 == 2 {
+            if profile.ssrObfsParam != "" {
                 configProfile.setValue(profile.ssrObfsParam, forKey: "obfsparam")
             }
-            if 3 == 3 {
+            if profile.ssrProtocolParam != "" {
                 configProfile.setValue(profile.ssrProtocolParam, forKey: "protoclparam")
             }
         }
@@ -132,6 +133,7 @@ func exportConfigFile() {
     savePanel.canCreateDirectories = true
     savePanel.allowedFileTypes = ["json"]
     savePanel.nameFieldStringValue = "export.json"
+    savePanel.becomeKeyWindow()
     savePanel.beginWithCompletionHandler { (result) -> Void in
         if (result == NSFileHandlingPanelOKButton && (savePanel.URL) != nil) {
             //write jsonArr1 back to file