Merge pull request #20 from Pega88/feature/small-ui-fixes

Feature/small ui fixes

.classpath

@@ -3,7 +3,5 @@
 	<classpathentry kind="src" path="src/resources"/>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/bitcoinj-core-0.14.5.jar"/>
-	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.21.0.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

build-mac.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+
+############################################
+#    Created by @Pega88 && @Jon_S_Layton   #
+#         v1.0.0 16 Feb 2018		   	   #
+############################################
+
+echo "***************************"
+echo "|| Checking dependencies ||"
+echo "***************************"
+echo ""
+
+#fetch + install jar2app
+if [ -e /usr/local/bin/jar2app ]
+then
+    echo "jar2app already installed - OK"
+else
+	git clone https://github.com/Jorl17/jar2app
+	cd jar2app
+	chmod +x install.sh uninstall.sh
+	sudo ./install.sh /usr/local/bin
+  cd ..
+  rm -rf jar2app
+fi
+
+#fetch + install dylibbundler 
+if [ -e /usr/local/bin/dylibbundler ]
+then
+    echo "dylibbundler already installed - OK"
+else
+	git clone https://github.com/auriamg/macdylibbundler
+	cd macdylibbundler 
+	sudo make install
+  cd ..
+  rm -rf macdylibbundler 
+fi
+
+if [ ! -e ./zcld ]
+then
+	echo "please provide zcld in the root directory"
+else
+	echo "found zcld - OK"
+fi
+
+if [ ! -e ./zcl-cli ]
+then
+	echo "please provide zcl-cli in the root directory"
+else
+	echo "found zcl-cli - OK"
+fi
+echo ""
+echo "******************"
+echo "|| building JAR ||"
+echo "******************"
+echo ""
+
+#build the jar from source
+ant jar -f src/build/build.xml
+
+echo ""
+echo "*******************"
+echo "|| Packaging App ||"
+echo "*******************"
+echo ""
+#package jar to app
+jar2app build/jars/ZclassicSwingWallet.jar  -i ./src/resources/images/zclassic-logo.icns
+
+#add zcld and zcl-cli into the required Contents folder of the App
+cp ./zcld ./ZclassicSwingWallet.app/Contents/zcld
+cp ./zcl-cli ./ZclassicSwingWallet.app/Contents/zcl-cli
+
+
+chmod +x ./ZclassicSwingWallet.app/Contents/zcld
+chmod +x ./ZclassicSwingWallet.app/Contents/zcl-cli
+echo ""
+echo "**********************************"
+echo "|| Statically linking libraries ||"
+echo "**********************************"
+echo ""
+
+#statically build required libraries
+dylibbundler -od -b -x ./ZclassicSwingWallet.app/Contents/zcld \
+                    -x ./ZclassicSwingWallet.app/Contents/zcl-cli \
+                    -d ./ZclassicSwingWallet.app/Contents/libs \
+                    -p @executable_path/libs

src/java/com/vaklinov/zcashui/AddressBookPanel.java

@@ -73,7 +73,7 @@ private JPanel buildButtonsPanel() {
         panel.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
         panel.setLayout(new FlowLayout(FlowLayout.CENTER, 3, 3));
 
-        JButton newContactButton = new JButton("New contact...");
+        JButton newContactButton = new JButton("New contact");
         newContactButton.addActionListener(new NewContactActionListener());
         panel.add(newContactButton);
 
@@ -316,8 +316,8 @@ public int getColumnCount() {
         @Override
         public String getColumnName(int columnIndex) {
             switch(columnIndex) {
-            case 0 : return "name";
-            case 1 : return "address";
+            case 0 : return "Name";
+            case 1 : return "Address";
             default:
                 throw new IllegalArgumentException("invalid column "+columnIndex);
             }

src/java/com/vaklinov/zcashui/AddressTable.java

@@ -55,8 +55,8 @@ public AddressTable(final Object[][] rowData, final Object[] columnNames,
 		super(rowData, columnNames);
 		int accelaratorKeyMask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
 
-		JMenuItem obtainPrivateKey = new JMenuItem("Obtain private key...");
-		obtainPrivateKey.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, accelaratorKeyMask));
+		JMenuItem obtainPrivateKey = new JMenuItem("Obtain private key");
+		//obtainPrivateKey.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, accelaratorKeyMask));
         popupMenu.add(obtainPrivateKey);
 
         obtainPrivateKey.addActionListener(new ActionListener()