mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-09 06:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed layout of ModalNoButtons

Browse Source
This commit is contained in:
0xNF 2012-10-18 13:39:27 -04:00
parent 2be9648e21
commit 24ba7509d8
3 changed files with 61 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties
View File

@ -58,7 +58,6 @@ HashDbManagementPanel.hashDbLocationLabel.text=No database selected
HashDbManagementPanel.informationLabel.text=Information HashDbManagementPanel.informationLabel.text=Information
HashDbManagementPanel.hashDatabasesLabel.text=Hash Databases: HashDbManagementPanel.hashDatabasesLabel.text=Hash Databases:
OpenIDE-Module-Short-Description=Hash Database Ingest Module and hash db tools OpenIDE-Module-Short-Description=Hash Database Ingest Module and hash db tools
ModalNoButtons.INDEXING_LABEL.text=Indexing x of y ModalNoButtons.CURRENTLYON_LABEL.text=Currently Indexing x of y
ModalNoButtons.CURRENTLYON_LABEL.text=Currently Indexing:
ModalNoButtons.CURRENTDB_LABEL.text=CurrentDB
ModalNoButtons.GO_GET_COFFEE_LABEL.text=Hash databases are currently being indexed, this may take some time. ModalNoButtons.GO_GET_COFFEE_LABEL.text=Hash databases are currently being indexed, this may take some time.
ModalNoButtons.CURRENTDB_LABEL.text=(CurrentDb)

77
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/ModalNoButtons.form
View File

@ -3,7 +3,16 @@
<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> <Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties> <Properties>
<Property name="defaultCloseOperation" type="int" value="2"/> <Property name="defaultCloseOperation" type="int" value="2"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[519, 100]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[519, 100]"/>
</Property>
<Property name="modal" type="boolean" value="true"/> <Property name="modal" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[519, 100]"/>
</Property>
<Property name="resizable" type="boolean" value="false"/> <Property name="resizable" type="boolean" value="false"/>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
@ -24,29 +33,23 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0"> <Group type="102" attributes="0">
<EmptySpace min="0" pref="28" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0"> <Component id="INDEXING_PROGBAR" alignment="1" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="GO_GET_COFFEE_LABEL" alignment="1" min="-2" max="-2" attributes="0"/> <Component id="GO_GET_COFFEE_LABEL" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="70" max="-2" attributes="0"/> <Component id="CURRENTLYON_LABEL" min="-2" max="-2" attributes="0"/>
<Component id="INDEXING_LABEL" min="-2" pref="197" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> <Component id="CURRENTDB_LABEL" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
<Component id="INDEXING_PROGBAR" min="-2" pref="264" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace min="-2" pref="23" max="-2" attributes="0"/> <EmptySpace min="0" pref="161" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="CURRENTLYON_LABEL" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="CURRENTDB_LABEL" min="-2" pref="181" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -54,32 +57,20 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="INDEXING_LABEL" min="-2" max="-2" attributes="0"/> <Component id="GO_GET_COFFEE_LABEL" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="CURRENTLYON_LABEL" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="CURRENTLYON_LABEL" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="CURRENTDB_LABEL" alignment="3" min="-2" pref="17" max="-2" attributes="0"/> <Component id="CURRENTDB_LABEL" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="32767" attributes="0"/> <EmptySpace max="32767" attributes="0"/>
<Component id="GO_GET_COFFEE_LABEL" min="-2" max="-2" attributes="0"/> <Component id="INDEXING_PROGBAR" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" pref="70" max="-2" attributes="0"/>
<Component id="INDEXING_PROGBAR" min="-2" pref="22" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JLabel" name="INDEXING_LABEL">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="24" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="ModalNoButtons.INDEXING_LABEL.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JProgressBar" name="INDEXING_PROGBAR"> <Component class="javax.swing.JProgressBar" name="INDEXING_PROGBAR">
</Component> </Component>
<Component class="javax.swing.JLabel" name="GO_GET_COFFEE_LABEL"> <Component class="javax.swing.JLabel" name="GO_GET_COFFEE_LABEL">
@ -90,16 +81,6 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="CURRENTDB_LABEL">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="14" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="ModalNoButtons.CURRENTDB_LABEL.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="CURRENTLYON_LABEL"> <Component class="javax.swing.JLabel" name="CURRENTLYON_LABEL">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
@ -110,5 +91,15 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="CURRENTDB_LABEL">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="14" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="ModalNoButtons.CURRENTDB_LABEL.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
</Component>
</SubComponents> </SubComponents>
</Form> </Form>

58
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/ModalNoButtons.java
View File

