Changeset 673 for AE/installer2/src/net/oni2/aeinstaller/gui

Timestamp:

Feb 25, 2013, 5:52:49 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99r:

• Add number of selected mods label to main win
• Add "Redownload package" to package tables context menu
• Unpacker: Filter out mac specific ".DS_Store" files

Location:

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

Files:

• MainWin.java (modified) (6 diffs)
• MainWin.yml (modified) (1 diff)
• modtable/DownloadSizeListener.java (deleted)
• modtable/ModInstallSelectionListener.java (added)
• modtable/ModTable.java (modified) (4 diffs)
• modtable/ModTableModel.java (modified) (7 diffs)

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -60 +60 @@
 import net.oni2.aeinstaller.gui.corepackages.CorePackagesDialog;
 import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
-import net.oni2.aeinstaller.gui.modtable.DownloadSizeListener;
+import net.oni2.aeinstaller.gui.modtable.ModInstallSelectionListener;
 import net.oni2.aeinstaller.gui.modtable.EApplyFilterTo;
 import net.oni2.aeinstaller.gui.modtable.ModSelectionListener;
@@ -80 +80 @@
  */
 public class MainWin extends JFrame implements ApplicationListener,
-                DownloadSizeListener, ModSelectionListener {
+                ModInstallSelectionListener, ModSelectionListener {
         private static final long serialVersionUID = -4027395051382659650L;
 
@@ -103 +103 @@
         private JScrollPane scrollMods;
         private ModTable tblMods;
+        private JLabel lblSelectedModsVal;
         private JLabel lblDownloadSizeVal;
 
@@ -147 +148 @@
 
                 getRootPane().setDefaultButton(btnInstall);
+                lblSelectedModsVal.setText("0");
                 lblDownloadSizeVal.setText(SizeFormatter.format(0, 2));
                 radAll.setSelected(true);
@@ -492 +494 @@
                                                                                 JOptionPane.ERROR_MESSAGE);
                                                         if (ex.getMessage().contains(".NET"))
-                                                                JOptionPane.showMessageDialog(null,
+                                                                JOptionPane.showMessageDialog(
+                                                                                null,
                                                                                 bundle.getString("dotNetNotFound.text"),
                                                                                 bundle.getString("dotNetNotFound.title"),
@@ -782 +785 @@
 
         @Override
-        public void downloadSizeChanged(int newSize) {
+        public void modInstallSelectionChanged(int newSize, int newCount) {
+                lblSelectedModsVal.setText(String.valueOf(newCount));
                 lblDownloadSizeVal.setText(SizeFormatter.format(newSize, 2));
         }

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml

@@ -64 +64 @@
             - JButton(name=btnRevertSelection, icon=img.undo16, text=btnRevertSelection.text, toolTipText=btnRevertSelection.tooltip, onAction=[revertSelection])
             - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, onAction=[install,installExec,installDone])
+            - JLabel(name=lblSelectedMods, text=lblSelectedMods.text)
+            - JLabel(name=lblSelectedModsVal)
             - JLabel(name=lblDownloadSize, text=lblDownloadSize.text)
             - JLabel(name=lblDownloadSizeVal)
             - MigLayout: |
-                 [min]           [grow]
-                 >lblModTypes    cmbModTypes                       [min]
-                 >lblShowOnly    radAll,radOnline,radLocal         [min]
-                 >lblShowFilter  txtShowFilter>,cmbShowFilterTo<   [min]
-                 scrollMods+*                                      [grow]
-                 >btnUnSelectAll+*,>btnRevertSelection,btnInstall  [min]
-                 lblDownloadSize+*,lblDownloadSizeVal              [min]
+                 [min]           [grow]                           [min]
+                 >lblModTypes    cmbModTypes+*                                     [min]
+                 >lblShowOnly    radAll+*,radOnline,radLocal                       [min]
+                 >lblShowFilter  txtShowFilter+*>,cmbShowFilterTo<                 [min]
+                 scrollMods+*                                                      [grow]
+                 >btnUnSelectAll+*,btnRevertSelection                              [min]
+                 lblSelectedMods+2,lblSelectedModsVal             >btnInstall+*+*  [min]
+                 lblDownloadSize+2,lblDownloadSizeVal                              [min]
         - PackageInfoBox(name=pkgInfo)
     - MigLayout:

AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java

@@ -38 +38 @@
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.backend.packages.Type;
+import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
 
 /**
@@ -173 +174 @@
          *            Listener to add
          */
-        public void addDownloadSizeListener(DownloadSizeListener listener) {
+        public void addDownloadSizeListener(ModInstallSelectionListener listener) {
                 model.addDownloadSizeListener(listener);
         }
@@ -181 +182 @@
          *            Listener to remove
          */
-        public void removeDownloadSizeListener(DownloadSizeListener listener) {
+        public void removeDownloadSizeListener(ModInstallSelectionListener listener) {
                 model.removeDownloadSizeListener(listener);
         }
@@ -332 +333 @@
                                                 });
                                                 popup.add(openDepotPage);
+                                        }
+
+                                        if (mod.getFile() != null) {
+                                                // Download package
+                                                JMenuItem downloadPackage = new JMenuItem(
+                                                                bundle.getString("downloadPackage.text"));
+                                                downloadPackage.addActionListener(new ActionListener() {
+                                                        @Override
+                                                        public void actionPerformed(ActionEvent arg0) {
+                                                                TreeSet<Package> toDo = new TreeSet<Package>();
+                                                                TreeSet<Package> deps = new TreeSet<Package>();
+                                                                toDo.add(mod);
+                                                                Downloader dl = new Downloader(toDo, deps);
+                                                                try {
+                                                                        dl.setVisible(true);
+                                                                } finally {
+                                                                        dl.dispose();
+                                                                }
+                                                                invalidate();
+                                                                repaint();
+                                                        }
+                                                });
+                                                popup.add(downloadPackage);
                                         }
 

AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java

@@ -29 +29 @@
         private Vector<Boolean> install = new Vector<Boolean>();
 
-        private HashSet<DownloadSizeListener> listeners = new HashSet<DownloadSizeListener>();
+        private HashSet<ModInstallSelectionListener> listeners = new HashSet<ModInstallSelectionListener>();
 
         private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -210 +210 @@
         public void revertSelection() {
                 install.clear();
+                int count = 0;
                 for (int i = 0; i < items.size(); i++) {
-                        install.add(i, items.get(i).isInstalled());
-                }
-                notifyDownloadSize(0);
+                        boolean installed = items.get(i).isInstalled();
+                        install.add(i, installed);
+                        if (installed)
+                                count++;
+                }
+                notifyDownloadSize(0, count);
                 fireTableDataChanged();
         }
@@ -262 +266 @@
         }
 
