codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

fix slideshow image cycling

Browse Source
This commit is contained in:
jmillman
2014-09-04 14:40:54 -04:00
parent 7d13d92984
commit faac2fa98f
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.java
View File

@@ -547,7 +547,7 @@ public class GroupPane extends BorderPane implements GroupView {
});
//listen to tile selection and make sure it is visible in scroll area
//TODO: make sure we are testing complete visability not just bounsd intersection
//TODO: make sure we are testing complete visability not just bounds intersection
globalSelectionModel.lastSelectedProperty().addListener((observable, oldFileID, newFileId) -> {
if (groupViewMode.get() == GroupViewMode.SLIDE_SHOW) {
slideShowPane.setFile(newFileId);
@@ -688,25 +688,32 @@ public class GroupPane extends BorderPane implements GroupView {
if (selectionAnchorIndex == null) {
selectionAnchorIndex = grouping.get().fileIds().indexOf(globalSelectionModel.lastSelectedProperty().get());
}
t.consume();
break;
case UP:
case DOWN:
case LEFT:
case RIGHT:
handleArrows(t);
if (groupViewMode.get() == GroupViewMode.TILE) {
handleArrows(t);
t.consume();
}
break;
case PAGE_DOWN:
getScrollBar().ifPresent((scrollBar) -> {
scrollBar.adjustValue(1);
});
t.consume();
break;
case PAGE_UP:
getScrollBar().ifPresent((scrollBar) -> {
scrollBar.adjustValue(0);
});
t.consume();
break;
case ENTER:
nextGroupAction.handle(null);
t.consume();
break;
case SPACE:
if (groupViewMode.get() == GroupViewMode.TILE) {
@@ -714,11 +721,13 @@ public class GroupPane extends BorderPane implements GroupView {
} else {
activateTileViewer();
}
t.consume();
break;
}
if (groupViewMode.get() == GroupViewMode.TILE && categoryKeyCodes.contains(t.getCode()) && t.isAltDown()) {
selectAllFiles();
t.consume();
}
if (globalSelectionModel.getSelected().isEmpty() == false) {
switch (t.getCode()) {
@@ -750,7 +759,6 @@ public class GroupPane extends BorderPane implements GroupView {
}
}
t.consume();
}
private void handleArrows(KeyEvent t) {

7
ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShowView.java
View File

@@ -184,10 +184,7 @@ public class SlideShowView extends SingleDrawableViewBase implements TagUtils.Ta
cycleSlideShowImage(1);
t.consume();
break;
//
}
}
});
@@ -275,9 +272,7 @@ public class SlideShowView extends SingleDrawableViewBase implements TagUtils.Ta
final int size = groupPane.getGrouping().fileIds().size();
index += d;
if (index < 0) {
index = size - 1;
} else if (index > size) {
index = 0;
index += size;
}
setFile(groupPane.getGrouping().fileIds().get(index));