cambiada tipografia para compatibilidad en linux

franquitt · Sep 4, 2017 · 4715d57 · 4715d57
1 parent dd068b4
commit 4715d57
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/nbproject/build-native.xml b/nbproject/build-native.xml
@@ -664,6 +664,25 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
 
                 // manifest
                 var man = jar.createManifest();
+                var userManifestPath = project.getProperty("manifest.file");
+                if (userManifestPath) {
+                    var userManifestFile = project.resolveFile(userManifestPath);
+                    if (userManifestFile.isFile()) {
+                        var manifestEncoding = project.getProperty("manifest.encoding");
+                        var userManifestReader = manifestEncoding ?
+                                new java.io.InputStreamReader(
+                                    new java.io.FileInputStream(userManifestFile),
+                                    manifestEncoding) :
+                                new java.io.InputStreamReader(
+                                    new java.io.FileInputStream(userManifestFile));
+                        try {
+                            var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
+                            man.merge(userManifest);
+                        } finally {
+                            userManifestReader.close();
+                        }
+                    }
+                }
                 var a1val = new String(project.getProperty("application.vendor"));
                 var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
                 a1.setName("Implementation-Vendor");

diff --git a/nbproject/build-native.xml~ b/nbproject/build-native.xml~
@@ -664,25 +664,6 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
 
                 // manifest
                 var man = jar.createManifest();
-                var userManifestPath = project.getProperty("manifest.file");
-                if (userManifestPath) {
-                    var userManifestFile = project.resolveFile(userManifestPath);
-                    if (userManifestFile.isFile()) {
-                        var manifestEncoding = project.getProperty("manifest.encoding");
-                        var userManifestReader = manifestEncoding ?
-                                new java.io.InputStreamReader(
-                                    new java.io.FileInputStream(userManifestFile),
-                                    manifestEncoding) :
-                                new java.io.InputStreamReader(
-                                    new java.io.FileInputStream(userManifestFile));
-                        try {
-                            var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
-                            man.merge(userManifest);
-                        } finally {
-                            userManifestReader.close();
-                        }
-                    }
-                }
                 var a1val = new String(project.getProperty("application.vendor"));
                 var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
                 a1.setName("Implementation-Vendor");

diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
@@ -3,4 +3,4 @@ do.depend=false
 do.jar=true
 javac.debug=true
 javadoc.preview=true
-user.properties.file=C:\\Users\\FrancoMain\\AppData\\Roaming\\NetBeans\\8.1\\build.properties
+user.properties.file=/home/franco/.netbeans/8.2/build.properties
diff --git a/src/MadTeam/MainWindow.form b/src/MadTeam/MainWindow.form
@@ -182,6 +182,7 @@
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="columns" type="int" value="20"/>
                     <Property name="rows" type="int" value="5"/>
+                    <Property name="text" type="java.lang.String" value="fdfdssss"/>
                   </Properties>
                 </Component>
               </SubComponents>

diff --git a/src/MadTeam/MainWindow.java b/src/MadTeam/MainWindow.java
@@ -68,13 +68,14 @@ public MainWindow() {
         try {
             GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
             ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, new File("assets/fonts/FreeMono.ttf")));
-            myFont = new Font("FreeMono", Font.BOLD, 37);
+            myFont = new Font("FreeMono", Font.PLAIN, 37);
         } catch (IOException | FontFormatException e) {
             System.out.println("Warning! " + e.toString());
         }
         frmMsg.setSize(320, 101);
 
         txtBrailleText.setFont(myFont);
+        System.out.println(txtBrailleText.getFont().getFontName());
         //txtBrailleText.setText("\u2813\u2815\u2807\u2801");
         txtplaintext.setLineWrap(true);
         txtplaintext.setWrapStyleWord(true);
@@ -220,6 +221,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         txtBrailleText.setEditable(false);
         txtBrailleText.setColumns(20);
         txtBrailleText.setRows(5);
+        txtBrailleText.setText("fdfdssss");
         jScrollPane2.setViewportView(txtBrailleText);
 
         jTabbedPane1.addTab("Braille", jScrollPane2);