Merge pull request #2729 from sleuthkit/release-4.4.0

Release 4.4.0 merge
This commit is contained in:
Richard Cordovano 2017-04-19 16:23:53 -04:00 committed by GitHub
commit ec27083f0a
7 changed files with 8 additions and 7 deletions

View File

@ -31,8 +31,9 @@ import org.openide.util.Lookup;
iconBase = "org/sleuthkit/autopsy/casemodule/services/tag-options-panel-icon.png", iconBase = "org/sleuthkit/autopsy/casemodule/services/tag-options-panel-icon.png",
keywords = "#OptionsCategory_TagNames", keywords = "#OptionsCategory_TagNames",
keywordsCategory = "CustomTagNames", keywordsCategory = "CustomTagNames",
position = 10 position = 11
) )
public final class TagsOptionsPanelController extends OptionsPanelController { public final class TagsOptionsPanelController extends OptionsPanelController {
private TagOptionsPanel panel; private TagOptionsPanel panel;

View File

@ -34,7 +34,7 @@ import org.openide.util.Lookup;
iconBase = "org/sleuthkit/autopsy/directorytree/external-viewer-rules-32x32.png", iconBase = "org/sleuthkit/autopsy/directorytree/external-viewer-rules-32x32.png",
keywords = "#OptionsCategory_Keywords_ExternalViewer", keywords = "#OptionsCategory_Keywords_ExternalViewer",
keywordsCategory = "ExternalViewer", keywordsCategory = "ExternalViewer",
position = 11 position = 12
) )
public final class ExternalViewerOptionsPanelController extends OptionsPanelController { public final class ExternalViewerOptionsPanelController extends OptionsPanelController {

View File

@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
@OptionsPanelController.TopLevelRegistration( @OptionsPanelController.TopLevelRegistration(
categoryName = "#OptionsCategory_Name_FileExtMismatchOptions", categoryName = "#OptionsCategory_Name_FileExtMismatchOptions",
iconBase = "org/sleuthkit/autopsy/modules/fileextmismatch/options-icon.png", iconBase = "org/sleuthkit/autopsy/modules/fileextmismatch/options-icon.png",
position = 7, position = 8,
keywords = "#OptionsCategory_FileExtMismatch", keywords = "#OptionsCategory_FileExtMismatch",
keywordsCategory = "KeywordSearchOptions") keywordsCategory = "KeywordSearchOptions")
public final class FileExtMismatchOptionsPanelController extends OptionsPanelController { public final class FileExtMismatchOptionsPanelController extends OptionsPanelController {

View File

@ -31,7 +31,7 @@ import org.openide.util.Lookup;
iconBase = "org/sleuthkit/autopsy/modules/filetypeid/user-defined-file-types-settings.png", iconBase = "org/sleuthkit/autopsy/modules/filetypeid/user-defined-file-types-settings.png",
keywords = "#OptionsCategory_Keywords_FileTypeId", keywords = "#OptionsCategory_Keywords_FileTypeId",
keywordsCategory = "FileTypeId", keywordsCategory = "FileTypeId",
position = 8 position = 9
) )
public final class FileTypeIdOptionsPanelController extends OptionsPanelController { public final class FileTypeIdOptionsPanelController extends OptionsPanelController {

View File

@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
@OptionsPanelController.TopLevelRegistration( @OptionsPanelController.TopLevelRegistration(
categoryName = "#OptionsCategory_Name_HashDatabase", categoryName = "#OptionsCategory_Name_HashDatabase",
iconBase = "org/sleuthkit/autopsy/modules/hashdatabase/options_icon.png", iconBase = "org/sleuthkit/autopsy/modules/hashdatabase/options_icon.png",
position = 6, position = 7,
keywords = "#OptionsCategory_Keywords_HashDatabase", keywords = "#OptionsCategory_Keywords_HashDatabase",
keywordsCategory = "HashDatabase", keywordsCategory = "HashDatabase",
id = "HashDatabase") id = "HashDatabase")

View File

@ -32,7 +32,7 @@ import org.openide.util.Lookup;
iconBase = "org/sleuthkit/autopsy/images/interesting_item_32x32.png", iconBase = "org/sleuthkit/autopsy/images/interesting_item_32x32.png",
keywords = "#OptionsCategory_Keywords_InterestingItemDefinitions", keywords = "#OptionsCategory_Keywords_InterestingItemDefinitions",
keywordsCategory = "InterestingItemDefinitions", keywordsCategory = "InterestingItemDefinitions",
position = 9 position = 10
) )
public final class InterestingItemDefsOptionsPanelController extends OptionsPanelController { public final class InterestingItemDefsOptionsPanelController extends OptionsPanelController {

View File

@ -34,7 +34,7 @@ import org.openide.util.Lookup;
iconBase = "org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_32.png", iconBase = "org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_32.png",
keywords = "#OptionsCategory_Keywords_Options", keywords = "#OptionsCategory_Keywords_Options",
keywordsCategory = "Options", keywordsCategory = "Options",
position = 12 position = 14
) )
@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_Options=Image / Video Gallery", "OptionsCategory_Keywords_Options=image video gallery category "}) @org.openide.util.NbBundle.Messages({"OptionsCategory_Name_Options=Image / Video Gallery", "OptionsCategory_Keywords_Options=image video gallery category "})
public final class ImageGalleryOptionsPanelController extends OptionsPanelController { public final class ImageGalleryOptionsPanelController extends OptionsPanelController {