Changeset 90 for trunk

Timestamp:

04/13/06 21:35:17 (6 years ago)

Author:

jlee

Message:

Add brand to profile

Location:

trunk/src

Files:

• org/thestaticvoid/iriverter/ConverterUI.java (modified) (1 diff)
• org/thestaticvoid/iriverter/Profile.java (modified) (1 diff)
• profiles/h300.profile (modified) (1 diff)
• profiles/ipod.profile (modified) (1 diff)
• profiles/pmp.profile (modified) (1 diff)
• profiles/u10.profile (modified) (1 diff)
• profiles/x5.profile (modified) (1 diff)

trunk/src/org/thestaticvoid/iriverter/ConverterUI.java

@@ -173 +173 @@
                 Profile[] profiles = Profile.getAllProfiles();
                 Profile currentProfile = converterOptions.getCurrentProfile();
-
+                
+                Map deviceToProfile = new HashMap();
+                Map brandToDevices = new TreeMap();
                 for (int i = 0; i < profiles.length; i++) {
-                        MenuItem profileMenuItem = new MenuItem(deviceMenu, SWT.CHECK);
-                        profileMenuItem.setText("&" + (i + 1) + " " + profiles[i].getDevice());
-                        profileMenuItem.setSelection(profiles[i].getProfileName().equals(currentProfile.getProfileName()));
-                        profileMenuItem.addSelectionListener(this);
-                        
-                        profileMenuItems.put(profileMenuItem, profiles[i].getProfileName());
+                        Set devices = (Set) brandToDevices.get(profiles[i].getBrand());
+                        if (devices == null) {
+                                devices = new TreeSet();
+                                brandToDevices.put(profiles[i].getBrand(), devices);
+                        }
+                        
+                        devices.add(profiles[i].getDevice());
+                        deviceToProfile.put(profiles[i].getDevice(), profiles[i]);
+                }
+                
+                Iterator brandItr = brandToDevices.keySet().iterator();
+                while (brandItr.hasNext()) {
+                        String brand = (String) brandItr.next();
+                        
+                        MenuItem brandMenuItem = new MenuItem(deviceMenu, SWT.CASCADE);
+                        brandMenuItem.setText(brand);
+                        
+                        Menu brandMenu = new Menu(shell, SWT.DROP_DOWN);
+                        brandMenuItem.setMenu(brandMenu);
+                        
+                        Iterator deviceItr = ((Set) brandToDevices.get(brand)).iterator();
+                        while (deviceItr.hasNext()) {
+                                String deviceStr = (String) deviceItr.next();
+                                Profile profile = (Profile) deviceToProfile.get(deviceStr);
+                                
+                                MenuItem profileMenuItem = new MenuItem(brandMenu, SWT.CHECK);
+                                profileMenuItem.setText(deviceStr);
+                                profileMenuItem.setSelection(profile.getProfileName().equals(currentProfile.getProfileName()));
+                                profileMenuItem.addSelectionListener(this);
+                                
+                                profileMenuItems.put(profileMenuItem, profile.getProfileName());
+                        }
                 }
                 

trunk/src/org/thestaticvoid/iriverter/Profile.java

@@ -47 +47 @@
                 String profileFileName = profileFile.getName();
                 return profileFileName.substring(0, profileFileName.indexOf('.'));
+        }
+        
+        public String getBrand() {
+                return readOption("brand");
         }
         

trunk/src/profiles/h300.profile

@@ +1 @@
+brand=iriver
 device=H300 Series
 maxVideoBitrate=500

trunk/src/profiles/ipod.profile

@@ -1 @@
-device=iPod Video
+brand=Apple
+device=iPod 5G
 maxVideoBitrate=2500
 maxAudioBitrate=160

trunk/src/profiles/pmp.profile

@@ +1 @@
+brand=iriver
 device=PMP Series
 maxVideoBitrate=1500

trunk/src/profiles/u10.profile

@@ -1 @@
-device=U10
+brand=iriver
+device=clix / U10
 maxVideoBitrate=384
 maxAudioBitrate=128

trunk/src/profiles/x5.profile

@@ -1 @@
-device=iAudio X5
+brand=iAUDIO
+device=X5 Series
 maxVideoBitrate=256
 maxAudioBitrate=192