Correct username not being correct in account dialog.

Change account display so less than 1mb doesn't appear as 0mb.

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 2079f5b..02edff2 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -223,6 +223,8 @@ public class Global {
                resourceMap = new HashMap<String,String>();  // Setup resource map used to store attachments when editing\r
                        \r
                databaseCache = getDatabaseCacheSize();  // Set database cache size     \r
+               \r
+               Global.username = getUserInformation().getUsername();\r
     }\r
 \r
     // Get/Set word parsing regular expression\r

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index d94e3bb..a311ffd 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -2757,7 +2757,7 @@ public class NeverNote extends QMainWindow{
                                                tr("About NixNote"),
                                                tr("<h4><center><b>NixNote</b></center></h4><hr><center>Version ")
                                                //+Global.version
-                                               +"1.2.120508"
+                                               +"1.2.120724"
                                                +tr("<hr>"
                                                                +"Open Source Evernote Client.<br><br>" 
                                                                +"Licensed under GPL v2.  <br><hr><br>"

diff --git a/src/cx/fbn/nevernote/dialog/AccountDialog.java b/src/cx/fbn/nevernote/dialog/AccountDialog.java
index 4a44ec4..9be49b7 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/AccountDialog.java
+++ b/src/cx/fbn/nevernote/dialog/AccountDialog.java
@@ -102,7 +102,10 @@ public class AccountDialog extends QDialog {
                textGrid.addWidget(new QLabel(tr("Limit:")), 3,1);\r
                textGrid.addWidget(new QLabel(uploadLimit.toString() +" MB"),3,2);\r
                textGrid.addWidget(new QLabel(tr("Uploaded In This Period:")), 4,1);\r
-               textGrid.addWidget(new QLabel(uploadAmt.toString()+unit +" ("+pct+"%)"),4,2);\r
+               if (uploadAmt > 0)\r
+                       textGrid.addWidget(new QLabel(uploadAmt.toString()+unit +" ("+pct+"%)"),4,2);\r
+               else\r
+                       textGrid.addWidget(new QLabel(tr("Less than 1MB")),4,2);\r
                textGrid.addWidget(new QLabel(tr("Current Cycle Ends:")), 5,1);\r
                textGrid.addWidget(new QLabel(endDate.toString()),5,2);\r
                limitGroup.setLayout(textGrid);\r