mirror of
https://github.com/Molunerfinn/PicGo.git
synced 2024-04-21 10:31:33 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5fb11f5d89 | ||
|
|
f78bfda258 | ||
|
|
21ceafe649 | ||
|
|
fecd35cb06 | ||
|
|
4a9623e49f | ||
|
|
e1ed998153 | ||
|
|
3a97d019d1 |
@@ -1,3 +1,4 @@
|
||||
test/unit/coverage/**
|
||||
test/unit/*.js
|
||||
test/e2e/*.js
|
||||
dist/
|
||||
+2
-2
@@ -37,7 +37,7 @@ install:
|
||||
script:
|
||||
#- xvfb-maybe node_modules/.bin/karma start test/unit/karma.conf.js
|
||||
#- yarn run pack && xvfb-maybe node_modules/.bin/mocha test/e2e
|
||||
- yarn run build
|
||||
- npm run release
|
||||
- yarn run build:docs
|
||||
branches:
|
||||
only:
|
||||
@@ -49,4 +49,4 @@ after_script:
|
||||
- git config user.email "marksz@teamsz.xyz"
|
||||
- git add .
|
||||
- git commit -m "Travis build docs"
|
||||
- git push --force --quiet "https://${GITHUB_TOKEN}@github.com/Molunerfinn/PicGo.git" master:gh-pages
|
||||
- git push --force --quiet "https://${GH_TOKEN}@github.com/Molunerfinn/PicGo.git" master:gh-pages
|
||||
|
||||
+2
-2
@@ -74,7 +74,7 @@ h1
|
||||
position relative
|
||||
.mask
|
||||
position absolute
|
||||
width 100vw
|
||||
width 100%
|
||||
height 100vh
|
||||
top 0
|
||||
left 0
|
||||
@@ -82,7 +82,7 @@ h1
|
||||
z-index -1
|
||||
#header
|
||||
height 100vh
|
||||
width 100vw
|
||||
width 100%
|
||||
background-image url("https://ws1.sinaimg.cn/large/8700af19ly1fm9ru6fqvjj22p81stdta")
|
||||
background-attachment fixed
|
||||
background-size cover
|
||||
|
||||
+3
-2
@@ -1,12 +1,13 @@
|
||||
{
|
||||
"name": "picgo",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.3",
|
||||
"author": "Molunerfinn <marksz@teamsz.xyz>",
|
||||
"description": "Easy to upload your pic & copy to write",
|
||||
"license": "MIT",
|
||||
"main": "./dist/electron/main.js",
|
||||
"scripts": {
|
||||
"build": "node .electron-vue/build.js && electron-builder --publish onTagOrDraft",
|
||||
"build": "node .electron-vue/build.js && electron-builder",
|
||||
"release": "node .electron-vue/build.js && electron-builder",
|
||||
"build:dir": "node .electron-vue/build.js && electron-builder --dir",
|
||||
"build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
|
||||
"build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
|
||||
|
||||
@@ -15,6 +15,7 @@ if (process.env.NODE_ENV !== 'development') {
|
||||
let window
|
||||
let settingWindow
|
||||
let tray
|
||||
let menu
|
||||
const winURL = process.env.NODE_ENV === 'development'
|
||||
? `http://localhost:9080`
|
||||
: `file://${__dirname}/index.html`
|
||||
@@ -168,6 +169,30 @@ const createSettingWindow = () => {
|
||||
})
|
||||
}
|
||||
|
||||
const createMenu = () => {
|
||||
const template = [{
|
||||
label: 'Edit',
|
||||
submenu: [
|
||||
{ label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
|
||||
{ label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' },
|
||||
{ type: 'separator' },
|
||||
{ label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
|
||||
{ label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
|
||||
{ label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
|
||||
{ label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' },
|
||||
{
|
||||
label: 'Quit',
|
||||
accelerator: 'CmdOrCtrl+Q',
|
||||
click () {
|
||||
app.quit()
|
||||
}
|
||||
}
|
||||
]
|
||||
}]
|
||||
menu = Menu.buildFromTemplate(template)
|
||||
Menu.setApplicationMenu(menu)
|
||||
}
|
||||
|
||||
const getWindowPosition = () => {
|
||||
const windowBounds = window.getBounds()
|
||||
const trayBounds = tray.getBounds()
|
||||
@@ -232,6 +257,7 @@ ipcMain.on('uploadChoosedFiles', async (evt, files) => {
|
||||
app.on('ready', () => {
|
||||
createWindow()
|
||||
createTray()
|
||||
createMenu()
|
||||
})
|
||||
|
||||
app.on('window-all-closed', () => {
|
||||
@@ -244,6 +270,7 @@ app.on('activate', () => {
|
||||
if (window === null || settingWindow === null) {
|
||||
createWindow()
|
||||
createTray()
|
||||
createMenu()
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user