mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-20 15:37:46 +03:00
Add Windows file.ico lost in move to new build
This commit is contained in:
parent
604aac782c
commit
3eb55d7db0
@ -73,11 +73,8 @@ function copyNonASARResources (packagedAppPath, bundledResourcesPath) {
|
||||
} else if (process.platform === 'linux') {
|
||||
fs.copySync(path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'png', '1024.png'), path.join(packagedAppPath, 'atom.png'))
|
||||
} else if (process.platform === 'win32') {
|
||||
fs.copySync(path.join('resources', 'win', 'atom.cmd'), path.join(bundledResourcesPath, 'cli', 'atom.cmd'))
|
||||
fs.copySync(path.join('resources', 'win', 'atom.sh'), path.join(bundledResourcesPath, 'cli', 'atom.sh'))
|
||||
fs.copySync(path.join('resources', 'win', 'atom.js'), path.join(bundledResourcesPath, 'cli', 'atom.js'))
|
||||
fs.copySync(path.join('resources', 'win', 'apm.cmd'), path.join(bundledResourcesPath, 'cli', 'apm.cmd'))
|
||||
fs.copySync(path.join('resources', 'win', 'apm.sh'), path.join(bundledResourcesPath, 'cli', 'apm.sh'))
|
||||
[ 'atom.cmd', 'atom.sh', 'atom.js', 'apm.cmd', 'apm.sh', 'file.ico' ]
|
||||
.forEach(file => fs.copySync(path.join('resources', 'win', file), path.join(bundledResourcesPath, 'cli', file)))
|
||||
}
|
||||
|
||||
console.log(`Writing LICENSE.md to ${bundledResourcesPath}`)
|
||||
|
@ -854,16 +854,21 @@ class AtomEnvironment extends Model
|
||||
@blobStore.save()
|
||||
|
||||
saveState: (options) ->
|
||||
console.log('environment.saveState\n')
|
||||
new Promise (resolve, reject) =>
|
||||
if @enablePersistence and @project
|
||||
state = @serialize(options)
|
||||
console.log('environment.saveState serialized\n')
|
||||
savePromise =
|
||||
if storageKey = @getStateKey(@project?.getPaths())
|
||||
@stateStore.save(storageKey, state)
|
||||
console.log('environment.saveState saved\n')
|
||||
else
|
||||
@applicationDelegate.setTemporaryWindowState(state)
|
||||
console.log('environment.saveState caching\n')
|
||||
savePromise.catch(reject).then(resolve)
|
||||
else
|
||||
console.log('environment.saveState resolving\n')
|
||||
resolve()
|
||||
|
||||
loadState: ->
|
||||
|
@ -96,10 +96,13 @@ class AtomApplication
|
||||
@launch(options)
|
||||
|
||||
destroy: ->
|
||||
console.log('application-destroy\n')
|
||||
windowsClosePromises = @windows.map (window) ->
|
||||
window.close()
|
||||
window.closedPromise
|
||||
console.log('application-destroy promising\n')
|
||||
Promise.all(windowsClosePromises).then(=> @disposable.dispose())
|
||||
console.log('application-destroy complete\n')
|
||||
|
||||
launch: (options) ->
|
||||
if options.pathsToOpen?.length > 0 or options.urlsToOpen?.length > 0 or options.test
|
||||
@ -323,9 +326,11 @@ class AtomApplication
|
||||
win.temporaryState = state
|
||||
|
||||
@disposable.add ipcHelpers.on ipcMain, 'did-cancel-window-unload', =>
|
||||
console.log('did-cancel-window-unload\n')
|
||||
@quitting = false
|
||||
for window in @windows
|
||||
window.didCancelWindowUnload()
|
||||
console.log('did-cancel-window-unload done\n')
|
||||
|
||||
clipboard = require '../safe-clipboard'
|
||||
@disposable.add ipcHelpers.on ipcMain, 'write-text-to-selection-clipboard', (event, selectedText) ->
|
||||
|
Loading…
Reference in New Issue
Block a user