Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties (revision 637) @@ -1,2 +1,2 @@ appname=AE Installer 2 -appversion=0.93 +appversion=0.94 Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 637) @@ -51,5 +51,6 @@ app = new DefaultApplication(); - URL icon = AEInstaller2.class.getResource("images/AElogo.png"); + URL icon = AEInstaller2.class.getResource(imagesBundle + .getString("img.ae")); try { BufferedImage img = ImageIO.read(icon); @@ -86,4 +87,5 @@ initMacOS(); + Settings.setDebug(debug); Settings.deserializeFromFile(); Settings.setDebug(debug); @@ -121,5 +123,6 @@ JFrame.setDefaultLookAndFeelDecorated(true); - System.out.println(basicBundle.getString("appname") + " " + basicBundle.getString("appversion")); + System.out.println(basicBundle.getString("appname") + " " + + basicBundle.getString("appversion")); System.out.println("JarPath: " + Paths.getInstallerPath()); System.out.println("PrefsPath: " + Paths.getPrefsPath()); Index: AE/installer2/src/net/oni2/aeinstaller/DepotPackageCheck.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/DepotPackageCheck.java (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/DepotPackageCheck.java (revision 637) @@ -49,8 +49,9 @@ for (NodeMod nm : foundNodes.get(inst)) { System.out - .format(" Node %3d, Files %d, Platform %5s, Type %10s, Title \"%s\"\n", + .format(" Node %3d, Files %d, Platform %5s, Type %11s, Submitter %10s, Title \"%s\"\n", nm.getNid(), nm.getUploads().size(), nm .getPlatform().toString(), nm - .getTypes().toString(), nm.getTitle()); + .getTypes().toString(), nm.getName(), + nm.getTitle()); } System.out.println(); Index: AE/installer2/src/net/oni2/aeinstaller/Images.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/Images.properties (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/Images.properties (revision 637) @@ -27,4 +27,5 @@ img.tools=/net/oni2/aeinstaller/images/open_icon_library/tools-hammer_and_nails.png img.install=/net/oni2/aeinstaller/images/open_icon_library/run-build-install-root.png +img.uninstall=/net/oni2/aeinstaller/images/open_icon_library/edit-delete-6.png img.folder=/net/oni2/aeinstaller/images/open_icon_library/folder-open-3.png img.update=/net/oni2/aeinstaller/images/open_icon_library/system-software-update-2.png Index: AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java (revision 637) @@ -8,4 +8,6 @@ import java.io.IOException; import java.io.InputStreamReader; +import java.net.URI; +import java.net.URISyntaxException; import java.util.HashSet; @@ -295,4 +297,21 @@ } + /** + * @return Depot page URI + */ + public URI getUrl() { + if (node == null) + return null; + if (node.getPath() == null) + return null; + URI res = null; + try { + res = new URI(node.getPath()); + } catch (URISyntaxException e) { + e.printStackTrace(); + } + return res; + } + @Override public String toString() { Index: AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java (revision 637) @@ -129,4 +129,11 @@ } + updateInstalledMods(); + } + + /** + * Update the list of currently installed mods + */ + public void updateInstalledMods() { currentlyInstalled = Installer.getInstalledMods(); if (currentlyInstalled == null) Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (revision 637) @@ -121,5 +121,6 @@ + SwingJavaBuilder.getConfig().getResource("appversion")); - contents.setDividerLocation(400); + setSize(getWidth()+150, getHeight()); + contents.setDividerLocation(500); contents.setResizeWeight(0.4); @@ -409,5 +410,4 @@ } - @SuppressWarnings("unused") private void revertSelection() { tblMods.revertSelection(); @@ -537,4 +537,6 @@ @SuppressWarnings("unused") private void installDone() { + ModManager.getInstance().updateInstalledMods(); + revertSelection(); switch (installDone) { case DONE: Index: AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java (revision 637) @@ -76,6 +76,8 @@ final Mod mod = (Mod) getValueAt(rowindex, -1); + JPopupMenu popup = new JPopupMenu(); + if (mod.isLocalAvailable()) { - JPopupMenu popup = new JPopupMenu(); + // Open package folder item JMenuItem openModFolder = new JMenuItem( bundle.getString("openModFolder.text")); @@ -94,6 +96,28 @@ }); popup.add(openModFolder); + } + + if (mod.getUrl() != null) { + // Open Depot page item + JMenuItem openDepotPage = new JMenuItem( + bundle.getString("openDepotPage.text")); + openDepotPage + .addActionListener(new ActionListener() { + @Override + public void actionPerformed( + ActionEvent arg0) { + try { + Desktop.getDesktop().browse( + mod.getUrl()); + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + popup.add(openDepotPage); + } + + if (popup.getSubElements().length > 0) popup.show(e.getComponent(), e.getX(), e.getY()); - } } } Index: AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java (revision 637) @@ -2,4 +2,6 @@ import java.io.File; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashSet; import java.util.ResourceBundle; @@ -55,4 +57,8 @@ res += (mod.isLocalAvailable() ? "D" : "_"); return res; + case 5: + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + return sdf + .format(new Date(mod.getFile().getTimestamp() * 1000)); } return null; @@ -72,4 +78,6 @@ case 4: return bundle.getString("mod.state"); + case 5: + return bundle.getString("mod.date"); } return null; @@ -83,5 +91,5 @@ @Override public int getColumnCount() { - return 5; + return 6; } @@ -98,4 +106,6 @@ return String.class; case 4: + return String.class; + case 5: return String.class; } @@ -134,4 +144,10 @@ case 4: w = 55; + col.setPreferredWidth(w); + col.setMinWidth(w); + col.setMaxWidth(w); + break; + case 5: + w = 95; col.setPreferredWidth(w); col.setMinWidth(w); Index: AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java (revision 637) @@ -9,4 +9,6 @@ import javax.swing.AbstractAction; import javax.swing.DefaultListModel; +import javax.swing.Icon; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JComponent; @@ -15,4 +17,5 @@ import javax.swing.JList; import javax.swing.JOptionPane; +import javax.swing.JSplitPane; import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; @@ -41,4 +44,6 @@ private BuildResult result = SwingJavaBuilder.build(this, bundle); + private JSplitPane contents; + private JList lstTools; @@ -51,4 +56,7 @@ private JButton btnInstall; + + private Icon icoInstall = null; + private Icon icoUninstall = null; /** @@ -73,4 +81,7 @@ getRootPane().getActionMap().put("close", closeAction); + contents.setDividerLocation(200); + contents.setResizeWeight(0.4); + lstTools.addListSelectionListener(this); lstTools.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); @@ -80,4 +91,10 @@ for (String name : tools.keySet()) dlm.addElement(tools.get(name)); + lstTools.setModel(dlm); + + icoInstall = new ImageIcon(getClass().getResource( + SwingJavaBuilder.getConfig().getResource("img.install"))); + icoUninstall = new ImageIcon(getClass().getResource( + SwingJavaBuilder.getConfig().getResource("img.uninstall"))); } @@ -102,4 +119,5 @@ lblDownloadSizeVal.setText(""); btnInstall.setEnabled(false); + btnInstall.setIcon(icoInstall); if (lstTools.getSelectedValue() instanceof Mod) { @@ -116,4 +134,5 @@ btnInstall.setToolTipText(bundle .getString("btnInstall.un.tooltip")); + btnInstall.setIcon(icoUninstall); } else { btnInstall.setText(bundle.getString("btnInstall.text")); Index: AE/installer2/src/net/oni2/aeinstaller/localization/ModTable.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/ModTable.properties (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/localization/ModTable.properties (revision 637) @@ -4,4 +4,5 @@ mod.creator=Creator mod.state=State +mod.date=Last change state.installed=Is Installed @@ -12,2 +13,3 @@ openModFolder.text=Open mod folder +openDepotPage.text=Open Depot page in browser Index: AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties (revision 636) +++ AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties (revision 637) @@ -1,7 +1,7 @@ frame.title=AE Installer: Tool Manager -btnInstall.text=&Install +btnInstall.text=Install btnInstall.tooltip=Install this tool -btnInstall.un.text=&Uninstall +btnInstall.un.text=Uninstall btnInstall.un.tooltip=Uninstall this tool