flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-12-24 20:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

no-data state now a bit better, native directory browser now opens dirs (O)...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-06-13 17:51:28 +04:00
parent 502af2eb5d
commit b54a9a2089
5 changed files with 60 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/layout.css
View File

@ -116,14 +116,25 @@ button:hover {
-ms-transform-origin: top left; -ms-transform-origin: top left;
transform-origin: top left; transform-origin: top left;
} }
.ribbon-set:empty:after { /* empty ribbon set... */
display: block; .ribbon-set:empty {
top: 0px;
left: 0px;
width: 100%; width: 100%;
height: 100%; height: 100%;
content: "Empty"; }
.ribbon-set:empty:after {
display: block;
position: absolute;
content: "No files loaded, press 'O' to load.";
top: 50%;
left: 0px;
width: 100%;
height: 20px;
margin-top: -10px;
text-align: center; text-align: center;
vertical-align: center;
font-size: 20px;
color: silver;
opacity: 0.9;
} }
/********************************************************** Ribbon ***/ /********************************************************** Ribbon ***/
.ribbon { .ribbon {
@ -851,6 +862,9 @@ button:hover {
.light.viewer .overlay-block:hover .background:after { .light.viewer .overlay-block:hover .background:after {
color: black; color: black;
} }
.light.viewer .ribbon-set:empty:after {
color: gray;
}
.gray.viewer, .gray.viewer,
.gray.viewer .overlay-block .background { .gray.viewer .overlay-block .background {
background: #333; background: #333;

28
ui/layout.less
View File

@ -191,14 +191,29 @@ button:hover {
and aligning... */ and aligning... */
.origin(top, left); .origin(top, left);
} }
.ribbon-set:empty:after {
display: block; /* empty ribbon set... */
top: 0px; .ribbon-set:empty {
left: 0px;
width: 100%; width: 100%;
height: 100%; height: 100%;
content: "Empty"; }
.ribbon-set:empty:after {
display: block;
position: absolute;
content: "No files loaded, press 'O' to load.";
top: 50%;
left: 0px;
width: 100%;
height: 20px;
margin-top: -10px;
text-align: center; text-align: center;
vertical-align: center;
font-size: 20px;
color: silver;
opacity: 0.9;
} }
@ -848,6 +863,9 @@ button:hover {
.light.viewer .overlay-block:hover .background:after { .light.viewer .overlay-block:hover .background:after {
color: black; color: black;
} }
.light.viewer .ribbon-set:empty:after {
color: gray;
}
.gray.viewer, .gray.viewer,
.gray.viewer .overlay-block .background { .gray.viewer .overlay-block .background {

12
ui/modes.js
View File

@ -182,14 +182,14 @@ var toggleSlideShowMode = createCSSClassToggler(
// interval from user... // interval from user...
//var interval = prompt('Slideshow interval (sec):', SLIDESHOW_INTERVAL/1000) //var interval = prompt('Slideshow interval (sec):', SLIDESHOW_INTERVAL/1000)
formDialog($('.viewer'), 'Slideshow', { formDialog($('.viewer'), 'Slideshow', {
'Interval:': (SLIDESHOW_INTERVAL/1000) + 'sec', 'Interval': (SLIDESHOW_INTERVAL/1000) + 'sec',
'Looping:': SLIDESHOW_LOOP ? true : false, 'Looping': SLIDESHOW_LOOP ? true : false,
'Reverse direction:': SLIDESHOW_DIRECTION == 'prev' ? true : false 'Reverse direction': SLIDESHOW_DIRECTION == 'prev' ? true : false
}, 'Start') }, 'Start')
.done(function(data){ .done(function(data){
var interval = parseFloat(data['Interval:']) var interval = parseFloat(data['Interval'])
var looping = data['Looping:'] var looping = data['Looping']
var reverse = data['Reverse direction:'] var reverse = data['Reverse direction']
SLIDESHOW_INTERVAL = isNaN(interval) ? 3000 : interval*1000 SLIDESHOW_INTERVAL = isNaN(interval) ? 3000 : interval*1000
SLIDESHOW_LOOP = looping SLIDESHOW_LOOP = looping

12
ui/setup.js
View File

@ -50,6 +50,18 @@ function setupIndicators(){
function setupDataBindings(viewer){ function setupDataBindings(viewer){
viewer = viewer == null ? $('.viewer') : viewer viewer = viewer == null ? $('.viewer') : viewer
viewer viewer
.click(function(){
if($('.ribbon').length == 0){
// XXX use the real action (the same as the keyboard handler)...
// browser version...
var getter = window.listDir != null ? getDir : prompt
getter('Path to open', BASE_URL)
.done(function(path){
path = path.trim()
statusNotify(loadDir(path))
})
}
})
// XXX need to maintain the correct number of images per ribbon // XXX need to maintain the correct number of images per ribbon
// per zoom setting -- things get really odd when a ribbon // per zoom setting -- things get really odd when a ribbon
// is smaller than it should be... // is smaller than it should be...

1
ui/ui.js
View File

@ -468,7 +468,6 @@ var FIELD_TYPES = {
.attr('nwworkingdir', value.ndir) .attr('nwworkingdir', value.ndir)
.change(function(){ .change(function(){
var p = file[0].files var p = file[0].files
console.log('mooo!!!', p[0])
if(p.length != 0){ if(p.length != 0){
field.find('.path').val(p[0].path) field.find('.path').val(p[0].path)
} }