mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 02:10:08 +00:00
added starting of ui from cli, still hackish...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
c0ecc7df80
commit
eb800f9c70
@ -433,7 +433,9 @@ module.PortableAppControl = core.ImageGridFeatures.Feature({
|
|||||||
|
|
||||||
//---------------------------------------------------------------------
|
//---------------------------------------------------------------------
|
||||||
|
|
||||||
// XXX would be nice to store/restore dev-tools state...
|
// XXX should we create and show the window here???
|
||||||
|
// ...if yes, then we'll need to start the ui features later as
|
||||||
|
// they need the dom ready...
|
||||||
var WindowedAppControlActions = actions.Actions({
|
var WindowedAppControlActions = actions.Actions({
|
||||||
config: {
|
config: {
|
||||||
// Window state:
|
// Window state:
|
||||||
@ -454,7 +456,6 @@ var WindowedAppControlActions = actions.Actions({
|
|||||||
'show-splash-screen': 'on',
|
'show-splash-screen': 'on',
|
||||||
},
|
},
|
||||||
|
|
||||||
// XXX revise these...
|
|
||||||
close: ['File|Window/Close viewer',
|
close: ['File|Window/Close viewer',
|
||||||
function(){
|
function(){
|
||||||
this.stop()
|
this.stop()
|
||||||
@ -525,9 +526,6 @@ var WindowedAppControlActions = actions.Actions({
|
|||||||
})],
|
})],
|
||||||
})
|
})
|
||||||
|
|
||||||
// XXX store/load window state...
|
|
||||||
// - size
|
|
||||||
// - state (fullscreen/normal)
|
|
||||||
var WindowedAppControl =
|
var WindowedAppControl =
|
||||||
module.WindowedAppControl = core.ImageGridFeatures.Feature({
|
module.WindowedAppControl = core.ImageGridFeatures.Feature({
|
||||||
title: '',
|
title: '',
|
||||||
@ -558,6 +556,7 @@ module.WindowedAppControl = core.ImageGridFeatures.Feature({
|
|||||||
function(){
|
function(){
|
||||||
// we are going to declare ready ourselves...
|
// we are going to declare ready ourselves...
|
||||||
this.requestReadyAnnounce() }],
|
this.requestReadyAnnounce() }],
|
||||||
|
// XXX should we create and show the window here???
|
||||||
['start',
|
['start',
|
||||||
function(){
|
function(){
|
||||||
var that = this
|
var that = this
|
||||||
|
|||||||
@ -23,6 +23,7 @@ if(typeof(process) != 'undefined'){
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*********************************************************************/
|
/*********************************************************************/
|
||||||
|
|
||||||
// setup logger...
|
// setup logger...
|
||||||
@ -215,6 +216,8 @@ module.CLI = core.ImageGridFeatures.Feature({
|
|||||||
actions: CLIActions,
|
actions: CLIActions,
|
||||||
|
|
||||||
handlers: [
|
handlers: [
|
||||||
|
// XXX sort out different run/stop/exit paths -- make this more
|
||||||
|
// systematic...
|
||||||
['ready',
|
['ready',
|
||||||
function(){
|
function(){
|
||||||
var that = this
|
var that = this
|
||||||
@ -363,7 +366,7 @@ module.CLI = core.ImageGridFeatures.Feature({
|
|||||||
// npm install -g nwjs
|
// npm install -g nwjs
|
||||||
// npm link nwjs
|
// npm link nwjs
|
||||||
// nw install 0.14.5-sdk
|
// nw install 0.14.5-sdk
|
||||||
.option('gui, --gui', 'start ImageGrid.Viewer', function(){
|
.option('nw, --nw', 'start ImageGrid.Viewer (nw)', function(){
|
||||||
throw new Error('ig: GUI startup not implemented.')
|
throw new Error('ig: GUI startup not implemented.')
|
||||||
|
|
||||||
var path = requirejs('path')
|
var path = requirejs('path')
|
||||||
@ -374,6 +377,25 @@ module.CLI = core.ImageGridFeatures.Feature({
|
|||||||
|
|
||||||
keep_running = true
|
keep_running = true
|
||||||
})
|
})
|
||||||
|
.option('electron, --electron', 'start ImageGrid.Viewer (electron)', function(){
|
||||||
|
var path = requirejs('path')
|
||||||
|
|
||||||
|
requirejs('child_process')
|
||||||
|
.spawn(requirejs('electron'), [
|
||||||
|
path.join(
|
||||||
|
path.dirname(nodeRequire.main.filename),
|
||||||
|
'e.js')])
|
||||||
|
// XXX need to stop the process iff nothing
|
||||||
|
// else is running, like repl...
|
||||||
|
// XXX feels hackish...
|
||||||
|
.on('exit', function(){
|
||||||
|
(!global.ig
|
||||||
|
|| global.ig.isStopped())
|
||||||
|
&& process.exit()
|
||||||
|
})
|
||||||
|
|
||||||
|
keep_running = true
|
||||||
|
})
|
||||||
|
|
||||||
/* // XXX the problem with this is that it still tires
|
/* // XXX the problem with this is that it still tires
|
||||||
// to find and run 'ig-index'...
|
// to find and run 'ig-index'...
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user