working through layout

This commit is contained in:
Greg DiCristofaro 2020-09-03 16:09:08 -04:00
parent 59e0d28fe6
commit 17644fe664
4 changed files with 77 additions and 12 deletions

View File

@ -35,3 +35,4 @@ DataSourceSummaryDetailsPanel.unallocatedSizeLabel.text=Unallocated Space:
DataSourceSummaryDetailsPanel.unallocatedSizeValue.text= DataSourceSummaryDetailsPanel.unallocatedSizeValue.text=
DataSourceSummaryUserActivityPanel.programsRunLabel.text=Recent Programs DataSourceSummaryUserActivityPanel.programsRunLabel.text=Recent Programs
DataSourceSummaryUserActivityPanel.recentDomainsLabel.text=Recent Domains DataSourceSummaryUserActivityPanel.recentDomainsLabel.text=Recent Domains
TypesPanel.filesByCategoryLabel.text=Files by Category

View File

@ -65,6 +65,7 @@ SizeRepresentationUtil_units_kilobytes=\ kB
SizeRepresentationUtil_units_megabytes=\ MB SizeRepresentationUtil_units_megabytes=\ MB
SizeRepresentationUtil_units_petabytes=\ PB SizeRepresentationUtil_units_petabytes=\ PB
SizeRepresentationUtil_units_terabytes=\ TB SizeRepresentationUtil_units_terabytes=\ TB
TypesPanel.filesByCategoryLabel.text=Files by Category
TypesPanel_artifactsTypesPieChart_title=Artifact Types TypesPanel_artifactsTypesPieChart_title=Artifact Types
TypesPanel_fileMimeTypesChart_audio_title=Audio TypesPanel_fileMimeTypesChart_audio_title=Audio
TypesPanel_fileMimeTypesChart_documents_title=Documents TypesPanel_fileMimeTypesChart_documents_title=Documents

View File

@ -40,10 +40,7 @@
<Dimension value="[32787, 32787]"/> <Dimension value="[32787, 32787]"/>
</Property> </Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[650, 500]"/> <Dimension value="[650, 510]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property> </Property>
</Properties> </Properties>
<AuxValues> <AuxValues>
@ -122,6 +119,15 @@
<Container class="javax.swing.JPanel" name="pieChartRow"> <Container class="javax.swing.JPanel" name="pieChartRow">
<Properties> <Properties>
<Property name="alignmentX" type="float" value="0.0"/> <Property name="alignmentX" type="float" value="0.0"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1170, 895]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
</Properties> </Properties>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
@ -178,17 +184,64 @@
</Container> </Container>
</SubComponents> </SubComponents>
</Container> </Container>
<Component class="javax.swing.Box$Filler" name="filler2">
<Properties>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[32767, 5]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[0, 5]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[0, 5]"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
<AuxValue name="classDetails" type="java.lang.String" value="Box.Filler.VerticalStrut"/>
</AuxValues>
</Component>
<Component class="javax.swing.JLabel" name="filesByCategoryLabel">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties" key="TypesPanel.filesByCategoryLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
</Component>
<Component class="javax.swing.Box$Filler" name="filler1">
<Properties>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[32767, 2]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[0, 2]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[0, 2]"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
<AuxValue name="classDetails" type="java.lang.String" value="Box.Filler.VerticalStrut"/>
</AuxValues>
</Component>
<Container class="javax.swing.JPanel" name="filesByCategoryPanel"> <Container class="javax.swing.JPanel" name="filesByCategoryPanel">
<Properties> <Properties>
<Property name="alignmentX" type="float" value="0.0"/> <Property name="alignmentX" type="float" value="0.0"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[32767, 106]"/> <Dimension value="[32767, 107]"/>
</Property> </Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[10, 106]"/> <Dimension value="[10, 107]"/>
</Property> </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[400, 106]"/> <Dimension value="[400, 107]"/>
</Property> </Property>
</Properties> </Properties>
<AuxValues> <AuxValues>

View File

