Tab names capitalized, Own identity -> My Identity, Send cash -> Send ZCL, syntax

Jon Layton · Jon Layton · commit 593ac9b642e9 · 2018-02-15T16:22:39.000-06:00
diff --git a/src/java/com/vaklinov/zcashui/AboutDialog.java b/src/java/com/vaklinov/zcashui/AboutDialog.java
@@ -61,7 +61,7 @@ public class AboutDialog
 	public AboutDialog(JFrame parent)
 		throws UnsupportedEncodingException
 	{
-		this.setTitle("About...");
+		this.setTitle("About");
 		this.setSize(620, 440);
 	    this.setLocation(100, 100);
 		this.setLocationRelativeTo(parent);
@@ -233,7 +233,7 @@ public void actionPerformed(ActionEvent e) {
 		    " Copyright (c) 2018 Jon Layton &lt;me@jonl.io&gt; \n" +
         " Donate ZCL: zcF3db2JwLNHa917NfbfFR2EJWXgowFmQ4bvouJEvGmPjLPcH7hyAhpSAFUhm7ANiBJfzMpJHMkp363r7M3GEC8g8oQXJ5n " +
 			"\n" +
-      "\n"
+      "\n" +
 		    " Copyright (c) 2016-2017 Ivan Vaklinov &lt;ivan@vaklinov.com&gt; \n" +
 			"\n" +
 			" Permission is hereby granted, free of charge, to any person obtaining a copy\n" +
diff --git a/src/java/com/vaklinov/zcashui/SendCashPanel.java b/src/java/com/vaklinov/zcashui/SendCashPanel.java
@@ -126,7 +126,7 @@ public SendCashPanel(ZCashClientCaller clientCaller,
 		sendCashPanel.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
 		
 		JPanel tempPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
-		tempPanel.add(new JLabel("Send cash from:       "));
+		tempPanel.add(new JLabel("Send ZCL from:       "));
 		tempPanel.add(new JLabel(
 			"<html><span style=\"font-size:0.8em;\">" +
 			"* Only addresses with a confirmed balance are shown as sources for sending!" +
diff --git a/src/java/com/vaklinov/zcashui/WalletOperations.java b/src/java/com/vaklinov/zcashui/WalletOperations.java
@@ -354,7 +354,7 @@ public void showPrivateKey()
 		{
 			JOptionPane.showMessageDialog(
 				this.parent, 
-				"Please select an address in the \"Own addresses\" tab " +
+				"Please select an address in the \"My Addresses\" tab " +
 				"to view its private key",
 				"Please select an address...", JOptionPane.INFORMATION_MESSAGE);
 			this.tabs.setSelectedIndex(1);
diff --git a/src/java/com/vaklinov/zcashui/ZCashUI.java b/src/java/com/vaklinov/zcashui/ZCashUI.java
@@ -154,13 +154,13 @@ public ZCashUI(StartupProgressDialog progressDialog)
 				new ImageIcon(cl.getResource("images/overview.png")),
 				dashboard = new DashboardPanel(this, installationObserver, clientCaller, 
 						errorReporter, backupTracker));
-		tabs.addTab("Own addresses ",
+		tabs.addTab("My Addresses ",
 				new ImageIcon(cl.getResource("images/own-addresses.png")),
 				addresses = new AddressesPanel(this, clientCaller, errorReporter));
-		tabs.addTab("Send cash ",
+		tabs.addTab("Send ZCL ",
 				new ImageIcon(cl.getResource("images/send.png")),
 				sendPanel = new SendCashPanel(clientCaller, errorReporter, installationObserver, backupTracker));
-		tabs.addTab("Address book ",
+		tabs.addTab("Address Book ",
 				new ImageIcon(cl.getResource("images/address-book.png")),
 				addressBookPanel = new AddressBookPanel(sendPanel, tabs));
 		tabs.addTab("Messaging ",
@@ -219,9 +219,9 @@ public ZCashUI(StartupProgressDialog progressDialog)
 
 		JMenu messaging = new JMenu("Messaging");
 		messaging.setMnemonic(KeyEvent.VK_S);
-		messaging.add(menuItemOwnIdentity = new JMenuItem("Own identity...", KeyEvent.VK_D));
+		messaging.add(menuItemOwnIdentity = new JMenuItem("My Identity...", KeyEvent.VK_D));
 		menuItemOwnIdentity.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, accelaratorKeyMask));        
-		messaging.add(menuItemExportOwnIdentity = new JMenuItem("Export own identity...", KeyEvent.VK_X));
+		messaging.add(menuItemExportOwnIdentity = new JMenuItem("Export my identity...", KeyEvent.VK_X));
 		menuItemExportOwnIdentity.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, accelaratorKeyMask));        
 		messaging.add(menuItemAddMessagingGroup = new JMenuItem("Add messaging group...", KeyEvent.VK_G));
 		menuItemAddMessagingGroup.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, accelaratorKeyMask));
diff --git a/src/java/com/vaklinov/zcashui/msg/MessagingPanel.java b/src/java/com/vaklinov/zcashui/msg/MessagingPanel.java
@@ -592,7 +592,7 @@ public void tabSelected()
 					return;
 				}
 				
-				// Own identity exists, check balance of T address !!! - must be none
+				// My Identity exists, check balance of T address !!! - must be none
 				MessagingIdentity ownIdentity =  this.messagingStorage.getOwnIdentity();
 				Cursor oldCursor = this.parentFrame.getCursor();
 				String balance = null;
@@ -723,7 +723,7 @@ public void exportOwnIdentity()
 		        JOptionPane.showMessageDialog(
 	        		this.parentFrame,
 	        		"Your messaging identity is missing! Maybe it has not been created yet.\n" +
-	        		"Use the menu option \"Messaging >> Own identity\" to crate it!", 
+	        		"Use the menu option \"Messaging >> My Identity\" to crate it!", 
 	        		"Messaging identity is not available", JOptionPane.ERROR_MESSAGE);
 		        return;
 			}

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public void showPrivateKey()`
`354`	`354`	`{`
`355`	`355`	`JOptionPane.showMessageDialog(`
`356`	`356`	`this.parent,`
`357`		`- "Please select an address in the \"Own addresses\" tab " +`
	`357`	`+ "Please select an address in the \"My Addresses\" tab " +`
`358`	`358`	`"to view its private key",`
`359`	`359`	`"Please select an address...", JOptionPane.INFORMATION_MESSAGE);`
`360`	`360`	`this.tabs.setSelectedIndex(1);`