diff --git a/package.json b/package.json index bfdb58bb..29661b73 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "marktext", - "version": "0.8.4", + "version": "0.8.8", "author": "Jocs ", "description": "Next generation markdown editor", "license": "MIT", diff --git a/src/main/actions/file.js b/src/main/actions/file.js index 7e63a41f..b2a17d86 100644 --- a/src/main/actions/file.js +++ b/src/main/actions/file.js @@ -6,7 +6,7 @@ import path from 'path' import { app, dialog, ipcMain, BrowserWindow } from 'electron' import createWindow, { windows } from '../createWindow' import { EXTENSIONS, EXTENSION_HASN } from '../config' -import { getPath, log } from '../utils' +import { getPath, log, isMarkdownFile } from '../utils' import userPreference from '../preference' const watchAndReload = (pathname, win) => { // when i build, and failed. @@ -124,6 +124,15 @@ ipcMain.on('AGANI::close-window', e => { forceClose(win) }) +ipcMain.on('AGANI::window::drop', (e, fileList) => { + for (const file of fileList) { + if (isMarkdownFile(file)) { + createWindow(file) + break + } + } +}) + export const exportFile = (win, type) => { win.webContents.send('AGANI::export', { type }) } diff --git a/src/main/index.js b/src/main/index.js index 98e78a1e..eacb08de 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -1,11 +1,10 @@ 'use strict' import './globalSetting' -import { app, ipcMain, Menu } from 'electron' +import { app, Menu } from 'electron' import configureMenu, { dockMenu } from './menus' import createWindow, { windows } from './createWindow' import { isMarkdownFile } from './utils' -// import { autoUpdater } from "electron-updater" let openFilesCache = [] @@ -59,12 +58,3 @@ app.on('activate', () => { onReady() } }) - -ipcMain.on('AGANI::window::drop', (e, fileList) => { - for (const file of fileList) { - if (isMarkdownFile(file)) { - createWindow(file) - break - } - } -}) diff --git a/src/main/preference.js b/src/main/preference.js index 4ef06463..ed2f55ee 100644 --- a/src/main/preference.js +++ b/src/main/preference.js @@ -66,7 +66,6 @@ ipcMain.on('AGANI::ask-for-user-preference', e => { ipcMain.on('AGANI::set-user-preference', (e, pre) => { Object.keys(pre).map(key => { - console.log(key, pre[key]) preference.setItem(key, pre[key]) .then(() => {}) .catch(log) diff --git a/src/renderer/app.vue b/src/renderer/app.vue index 8c40202d..205b1c91 100644 --- a/src/renderer/app.vue +++ b/src/renderer/app.vue @@ -58,7 +58,7 @@ BottomBar, SourceCode, UploadImage, - AboutDialog + AboutDialog, Font }, data () { diff --git a/src/renderer/components/about/index.vue b/src/renderer/components/about/index.vue index fb54c4a7..9b6a6d96 100644 --- a/src/renderer/components/about/index.vue +++ b/src/renderer/components/about/index.vue @@ -19,6 +19,7 @@
Copyright © 2018 Jocs
+ @@ -61,6 +62,8 @@ } .about-dialog .logo { + width: 100px; + height: 100px; display: inherit; margin: 0 auto; } diff --git a/src/renderer/main.js b/src/renderer/main.js index 99e2b31a..b06287fb 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -9,7 +9,7 @@ import store from './store' import './assets/symbolIcon' import './index.css' -import { Dialog, Form, FormItem, InputNumber, Button, Tooltip, Upload, Slider, ColorPicker } from 'element-ui' +import { Dialog, Form, FormItem, InputNumber, Button, Tooltip, Upload, Slider, ColorPicker, Col, Row } from 'element-ui' // In the renderer process: // var webFrame = require('electron').webFrame // var SpellCheckProvider = require('electron-spell-check-provider') @@ -48,6 +48,8 @@ Vue.use(Tooltip) Vue.use(Upload) Vue.use(Slider) Vue.use(ColorPicker) +Vue.use(Col) +Vue.use(Row) if (!process.env.IS_WEB) Vue.use(require('vue-electron')) Vue.http = Vue.prototype.$http = axios