From f54d8aadc45ae77a0bd95a9d3722a2f856757ee1 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 4 Feb 2016 05:01:06 +0300
Subject: [PATCH] now the status indicator (bar) is starting to take shape,
 still needs styling...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/ui.js | 105 +++++++++++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 20 deletions(-)

diff --git a/ui (gen4)/features/ui.js b/ui (gen4)/features/ui.js
index 52034bcd..34934f75 100755
--- a/ui (gen4)/features/ui.js	
+++ b/ui (gen4)/features/ui.js	
@@ -2492,6 +2492,7 @@ var makeStateIndicator = function(type){
 		.addClass('state-indicator-container ' + type || '')
 }
 
+// XXX do we need this???
 var makeStateIndicatorItem = function(container, type, text){
 	var item = $('<div>')
 			.addClass('item '+ type || '')
@@ -2501,6 +2502,25 @@ var makeStateIndicatorItem = function(container, type, text){
 	return item
 }
 
+// XXX should we use this or makeStateIndicatorItem(..)???
+// 		...investigate the features of the above...
+// 			- .attr('text')???
+var makeExpandingInfoItem = function(container, cls, align){
+	var e = $('<span>')
+		.addClass(cls + ' expanding-text ' + align)
+		.append($('<span class="shown">'))
+		.append($('<span class="hidden">'))
+	container.append(e)
+	return e
+}
+var makeInfoItem = function(container, cls, align){
+	var e = $('<span>')
+		.addClass(cls +' '+ align)
+	container.append(e)
+	return e
+} 
+
+
 // Format:
 // 	full:
 // 	[ (12/123) DSC_1234.jpg GID:a1b2c3 T:2016-01-28 08:37:50	B M C ]
@@ -2545,13 +2565,25 @@ module.ImageStateIndicator = core.ImageGridFeatures.Feature({
 	],
 
 	config: {
+		'global-info-elements': [
+			'path',
+			'gid',
+			'---',
+			'index',
+			'mark',
+			'bookmark',
+		],
 	},
 
 	actions: actions.Actions({
+		// XXX for some reason mark indicator clicking does not work in
+		// 		single image mode...
 		updateStateIndicators: ['- Interface/',
 			function(gid){
 				gid = gid || this.current
 
+				var that = this
+
 				// make/get indicator containers...
 				var image = this.ribbons.viewer.find('.state-indicator-container.image-info')
 				if(image.length == 0){
@@ -2563,27 +2595,43 @@ module.ImageStateIndicator = core.ImageGridFeatures.Feature({
 				if(global.length == 0){
 					//global = makeStateIndicator('global-info') 
 					global = makeStateIndicator('global-info overlay-info') 
-						// XXX do this based on config...
-						.append($('<span>')
-							.addClass('path expanding-text')
-							.append($('<span class="shown">'))
-							.append($('<span class="hidden">')))
 
-						.append($('<span>')
-							.addClass('gid expanding-text')
-							.append($('<span class="shown">'))
-							.append($('<span class="hidden">')))
+					var align = ''
+					var order = this.config['global-info-elements'].slice()
 
-						.append($('<span>')
-							.addClass('index float-right'))
+					var i = order.indexOf('---')
+					// rearrange the tail section...
+					// NOTE: this is here as we need to push the floated
+					// 		right items in reverse order...
+					if(i >= 0){
+						order = order.concat(order.splice(i+1, order.length).reverse())
+					}
 
-						.append($('<span>')
-							.addClass('bookmarked float-right'))
+					order.forEach(function(elem){
+						// spacer...
+						if(elem == '---'){
+							align = 'float-right'
 
-						.append($('<span>')
-							.addClass('marked float-right'))
+						// expanding indicators...
+						} else if(elem == 'gid' || elem == 'path'){
+							makeExpandingInfoItem(global, elem, align)
 
-						.appendTo(this.ribbons.viewer)
+						// simple indicators...
+						} else if(elem == 'index'){
+							makeInfoItem(global, elem, align)
+
+						// toggler indicators...
+						} else if(elem == 'bookmark' || elem == 'mark'){
+							makeInfoItem(global, elem+'ed', align)
+								.click(function(){
+									that['toggle'+elem.capitalize()]()
+								})
+								// XXX use CSS for this...
+								.text(elem[0].toUpperCase())
+						}
+					})
+
+					global.appendTo(this.ribbons.viewer)
 				}
 
 				if(!gid){
@@ -2607,10 +2655,23 @@ module.ImageStateIndicator = core.ImageGridFeatures.Feature({
 						+'/'+ 
 						this.data.getImages(gid).len)
 
+				// NOTE: we are not using .toggleMark('?') and friends 
+				// 		here to avoid recursion as we might be handling 
+				// 		them here...
+				// 		...this also simpler than handling '?' and other
+				// 		special toggler args in the handler...
+				var tags = this.data.getTags(gid)
+
 				// marks...
-				// XXX
-				global.find('.marked').text('M')
-				global.find('.bookmarked').text('B')
+				// XXX change class...
+				global.find('.marked')
+					.css({
+						opacity: tags.indexOf('selected') < 0 ? '0.5' : '1',
+					})
+				global.find('.bookmarked')
+					.css({
+						opacity: tags.indexOf('bookmark') < 0 ? '0.5' : '1',
+					})
 			}],
 
 			// XXX add toggler to toggle global image indicator (status bar) modes...
@@ -2618,7 +2679,11 @@ module.ImageStateIndicator = core.ImageGridFeatures.Feature({
 	}),
 
 	handlers: [
-		['focusImage',
+		[[
+			'focusImage',
+			'toggleBookmark',
+			'toggleMark',
+		],
 			function(){
 				this.updateStateIndicators()
 			}]