Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop

This commit is contained in:
Richard Cordovano 2016-02-04 17:04:06 -05:00
commit b0dbd2dba4
2 changed files with 3 additions and 5 deletions

View File

@ -60,10 +60,8 @@
<SubComponents> <SubComponents>
<Container class="javax.swing.JSplitPane" name="jSplitPane1"> <Container class="javax.swing.JSplitPane" name="jSplitPane1">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<FontInfo relative="true"> <Connection component="leftPane" name="font" type="property"/>
<Font bold="false" component="jSplitPane1" property="font" relativeSize="false" size="11"/>
</FontInfo>
</Property> </Property>
</Properties> </Properties>

View File

@ -200,7 +200,7 @@ class DropdownListSearchPanel extends KeywordSearchPanel {
setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11)); setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
jSplitPane1.setFont(jSplitPane1.getFont().deriveFont(jSplitPane1.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); jSplitPane1.setFont(leftPane.getFont());
leftPane.setFont(leftPane.getFont().deriveFont(leftPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); leftPane.setFont(leftPane.getFont().deriveFont(leftPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
leftPane.setMinimumSize(new java.awt.Dimension(150, 23)); leftPane.setMinimumSize(new java.awt.Dimension(150, 23));