[freenet-cvs] r15425 - in trunk/apps/jSite/src/de/todesbaum/jsite: gui main

[bombe at freenetproject.org]

Author: bombe
Date: 2007-10-01 21:32:33 +0000 (Mon, 01 Oct 2007)
New Revision: 15425

Modified:
   trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
   trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java
Log:
version 0.4.9.1:
show next version number on insert instead of current
add display of completed and total blocks to progress bar

Modified: trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectInsertPage.java	2007-10-01 14:02:35 UTC (rev 15424)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectInsertPage.java	2007-10-01 21:32:33 UTC (rev 15425)
@@ -20,6 +20,7 @@
 package de.todesbaum.jsite.gui;
 
 import java.awt.BorderLayout;
+import java.awt.Font;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -129,6 +130,7 @@
 		wizard.setQuitEnabled(false);
 		copyURIAction.setEnabled(false);
 		progressBar.setValue(0);
+		progressBar.setFont(progressBar.getFont().deriveFont(Font.PLAIN));
 		projectInserter.start();
 	}
 
@@ -149,7 +151,7 @@
 		SwingUtilities.invokeLater(new Runnable() {
 
 			public void run() {
-				requestURITextField.setText(project.getFinalRequestURI(0));
+				requestURITextField.setText(project.getFinalRequestURI(1));
 			}
 		});
 	}
@@ -196,6 +198,15 @@
 			public void run() {
 				progressBar.setMaximum(total);
 				progressBar.setValue(succeeded + failed + fatal);
+				int progress = (succeeded + failed + fatal) * 100 / total;
+				StringBuilder progressString = new StringBuilder();
+				progressString.append(progress).append("% (");
+				progressString.append(succeeded + failed + fatal).append("/").append(total);
+				progressString.append(")");
+				progressBar.setString(progressString.toString());
+				if (finalized) {
+					progressBar.setFont(progressBar.getFont().deriveFont(Font.BOLD));
+				}
 			}
 		});
 	}
@@ -217,6 +228,7 @@
 
 			public void run() {
 				progressBar.setValue(progressBar.getMaximum());
+				progressBar.setString("Done");
 				wizard.setNextEnabled(true);
 				wizard.setQuitEnabled(true);
 			}

Modified: trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java	2007-10-01 14:02:35 UTC (rev 15424)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java	2007-10-01 21:32:33 UTC (rev 15425)
@@ -25,7 +25,7 @@
  */
 public class Version {
 
-	private static final String VERSION = "0.4.9";
+	private static final String VERSION = "0.4.9.1";
 
 	public static final String getVersion() {
 		return VERSION;