mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-18 10:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7246 from kellykelly3/7951-incorrect-page-number

Browse Source 
7951 Fixed string content page number issue
This commit is contained in:
Richard Cordovano 2021-09-08 16:20:32 -04:00 committed by GitHub
commit 069e21f9c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/Bundle.properties
View File

@ -8,7 +8,7 @@ StringsContentPanel.selectAllMenuItem.text=Select All
StringsContentPanel.currentPageLabel.text_1=1 StringsContentPanel.currentPageLabel.text_1=1
StringsContentPanel.copyMenuItem.text=Copy StringsContentPanel.copyMenuItem.text=Copy
StringsContentPanel.ofLabel.text_1=of StringsContentPanel.ofLabel.text_1=of
StringsContentPanel.totalPageLabel.text_1=100 StringsContentPanel.totalPageLabel.text_1=1000
StringsContentPanel.languageLabel.toolTipText= StringsContentPanel.languageLabel.toolTipText=
StringsContentPanel.languageLabel.text=Script: StringsContentPanel.languageLabel.text=Script:
StringsContentPanel.languageCombo.toolTipText=Language to attempt when interpreting (extracting and decoding) strings from binary data StringsContentPanel.languageCombo.toolTipText=Language to attempt when interpreting (extracting and decoding) strings from binary data

2
Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/Bundle.properties-MERGED
View File

@ -9,7 +9,7 @@ StringsContentPanel.selectAllMenuItem.text=Select All
StringsContentPanel.currentPageLabel.text_1=1 StringsContentPanel.currentPageLabel.text_1=1
StringsContentPanel.copyMenuItem.text=Copy StringsContentPanel.copyMenuItem.text=Copy
StringsContentPanel.ofLabel.text_1=of StringsContentPanel.ofLabel.text_1=of
StringsContentPanel.totalPageLabel.text_1=100 StringsContentPanel.totalPageLabel.text_1=1000
StringsContentPanel.languageLabel.toolTipText= StringsContentPanel.languageLabel.toolTipText=
StringsContentPanel.languageLabel.text=Script: StringsContentPanel.languageLabel.text=Script:
StringsContentPanel.languageCombo.toolTipText=Language to attempt when interpreting (extracting and decoding) strings from binary data StringsContentPanel.languageCombo.toolTipText=Language to attempt when interpreting (extracting and decoding) strings from binary data

15
Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/StringsContentPanel.form
View File

@ -103,15 +103,6 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/contentviewers/textcontentviewer/Bundle.properties" key="StringsContentPanel.currentPageLabel.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/textcontentviewer/Bundle.properties" key="StringsContentPanel.currentPageLabel.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[18, 25]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[7, 25]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[18, 25]"/>
</Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JSeparator" name="jSepMed2"> <Component class="javax.swing.JSeparator" name="jSepMed2">
@ -158,13 +149,13 @@
<ResourceString bundle="org/sleuthkit/autopsy/contentviewers/textcontentviewer/Bundle.properties" key="StringsContentPanel.totalPageLabel.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/textcontentviewer/Bundle.properties" key="StringsContentPanel.totalPageLabel.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
<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="[21, 25]"/> <Dimension value="[25, 25]"/>
</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="[21, 25]"/> <Dimension value="[25, 25]"/>
</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="[21, 25]"/> <Dimension value="[25, 25]"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>

35
Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/StringsContentPanel.java
View File

