Skip to content

Commit ad808e0

Browse files
author
William Schaefer
committed
6225 second attempt to fix screenshot 15
1 parent 753ac8d commit ad808e0

File tree

2 files changed

+35
-32
lines changed

2 files changed

+35
-32
lines changed

‎Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.form‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -320,18 +320,18 @@
320320
<ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="OptionalCasePropertiesPanel.lbPointOfContactPhoneLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
321321
</Property>
322322
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
323-
<Dimension value="[82, 14]"/>
323+
<Dimension value="[182, 14]"/>
324324
</Property>
325325
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
326326
<Dimension value="[82, 14]"/>
327327
</Property>
328328
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
329-
<Dimension value="[82, 14]"/>
329+
<Dimension value="[120, 14]"/>
330330
</Property>
331331
</Properties>
332332
<Constraints>
333333
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
334-
<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="7" insetsLeft="12" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
334+
<GridBagConstraints gridX="0" gridY="2" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="7" insetsLeft="12" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
335335
</Constraint>
336336
</Constraints>
337337
</Component>
@@ -359,18 +359,18 @@
359359
<ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="OptionalCasePropertiesPanel.lbPointOfContactNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
360360
</Property>
361361
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
362-
<Dimension value="[82, 14]"/>
362+
<Dimension value="[182, 14]"/>
363363
</Property>
364364
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
365365
<Dimension value="[82, 14]"/>
366366
</Property>
367367
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
368-
<Dimension value="[82, 14]"/>
368+
<Dimension value="[120, 14]"/>
369369
</Property>
370370
</Properties>
371371
<Constraints>
372372
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
373-
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="13" insetsLeft="12" insetsBottom="0" insetsRight="5" anchor="18" weightX="0.0" weightY="0.0"/>
373+
<GridBagConstraints gridX="0" gridY="1" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="13" insetsLeft="12" insetsBottom="0" insetsRight="5" anchor="18" weightX="0.0" weightY="0.0"/>
374374
</Constraint>
375375
</Constraints>
376376
</Component>
@@ -383,13 +383,13 @@
383383
<Insets value="[2, 6, 2, 6]"/>
384384
</Property>
385385
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
386-
<Dimension value="[123, 23]"/>
386+
<Dimension value="[160, 23]"/>
387387
</Property>
388388
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
389389
<Dimension value="[123, 23]"/>
390390
</Property>
391391
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
392-
<Dimension value="[123, 23]"/>
392+
<Dimension value="[140, 23]"/>
393393
</Property>
394394
</Properties>
395395
<Events>
@@ -404,14 +404,14 @@
404404
<Component class="javax.swing.JLabel" name="lbPointOfContactEmailText">
405405
<Constraints>
406406
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
407-
<GridBagConstraints gridX="1" gridY="3" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="7" insetsLeft="4" insetsBottom="13" insetsRight="18" anchor="18" weightX="0.0" weightY="0.0"/>
407+
<GridBagConstraints gridX="2" gridY="3" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="7" insetsLeft="4" insetsBottom="13" insetsRight="18" anchor="18" weightX="0.0" weightY="0.0"/>
408408
</Constraint>
409409
</Constraints>
410410
</Component>
411411
<Component class="javax.swing.JLabel" name="lbPointOfContactNameText">
412412
<Constraints>
413413
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
414-
<GridBagConstraints gridX="1" gridY="1" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="13" insetsLeft="4" insetsBottom="0" insetsRight="18" anchor="18" weightX="0.0" weightY="0.0"/>
414+
<GridBagConstraints gridX="2" gridY="1" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="13" insetsLeft="4" insetsBottom="0" insetsRight="18" anchor="18" weightX="0.0" weightY="0.0"/>
415415
</Constraint>
416416
</Constraints>
417417
</Component>
@@ -421,13 +421,13 @@
421421
<ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="OptionalCasePropertiesPanel.lbOrganizationNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
422422
</Property>
423423
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
424-
<Dimension value="[189, 14]"/>
424+
<Dimension value="[300, 14]"/>
425425
</Property>
426426
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
427427
<Dimension value="[189, 14]"/>
428428
</Property>
429429
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
430-
<Dimension value="[189, 14]"/>
430+
<Dimension value="[220, 14]"/>
431431
</Property>
432432
</Properties>
433433
<Constraints>
@@ -442,25 +442,25 @@
442442
<ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="OptionalCasePropertiesPanel.lbPointOfContactEmailLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
443443
</Property>
444444
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
445-
<Dimension value="[82, 14]"/>
445+
<Dimension value="[182, 14]"/>
446446
</Property>
447447
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
448448
<Dimension value="[82, 14]"/>
449449
</Property>
450450
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
451-
<Dimension value="[82, 14]"/>
451+
<Dimension value="[120, 14]"/>
452452
</Property>
453453
</Properties>
454454
<Constraints>
455455
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
456-
<GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="7" insetsLeft="12" insetsBottom="13" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
456+
<GridBagConstraints gridX="0" gridY="3" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="7" insetsLeft="12" insetsBottom="13" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
457457
</Constraint>
458458
</Constraints>
459459
</Component>
460460
<Component class="javax.swing.JLabel" name="lbPointOfContactPhoneText">
461461
<Constraints>
462462
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
463-
<GridBagConstraints gridX="1" gridY="2" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="7" insetsLeft="4" insetsBottom="0" insetsRight="18" anchor="18" weightX="0.0" weightY="0.0"/>
463+
<GridBagConstraints gridX="2" gridY="2" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="7" insetsLeft="4" insetsBottom="0" insetsRight="18" anchor="18" weightX="0.0" weightY="0.0"/>
464464
</Constraint>
465465
</Constraints>
466466
</Component>

