Changeset 660 for AE/installer2/src/net/oni2/aeinstaller

Timestamp:

Jan 30, 2013, 11:05:56 AM (12 years ago)

Author:

alloc

Message:

AEI2 0.99k:

• Added mod string filter
• Made jump-to-mod by key-press cycle through mods if pressed multiple times

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• gui/MainWin.java (modified) (7 diffs)
• gui/MainWin.yml (modified) (2 diffs)
• gui/modtable/EApplyFilterTo.java (added)
• gui/modtable/ModTable.java (modified) (4 diffs)
• gui/modtable/ModTableFilter.java (modified) (4 diffs)
• localization/MainWin.properties (modified) (1 diff)
• localization/ModTable.properties (modified) (1 diff)

AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99j
+appversion=0.99k

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

@@ -7 +7 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.io.File;
 import java.net.URL;
@@ -33 +35 @@
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
+import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 import javax.swing.ToolTipManager;
@@ -57 +60 @@
 import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
 import net.oni2.aeinstaller.gui.modtable.DownloadSizeListener;
+import net.oni2.aeinstaller.gui.modtable.EApplyFilterTo;
 import net.oni2.aeinstaller.gui.modtable.ModSelectionListener;
 import net.oni2.aeinstaller.gui.modtable.ModTable;
@@ -94 +98 @@
         private JRadioButton radOnline;
         private JRadioButton radLocal;
+        private JTextField txtShowFilter;
+        private JComboBox cmbShowFilterTo;
         private JScrollPane scrollMods;
         private ModTable tblMods;
@@ -99 +105 @@
 
         private PackageInfoBox pkgInfo;
-        
+
         private JButton btnInstall;
 
@@ -142 +148 @@
                 lblDownloadSizeVal.setText(SizeFormatter.format(0, 2));
                 radAll.setSelected(true);
+
+                for (EApplyFilterTo f : EApplyFilterTo.values()) {
+                        cmbShowFilterTo.addItem(f);
+                }
+                txtShowFilter.addKeyListener(new KeyAdapter() {
+                        @Override
+                        public void keyReleased(KeyEvent e) {
+                                super.keyReleased(e);
+                                updateTableFilter();
+                        }
+                });
 
                 tblMods.addModSelectionListener(this);
@@ -716 +733 @@
                 if (radLocal.isSelected())
                         downloadState = 2;
-                tblMods.setFilter(t, downloadState);
-        }
-
-        @SuppressWarnings("unused")
-        private void modTypeSelection() {
-                updateTableFilter();
-        }
-
-        @SuppressWarnings("unused")
-        private void showTypeSelection() {
-                updateTableFilter();
+                tblMods.setFilter(t, downloadState, txtShowFilter.getText(),
+                                (EApplyFilterTo) cmbShowFilterTo.getSelectedItem());
         }
 

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

@@ -51 +51 @@
         - JPanel(name=panMods):
             - JLabel(name=lblModTypes, text=lblModTypes.text)
-            - JComboBox(name=cmbModTypes, onAction=modTypeSelection)
+            - JComboBox(name=cmbModTypes, onAction=updateTableFilter)
             - JLabel(name=lblShowOnly, text=lblShowOnly.text)
-            - JRadioButton(name=radAll, text=radAll.text, onAction=showTypeSelection)
-            - JRadioButton(name=radOnline, text=radOnline.text, onAction=showTypeSelection)
-            - JRadioButton(name=radLocal, text=radLocal.text, onAction=showTypeSelection)
+            - JRadioButton(name=radAll, text=radAll.text, onAction=updateTableFilter)
+            - JRadioButton(name=radOnline, text=radOnline.text, onAction=updateTableFilter)
+            - JRadioButton(name=radLocal, text=radLocal.text, onAction=updateTableFilter)
             - ButtonGroup: [radAll,radOnline,radLocal]
+            - JLabel(name=lblShowFilter, text=lblShowFilter.text)
+            - JTextField(name=txtShowFilter)
+            - JComboBox(name=cmbShowFilterTo, onAction=updateTableFilter)
             - JScrollPane(name=scrollMods, vScrollBar=always, hScrollBar=never)
             - JButton(name=btnUnSelectAll, icon=img.unSelect16, text=btnUnSelectAll.text, onAction=[unSelectAll])
@@ -64 +67 @@
             - JLabel(name=lblDownloadSizeVal)
             - MigLayout: |
-                 [grow]
-                 lblModTypes<,cmbModTypes                        [min]
-                 lblShowOnly<,radAll,radOnline,radLocal          [min]
-                 scrollMods                                      [grow]
-                 >btnUnSelectAll,>btnRevertSelection,btnInstall  [min]
-                 lblDownloadSize,lblDownloadSizeVal              [min]
+                 [min]           [grow]
+                 >lblModTypes    cmbModTypes                       [min]
+                 >lblShowOnly    radAll,radOnline,radLocal         [min]
+                 >lblShowFilter  txtShowFilter>,cmbShowFilterTo<   [min]
+                 scrollMods+*                                      [grow]
+                 >btnUnSelectAll+*,>btnRevertSelection,btnInstall  [min]
+                 lblDownloadSize+*,lblDownloadSizeVal              [min]
         - PackageInfoBox(name=pkgInfo)
     - MigLayout:

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

@@ -98 +98 @@
                 setRowSorter(sorter);
 
