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

Timestamp:

Dec 31, 2012, 2:48:32 PM (12 years ago)

Author:

alloc

Message:

 

Location:

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

Files:

• HTMLLinkLabel.java (modified) (1 diff)
• MainWin.java (modified) (12 diffs)
• MainWin.properties (modified) (2 diffs)
• MainWin.yml (modified) (3 diffs)
• about (added)
• about/AboutDialog.java (added)
• about/AboutDialog.properties (added)
• about/AboutDialog.yml (added)
• modtable/ModTableModel.java (modified) (10 diffs)
• modtable/ModTableModel.properties (modified) (1 diff)
• settings/SettingsDialog.java (modified) (4 diffs)
• settings/SettingsDialog.yml (modified) (2 diffs)

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

@@ -77 +77 @@
                 super.setText(prefix + t + suffix);
         }
+
 }

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

@@ -10 +10 @@
 
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JOptionPane;
 import javax.swing.JSplitPane;
 import javax.swing.JTable;
@@ -23 +26 @@
 
 import net.oni2.aeinstaller.backend.Settings;
+import net.oni2.aeinstaller.backend.Settings.Platform;
 import net.oni2.aeinstaller.backend.depot.DepotCacheUpdateProgressListener;
 import net.oni2.aeinstaller.backend.depot.DepotConfig;
@@ -29 +33 @@
 import net.oni2.aeinstaller.backend.depot.model.TaxonomyTerm;
 import net.oni2.aeinstaller.backend.depot.model.TaxonomyVocabulary;
+import net.oni2.aeinstaller.gui.about.AboutDialog;
 import net.oni2.aeinstaller.gui.modtable.ModTableFilter;
 import net.oni2.aeinstaller.gui.modtable.ModTableModel;
@@ -37 +42 @@
 import org.javabuilders.event.BackgroundEvent;
 import org.javabuilders.swing.SwingJavaBuilder;
+import org.simplericity.macify.eawt.ApplicationEvent;
+import org.simplericity.macify.eawt.ApplicationListener;
 
 /**
  * @author Christian Illy
  */
-public class MainWin extends JFrame {
+public class MainWin extends JFrame implements ApplicationListener {
         private static final long serialVersionUID = -4027395051382659650L;
 
@@ -48 +55 @@
         @SuppressWarnings("unused")
         private BuildResult result = SwingJavaBuilder.build(this, bundle);
+
+        private JMenu mainMenu;
 
         private JSplitPane contents;
@@ -66 +75 @@
          */
         public MainWin() {
-                this.setTitle(bundle.getString("frame.title") + " - v"
-                                + bundle.getString("version"));
+                this.setTitle(SwingJavaBuilder.getConfig().getResource("appname")
+                                + " - v"
+                                + SwingJavaBuilder.getConfig().getResource("appversion"));
 
                 contents.setDividerLocation(400);
                 initTable();
                 initModTypeBox();
+
+                if (Settings.getPlatform() == Platform.MACOS) {
+                        mainMenu.setVisible(false);
+                }
         }
 
@@ -115 +129 @@
                                 });
 
+                // To get checkbox-cells with background of row
+                ((JComponent) tblMods.getDefaultRenderer(Boolean.class))
+                                .setOpaque(true);
+
                 model = new ModTableModel();
 
@@ -148 +166 @@
         }
 
-        @SuppressWarnings("unused")
+        private boolean askClose() {
+                int res = JOptionPane.showConfirmDialog(this,
+                                bundle.getString("askClose.text"),
+                                bundle.getString("askClose.title"), JOptionPane.YES_NO_OPTION,
+                                JOptionPane.QUESTION_MESSAGE);
+                return res == JOptionPane.YES_OPTION;
+        }
+
         private boolean closeFrames() {
                 System.gc();
@@ -158 +183 @@
         }
 
-        @SuppressWarnings("unused")
         private void exit() {
                 setVisible(false);
@@ -164 +188 @@
         }
 
