Changeset 752 for java/installer2/src/net/oni2/aeinstaller

Timestamp:

Mar 28, 2013, 4:34:30 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99y:

• Main win button icons
• (Un)Select all now works a lot faster

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• Images.properties (modified) (2 diffs)
• gui/modtable/ModTable.java (modified) (1 diff)
• gui/modtable/ModTableModel.java (modified) (1 diff)
• images/gnome-edit-undo.png (added)
• images/open_icon_library/_run-build-install-root.png (deleted)
• images/open_icon_library/select-2.png (deleted)
• images/selectall.png (added)
• images/tango/_edit-undo.png (deleted)
• images/tango/edit-undo.png (deleted)
• images/tango/edit-undo16.png (deleted)

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

@@ -3 +3 @@
 img.settings=/net/oni2/aeinstaller/images/tango/preferences-system.png
 img.exit=/net/oni2/aeinstaller/images/tango/system-log-out.png
-img.undo=/net/oni2/aeinstaller/images/tango/edit-undo.png
-img.undo16=/net/oni2/aeinstaller/images/tango/edit-undo16.png
 img.redo=/net/oni2/aeinstaller/images/tango/edit-redo.png
 img.refresh=/net/oni2/aeinstaller/images/tango/view-refresh.png
@@ -15 +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.unSelect16=/net/oni2/aeinstaller/images/open_icon_library/select-2.png
+
+img.unSelect16=/net/oni2/aeinstaller/images/selectall.png
+img.undo=/net/oni2/aeinstaller/images/gnome-edit-undo.png
 
 img.ae=/net/oni2/aeinstaller/images/AElogo.png

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

@@ -267 +267 @@
                 for (int i = 0; i < getRowCount(); i++) {
                         int modRow = convertRowIndexToModel(i);
-                        model.setValueAt(!isAll, modRow, 0);
-                }
+                        model.selectPackage(modRow, !isAll);
+                }
+                model.updateDownloadSize();
                 invalidate();
                 repaint();

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

@@ -271 +271 @@
         }
 
+        /**
+         * Check the current download size and notify listeners
+         */
+        public void updateDownloadSize() {
+                int size = 0;
+                int count = 0;
+                for (int i = 0; i < items.size(); i++) {
+                        if (install.get(i)) {
+                                count++;
+                                Package m = items.get(i);
+                                if (!m.isLocalAvailable())
+                                        size += m.getZipSize();
+                        }
+                }
+                notifyDownloadSize(size, count);
+        }
+
         @Override
         public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
                 super.setValueAt(aValue, rowIndex, columnIndex);
                 if (columnIndex == 0) {
-                        install.set(rowIndex, (Boolean) aValue);
-
-                        int size = 0;
-                        int count = 0;
-                        for (int i = 0; i < items.size(); i++) {
-                                if (install.get(i)) {
-                                        count++;
-                                        Package m = items.get(i);
-                                        if (!m.isLocalAvailable())
-                                                size += m.getZipSize();
-                                }
-                        }
-                        notifyDownloadSize(size, count);
-                }
+                        selectPackage(rowIndex, (Boolean) aValue);
+                        updateDownloadSize();
+                }
+        }
+
+        /**
+         * Select package in given row
+         * 
+         * @param row
+         *            Row of package
+         * @param select
+         *            Select or not
+         */
+        public void selectPackage(int row, boolean select) {
+                install.set(row, select);
         }