some tweaking docs and minor stuff...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2017-09-09 13:47:33 +03:00
parent 24f8cbbcec
commit 8f8ed2d6c9
3 changed files with 40 additions and 14 deletions

View File

@ -486,20 +486,39 @@ var CollectionActions = actions.Actions({
collect: ['- Collections/',
core.doc`Add items to collection
.collect('current', collection)
-> this
.collect('ribbon', collection)
-> this
.collect('loaded', collection)
-> this
.collect(gid, collection)
.collect([gid, ,. ], collection)
-> this
NOTE: this will not account for item topology.`,
function(gids, collection){
var that = this
collection = collection || this.collection
if(collection == null || collection == MAIN_COLLECTION_TITLE){
return
}
var that = this
if(!this.collections || !(collection in this.collections)){
this.newCollection(collection)
}
// create collection if needed...
(!this.collections
|| !(collection in this.collections))
&& this.newCollection(collection)
gids = gids == 'loaded' ? this.data.getImages('loaded')
: gids instanceof Array ? gids
gids = gids == 'loaded' ?
this.data.getImages('loaded')
: gids == 'ribbon' ?
[this.current_ribbon]
: gids instanceof Array ?
gids
: [gids]
gids = gids
.map(function(gid){
@ -543,9 +562,9 @@ var CollectionActions = actions.Actions({
return
}
if(!this.collections || !(collection in this.collections)){
this.newCollection(collection)
}
(!this.collections
|| !(collection in this.collections))
&& this.newCollection(collection)
// if only collection is given, reset align to null...
align = align === collection ? null : align
@ -1486,7 +1505,9 @@ var UICollectionActions = actions.Actions({
addToCollection: ['Collections|Image/Add $image to collection...',
widgets.uiDialog(function(gids){
return this.browseCollections(function(title){
this.collect(gids || this.current, title) }) })],
this.collect(gids || 'current', title) }) })],
addRibbonToCollection: ['Collections|Ribbon/Add $ribbon to collection...',
widgets.uiDialog(function(){ return this.addToCollection('ribbon') })],
addLoadedToCollection: ['Collections/$Add loaded images to collection...',
widgets.uiDialog(function(){ return this.addToCollection('loaded') })],
joinToCollection: ['Collections/$Merge view to collection...',

View File

@ -385,7 +385,7 @@ module.ImageEditMarks = core.ImageGridFeatures.Feature({
var ImageMarkGroupActions = actions.Actions({
// NOTE: this will only group loaded images...
groupMarked: ['Group|Mark/-90:Group loaded marked images',
groupMarked: ['Group|Mark/-70:Group loaded marked images',
{journal: true,
browseMode: 'cropMarked'},
function(){
@ -511,7 +511,7 @@ var ImageBookmarkEditActions = actions.Actions({
// 'on' - toggle all on
// 'off' - toggle all off
// 'next' - toggle each image to next state
toggleBookmarkOnMarked: ['Bookmark|Mark/-90:Toggle bookmark on maked images',
toggleBookmarkOnMarked: ['Bookmark|Mark/-70:Toggle bookmark on maked images',
{browseMode: 'cropMarked'},
function(action){
return this.toggleBookmark(this.data.getTaggedByAny('selected'), action)

View File

@ -1213,6 +1213,8 @@ var BrowseActionsActions = actions.Actions({
// Non existing elements will not get drawn...
//'File/-99:moo',
'99:$Edit',
'Edit/Undo',
'Edit/Redo',
'$Navigate',
'$Image',
'Image/-70:---',
@ -1266,9 +1268,12 @@ var BrowseActionsActions = actions.Actions({
'Collections/-70:---',
'Collections/-70:.*remove.*',
'$Mark',
//'Mark/-99:.*remove.*',
'Mark/-80:---',
'Mark/-80:.*remove.*',
'Mark/-90:.*unmark.*',
'$Bookmark',
//'Bookmark/-99:.*remove.*',
'Bookmark/-80:---',
'Bookmark/-80:.*remove.*',
// ...