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

Timestamp:

Jan 22, 2013, 10:24:47 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99b:

• Show updated mandatory packages
• About: Added OCF-link
• Saving table sort across sessions

Location:

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

Files:

• MainWin.java (modified) (5 diffs)
• MainWin.yml (modified) (3 diffs)
• about/AboutDialog.properties (modified) (1 diff)
• modtable/ModTable.java (modified) (4 diffs)

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

@@ -103 +103 @@
         private JButton btnInstall;
 
+        private TreeSet<Mod> execMandatoryUpdates = new TreeSet<Mod>();
         private TreeSet<Mod> execUpdates = null;
 
@@ -307 +308 @@
 
         }
+        
+        @SuppressWarnings("unused")
+        private void showMandatoryPackagesDialog() {
+                // TODO: open mand-pack-dialog
+        }
 
         private void showSettings() {
@@ -433 +439 @@
         private void checkMandatoryFiles(final BackgroundEvent evt) {
                 if (!Settings.getInstance().isOfflineMode()) {
-                        TreeSet<Mod> mand = new TreeSet<Mod>();
                         for (Mod m : ModManager.getInstance().getMandatoryTools()) {
                                 if (m.isNewerAvailable()) {
-                                        mand.add(m);
+                                        execMandatoryUpdates.add(m);
                                 }
                         }
                         for (Mod m : ModManager.getInstance().getMandatoryMods()) {
                                 if (m.isNewerAvailable()) {
-                                        mand.add(m);
-                                }
-                        }
-                        if (mand.size() > 0) {
-                                ModDownloader m = new ModDownloader(mand,
+                                        execMandatoryUpdates.add(m);
+                                }
+                        }
+                        if (execMandatoryUpdates.size() > 0) {
+                                ModDownloader m = new ModDownloader(execMandatoryUpdates,
                                                 new ModDownloaderListener() {
                                                         @Override
@@ -468 +473 @@
                         Installer
                                         .installTools(ModManager.getInstance().getMandatoryTools());
+                }
+        }
+
+        @SuppressWarnings("unused")
+        private void infoMandatoryFiles() {
+                if (execMandatoryUpdates.size() > 0) {
+                        String packages = "";
+                        for (Mod m : execMandatoryUpdates) {
+                                packages += String.format("\n - %s (%s)", m.getName(),
+                                                m.getVersion());
+                        }
+                        JOptionPane.showMessageDialog(this, String.format(
+                                        bundle.getString("mandatoryFilesUpdated.text"), packages),
+                                        bundle.getString("mandatoryFilesUpdated.title"),
+                                        JOptionPane.INFORMATION_MESSAGE);
                 }
         }
@@ -543 +563 @@
                                 }
                         } else {
-                                HashMap<Mod, HashSet<Mod>> incompatibilities = ModManager.getInstance()
-                                                .checkIncompabitilites(mods);
+                                HashMap<Mod, HashSet<Mod>> incompatibilities = ModManager
+                                                .getInstance().checkIncompabitilites(mods);
                                 if (incompatibilities.size() > 0) {
                                         installState = EInstallState.INCOMPATIBLE;

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

@@ -6 +6 @@
   locationRelativeTo: null
   defaultCloseOperation: doNothingOnClose
-  onWindowOpened: [execDepotUpdate,checkMandatoryFiles,checkInitialize,initialize,checkUpdates,doUpdate,refreshToolsMenu,focus]
+  onWindowOpened: [execDepotUpdate,checkMandatoryFiles,infoMandatoryFiles,checkInitialize,initialize,checkUpdates,doUpdate,refreshToolsMenu,focus]
   onWindowClosing: [saveLocalData,exit]
   iconImage: img.ae
@@ -21 +21 @@
     - Action(name=tools, text=menu.manageTools, toolTipText=menu.manageToolsTooltip, icon=img.tools, onAction=[tools,refreshToolsMenu])
     - Action(name=update, text=menu.update, toolTipText=menu.updateTooltip, icon=img.update, onAction=[checkUpdates,doUpdate])
+    - Action(name=mandatoryPackages, text=menu.mandatoryPackages, toolTipText=menu.mandatoryPackagesTooltip, icon=img.mandatory, onAction=[showMandatoryPackagesDialog])
     - JMenuBar:
         - JMenu(name=mainMenu, text=menu.main):
@@ -30 +31 @@
             - JMenuItem(action=runOniWin)
             - JSeparator()
-            - JMenuItem(action=openEditionFolder)
+            - JMenuItem(action=update)
             - JSeparator()
             - JMenuItem(action=loadConfig)
             - JMenuItem(action=saveConfig)
             - JSeparator()
+            - JMenuItem(action=openEditionFolder)
+            - JSeparator()
+            - JMenuItem(action=mandatoryPackages)
             - JMenuItem(action=reglobalize)
-            - JSeparator()
-            - JMenuItem(action=update)
         - JMenu(name=toolsMenu, text=menu.tools):
             - JMenuItem(name=manageToolsItem, action=tools)

AE/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.properties

@@ -9 +9 @@
 
 panLinks=Links:
-Links=<a href="http://oni.bungie.org/">Oni Community Portal</a> (oni.bungie.org)<br><a href="http://mods.oni2.net/">Oni Mod Depot</a> (mods.oni2.net)<br><a href="http://wiki.oni2.net/">Oni Galore Wiki</a> (wiki.oni2.net)
+Links=<a href="http://oni.bungie.org/community/forum/index.php">Oni Central Forum</a> (oni.bungie.org/community/forum)<br><a href="http://oni.bungie.org/">Oni Community Portal</a> (oni.bungie.org)<br><a href="http://mods.oni2.net/">Oni Mod Depot</a> (mods.oni2.net)<br><a href="http://wiki.oni2.net/">Oni Galore Wiki</a> (wiki.oni2.net)

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

@@ -26 +26 @@
 import javax.swing.SortOrder;
 import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.RowSorterEvent;
 import javax.swing.table.TableRowSorter;
 
+import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.mods.Mod;
 import net.oni2.aeinstaller.backend.mods.Type;
@@ -68 +70 @@
 
                 List<RowSorter.SortKey> sortKeys = new ArrayList<RowSorter.SortKey>();
-                sortKeys.add(new RowSorter.SortKey(1, SortOrder.ASCENDING));
+
+                int sortCol = Settings.getInstance().get("modSortColumn", 1);
+                SortOrder sortOrder = SortOrder.valueOf(Settings.getInstance().get(
+                                "modSortOrder", "ASCENDING"));
+
+                sortKeys.add(new RowSorter.SortKey(sortCol, sortOrder));
                 sorter.setSortKeys(sortKeys);
 
@@ -180 +187 @@
         public void setFilter(Type type, int downloadState) {
                 sorter.setRowFilter(new ModTableFilter(type, downloadState));
+        }
+
+        @Override
+        public void sorterChanged(RowSorterEvent evt) {
+                super.sorterChanged(evt);
+                if (evt.getType() == RowSorterEvent.Type.SORT_ORDER_CHANGED) {
+                        @SuppressWarnings("unchecked")
+                        RowSorter<ModTableModel> rs = (RowSorter<ModTableModel>) getRowSorter();
+                        List<? extends RowSorter.SortKey> keys = rs.getSortKeys();
+                        if (keys.size() > 0) {
+                                int col = keys.get(0).getColumn();
+                                SortOrder so = keys.get(0).getSortOrder();
+                                Settings.getInstance().put("modSortColumn", col);
+                                Settings.getInstance().put("modSortOrder", so.toString());
+                        }
+                }
         }
 
@@ -273 +296 @@
                                                 setRowSelectionInterval(i, i);
                                                 JViewport viewport = (JViewport) getParent();
-                                                Rectangle rect = getCellRect(i, 0,
-                                                                true);
+                                                Rectangle rect = getCellRect(i, 0, true);
                                                 Rectangle r2 = viewport.getVisibleRect();
                                                 scrollRectToVisible(new Rectangle(rect.x, rect.y,