Changeset 805 for java

Timestamp:

Apr 12, 2013, 6:11:49 PM (12 years ago)

Author:

alloc

Message:

AEI2.02:

• Fixes #18

Location:

java/installer2

Files:

• locales/net/oni2/aeinstaller/localization/MainWin_de.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/Images.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/gui/MainWin.java (modified) (3 diffs)
• src/net/oni2/aeinstaller/gui/MainWin.yml (modified) (2 diffs)
• src/net/oni2/aeinstaller/gui/modtable/ModTable.java (modified) (4 diffs)
• src/net/oni2/aeinstaller/gui/modtable/ModTableFilter.java (modified) (2 diffs)
• src/net/oni2/aeinstaller/images/open_icon_library/edit-clear-locationbar-rtl.png (added)
• src/net/oni2/aeinstaller/localization/MainWin.properties (modified) (1 diff)

java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties

@@ -43 +43 @@
 radOnline.text=Online
 radLocal.text=Heruntergeladen
+radInstalled.text=Installiert
 lblShowFilter.text=Filter:
 lblSelectedMods.text=Mods für Installation ausgewählt:

java/installer2/src/net/oni2/aeinstaller/Images.properties

@@ -13 +13 @@
 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
+img.clear=/net/oni2/aeinstaller/images/open_icon_library/edit-clear-locationbar-rtl.png
 
 img.unSelect16=/net/oni2/aeinstaller/images/selectall.png

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

@@ -102 +102 @@
         private JRadioButton radOnline;
         private JRadioButton radLocal;
+        private JRadioButton radInstalled;
         private JTextField txtShowFilter;
         private JComboBox cmbShowFilterTo;
@@ -794 +795 @@
                 pkgInfo.updateInfo(m);
         }
+        
+        @SuppressWarnings("unused")
+        private void clearFilter() {
+                txtShowFilter.setText("");
+                updateTableFilter();
+        }
 
         private void updateTableFilter() {
@@ -805 +812 @@
                 if (radLocal.isSelected())
                         downloadState = 2;
+                if (radInstalled.isSelected())
+                        downloadState = 3;
                 tblMods.setFilter(t, downloadState, txtShowFilter.getText(),
                                 (EApplyFilterTo) cmbShowFilterTo.getSelectedItem());

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

@@ -53 +53 @@
             - JRadioButton(name=radOnline, text=radOnline.text, onAction=updateTableFilter)
             - JRadioButton(name=radLocal, text=radLocal.text, onAction=updateTableFilter)
-            - ButtonGroup: [radAll,radOnline,radLocal]
+            - JRadioButton(name=radInstalled, text=radInstalled.text, onAction=updateTableFilter)
+            - ButtonGroup: [radAll,radOnline,radLocal,radInstalled]
             - JLabel(name=lblShowFilter, text=lblShowFilter.text)
+            - JButton(name=btnClearFilter, icon=img.clear, onAction=[clearFilter])
             - JTextField(name=txtShowFilter)
             - JComboBox(name=cmbShowFilterTo, onAction=updateTableFilter)
@@ -90 +92 @@
             - MigLayout: |
                  [min]                 [grow]
-                 >lblModTypes          cmbModTypes<,lblShowOnly,radAll,radOnline,radLocal      [min]
-                 >lblShowFilter        txtShowFilter>,cmbShowFilterTo<                         [min]
-                 scrollMods+*                                                                  [grow]
-                 panBottom+*                                                                   [min]
+                 >lblModTypes          cmbModTypes<,lblShowOnly,radAll,radOnline,radLocal,radInstalled   [min]
+                 >lblShowFilter        txtShowFilter>,btnClearFilter<,cmbShowFilterTo<                   [min]
+                 scrollMods+*                                                                            [grow]
+                 panBottom+*                                                                             [min]
                  {lblShowOnly: gap 30px}
         - PackageInfoBox(name=pkgInfo)

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

@@ -104 +104 @@
 
                 int sortCol = SettingsManager.getInstance().get("modSortColumn", 1);
-                SortOrder sortOrder = SortOrder.valueOf(SettingsManager.getInstance().get(
-                                "modSortOrder", "ASCENDING"));
+                SortOrder sortOrder = SortOrder.valueOf(SettingsManager.getInstance()
+                                .get("modSortOrder", "ASCENDING"));
 
                 sortKeys.add(new RowSorter.SortKey(sortCol, sortOrder));
@@ -221 +221 @@
          *            Type of mods to show (null for all)
          * @param downloadState
-         *            Show only: 0 = all, 1 = online, 2 = downloaded
+         *            Show only: 0 = all, 1 = online, 2 = downloaded, 3 = installed
          * @param filterString
          *            String to filter on
@@ -245 +245 @@
                                 SortOrder so = keys.get(0).getSortOrder();
                                 SettingsManager.getInstance().put("modSortColumn", col);
-                                SettingsManager.getInstance().put("modSortOrder", so.toString());
+                                SettingsManager.getInstance()
+                                                .put("modSortOrder", so.toString());
                         }
                 }
@@ -346 +347 @@
                                                                 TreeSet<Package> deps = new TreeSet<Package>();
                                                                 toDo.add(mod);
-                                                                Downloader dl = new Downloader(toDo, deps, false);
+                                                                Downloader dl = new Downloader(toDo, deps,
+                                                                                false);
                                                                 try {
                                                                         dl.setVisible(true);

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

@@ -22 +22 @@
          *            Type of mods to show (null for all)
          * @param downloadState
-         *            Show only: 0 = all, 1 = online, 2 = downloaded
+         *            Show only: 0 = all, 1 = online, 2 = downloaded, 3 = installed
          * @param filterString
          *            Filter for the given string
@@ -67 +67 @@
                                 result &= mod.isLocalAvailable();
                                 break;
+                        case 3:
+                                result &= mod.isInstalled();
+                                break;
                 }
                 if (filterString != null && filterString.length() > 1) {

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

@@ -43 +43 @@
 radOnline.text=Online
 radLocal.text=Downloaded
+radInstalled.text=Installed
 lblShowFilter.text=Filter:
 lblSelectedMods.text=Mods selected for installation: