Layout and bug fixes

ldiogoz · Aug 30, 2016 · 88872c0 · 88872c0
1 parent ac4520f
commit 88872c0
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 40 deletions.
diff --git a/aCCinaPDF/aCCinaPDF.cfg b/aCCinaPDF/aCCinaPDF.cfg
@@ -0,0 +1,17 @@
+#Settings
+#Tue Aug 30 19:59:50 BST 2016
+textAlign=0
+fontLocation=extrafonts\\verdana.ttf
+showLocation=true
+language=en-US
+pdfversion=/1.7
+prefix=aCCinatura
+signatureWidth=403
+showReason=true
+fontBold=false
+fontColor=0
+renderQuality=2
+fontItalic=true
+showName=true
+showDate=true
+signatureHeight=34
diff --git a/aCCinaPDF/src/Text_en_US.properties b/aCCinaPDF/src/Text_en_US.properties
@@ -52,8 +52,8 @@ certNotChained=The certificate is not chained to a trusted certificate chain
 certExpired=The certificate has expired
 certChainedLocally=The signature does not contain the full certificate chain nor the revocation checks. However, the signer's certificate was issued by a certificate contained in the trusted keystore
 validTimestamp=The signature includes a valid timestamp
-signerDateTime=The Date and Time of the signature are from the signer's computer
-signerDateTimeSmall=date and time from the signer's computer
+signerDateTime=The Date and Time of the signature are from the signer's computer or could not be validated
+signerDateTimeSmall=date and time from the signer's computer or unable to validate
 isLtv=Long Term Validation Enabled
 reason=Reason
 defaultReason=Certified Electronic Signature (DL 62/2003)

diff --git a/aCCinaPDF/src/Text_pt_PT.properties b/aCCinaPDF/src/Text_pt_PT.properties
@@ -52,8 +52,8 @@ certNotChained=O Certificado n\u00e3o est\u00e1 encadeado a um certificado desig
 certExpired=O Certificado expirou
 certChainedLocally=A assinatura n\u00e3o cont\u00e9m a \u00e2ncora completa nem verifica\u00e7\u00f5es de revoga\u00e7\u00e3o. No entanto, o certificado do assinante foi emitido por um certificado na \u00e2ncora confi\u00e1vel
 validTimestamp=A Assinatura inclui um carimbo de Data e Hora v\u00e1lido
-signerDateTime=A Data e Hora da assinatura s\u00e3o do rel\u00f3gio do computador do signat\u00e1rio
-signerDateTimeSmall=hora do computador do signat\u00e1rio
+signerDateTime=A Data e Hora da assinatura s\u00e3o do rel\u00f3gio do computador do signat\u00e1rio ou n\u00e3o p\u00f4de ser validada
+signerDateTimeSmall=hora do computador do signat\u00e1rio ou n\u00e3o validada
 isLtv=Habilitada para valida\u00e7\u00e3o a longo termo
 reason=Raz\u00e3o
 defaultReason=Assinatura Eletr\u00f3nica Qualificada (DL 62/2003)

diff --git a/aCCinaPDF/src/controller/Bundle.java b/aCCinaPDF/src/controller/Bundle.java
@@ -26,8 +26,10 @@ public enum Locales {
     };
 
     public Bundle() {
-        locales.add(new Locale("en", "us"));
-        locales.add(new Locale("pt", "pt"));
+        this.locales.add(new Locale("en", "us"));
+        this.locales.add(new Locale("pt", "pt"));
+        this.setCurrentLocale(Bundle.Locales.English);
+
     }
 
     public static Bundle getBundle() {

diff --git a/aCCinaPDF/src/view/CertificateManagementDialog.form b/aCCinaPDF/src/view/CertificateManagementDialog.form
@@ -141,13 +141,7 @@
             <Component class="javax.swing.JList" name="jList1">
               <Properties>
                 <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
-                  <StringArray count="5">
-                    <StringItem index="0" value="Item 1"/>
-                    <StringItem index="1" value="Item 2"/>
-                    <StringItem index="2" value="Item 3"/>
-                    <StringItem index="3" value="Item 4"/>
-                    <StringItem index="4" value="Item 5"/>
-                  </StringArray>
+                  <StringArray count="0"/>
                 </Property>
               </Properties>
               <Events>

diff --git a/aCCinaPDF/src/view/CertificateManagementDialog.java b/aCCinaPDF/src/view/CertificateManagementDialog.java
@@ -234,11 +234,6 @@ private void initComponents() {
 
         panelTrustedCertificates.setBorder(javax.swing.BorderFactory.createTitledBorder("Certificados Confiáveis"));
 
-        jList1.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
-        });
         jList1.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
             public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
                 jList1ValueChanged(evt);

diff --git a/aCCinaPDF/src/view/MainWindow.form b/aCCinaPDF/src/view/MainWindow.form
@@ -195,21 +195,21 @@
                     <DimensionLayout dim="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
                                   <Group type="102" alignment="0" attributes="0">
