Skip to content

Commit d9a37c4

Browse files
rcordovanorcordovano
authored
Merge pull request #5806 from wschaeferB/6225-fixTextClipping
6225 fix text clipping
2 parents 47d6f83 + 89e17ec commit d9a37c4

35 files changed

+2949
-2022
lines changed

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

Lines changed: 56 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -312,83 +312,28 @@
312312
</Property>
313313
</Properties>
314314

315-
<Layout>
316-
<DimensionLayout dim="0">
317-
<Group type="103" groupAlignment="0" attributes="0">
318-
<Group type="102" alignment="0" attributes="0">
319-
<Group type="103" groupAlignment="0" attributes="0">
320-
<Group type="102" attributes="0">
321-
<EmptySpace min="-2" pref="106" max="-2" attributes="0"/>
322-
<Group type="103" groupAlignment="0" attributes="0">
323-
<Component id="lbPointOfContactPhoneLabel" linkSize="4" alignment="0" max="32767" attributes="0"/>
324-
<Component id="lbPointOfContactEmailLabel" linkSize="4" alignment="0" max="32767" attributes="0"/>
325-
<Component id="lbPointOfContactNameLabel" linkSize="4" min="-2" pref="109" max="-2" attributes="0"/>
326-
</Group>
327-
<EmptySpace max="-2" attributes="0"/>
328-
<Group type="103" groupAlignment="0" attributes="0">
329-
<Component id="lbPointOfContactPhoneText" alignment="1" max="32767" attributes="0"/>
330-
<Component id="lbPointOfContactNameText" max="32767" attributes="0"/>
331-
<Component id="lbPointOfContactEmailText" max="32767" attributes="0"/>
332-
</Group>
333-
</Group>
334-
<Group type="102" attributes="0">
335-
<EmptySpace max="-2" attributes="0"/>
336-
<Component id="lbOrganizationNameLabel" pref="206" max="32767" attributes="0"/>
337-
<EmptySpace type="separate" max="-2" attributes="0"/>
338-
<Component id="comboBoxOrgName" min="-2" pref="108" max="-2" attributes="0"/>
339-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
340-
<Component id="bnNewOrganization" min="-2" pref="147" max="-2" attributes="0"/>
341-
</Group>
342-
</Group>
343-
<EmptySpace min="-2" max="-2" attributes="0"/>
344-
</Group>
345-
</Group>
346-
</DimensionLayout>
347-
<DimensionLayout dim="1">
348-
<Group type="103" groupAlignment="0" attributes="0">
349-
<Group type="102" alignment="0" attributes="0">
350-
<EmptySpace max="-2" attributes="0"/>
351-
<Group type="103" groupAlignment="3" attributes="0">
352-
<Component id="lbOrganizationNameLabel" alignment="3" min="-2" max="-2" attributes="0"/>
353-
<Component id="comboBoxOrgName" alignment="3" min="-2" max="-2" attributes="0"/>
354-
<Component id="bnNewOrganization" alignment="3" min="-2" max="-2" attributes="0"/>
355-
</Group>
356-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
357-
<Group type="103" groupAlignment="0" max="-2" attributes="0">
358-
<Component id="lbPointOfContactNameText" max="32767" attributes="0"/>
359-
<Component id="lbPointOfContactNameLabel" max="32767" attributes="0"/>
360-
</Group>
361-
<EmptySpace min="-2" max="-2" attributes="0"/>
362-
<Group type="103" groupAlignment="0" max="-2" attributes="0">
363-
<Component id="lbPointOfContactPhoneLabel" alignment="0" max="32767" attributes="0"/>
364-
<Component id="lbPointOfContactPhoneText" alignment="0" min="-2" pref="14" max="-2" attributes="0"/>
365-
</Group>
366-
<EmptySpace max="-2" attributes="0"/>
367-
<Group type="103" groupAlignment="0" max="-2" attributes="0">
368-
<Component id="lbPointOfContactEmailLabel" alignment="0" max="32767" attributes="0"/>
369-
<Component id="lbPointOfContactEmailText" alignment="0" min="-2" pref="14" max="-2" attributes="0"/>
370-
</Group>
371-
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
372-
</Group>
373-
</Group>
374-
</DimensionLayout>
375-
</Layout>
315+
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
376316
<SubComponents>
377317
<Component class="javax.swing.JLabel" name="lbPointOfContactPhoneLabel">
378318
<Properties>
379319
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
380320
<ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="OptionalCasePropertiesPanel.lbPointOfContactPhoneLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
381321
</Property>
382322
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
383-
<Dimension value="[82, 14]"/>
323+
<Dimension value="[182, 14]"/>
384324
</Property>
385325
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
386326
<Dimension value="[82, 14]"/>
387327
</Property>
388328
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
389-
<Dimension value="[82, 14]"/>
329+
<Dimension value="[120, 14]"/>
390330
</Property>
391331
</Properties>
332+
<Constraints>
333+
<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="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"/>
335+
</Constraint>
336+
</Constraints>
392337
</Component>
393338
<Component class="javax.swing.JComboBox" name="comboBoxOrgName">
394339
<Properties>
@@ -402,22 +347,32 @@
402347
<AuxValues>
403348
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
404349
</AuxValues>
350+
<Constraints>
351+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
352+
<GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="18" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
353+
</Constraint>
354+
</Constraints>
405355
</Component>
406356
<Component class="javax.swing.JLabel" name="lbPointOfContactNameLabel">
407357
<Properties>
408358
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
409359
<ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="OptionalCasePropertiesPanel.lbPointOfContactNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
410360
</Property>
411361
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
412-
<Dimension value="[82, 14]"/>
362+
<Dimension value="[182, 14]"/>
413363
</Property>
414364
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
415365
<Dimension value="[82, 14]"/>
416366
</Property>
417367
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
418-
<Dimension value="[82, 14]"/>
368+
<Dimension value="[120, 14]"/>
419369
</Property>
420370
</Properties>
371+
<Constraints>
372+
<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="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"/>
374+
</Constraint>
375+
</Constraints>
421376
</Component>
422377
<Component class="javax.swing.JButton" name="bnNewOrganization">
423378
<Properties>
@@ -428,56 +383,86 @@
428383
<Insets value="[2, 6, 2, 6]"/>
429384
</Property>
430385
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
431-
<Dimension value="[123, 23]"/>
386+
<Dimension value="[160, 23]"/>
432387
</Property>
433388
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
434389
<Dimension value="[123, 23]"/>
435390
</Property>
436391
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
437-
<Dimension value="[123, 23]"/>
392+
<Dimension value="[140, 23]"/>
438393
</Property>
439394
</Properties>
440395
<Events>
441396
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bnNewOrganizationActionPerformed"/>
442397
</Events>
398+
<Constraints>
399+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
400+
<GridBagConstraints gridX="3" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="12" insetsBottom="0" insetsRight="18" anchor="18" weightX="0.0" weightY="0.0"/>
401+
</Constraint>
402+
</Constraints>
443403
</Component>
444404
<Component class="javax.swing.JLabel" name="lbPointOfContactEmailText">
405+
<Constraints>
406+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
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"/>
408+
</Constraint>
409+
</Constraints>
445410
</Component>
446411
<Component class="javax.swing.JLabel" name="lbPointOfContactNameText">
412+
<Constraints>
413+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
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"/>
415+
</Constraint>
416+
</Constraints>
447417
</Component>
448418
<Component class="javax.swing.JLabel" name="lbOrganizationNameLabel">
449419
<Properties>
450420
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
451421
<ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="OptionalCasePropertiesPanel.lbOrganizationNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
452422
</Property>
453423
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
454-
<Dimension value="[189, 14]"/>
424+
<Dimension value="[300, 14]"/>
455425
</Property>
456426
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
457427
<Dimension value="[189, 14]"/>
458428
</Property>
459429
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
460-
<Dimension value="[189, 14]"/>
430+
<Dimension value="[220, 14]"/>
461431
</Property>
462432
</Properties>
433+
<Constraints>
434+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
435+
<GridBagConstraints gridX="0" gridY="0" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
436+
</Constraint>
437+
</Constraints>
463438
</Component>
464439
<Component class="javax.swing.JLabel" name="lbPointOfContactEmailLabel">
465440
<Properties>
466441
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
467442
<ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="OptionalCasePropertiesPanel.lbPointOfContactEmailLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
468443
</Property>
469444
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
470-
<Dimension value="[82, 14]"/>
445+
<Dimension value="[182, 14]"/>
471446
</Property>
472447
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
473448
<Dimension value="[82, 14]"/>
474449
</Property>
475450
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
476-
<Dimension value="[82, 14]"/>
451+
<Dimension value="[120, 14]"/>
477452
</Property>
478453
</Properties>
454+
<Constraints>
455+
<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="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"/>
457+
</Constraint>
458+
</Constraints>
479459
</Component>
480460
<Component class="javax.swing.JLabel" name="lbPointOfContactPhoneText">
461+
<Constraints>
462+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
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"/>
464+
</Constraint>
465+
</Constraints>
481466
</Component>
482467
</SubComponents>
483468
</Container>

0 commit comments

Comments
 (0)