diff --git a/ui (gen4)/features/keyboard.js b/ui (gen4)/features/keyboard.js index 9bfcf0b4..2319654d 100755 --- a/ui (gen4)/features/keyboard.js +++ b/ui (gen4)/features/keyboard.js @@ -242,7 +242,7 @@ module.GLOBAL_KEYBOARD = { // XXX experimental, not sure if wee need this with a keyboard... T: 'rotateRibbonCCW -- Tilt ribbons counter clock wise', shift_T: 'rotateRibbonCW -- Tilt ribbons clock wise', - alt_T: 'resetRibbonRotation -- Reset ribbon tilt', + ctrl_shift_T: 'resetRibbonRotation -- Reset ribbon tilt', // NOTE: this is handled by the wrapper at this point, so we do diff --git a/ui (gen4)/features/tags.js b/ui (gen4)/features/tags.js index 0bd46cd6..4b16d35f 100755 --- a/ui (gen4)/features/tags.js +++ b/ui (gen4)/features/tags.js @@ -56,6 +56,7 @@ module.PersistentTags = core.ImageGridFeatures.Feature({ var TagUIActions = actions.Actions({ // XXX use global tag list... (???) + // XXX make this reusable... showTagCloud: ['Tag|Edit|Image/$Tags...', core.doc` `, @@ -79,6 +80,7 @@ var TagUIActions = actions.Actions({ // XXX var removeTag = function(tag){ console.log('REMOVE TAG:', tag) + // XXX } return browse.makeLister(null, function(path, make){ @@ -108,8 +110,8 @@ var TagUIActions = actions.Actions({ e.css('opacity', on ? 0.3 : '') on ? - that.data.untag(tag, gids) - : that.data.tag(tag, gids) + that.untag(tag, gids) + : that.tag(tag, gids) }, buttons: [ // remove tag button... @@ -129,7 +131,7 @@ var TagUIActions = actions.Actions({ return } - that.data.tag(tag, gids) + that.tag(tag, gids) // update tag list... make.dialog @@ -149,6 +151,10 @@ var TagUIActions = actions.Actions({ // XXX crop/filter by tags... // XXX + cropTaggedFromCloud: ['-Tag|Crop/Crop tagged...', + widgets.makeUIDialog(function(){ + // XXX + })], }) diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index 5054e1b8..2ba0f1fe 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -1345,11 +1345,15 @@ var BrowseActionsActions = actions.Actions({ 'Crop/-80:Uncrop and keep crop image order', 'Crop/-81:Uncrop all', 'Crop/-82:$Uncrop', - 'Collec$tions', + 'Co$llections', 'Collections/-50:.*exit.*', 'Collections/-60:.*edit.*', 'Collections/-70:---', 'Collections/-70:.*remove.*', + '$Tag', + // XXX revise... + 'Tag/-80:---', + 'Tag/-90:.*remove.*', '$Mark', 'Mark/-75:.*collection...', 'Mark/-80:---',