@ -305,14 +305,16 @@ class TypesPanel extends BaseDataSourceSummaryPanel {
pieChartRow = new javax.swing.JPanel(); pieChartRow = new javax.swing.JPanel();
javax.swing.JPanel fileMimeTypesPanel = fileMimeTypesChart; javax.swing.JPanel fileMimeTypesPanel = fileMimeTypesChart;
javax.swing.JPanel artifactTypesPanel = artifactTypesChart; javax.swing.JPanel artifactTypesPanel = artifactTypesChart;
javax.swing.Box.Filler filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 5), new java.awt.Dimension(0, 5), new java.awt.Dimension(32767, 5));
javax.swing.JLabel filesByCategoryLabel = new javax.swing.JLabel();
javax.swing.Box.Filler filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2), new java.awt.Dimension(32767, 2));
javax.swing.JPanel filesByCategoryPanel = filesByCategoryTable; javax.swing.JPanel filesByCategoryPanel = filesByCategoryTable;
setLayout(new java.awt.BorderLayout()); setLayout(new java.awt.BorderLayout());
contentParent.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)); contentParent.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));
contentParent.setMaximumSize(new java.awt.Dimension(32787, 32787)); contentParent.setMaximumSize(new java.awt.Dimension(32787, 32787));
contentParent.setMinimumSize(new java.awt.Dimension(650, 500)); contentParent.setMinimumSize(new java.awt.Dimension(650, 510));
contentParent.setPreferredSize(null);
contentParent.setLayout(new javax.swing.BoxLayout(contentParent, javax.swing.BoxLayout.PAGE_AXIS)); contentParent.setLayout(new javax.swing.BoxLayout(contentParent, javax.swing.BoxLayout.PAGE_AXIS));
usagePanel.setAlignmentX(0.0F); usagePanel.setAlignmentX(0.0F);
@ -335,6 +337,9 @@ class TypesPanel extends BaseDataSourceSummaryPanel {
contentParent.add(sizePanel); contentParent.add(sizePanel);
pieChartRow.setAlignmentX(0.0F); pieChartRow.setAlignmentX(0.0F);
pieChartRow.setMaximumSize(new java.awt.Dimension(1170, 895));
pieChartRow.setMinimumSize(null);
pieChartRow.setPreferredSize(null);
fileMimeTypesPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); fileMimeTypesPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
fileMimeTypesPanel.setMaximumSize(new java.awt.Dimension(500, 375)); fileMimeTypesPanel.setMaximumSize(new java.awt.Dimension(500, 375));
@ -349,11 +354,16 @@ class TypesPanel extends BaseDataSourceSummaryPanel {
pieChartRow.add(artifactTypesPanel); pieChartRow.add(artifactTypesPanel);
contentParent.add(pieChartRow); contentParent.add(pieChartRow);
contentParent.add(filler2);
org.openide.awt.Mnemonics.setLocalizedText(filesByCategoryLabel, org.openide.util.NbBundle.getMessage(TypesPanel.class, "TypesPanel.filesByCategoryLabel.text")); // NOI18N
contentParent.add(filesByCategoryLabel);
contentParent.add(filler1);
filesByCategoryPanel.setAlignmentX(0.0F); filesByCategoryPanel.setAlignmentX(0.0F);
filesByCategoryPanel.setMaximumSize(new java.awt.Dimension(32767, 106)); filesByCategoryPanel.setMaximumSize(new java.awt.Dimension(32767, 107));
filesByCategoryPanel.setMinimumSize(new java.awt.Dimension(10, 106)); filesByCategoryPanel.setMinimumSize(new java.awt.Dimension(10, 107));
filesByCategoryPanel.setPreferredSize(new java.awt.Dimension(400, 106)); filesByCategoryPanel.setPreferredSize(new java.awt.Dimension(400, 107));
contentParent.add(filesByCategoryPanel); contentParent.add(filesByCategoryPanel);
scrollParent.setViewportView(contentParent); scrollParent.setViewportView(contentParent);