‎Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,13 @@ private void initComponents() {
382382
orgainizationPanel.setLayout(new java.awt.GridBagLayout());
383383

384384
org.openide.awt.Mnemonics.setLocalizedText(lbPointOfContactPhoneLabel, org.openide.util.NbBundle.getMessage(OptionalCasePropertiesPanel.class, "OptionalCasePropertiesPanel.lbPointOfContactPhoneLabel.text")); // NOI18N
385-
lbPointOfContactPhoneLabel.setMaximumSize(new java.awt.Dimension(82, 14));
385+
lbPointOfContactPhoneLabel.setMaximumSize(new java.awt.Dimension(182, 14));
386386
lbPointOfContactPhoneLabel.setMinimumSize(new java.awt.Dimension(82, 14));
387-
lbPointOfContactPhoneLabel.setPreferredSize(new java.awt.Dimension(82, 14));
387+
lbPointOfContactPhoneLabel.setPreferredSize(new java.awt.Dimension(120, 14));
388388
gridBagConstraints = new java.awt.GridBagConstraints();
389389
gridBagConstraints.gridx = 0;
390390
gridBagConstraints.gridy = 2;
391+
gridBagConstraints.gridwidth = 2;
391392
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
392393
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
393394
gridBagConstraints.insets = new java.awt.Insets(7, 12, 0, 0);
@@ -407,22 +408,23 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
407408
orgainizationPanel.add(comboBoxOrgName, gridBagConstraints);
408409

409410
org.openide.awt.Mnemonics.setLocalizedText(lbPointOfContactNameLabel, org.openide.util.NbBundle.getMessage(OptionalCasePropertiesPanel.class, "OptionalCasePropertiesPanel.lbPointOfContactNameLabel.text")); // NOI18N
410-
lbPointOfContactNameLabel.setMaximumSize(new java.awt.Dimension(82, 14));
411+
lbPointOfContactNameLabel.setMaximumSize(new java.awt.Dimension(182, 14));
411412
lbPointOfContactNameLabel.setMinimumSize(new java.awt.Dimension(82, 14));
412-
lbPointOfContactNameLabel.setPreferredSize(new java.awt.Dimension(82, 14));
413+
lbPointOfContactNameLabel.setPreferredSize(new java.awt.Dimension(120, 14));
413414
gridBagConstraints = new java.awt.GridBagConstraints();
414415
gridBagConstraints.gridx = 0;
415416
gridBagConstraints.gridy = 1;
417+
gridBagConstraints.gridwidth = 2;
416418
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
417419
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
418420
gridBagConstraints.insets = new java.awt.Insets(13, 12, 0, 5);
419421
orgainizationPanel.add(lbPointOfContactNameLabel, gridBagConstraints);
420422

421423
org.openide.awt.Mnemonics.setLocalizedText(bnNewOrganization, org.openide.util.NbBundle.getMessage(OptionalCasePropertiesPanel.class, "OptionalCasePropertiesPanel.bnNewOrganization.text")); // NOI18N
422424
bnNewOrganization.setMargin(new java.awt.Insets(2, 6, 2, 6));
423-
bnNewOrganization.setMaximumSize(new java.awt.Dimension(123, 23));
425+
bnNewOrganization.setMaximumSize(new java.awt.Dimension(160, 23));
424426
bnNewOrganization.setMinimumSize(new java.awt.Dimension(123, 23));
425-
bnNewOrganization.setPreferredSize(new java.awt.Dimension(123, 23));
427+
bnNewOrganization.setPreferredSize(new java.awt.Dimension(140, 23));
426428
bnNewOrganization.addActionListener(new java.awt.event.ActionListener() {
427429
public void actionPerformed(java.awt.event.ActionEvent evt) {
428430
bnNewOrganizationActionPerformed(evt);
@@ -436,26 +438,26 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
436438
gridBagConstraints.insets = new java.awt.Insets(8, 12, 0, 18);
437439
orgainizationPanel.add(bnNewOrganization, gridBagConstraints);
438440
gridBagConstraints = new java.awt.GridBagConstraints();
439-
gridBagConstraints.gridx = 1;
441+
gridBagConstraints.gridx = 2;
440442
gridBagConstraints.gridy = 3;
441-
gridBagConstraints.gridwidth = 3;
443+
gridBagConstraints.gridwidth = 2;
442444
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
443445
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
444446
gridBagConstraints.insets = new java.awt.Insets(7, 4, 13, 18);
445447
orgainizationPanel.add(lbPointOfContactEmailText, gridBagConstraints);
446448
gridBagConstraints = new java.awt.GridBagConstraints();
447-
gridBagConstraints.gridx = 1;
449+
gridBagConstraints.gridx = 2;
448450
gridBagConstraints.gridy = 1;
449-
gridBagConstraints.gridwidth = 3;
451+
gridBagConstraints.gridwidth = 2;
450452
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
451453
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
452454
gridBagConstraints.insets = new java.awt.Insets(13, 4, 0, 18);
453455
orgainizationPanel.add(lbPointOfContactNameText, gridBagConstraints);
454456

455457
org.openide.awt.Mnemonics.setLocalizedText(lbOrganizationNameLabel, org.openide.util.NbBundle.getMessage(OptionalCasePropertiesPanel.class, "OptionalCasePropertiesPanel.lbOrganizationNameLabel.text")); // NOI18N
456-
lbOrganizationNameLabel.setMaximumSize(new java.awt.Dimension(189, 14));
458+
lbOrganizationNameLabel.setMaximumSize(new java.awt.Dimension(300, 14));
457459
lbOrganizationNameLabel.setMinimumSize(new java.awt.Dimension(189, 14));
458-
lbOrganizationNameLabel.setPreferredSize(new java.awt.Dimension(189, 14));
460+
lbOrganizationNameLabel.setPreferredSize(new java.awt.Dimension(220, 14));
459461
gridBagConstraints = new java.awt.GridBagConstraints();
460462
gridBagConstraints.gridx = 0;
461463
gridBagConstraints.gridy = 0;
@@ -466,20 +468,21 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
466468
orgainizationPanel.add(lbOrganizationNameLabel, gridBagConstraints);
467469

468470
org.openide.awt.Mnemonics.setLocalizedText(lbPointOfContactEmailLabel, org.openide.util.NbBundle.getMessage(OptionalCasePropertiesPanel.class, "OptionalCasePropertiesPanel.lbPointOfContactEmailLabel.text")); // NOI18N
469-
lbPointOfContactEmailLabel.setMaximumSize(new java.awt.Dimension(82, 14));
471+
lbPointOfContactEmailLabel.setMaximumSize(new java.awt.Dimension(182, 14));
470472
lbPointOfContactEmailLabel.setMinimumSize(new java.awt.Dimension(82, 14));
471-
lbPointOfContactEmailLabel.setPreferredSize(new java.awt.Dimension(82, 14));
473+
lbPointOfContactEmailLabel.setPreferredSize(new java.awt.Dimension(120, 14));
472474
gridBagConstraints = new java.awt.GridBagConstraints();
473475
gridBagConstraints.gridx = 0;
474476
gridBagConstraints.gridy = 3;
477+
gridBagConstraints.gridwidth = 2;
475478
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
476479
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
477480
gridBagConstraints.insets = new java.awt.Insets(7, 12, 13, 0);
478481
orgainizationPanel.add(lbPointOfContactEmailLabel, gridBagConstraints);
479482
gridBagConstraints = new java.awt.GridBagConstraints();
480-
gridBagConstraints.gridx = 1;
483+
gridBagConstraints.gridx = 2;
481484
gridBagConstraints.gridy = 2;
482-
gridBagConstraints.gridwidth = 3;
485+
gridBagConstraints.gridwidth = 2;
483486
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
484487
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
485488
gridBagConstraints.insets = new java.awt.Insets(7, 4, 0, 18);

0 commit comments

Comments
 (0)