Merge branch 'v2.0.x' into v2.1.x

CHANGELOG.md

@@ -17,6 +17,11 @@
 
 ![chunk-1.png](https://i.loli.net/2019/01/28/5c4e8868f178a.png)
 
+### 文件管理
+
+* 编辑文件标签打开时显示正在编辑的文件的「IP地址」和「绝对路径」 (#129)
+* 编辑文件「保存」按钮移动到右侧
+
 ### 插件市场
 
 * 支持使用代理访问插件市场,当配置了代理之后，默认开启

source/modules/filemanager/index.js

@@ -809,6 +809,7 @@ class FileManager {
     let editor = null;
     let codes = '';
     let win;
+    let hinttext = '';
     if (openfileintab == false){
       win = this.createWin({
         title: LANG['editor']['title'](path),
@@ -823,6 +824,7 @@ class FileManager {
         null, null, true, true
       );
       win = antSword['tabbar'].cells(`tab_file_${_id}`);
+      hinttext = `IP:${this.opts['ip']} File:${path}`;
     }
 
     win.progressOn();
@@ -854,9 +856,11 @@ class FileManager {
       _options.push(_opt);
     }
     toolbar.loadStruct([
-      { id: 'save', type: 'button', icon: 'save', text: LANG['editor']['toolbar']['save'] },
+      { id: 'hinttext', type: 'text', text: hinttext},
       { type: 'separator' },
       { type: 'spacer' },
+      { id: 'save', type: 'button', icon: 'save', text: LANG['editor']['toolbar']['save'] },
+      { type: 'separator' },
       {
         id: 'encode', type: 'buttonSelect', icon: 'language', openAll: true,
         text: LANG['editor']['toolbar']['encode'],