-        @SuppressWarnings("unused")
         private void saveLocalData() {
                 Settings.getInstance().serializeToFile();
@@ -213 +236 @@
         }
 
-        @SuppressWarnings("unused")
         private void showSettings() {
-                SettingsDialog.openWindow();
-        }
+                new SettingsDialog().setVisible(true);
+        }
+
+        private void showAbout() {
+                new AboutDialog().setVisible(true);
+        }
+
+        @SuppressWarnings("unused")
+        private void loadConfig() {
+                // TODO Auto-generated method stub
+                JOptionPane.showMessageDialog(this, "loadConfig", "todo",
+                                JOptionPane.INFORMATION_MESSAGE);
+        }
+
+        @SuppressWarnings("unused")
+        private void saveConfig() {
+                // TODO Auto-generated method stub
+                JOptionPane.showMessageDialog(this, "saveConfig", "todo",
+                                JOptionPane.INFORMATION_MESSAGE);
+        }
+
+        @SuppressWarnings("unused")
+        private void reglobalize() {
+                // TODO Auto-generated method stub
+                JOptionPane.showMessageDialog(this, "reglobalize", "todo",
+                                JOptionPane.INFORMATION_MESSAGE);
+        }
+        
+        @SuppressWarnings("unused")
+        private void revertSelection() {
+                // TODO Auto-generated method stub
+                JOptionPane.showMessageDialog(this, "revertSelection", "todo",
+                                JOptionPane.INFORMATION_MESSAGE);
+        }
+        
+        
 
         private void modSelection(NodeMod n) {
@@ -243 +299 @@
                         sorter.setRowFilter(new ModTableFilter(-1));
         }
+
+        @Override
+        public void handleAbout(ApplicationEvent event) {
+                event.setHandled(true);
+                showAbout();
+        }
+
+        @Override
+        public void handleOpenApplication(ApplicationEvent event) {
+        }
+
+        @Override
+        public void handleOpenFile(ApplicationEvent event) {
+        }
+
+        @Override
+        public void handlePreferences(ApplicationEvent event) {
+                showSettings();
+        }
+
+        @Override
+        public void handlePrintFile(ApplicationEvent event) {
+        }
+
+        @Override
+        public void handleQuit(ApplicationEvent event) {
+                if (askClose()) {
+                        event.setHandled(true);
+                        closeFrames();
+                        saveLocalData();
+                        exit();
+                } else {
+                        event.setHandled(false);
+                }
+        }
+
+        @Override
+        public void handleReOpenApplication(ApplicationEvent event) {
+        }
 }

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

@@ -1 +1 @@
 # Main Frame
-frame.title=AE Installer 2
 buttonExit.title=Exit
-version=0.1
 
-menu.file=&Menu
+menu.main=&Main
 menu.settings=&Settings
 menu.settingsTooltip=Settings
+menu.about=&About
+menu.aboutTooltip=About
 menu.exit=&Exit\tCtrl+Q
 menu.exitTooltip=Exit
 
+menu.file=&File
+menu.loadConfig=&Load configuration...
+menu.loadConfigTooltip=Load configuration
+menu.saveConfig=&Save configuration...
+menu.saveConfigTooltip=Save configuration
+
+menu.reglobalize=&Rebuild Core Data
+menu.reglobalizeTooltip=Rebuild Core Data
+
+btnRevertSelection.text=Revert selection
+btnRevertSelection.tooltip=Select mods which are currently installed
 lblModTypes.text=Mod types: 
 
@@ -22 +33 @@
 updatesAvailable.title=Updates available
 updatesAvailable.text=Some mods have newer versions available.
+
+askClose.title=Confirm close request
+askClose.text=Are you sure you want to close the program?

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

@@ -1 +1 @@
 JFrame:
   name: frame
-  title: frame.title
+  title: appname
   size: 800x600
   minimumSize: 400x300
