fix shortcut invalid

modify shortcut tip in different system
modify UI bug
fix mode change logic && shortcut

app/moe-config-default.js

@@ -25,8 +25,8 @@ module.exports = {
     'scale-factor': 1.0,
     'tab-size': 4,
     'edit-mode': 'preview',
-    'edit-mode-read': 'read-mode-wide',
-    'edit-mode-write': 'write-mode-wide',
+    'edit-mode-read': 'read',
+    'edit-mode-write': 'write',
     'focus-mode': false,
     'editor-font': 'default',
     'editor-theme': 'base16-light',

app/moe-menu.js

@@ -65,13 +65,13 @@ module.exports = (cb) => {
                     submenu: [
                         {
                             localize() { this.label = 'HTML...'; },
-                            accelerator: 'CmdOrCtrl+Shift+E',
+                            // accelerator: 'CmdOrCtrl+Shift+E',
                             click(item, hexoWindow) {
                                 cb.fileExportHTML(hexoWindow);
                             }
                         }, {
                             localize() { this.label = 'PDF...'; },
-                            accelerator: 'CmdOrCtrl+Shift+P',
+                            // accelerator: 'CmdOrCtrl+Shift+P',
                             click(item, hexoWindow) {
                                 cb.fileExportPDF(hexoWindow);
                             }
@@ -194,8 +194,8 @@ module.exports = (cb) => {
             role: 'help',
             submenu: [
                 {
-                    localize() { this.label = 'Moeditor on GitHub'; },
-                    click() { require('electron').shell.openExternal('https://github.com/Moeditor/Moeditor'); }
+                    localize() { this.label = 'HexoEditor on GitHub'; },
+                    click() { require('electron').shell.openExternal('https://github.com/zhuzhuyule/HexoEditor'); }
                 },
             ]
         },
@@ -207,7 +207,7 @@ module.exports = (cb) => {
             label: name,
             submenu: [
                 {
-                    localize() { this.label = __('About') + ' Moeditor'; },
+                    localize() { this.label = __('About') + ' HexoEditor'; },
                     click() {
                         cb.about();
                     }
@@ -234,7 +234,7 @@ module.exports = (cb) => {
                     type: 'separator'
                 },
                 {
-                    localize() { this.label = __('Hide') + ' Moeditor'; },
+                    localize() { this.label = __('Hide') + ' HexoEditor'; },
                     role: 'hide'
                 },
                 {
@@ -249,7 +249,7 @@ module.exports = (cb) => {
                     type: 'separator'
                 },
                 {
-                    localize() { this.label = __('Quit') + ' Moeditor'; },
+                    localize() { this.label = __('Quit') + ' HexoEditor'; },
                     role: 'quit'
                 },
             ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "HexoEditor",
-  "version": "1.4.26",
+  "version": "1.5.28",
   "description": "This is markdown editor for Hexo.",
   "main": "app/index.js",
   "scripts": {

views/main/index.html

@@ -73,7 +73,7 @@
         <li data-action="export-as-html" class="l10n">Export as HTML</li>
         <li data-action="export-as-pdf" class="l10n">Export as PDF</li>
         <li class="break"></li>
-        <li data-action="settings" class="l10n">Settings</li>
+        <li data-action="settings" class="l10n" title="Ctrl+Alt+S">Settings</li>
         <li data-action="about" class="l10n">About</li>
     </ul>
 </div>

views/main/moe-document.js

@@ -146,6 +146,28 @@ $(() => {
 
     hexoWindow.window.show();
 
+    //Mac 下应该做的改变
+    if(process.platform !== 'darwin'){
+        document.querySelectorAll('#side-menu li[title],#cover-bottom-right>div[exdata]').forEach(
+            function (item) {
+                let value = item.getAttribute('title');
+                if (/^Ctrl(.*)$/.test(value)) {
+                    value = value.replace(/^Ctrl(.*)$/,'Cmd$1');
+                    item.setAttribute('title',value);
+                }
+
+                if(item.hasAttribute('exdata')){
+                    value = item.getAttribute('title');
+                    if (/\(Ctrl\+/.test(value)) {
+                        value = value.replace(/\(Ctrl\+/,'(Cmd+');
+                        item.setAttribute('title',value);
+                    }
+                }
+            }
+        )
+    }
+
+
     $("#main-container div").mousemove(function (e) {
         // $('.scrolling').removeClass('scrolling');
         if (e.clientX + 100 > this.offsetWidth + this.offsetLeft)
@@ -179,24 +201,7 @@ $(() => {
         }
     );
 
-    function replaceImgSelection(codeMirror, title, relativePath) {
-        codeMirror.replaceSelection(`![${title}](${relativePath})`);
-    }
-
-    window.pasteData = (codeMirror) => {
-        if (!codeMirror)
-            codeMirror = editor;
-        let image = clipboard.readImage();
-        if (!image.isEmpty()) {
-            let imageTitle = codeMirror.getSelection();
-            replaceImgSelection(codeMirror, imageTitle, imgManager.getImageOfObj(image,imageTitle));
-        } else {
-            codeMirror.replaceSelection(clipboard.readText())
-        }
-    };
 
-    var prastDataKey = (process.platform === 'darwin' ? "Cmd" : "Ctrl") + "-V";
-    editor.options.extraKeys[prastDataKey] = pasteData;
 
      window.changeFileName = (force) => {
         if (!force && hexoWindow.defName !== hexoWindow.fileName)

views/main/moe-mode.js

@@ -48,21 +48,22 @@ document.addEventListener('DOMContentLoaded', () => {
 
     window.editor.focus();
 
+    let OldModule = '';
     require('electron').ipcRenderer.on('change-edit-mode', (e, arg) => {
-        if (arg === 'read' || arg === 'write')
-            setMode(moeApp.config.get('edit-mode-' + arg));
-        else if (arg === 'change') {
-            if (document.querySelector('.write'))
-                setMode(moeApp.config.get('edit-mode-read'));
-            else
-                setMode(moeApp.config.get('edit-mode-write'));
+        if (arg === 'read' || arg === 'write'|| arg === 'preview'){
+            if (window.editMode == arg){
+                setMode(OldModule);
+            }else{
+                OldModule = window.editMode || 'preview'
+                setMode(arg);
+            }
         } else if (arg === 'changepreview') {
             if (document.querySelector('.write'))
                 setMode('preview');
             else if (document.querySelector('.read'))
-                setMode(moeApp.config.get('edit-mode-write'));
+                setMode('write');
             else
-                setMode(moeApp.config.get('edit-mode-read'));
+                setMode('read');
         } else
             setMode('preview');
     });

views/main/moe-style.css

@@ -130,6 +130,7 @@ body{
     top: 1px !important;
     width: calc(100% - 2px) !important;
     height: calc(100% - 2px) !important;
+    overflow: hidden !important;
 }
 
 #main-container {