-                setFilter(null, 0);
+                setFilter(null, 0, null, EApplyFilterTo.ALL);
 
                 List<RowSorter.SortKey> sortKeys = new ArrayList<RowSorter.SortKey>();
@@ -221 +221 @@
          * @param downloadState
          *            Show only: 0 = all, 1 = online, 2 = downloaded
-         */
-        public void setFilter(Type type, int downloadState) {
+         * @param filterString
+         *            String to filter on
+         * @param filterTo
+         *            Fields to use string filter on
+         */
+        public void setFilter(Type type, int downloadState, String filterString,
+                        EApplyFilterTo filterTo) {
                 sorter.setRowFilter(new ModTableFilter(type, downloadState,
-                                contentType == ETableContentType.CORE, false));
+                                filterString, filterTo, contentType == ETableContentType.CORE,
+                                false));
         }
 
@@ -378 +384 @@
 
         private class KeyEventHandler extends KeyAdapter {
+                private void goToRow(int row) {
+                        setRowSelectionInterval(row, row);
+                        JViewport viewport = (JViewport) getParent();
+                        Rectangle rect = getCellRect(row, 0, true);
+                        Rectangle r2 = viewport.getVisibleRect();
+                        scrollRectToVisible(new Rectangle(rect.x, rect.y,
+                                        (int) r2.getWidth(), (int) r2.getHeight()));
+                }
+
                 @Override
                 public void keyTyped(KeyEvent e) {
@@ -384 +399 @@
                         if (e.getModifiers() == 0) {
                                 String key = String.valueOf(e.getKeyChar()).toLowerCase();
-                                for (int i = 0; i < getRowCount(); i++) {
+                                int row = getSelectedRow();
+                                if (row == (getRowCount() - 1))
+                                        row = -1;
+                                for (int i = row + 1; i < getRowCount(); i++) {
                                         Package m = (Package) getValueAt(i, -1);
                                         if (m.getName().toLowerCase().startsWith(key)) {
-                                                setRowSelectionInterval(i, i);
-                                                JViewport viewport = (JViewport) getParent();
-                                                Rectangle rect = getCellRect(i, 0, true);
-                                                Rectangle r2 = viewport.getVisibleRect();
-                                                scrollRectToVisible(new Rectangle(rect.x, rect.y,
-                                                                (int) r2.getWidth(), (int) r2.getHeight()));
-                                                break;
+                                                goToRow(i);
+                                                return;
+                                        }
+                                }
+                                if (row > 0) {
+                                        for (int i = 0; i < row; i++) {
+                                                Package m = (Package) getValueAt(i, -1);
+                                                if (m.getName().toLowerCase().startsWith(key)) {
+                                                        goToRow(i);
+                                                        return;
+                                                }
                                         }
                                 }

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

@@ -12 +12 @@
         private Type type = null;
         private int downloadState = 0;
+        private EApplyFilterTo filterTo = EApplyFilterTo.ALL;
+        private String filterString = null;
 
         private boolean showCorePackages = false;
@@ -21 +23 @@
          * @param downloadState
          *            Show only: 0 = all, 1 = online, 2 = downloaded
+         * @param filterString
+         *            Filter for the given string
+         * @param filterTo
+         *            Use the string filter only on the named field
          * @param showCorePackages
          *            Show core packages in table
@@ -26 +32 @@
          *            Show packages not valid on this platform
          */
-        public ModTableFilter(Type type, int downloadState,
-                        boolean showCorePackages, boolean showInvalidPlatform) {
+        public ModTableFilter(Type type, int downloadState, String filterString,
+                        EApplyFilterTo filterTo, boolean showCorePackages,
+                        boolean showInvalidPlatform) {
                 super();
                 this.type = type;
                 this.downloadState = downloadState;
+                if (filterString != null)
+                        this.filterString = filterString.toLowerCase();
+                this.filterTo = filterTo;
                 this.showCorePackages = showCorePackages;
                 this.showInvalidPlatform = showInvalidPlatform;
@@ -58 +68 @@
                                 break;
                 }
+                if (filterString != null && filterString.length() > 1) {
+                        switch (filterTo) {
+                                case ALL:
+                                        result &= mod.getName().toLowerCase()
+                                                        .contains(filterString)
+                                                        || mod.getCreator().toLowerCase()
+                                                                        .contains(filterString)
+                                                        || mod.getDescription().toLowerCase()
+                                                                        .contains(filterString);
+                                        break;
+                                case CREATOR:
+                                        result &= mod.getCreator().toLowerCase()
+                                                        .contains(filterString);
+                                        break;
+                                case DESCRIPTION:
+                                        result &= mod.getDescription().toLowerCase()
+                                                        .contains(filterString);
+                                        break;
+                                case NAME:
+                                        result &= mod.getName().toLowerCase()
+                                                        .contains(filterString);
+                                        break;
+                        }
+                }
 
                 return result;

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

@@ -43 +43 @@
 radOnline.text=Online
 radLocal.text=Downloaded
+lblShowFilter.text=Filter:
 lblDownloadSize.text=Size of files to download: 
 

AE/installer2/src/net/oni2/aeinstaller/localization/ModTable.properties

@@ -6 +6 @@
 mod.added=Added
 mod.date=Last change
+
+filterTo.ALL=All
+filterTo.NAME=Mod name
+filterTo.CREATOR=Creator
+filterTo.DESCRIPTION=Description
 
 state.installed=Is <b>I</b>nstalled