-                                      <Component id="cbVolume" max="32767" attributes="0"/>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Component id="btnRefreshTree" min="-2" pref="120" max="-2" attributes="0"/>
+                                      <Component id="cbVolume" pref="121" max="32767" attributes="0"/>
+                                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                                      <Component id="btnRefreshTree" pref="150" max="32767" attributes="0"/>
                                   </Group>
                                   <Component id="jScrollPane2" max="32767" attributes="0"/>
                                   <Group type="102" alignment="1" attributes="0">
-                                      <Component id="lblLookFor" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Component id="tfProcurar" pref="191" max="32767" attributes="0"/>
+                                      <Component id="lblLookFor" max="32767" attributes="0"/>
+                                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                                      <Component id="tfProcurar" pref="208" max="32767" attributes="0"/>
                                   </Group>
                               </Group>
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                           </Group>
                       </Group>
                     </DimensionLayout>
@@ -227,7 +227,7 @@
                                   <Component id="lblLookFor" alignment="3" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Component id="jScrollPane2" pref="602" max="32767" attributes="0"/>
+                              <Component id="jScrollPane2" pref="595" max="32767" attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
                           </Group>
                       </Group>
@@ -287,6 +287,9 @@
                     <Component class="view.WideDropDownComboBox" name="cbVolume">
                       <Properties>
                         <Property name="toolTipText" type="java.lang.String" value=""/>
+                        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[10, 20]"/>
+                        </Property>
                       </Properties>
                       <Events>
                         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbVolumeActionPerformed"/>
@@ -305,15 +308,15 @@
                     <DimensionLayout dim="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
                                   <Component id="jScrollPane1" max="32767" attributes="0"/>
                                   <Group type="102" attributes="0">
-                                      <Component id="lblOpenedDocuments" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace min="0" pref="140" max="32767" attributes="0"/>
+                                      <Component id="lblOpenedDocuments" max="32767" attributes="0"/>
+                                      <EmptySpace min="-2" pref="167" max="-2" attributes="0"/>
                                   </Group>
                               </Group>
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                           </Group>
                       </Group>
                     </DimensionLayout>
@@ -389,7 +392,7 @@
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="workspacePanel" alignment="0" pref="895" max="32767" attributes="0"/>
+                  <Component id="workspacePanel" alignment="0" pref="878" max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>

diff --git a/aCCinaPDF/src/view/MainWindow.java b/aCCinaPDF/src/view/MainWindow.java
@@ -570,6 +570,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
         lblLookFor.setMinimumSize(new java.awt.Dimension(0, 16));
 
         cbVolume.setToolTipText("");
+        cbVolume.setMinimumSize(new java.awt.Dimension(10, 20));
         cbVolume.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 cbVolumeActionPerformed(evt);
@@ -584,14 +585,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addContainerGap()
                 .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPanel2Layout.createSequentialGroup()
-                        .addComponent(cbVolume, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(cbVolume, javax.swing.GroupLayout.DEFAULT_SIZE, 121, Short.MAX_VALUE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(btnRefreshTree, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(btnRefreshTree, javax.swing.GroupLayout.DEFAULT_SIZE, 150, Short.MAX_VALUE))
                     .addComponent(jScrollPane2)
                     .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
-                        .addComponent(lblLookFor, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(lblLookFor, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(tfProcurar, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)))
+                        .addComponent(tfProcurar, javax.swing.GroupLayout.DEFAULT_SIZE, 208, Short.MAX_VALUE)))
                 .addContainerGap())
         );
         jPanel2Layout.setVerticalGroup(
@@ -606,7 +607,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                     .addComponent(tfProcurar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(lblLookFor, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 602, Short.MAX_VALUE)
+                .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 595, Short.MAX_VALUE)
                 .addContainerGap())
         );
 
@@ -646,8 +647,8 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
                 .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(jScrollPane1)
                     .addGroup(jPanel3Layout.createSequentialGroup()
-                        .addComponent(lblOpenedDocuments)
-                        .addGap(0, 140, Short.MAX_VALUE)))
+                        .addComponent(lblOpenedDocuments, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addGap(167, 167, 167)))
                 .addContainerGap())
         );
         jPanel3Layout.setVerticalGroup(
@@ -685,7 +686,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         );
         rightPanelLayout.setVerticalGroup(
             rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(workspacePanel, javax.swing.GroupLayout.DEFAULT_SIZE, 895, Short.MAX_VALUE)
+            .addComponent(workspacePanel, javax.swing.GroupLayout.DEFAULT_SIZE, 878, Short.MAX_VALUE)
         );
 
         jSplitPane1.setRightComponent(rightPanel);

diff --git a/aCCinaPDF/src/view/WorkspacePanel.java b/aCCinaPDF/src/view/WorkspacePanel.java
@@ -123,6 +123,9 @@ public enum CardEnum {
      */
     public WorkspacePanel() {
         initComponents();
+        if (Bundle.getBundle().getCurrentLocale() == null) {
+            Bundle.getBundle().setCurrentLocale(Bundle.Locales.English);
+        }
         updateText();
         status = Status.READY;
         cl = (CardLayout) this.rightPanel.getLayout();