@ -52,64 +52,57 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
INDEXING_LABEL = new javax.swing.JLabel();
INDEXING_PROGBAR = new javax.swing.JProgressBar(); INDEXING_PROGBAR = new javax.swing.JProgressBar();
GO_GET_COFFEE_LABEL = new javax.swing.JLabel(); GO_GET_COFFEE_LABEL = new javax.swing.JLabel();
CURRENTDB_LABEL = new javax.swing.JLabel();
CURRENTLYON_LABEL = new javax.swing.JLabel(); CURRENTLYON_LABEL = new javax.swing.JLabel();
CURRENTDB_LABEL = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setMaximumSize(new java.awt.Dimension(519, 100));
setMinimumSize(new java.awt.Dimension(519, 100));
setModal(true); setModal(true);
setPreferredSize(new java.awt.Dimension(519, 100));
setResizable(false); setResizable(false);
INDEXING_LABEL.setFont(new java.awt.Font("Tahoma", 0, 24)); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(INDEXING_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.INDEXING_LABEL.text")); // NOI18N
GO_GET_COFFEE_LABEL.setDisplayedMnemonic('H'); GO_GET_COFFEE_LABEL.setDisplayedMnemonic('H');
org.openide.awt.Mnemonics.setLocalizedText(GO_GET_COFFEE_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.GO_GET_COFFEE_LABEL.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(GO_GET_COFFEE_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.GO_GET_COFFEE_LABEL.text")); // NOI18N
CURRENTDB_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(CURRENTDB_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTDB_LABEL.text")); // NOI18N
CURRENTLYON_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N CURRENTLYON_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(CURRENTLYON_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTLYON_LABEL.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(CURRENTLYON_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTLYON_LABEL.text")); // NOI18N
CURRENTDB_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(CURRENTDB_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTDB_LABEL.text")); // NOI18N
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout); getContentPane().setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGap(0, 28, Short.MAX_VALUE) .addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(INDEXING_PROGBAR, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(GO_GET_COFFEE_LABEL, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(GO_GET_COFFEE_LABEL)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGap(70, 70, 70) .addComponent(CURRENTLYON_LABEL)
.addComponent(INDEXING_LABEL, javax.swing.GroupLayout.PREFERRED_SIZE, 197, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createSequentialGroup() .addComponent(CURRENTDB_LABEL)))
.addGap(24, 24, 24) .addGap(0, 161, Short.MAX_VALUE)))
.addComponent(INDEXING_PROGBAR, javax.swing.GroupLayout.PREFERRED_SIZE, 264, javax.swing.GroupLayout.PREFERRED_SIZE))) .addContainerGap())
.addGap(23, 23, 23))
.addGroup(layout.createSequentialGroup()
.addComponent(CURRENTLYON_LABEL)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(CURRENTDB_LABEL, javax.swing.GroupLayout.PREFERRED_SIZE, 181, javax.swing.GroupLayout.PREFERRED_SIZE))))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(INDEXING_LABEL) .addComponent(GO_GET_COFFEE_LABEL)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(CURRENTLYON_LABEL) .addComponent(CURRENTLYON_LABEL)
.addComponent(CURRENTDB_LABEL, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(CURRENTDB_LABEL))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(GO_GET_COFFEE_LABEL) .addComponent(INDEXING_PROGBAR, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGap(70, 70, 70))
.addComponent(INDEXING_PROGBAR, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(16, 16, 16))
); );
pack(); pack();
@ -122,12 +115,11 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
void indexThese(List<HashDb> unindexedd) { void indexThese(List<HashDb> unindexedd) {
length = unindexedd.size(); length = unindexedd.size();
this.INDEXING_LABEL.setText("Indexing " + currentcount + " of " + length);
this.INDEXING_PROGBAR.setIndeterminate(true); this.INDEXING_PROGBAR.setIndeterminate(true);
for (HashDb db : unindexedd) { for (HashDb db : unindexedd) {
this.CURRENTDB_LABEL.setText(currentDb);
db.addPropertyChangeListener(this);
currentDb = db.getName(); currentDb = db.getName();
this.CURRENTDB_LABEL.setText("(" + currentDb + ")");
db.addPropertyChangeListener(this);
try { try {
db.createIndex(); db.createIndex();
} catch (TskException e) { } catch (TskException e) {
@ -139,7 +131,6 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
private javax.swing.JLabel CURRENTDB_LABEL; private javax.swing.JLabel CURRENTDB_LABEL;
private javax.swing.JLabel CURRENTLYON_LABEL; private javax.swing.JLabel CURRENTLYON_LABEL;
private javax.swing.JLabel GO_GET_COFFEE_LABEL; private javax.swing.JLabel GO_GET_COFFEE_LABEL;
private javax.swing.JLabel INDEXING_LABEL;
private javax.swing.JProgressBar INDEXING_PROGBAR; private javax.swing.JProgressBar INDEXING_PROGBAR;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
@ -152,7 +143,8 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
this.setVisible(false); this.setVisible(false);
} else { } else {
currentcount++; currentcount++;
this.INDEXING_LABEL.setText("Indexing " + currentcount + " of " + length); this.CURRENTLYON_LABEL.setText("Currently indexing " + currentcount + " of " + length);
} }
} }
} }