ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
(Generate patch)

Comparing AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (file contents):
Revision 658 by alloc, Tue Jan 29 12:34:16 2013 UTC vs.
Revision 660 by alloc, Wed Jan 30 10:05:56 2013 UTC

# Line 6 | Line 6 | import java.awt.GridLayout;
6   import java.awt.event.ActionEvent;
7   import java.awt.event.ItemEvent;
8   import java.awt.event.ItemListener;
9 + import java.awt.event.KeyAdapter;
10 + import java.awt.event.KeyEvent;
11   import java.io.File;
12   import java.net.URL;
13   import java.util.Date;
# Line 32 | Line 34 | import javax.swing.JPanel;
34   import javax.swing.JRadioButton;
35   import javax.swing.JScrollPane;
36   import javax.swing.JSplitPane;
37 + import javax.swing.JTextField;
38   import javax.swing.SwingUtilities;
39   import javax.swing.ToolTipManager;
40   import javax.swing.filechooser.FileFilter;
# Line 56 | Line 59 | import net.oni2.aeinstaller.gui.about.Ab
59   import net.oni2.aeinstaller.gui.corepackages.CorePackagesDialog;
60   import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
61   import net.oni2.aeinstaller.gui.modtable.DownloadSizeListener;
62 + import net.oni2.aeinstaller.gui.modtable.EApplyFilterTo;
63   import net.oni2.aeinstaller.gui.modtable.ModSelectionListener;
64   import net.oni2.aeinstaller.gui.modtable.ModTable;
65   import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
# Line 93 | Line 97 | public class MainWin extends JFrame impl
97          private JRadioButton radAll;
98          private JRadioButton radOnline;
99          private JRadioButton radLocal;
100 +        private JTextField txtShowFilter;
101 +        private JComboBox cmbShowFilterTo;
102          private JScrollPane scrollMods;
103          private ModTable tblMods;
104          private JLabel lblDownloadSizeVal;
105  
106          private PackageInfoBox pkgInfo;
107 <        
107 >
108          private JButton btnInstall;
109  
110          private TreeSet<Package> execCoreUpdates = new TreeSet<Package>();
# Line 142 | Line 148 | public class MainWin extends JFrame impl
148                  lblDownloadSizeVal.setText(SizeFormatter.format(0, 2));
149                  radAll.setSelected(true);
150  
151 +                for (EApplyFilterTo f : EApplyFilterTo.values()) {
152 +                        cmbShowFilterTo.addItem(f);
153 +                }
154 +                txtShowFilter.addKeyListener(new KeyAdapter() {
155 +                        @Override
156 +                        public void keyReleased(KeyEvent e) {
157 +                                super.keyReleased(e);
158 +                                updateTableFilter();
159 +                        }
160 +                });
161 +
162                  tblMods.addModSelectionListener(this);
163                  tblMods.addDownloadSizeListener(this);
164          }
# Line 715 | Line 732 | public class MainWin extends JFrame impl
732                          downloadState = 1;
733                  if (radLocal.isSelected())
734                          downloadState = 2;
735 <                tblMods.setFilter(t, downloadState);
736 <        }
720 <
721 <        @SuppressWarnings("unused")
722 <        private void modTypeSelection() {
723 <                updateTableFilter();
724 <        }
725 <
726 <        @SuppressWarnings("unused")
727 <        private void showTypeSelection() {
728 <                updateTableFilter();
735 >                tblMods.setFilter(t, downloadState, txtShowFilter.getText(),
736 >                                (EApplyFilterTo) cmbShowFilterTo.getSelectedItem());
737          }
738  
739          @Override

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)