@@ -7 +7 @@
   defaultCloseOperation: doNothingOnClose
   onWindowOpened: [execDepotUpdate,checkUpdates,focus]
-  onWindowClosing: [$confirm,closeFrames,saveLocalData,exit]
-  iconImage: img.kdt
+  onWindowClosing: [askClose,closeFrames,saveLocalData,exit]
+  iconImage: img.ae
   content:
-    - Action(name=exitAction, text=menu.exit, toolTipText=menu.exitTooltip, icon=img.exit, onAction=[$confirm,closeFrames,saveLocalData,exit])
+    - Action(name=exitAction, text=menu.exit, toolTipText=menu.exitTooltip, icon=img.exit, onAction=[askClose,closeFrames,saveLocalData,exit])
     - Action(name=settings, text=menu.settings, toolTipText=menu.settingsTooltip, icon=img.settings, onAction=[showSettings])
+    - Action(name=about, text=menu.about, toolTipText=menu.aboutTooltip, icon=img.about, onAction=[showAbout])
+    - Action(name=loadConfig, text=menu.loadConfig, toolTipText=menu.loadConfigTooltip, icon=img.openFile, onAction=[loadConfig])
+    - Action(name=saveConfig, text=menu.saveConfig, toolTipText=menu.saveConfigTooltip, icon=img.saveFile, onAction=[saveConfig])
+    - Action(name=reglobalize, text=menu.reglobalize, toolTipText=menu.reglobalizeTooltip, icon=img.refresh, onAction=[reglobalize])
     - JMenuBar:
+        - JMenu(name=mainMenu, text=menu.main):
+            - JMenuItem(action=settings)
+            - JMenuItem(action=about)
+            - JMenuItem(action=exitAction)
         - JMenu(name=fileMenu, text=menu.file):
-            - JMenuItem(action=settings)
-            - JMenuItem(action=exitAction)
+            - JMenuItem(action=loadConfig)
+            - JMenuItem(action=saveConfig)
+            - JSeparator()
+            - JMenuItem(action=reglobalize)
     - JToolBar(name=tools, floatable=false, orientation=0):
         - JButton(action=exitAction, hideActionText=true)
         - JToolBarSeparator()
         - JButton(action=settings, hideActionText=true)
+        - JButton(action=about, hideActionText=true)
     - JSplitPane(name=contents, orientation=horizontalSplit, continuousLayout=true):
         - JPanel(name=panMods):
+            - JButton(name=btnRevertSelection, icon=img.undo16, text=btnRevertSelection.text, toolTipText=btnRevertSelection.tooltip, onAction=[revertSelection])
             - JLabel(name=lblModTypes, text=lblModTypes.text)
             - JComboBox(name=cmbModTypes, onAction=modTypeSelection)
@@ -28 +40 @@
             - MigLayout: |
                  [grow]
+                 btnRevertSelection                 [min]
                  lblModTypes<,cmbModTypes           [min]
                  scrollMods                         [grow]

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

@@ -22 +22 @@
 
         private Vector<NodeMod> items;
+        private Vector<Boolean> install;
         private int vocabModTypeID = -1;
         private int vocabPlatformID = -1;
@@ -45 +46 @@
                                 String type = "";
                                 if (vocabModTypeID < 0) {
-                                        vocabModTypeID = DepotManager.getInstance()
-                                                        .getVocabulary(DepotConfig.getVocabularyName_ModType()).getVid();
+                                        vocabModTypeID = DepotManager
+                                                        .getInstance()
+                                                        .getVocabulary(
+                                                                        DepotConfig.getVocabularyName_ModType())
+                                                        .getVid();
                                 }
                                 for (int tid : node.getTaxonomyTerms().get(vocabModTypeID)) {
@@ -57 +61 @@
                         case 3:
                                 if (vocabPlatformID < 0) {
-                                        vocabPlatformID = DepotManager.getInstance()
-                                                        .getVocabulary(DepotConfig.getVocabularyName_Platform()).getVid();
+                                        vocabPlatformID = DepotManager
+                                                        .getInstance()
+                                                        .getVocabulary(
+                                                                        DepotConfig.getVocabularyName_Platform())
+                                                        .getVid();
                                 }
                                 int tid = node.getTaxonomyTerms().get(vocabPlatformID)
@@ -64 +71 @@
                                 return DepotManager.getInstance().getTaxonomyTerm(tid)
                                                 .getName();
+                        case 4:
+                                return install.get(row);
                 }
                 return null;