@ -95,12 +95,11 @@ public class StringsContentPanel extends javax.swing.JPanel {
currentPage = 1; currentPage = 1;
currentOffset = 0; currentOffset = 0;
this.dataSource = null; this.dataSource = null;
currentPageLabel.setText(""); currentPageLabel.setText("1");
totalPageLabel.setText(""); totalPageLabel.setText("");
prevPageButton.setEnabled(false); prevPageButton.setEnabled(false);
nextPageButton.setEnabled(false); nextPageButton.setEnabled(false);
outputViewPane.setText(""); // reset the output view outputViewPane.setText(""); // reset the output view
setComponentsVisibility(false); // hides the components that not needed
} }
/** /**
@ -167,9 +166,6 @@ public class StringsContentPanel extends javax.swing.JPanel {
panelPageOfCount.add(jSepMed1); panelPageOfCount.add(jSepMed1);
currentPageLabel.setText(org.openide.util.NbBundle.getMessage(StringsContentPanel.class, "StringsContentPanel.currentPageLabel.text_1")); // NOI18N currentPageLabel.setText(org.openide.util.NbBundle.getMessage(StringsContentPanel.class, "StringsContentPanel.currentPageLabel.text_1")); // NOI18N
currentPageLabel.setMaximumSize(new java.awt.Dimension(18, 25));
currentPageLabel.setMinimumSize(new java.awt.Dimension(7, 25));
currentPageLabel.setPreferredSize(new java.awt.Dimension(18, 25));
panelPageOfCount.add(currentPageLabel); panelPageOfCount.add(currentPageLabel);
jSepMed2.setPreferredSize(new java.awt.Dimension(5, 0)); jSepMed2.setPreferredSize(new java.awt.Dimension(5, 0));
@ -185,9 +181,9 @@ public class StringsContentPanel extends javax.swing.JPanel {
panelPageOfCount.add(jSepMed3); panelPageOfCount.add(jSepMed3);
totalPageLabel.setText(org.openide.util.NbBundle.getMessage(StringsContentPanel.class, "StringsContentPanel.totalPageLabel.text_1")); // NOI18N totalPageLabel.setText(org.openide.util.NbBundle.getMessage(StringsContentPanel.class, "StringsContentPanel.totalPageLabel.text_1")); // NOI18N
totalPageLabel.setMaximumSize(new java.awt.Dimension(21, 25)); totalPageLabel.setMaximumSize(new java.awt.Dimension(25, 25));
totalPageLabel.setMinimumSize(new java.awt.Dimension(21, 25)); totalPageLabel.setMinimumSize(new java.awt.Dimension(25, 25));
totalPageLabel.setPreferredSize(new java.awt.Dimension(21, 25)); totalPageLabel.setPreferredSize(new java.awt.Dimension(25, 25));
panelPageOfCount.add(totalPageLabel); panelPageOfCount.add(totalPageLabel);
jSepMed4.setPreferredSize(new java.awt.Dimension(5, 0)); jSepMed4.setPreferredSize(new java.awt.Dimension(5, 0));
@ -409,24 +405,6 @@ public class StringsContentPanel extends javax.swing.JPanel {
worker.execute(); worker.execute();
} }
/**
* To set the visibility of specific components in this class.
*
* @param isVisible whether to show or hide the specific components
*/
private void setComponentsVisibility(boolean isVisible) {
currentPageLabel.setVisible(isVisible);
totalPageLabel.setVisible(isVisible);
ofLabel.setVisible(isVisible);
prevPageButton.setVisible(isVisible);
nextPageButton.setVisible(isVisible);
pageLabel.setVisible(isVisible);
pageLabel2.setVisible(isVisible);
goToPageTextField.setVisible(isVisible);
goToPageLabel.setVisible(isVisible);
languageCombo.setVisible(isVisible);
languageLabel.setVisible(isVisible);
}
/** /**
* Swingworker for getting the text from a content object. * Swingworker for getting the text from a content object.
@ -509,9 +487,7 @@ public class StringsContentPanel extends javax.swing.JPanel {
int totalPage = Math.round((dataSource.getSize() - 1) / PAGE_LENGTH) + 1; int totalPage = Math.round((dataSource.getSize() - 1) / PAGE_LENGTH) + 1;
totalPageLabel.setText(Integer.toString(totalPage)); totalPageLabel.setText(Integer.toString(totalPage));
currentPageLabel.setText("1");
outputViewPane.setText(text); // set the output view outputViewPane.setText(text); // set the output view
setComponentsVisibility(true); // shows the components that not needed
outputViewPane.moveCaretPosition(0); outputViewPane.moveCaretPosition(0);
setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
@ -557,10 +533,7 @@ public class StringsContentPanel extends javax.swing.JPanel {
prevPageButton.setEnabled(false); prevPageButton.setEnabled(false);
currentPage = 1; currentPage = 1;
totalPageLabel.setText("1");
currentPageLabel.setText("1");
outputViewPane.setText(text); // set the output view outputViewPane.setText(text); // set the output view
setComponentsVisibility(true); // shows the components that not needed
outputViewPane.moveCaretPosition(0); outputViewPane.moveCaretPosition(0);
setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));