flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved image info from an alert to a drawer...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-06-02 05:33:27 +04:00
parent bb48a23a10
commit 3c3fd5724c
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/keybindings.js
View File

@ -372,24 +372,7 @@ var KEYBOARD_CONFIG = {
function(){ toggleImageInfo() }),
// XXX STUB -- replace with a real info window...
shift: doc('Show current image info',
function(){
var gid = getImageGID(getImage())
var r = getRibbonIndex(getRibbon())
var data = IMAGES[gid]
var orientation = data.orientation
orientation = orientation == null ? 0 : orientation
var order = DATA.order.indexOf(gid)
var name = data.path.split('/').pop()
alert('"'+ name +'"\n'+
'Orientation: '+ orientation +'deg\n'+
'GID: '+ gid +'\n'+
'Path: "'+ data.path +'"\n'+
'Order: '+ order +'\n'+
'Position (ribbon): '+ DATA.ribbons[r].indexOf(gid) +
'/'+ DATA.ribbons[r].length +'\n'+
'Position (global): '+ order +'/'+ DATA.order.length +'\n'+
'')
}),
function(){ toggleImageInfoDrawer() }),
alt: doc('Toggle inline image info display',
function(){
toggleInlineImageInfo()

46
ui/modes.js
View File

@ -14,8 +14,10 @@
*/
// NOTE: this expects a certain structure, this it is not generic...
function makeDrawerToggler(contentRenderer, root, element_class, mode_class){
var toggler = createCSSClassToggler(root, mode_class + ' drawer-mode overlay',
//function makeDrawerToggler(contentRenderer, root, element_class, mode_class){
function makeDrawerToggler(contentRenderer, root){
var element_class = '.drawer-block'
var toggler = createCSSClassToggler(root, 'drawer-mode overlay',
function(action){
// XXX
var body = $(document.body)
@ -305,31 +307,47 @@ var toggleHelp = makeDrawerToggler(
// XXX populate...
// ...load from file.
return $('<h1>Help</h1>')
},
'.viewer',
'.general-help',
'general-help-mode')
}, '.viewer')
var toggleKeyboardHelp = makeDrawerToggler(
function(){
return buildKeybindingsHelpHTML(KEYBOARD_CONFIG)
},
'.viewer',
'.keyboard-help',
'keyboard-help-mode')
}, '.viewer')
var toggleOptionsUI = makeDrawerToggler(
function(){
// XXX populate...
return $('<h1>Options</h1>')
},
'.viewer',
'.options-ui',
'options-mode')
}, '.viewer')
// XXX needs styling and cleanup...
// XXX add a preview...
var toggleImageInfoDrawer = makeDrawerToggler(
function(){
var gid = getImageGID(getImage())
var r = getRibbonIndex(getRibbon())
var data = IMAGES[gid]
var orientation = data.orientation
orientation = orientation == null ? 0 : orientation
var order = DATA.order.indexOf(gid)
var name = data.path.split('/').pop()
return $('<div>'+
'<h1>"'+ name +'"</h1>'+
'Orientation: '+ orientation +'deg<br>'+
'GID: '+ gid +'<br>'+
'Path: "'+ data.path +'"<br>'+
'Order: '+ order +'<br>'+
'Position (ribbon): '+ (DATA.ribbons[r].indexOf(gid)+1) +
'/'+ DATA.ribbons[r].length +'<br>'+
'Position (global): '+ (order+1) +'/'+ DATA.order.length +'<br>'+
'</div>')
}, '.viewer')
/**********************************************************************