-        private void notifyDownloadSize(int size) {
-                for (DownloadSizeListener dsl : listeners)
-                        dsl.downloadSizeChanged(size);
+        private void notifyDownloadSize(int size, int count) {
+                for (ModInstallSelectionListener dsl : listeners)
+                        dsl.modInstallSelectionChanged(size, count);
         }
 
@@ -274 +278 @@
 
                         int size = 0;
+                        int count = 0;
                         for (int i = 0; i < items.size(); i++) {
                                 if (install.get(i)) {
+                                        count++;
                                         Package m = items.get(i);
                                         if (!m.isLocalAvailable())
@@ -281 +287 @@
                                 }
                         }
-                        notifyDownloadSize(size);
+                        notifyDownloadSize(size, count);
                 }
         }
@@ -289 +295 @@
          *            Listener to receive download size changed events
          */
-        public void addDownloadSizeListener(DownloadSizeListener lis) {
+        public void addDownloadSizeListener(ModInstallSelectionListener lis) {
                 listeners.add(lis);
         }
@@ -297 +303 @@
          *            Listener to no longer receive download size changed events
          */
-        public void removeDownloadSizeListener(DownloadSizeListener lis) {
+        public void removeDownloadSizeListener(ModInstallSelectionListener lis) {
                 listeners.remove(lis);
         }