Added Send/Receive to sidebar

Purged *.jar from repo (28Mb of bloat removed)
Multibit-Legacy · Mar 20, 2014 · e9008dc · e9008dc
1 parent 1f44caa
commit e9008dc
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/git-purge.sh b/git-purge.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+echo "Removing history for *.war, *.jar, *.class files"
+
+echo "Starting size"
+git count-objects -v
+
+echo "Removing history for *.war, *.jar, *.class files"
+git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch *.war' --prune-empty --tag-name-filter cat -- --all
+git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch *.jar' --prune-empty --tag-name-filter cat -- --all
+git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch *.class' --prune-empty --tag-name-filter cat -- --all
+
+echo "Purging refs and garbage collection"
+# Purge the backups
+rm -Rf .git/refs/original
+
+# Force reflog to expire now (not in the default 30 days)
+git reflog expire --expire=now --all
+
+# Prune
+git gc --prune=now
+
+# Aggressive garbage collection
+git gc --aggressive --prune=now
+
+echo
+echo "Ending size (size-pack shows new size in Kb)"
+git count-objects -v
+
+# Can't do this in the script - it needs a human to be sure
+echo
+echo "Now use this command to force the changes into your remote repo (origin)"
+echo
+echo git push --all origin --force
diff --git a/mbhd-install/jwrapper-00026332815.jar b/mbhd-install/jwrapper-00026332815.jar
diff --git a/mbhd-swing/src/main/java/org/multibit/hd/ui/languages/MessageKey.java b/mbhd-swing/src/main/java/org/multibit/hd/ui/languages/MessageKey.java
@@ -94,14 +94,14 @@ public enum MessageKey {
 
   // Sidebar
 
+  SEND_OR_REQUEST("send_or_request"),
   CONTACTS("contacts"),
   TRANSACTIONS("transactions"),
   HISTORY("history"),
   PREFERENCES("preferences"),
   TOOLS("tools"),
 
-  // Placeholders
-
+  // Placeholde_ru
   APPROXIMATELY("approximately"),
   PARANTHESES("parantheses"),
   LIST_COMMA("list_comma"),

diff --git a/mbhd-swing/src/main/java/org/multibit/hd/ui/views/SidebarView.java b/mbhd-swing/src/main/java/org/multibit/hd/ui/views/SidebarView.java
@@ -144,13 +144,15 @@ private DefaultMutableTreeNode createSidebarTreeNodes() {
 
     DefaultMutableTreeNode root = TreeNodes.newSidebarTreeNode("", Screen.WALLET);
 
+    // TODO Integrate with Switch wallet WalletId<->Friendly name
     DefaultMutableTreeNode wallet = TreeNodes.newSidebarTreeNode("Wallet", Screen.WALLET);
+    wallet.add(TreeNodes.newSidebarTreeNode(MessageKey.SEND_OR_REQUEST, Screen.WALLET));
     wallet.add(TreeNodes.newSidebarTreeNode(MessageKey.CONTACTS, Screen.CONTACTS));
     wallet.add(TreeNodes.newSidebarTreeNode(MessageKey.TRANSACTIONS, Screen.TRANSACTIONS));
-    wallet.add(TreeNodes.newSidebarTreeNode(MessageKey.HISTORY, Screen.HISTORY));
     root.add(wallet);
 
     root.add(TreeNodes.newSidebarTreeNode(MessageKey.HELP, Screen.HELP));
+    wallet.add(TreeNodes.newSidebarTreeNode(MessageKey.HISTORY, Screen.HISTORY));
     root.add(TreeNodes.newSidebarTreeNode(MessageKey.SETTINGS, Screen.SETTINGS));
     root.add(TreeNodes.newSidebarTreeNode(MessageKey.TOOLS, Screen.TOOLS));
     root.add(TreeNodes.newSidebarTreeNode(MessageKey.EXIT, Screen.EXIT));

diff --git a/mbhd-swing/src/main/resources/languages/language.properties b/mbhd-swing/src/main/resources/languages/language.properties
@@ -194,6 +194,7 @@ select_file=File name
 enter_password=Enter password
 confirm_password=Confirm password
 amount=Amount
+send_or_request=Send/Request
 contacts=Contacts
 transactions=Payments
 history=History