Changeset 805 for java/installer2/src/net/oni2
- Timestamp:
- Apr 12, 2013, 6:11:49 PM (12 years ago)
- Location:
- java/installer2/src/net/oni2/aeinstaller
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/src/net/oni2/aeinstaller/Images.properties
r752 r805 13 13 img.folder=/net/oni2/aeinstaller/images/open_icon_library/folder-open-3.png 14 14 img.update=/net/oni2/aeinstaller/images/open_icon_library/system-software-update-2.png 15 img.clear=/net/oni2/aeinstaller/images/open_icon_library/edit-clear-locationbar-rtl.png 15 16 16 17 img.unSelect16=/net/oni2/aeinstaller/images/selectall.png -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r804 r805 102 102 private JRadioButton radOnline; 103 103 private JRadioButton radLocal; 104 private JRadioButton radInstalled; 104 105 private JTextField txtShowFilter; 105 106 private JComboBox cmbShowFilterTo; … … 794 795 pkgInfo.updateInfo(m); 795 796 } 797 798 @SuppressWarnings("unused") 799 private void clearFilter() { 800 txtShowFilter.setText(""); 801 updateTableFilter(); 802 } 796 803 797 804 private void updateTableFilter() { … … 805 812 if (radLocal.isSelected()) 806 813 downloadState = 2; 814 if (radInstalled.isSelected()) 815 downloadState = 3; 807 816 tblMods.setFilter(t, downloadState, txtShowFilter.getText(), 808 817 (EApplyFilterTo) cmbShowFilterTo.getSelectedItem()); -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml
r753 r805 53 53 - JRadioButton(name=radOnline, text=radOnline.text, onAction=updateTableFilter) 54 54 - JRadioButton(name=radLocal, text=radLocal.text, onAction=updateTableFilter) 55 - ButtonGroup: [radAll,radOnline,radLocal] 55 - JRadioButton(name=radInstalled, text=radInstalled.text, onAction=updateTableFilter) 56 - ButtonGroup: [radAll,radOnline,radLocal,radInstalled] 56 57 - JLabel(name=lblShowFilter, text=lblShowFilter.text) 58 - JButton(name=btnClearFilter, icon=img.clear, onAction=[clearFilter]) 57 59 - JTextField(name=txtShowFilter) 58 60 - JComboBox(name=cmbShowFilterTo, onAction=updateTableFilter) … … 90 92 - MigLayout: | 91 93 [min] [grow] 92 >lblModTypes cmbModTypes<,lblShowOnly,radAll,radOnline,radLocal 93 >lblShowFilter txtShowFilter>, cmbShowFilterTo<[min]94 scrollMods+* [grow]95 panBottom+* [min]94 >lblModTypes cmbModTypes<,lblShowOnly,radAll,radOnline,radLocal,radInstalled [min] 95 >lblShowFilter txtShowFilter>,btnClearFilter<,cmbShowFilterTo< [min] 96 scrollMods+* [grow] 97 panBottom+* [min] 96 98 {lblShowOnly: gap 30px} 97 99 - PackageInfoBox(name=pkgInfo) -
java/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java
r773 r805 104 104 105 105 int sortCol = SettingsManager.getInstance().get("modSortColumn", 1); 106 SortOrder sortOrder = SortOrder.valueOf(SettingsManager.getInstance() .get(107 "modSortOrder", "ASCENDING"));106 SortOrder sortOrder = SortOrder.valueOf(SettingsManager.getInstance() 107 .get("modSortOrder", "ASCENDING")); 108 108 109 109 sortKeys.add(new RowSorter.SortKey(sortCol, sortOrder)); … … 221 221 * Type of mods to show (null for all) 222 222 * @param downloadState 223 * Show only: 0 = all, 1 = online, 2 = downloaded 223 * Show only: 0 = all, 1 = online, 2 = downloaded, 3 = installed 224 224 * @param filterString 225 225 * String to filter on … … 245 245 SortOrder so = keys.get(0).getSortOrder(); 246 246 SettingsManager.getInstance().put("modSortColumn", col); 247 SettingsManager.getInstance().put("modSortOrder", so.toString()); 247 SettingsManager.getInstance() 248 .put("modSortOrder", so.toString()); 248 249 } 249 250 } … … 346 347 TreeSet<Package> deps = new TreeSet<Package>(); 347 348 toDo.add(mod); 348 Downloader dl = new Downloader(toDo, deps, false); 349 Downloader dl = new Downloader(toDo, deps, 350 false); 349 351 try { 350 352 dl.setVisible(true); -
java/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableFilter.java
r660 r805 22 22 * Type of mods to show (null for all) 23 23 * @param downloadState 24 * Show only: 0 = all, 1 = online, 2 = downloaded 24 * Show only: 0 = all, 1 = online, 2 = downloaded, 3 = installed 25 25 * @param filterString 26 26 * Filter for the given string … … 67 67 result &= mod.isLocalAvailable(); 68 68 break; 69 case 3: 70 result &= mod.isInstalled(); 71 break; 69 72 } 70 73 if (filterString != null && filterString.length() > 1) { -
java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
r766 r805 43 43 radOnline.text=Online 44 44 radLocal.text=Downloaded 45 radInstalled.text=Installed 45 46 lblShowFilter.text=Filter: 46 47 lblSelectedMods.text=Mods selected for installation:
Note:
See TracChangeset
for help on using the changeset viewer.