Changeset 646 for AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow

Timestamp:

Jan 23, 2013, 12:43:13 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99c:

• Download window: Show which file is currently being downloaded and if it is an automaticly resolved dependency
• Added mandatory packages dialog
• Added option to show automatic resolved dependencies after installation is done instead of interrupting installation process to ask whether to continue
• ToolManager: version number + last change added
• Correct output of download-size in mainwin after installation of mods done

Location:

AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow

Files:

• Downloader.java (modified) (4 diffs)
• Downloader.yml (modified) (2 diffs)

AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java

@@ -31 +31 @@
         private BuildResult result = SwingJavaBuilder.build(this, bundle);
 
+        private JLabel lblNameVal;
+        private JLabel lblIsDep;
         private JLabel lblElapsedVal;
         private JLabel lblRemainingVal;
@@ -37 +39 @@
         private JLabel lblRateVal;
         private JProgressBar progress;
-        
+
         private JButton btnAbort;
 
         private ModDownloader downloader;
+        private TreeSet<Mod> dependencies = new TreeSet<Mod>();
 
         /**
          * @param mods
          *            Mods to download
+         * @param dependencies
+         *            List of mods that only are auto-resolved dependencies
          */
-        public Downloader(TreeSet<Mod> mods) {
+        public Downloader(TreeSet<Mod> mods, TreeSet<Mod> dependencies) {
                 super();
 
                 setResizable(false);
                 setSize(500, (int) getSize().getHeight());
+
+                if (dependencies != null)
+                        this.dependencies = dependencies;
 
                 downloader = new ModDownloader(mods, this);
@@ -84 +92 @@
 
         @Override
-        public void updateStatus(ModDownloader source, State state, int filesDown,
-                        int filesTotal, int bytesDown, int bytesTotal, int duration,
-                        int remaining, int speed) {
+        public void updateStatus(ModDownloader source, Mod currentDownload,
+                        State state, int filesDown, int filesTotal, int bytesDown,
+                        int bytesTotal, int duration, int remaining, int speed) {
                 if (state == ModDownloader.State.FINISHED) {
                         close();
@@ -92 +100 @@
                         if (state == State.LAST_FILE_DOWNLOADED)
                                 btnAbort.setEnabled(false);
-                        
+
                         progress.setValue(bytesDown);
                         progress.setToolTipText(String.format("%d / %d files downloaded",
                                         filesDown, filesTotal));
+
+                        if (currentDownload != null) {
+                                lblNameVal.setText(currentDownload.getName());
+                                lblIsDep.setVisible(dependencies.contains(currentDownload));
+                        } else {
+                                lblNameVal.setText(bundle.getString("unpacking"));
+                                lblIsDep.setVisible(false);
+                        }
 
                         lblElapsedVal.setText(formatTime(duration));

AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.yml

@@ -10 +10 @@
   content:
     - JButton(name=btnAbort, text=btnAbort.title, icon=img.stop, onAction=[confirm,close])
+    - JLabel(name=lblName, text=lblName.title)
+    - JLabel(name=lblNameVal, font=14pt)
+    - JLabel(name=lblIsDep, text=lblIsDep.title, foreground=darkred, visible=false)
     - JLabel(name=lblElapsed, text=lblElapsed.title)
     - JLabel(name=lblElapsedVal)
@@ -23 +26 @@
     - MigLayout: |
          [grow]
+         lblName<,lblNameVal<,lblIsDep<                                  [min]
          lblElapsed=1,lblElapsedVal=2,lblRemaining=1,lblRemainingVal=2   [min]
          lblDownloaded=1,lblDownloadedVal=2,lblTotal=1,lblTotalVal=2     [min]