@@ -79 +88 @@
                         case 3:
                                 return bundle.getString("mod.platform");
+                        case 4:
+                                return bundle.getString("mod.install");
                 }
                 return null;
@@ -90 +101 @@
         @Override
         public int getColumnCount() {
-                return 4;
+                return 5;
         }
 
@@ -104 +115 @@
                         case 3:
                                 return String.class;
+                        case 4:
+                                return Boolean.class;
                 }
                 return null;
@@ -137 +150 @@
                                 col.setMaxWidth(w);
                                 break;
+                        case 4:
+                                w = 60;
+                                col.setPreferredWidth(w);
+                                col.setMinWidth(w);
+                                col.setMaxWidth(w);
+                                break;
                 }
         }
@@ -145 +164 @@
         public void reloadData() {
                 items = DepotManager.getInstance().getModPackageNodes();
+                install = new Vector<Boolean>();
+                // TODO check installed
+                for (int i = 0; i < items.size(); i++) {
+                        install.add(i, false);
+                }
         }
 
@@ -156 +180 @@
         }
 
+        @Override
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+                return columnIndex == 4;
+        }
+
+        @Override
+        public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+                super.setValueAt(aValue, rowIndex, columnIndex);
+                if (columnIndex == 4) {
+                        install.set(rowIndex, (Boolean) aValue);
+                }
+        }
+
 }

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

@@ -3 +3 @@
 mod.package_number=Pkg#
 mod.platform=Platform
+mod.install=Install?

AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

@@ -9 +9 @@
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
-import javax.swing.JFrame;
+import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
@@ -23 +22 @@
  * @author Christian Illy
  */
-public class SettingsDialog extends JFrame {
+public class SettingsDialog extends JDialog {
         private static final long serialVersionUID = -5719515325671846620L;
 
@@ -31 +30 @@
         private BuildResult result = SwingJavaBuilder.build(this, bundle);
 
-        private static SettingsDialog openWindow = null;
-
         private JComboBox cmbLaF;
         private LaFComboModel laFModel;
 
         /**
-         * Open the Settings dialog if not currently opened or brings the existing
-         * one to front
+         * Open the settings
          */
-        public static void openWindow() {
-                if (openWindow != null) {
-                        SwingUtilities.invokeLater(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                        openWindow.toFront();
-                                        openWindow.repaint();
-                                }
-                        });
-                } else {
-                        new SettingsDialog().setVisible(true);
-                }
-        }
-
-        private SettingsDialog() {
-                openWindow = this;
+        public SettingsDialog() {
                 setMinimumSize(new Dimension(500, (int) getSize().getHeight() + 0));
 
@@ -85 +65 @@
 
         @SuppressWarnings("unused")
-        private void close() {
-                openWindow = null;
-        }
-
-        @SuppressWarnings("unused")
         private boolean save() {
                 Settings set = Settings.getInstance();

AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.yml

@@ -1 @@
-JFrame:
+JDialog:
   name: frame
   title: frame.title
@@ -5 +5 @@
   locationRelativeTo: null
   defaultCloseOperation: disposeOnClose
-  onWindowClosed: [close]
-  iconImage: img.kdt
+  iconImage: img.ae
+  modalityType: applicationModal
   content:
     - JButton(name=btnOk, text=btnOk, onAction=[save,dispose])