New layout icons

Normand Briere

2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15

 cFileSystemModel.java
..
..
@@ -113,35 +113,74 @@
113
113
             
114
114
             if (valueString.toLowerCase().endsWith(".gfd") || valueString.toLowerCase().endsWith(".obj") || valueString.toLowerCase().endsWith(".3ds"))
115
115
             {
116
-                String valueTruncated = valueString.substring(0, valueString.length()-4);
117
-                
118
-                System.out.println(valueTruncated);
119
-                
120
-                javax.swing.ImageIcon rendererIcon = icons.get(valueTruncated);
121
-                
122
-                if (rendererIcon == null)
116
+                if (true)
123
117
                 {
124
-                    if (new File(valueTruncated + ".jpg").exists())
125
-                    {
126
-                        rendererIcon = new javax.swing.ImageIcon(valueTruncated + ".jpg");
127
-                    }
128
-                    else
129
-                    {
130
-                        if (new File(valueTruncated + ".png").exists())
131
-                        {
132
-                            rendererIcon = new javax.swing.ImageIcon(valueTruncated + ".png");
133
-                        }
134
-                    }
135
-                    
118
+                    // Small icons
119
+                    String valueTruncated = valueString.substring(0, valueString.length()-4);
120
+
121
+                    //System.out.println("valueTruncated = " + valueTruncated);
122
+
123
+                    javax.swing.ImageIcon rendererIcon = icons.get(valueTruncated);
124
+
136
125
                     if (rendererIcon == null)
137
126
                     {
138
-                        rendererIcon = new javax.swing.ImageIcon();
127
+                        if (new File(valueTruncated + ".jpg").exists())
128
+                        {
129
+                            rendererIcon = new javax.swing.ImageIcon(valueTruncated + ".jpg");
130
+                        }
131
+                        else
132
+                        {
133
+                            if (new File(valueTruncated + ".png").exists())
134
+                            {
135
+                                rendererIcon = new javax.swing.ImageIcon(valueTruncated + ".png");
136
+                            }
137
+                        }
138
+
139
+                        if (rendererIcon == null)
140
+                        {
141
+                            rendererIcon = new javax.swing.ImageIcon();
142
+                        }
143
+
144
+                        icons.put(valueTruncated, rendererIcon);
145
+                    }
146
+
147
+                    setIcon(rendererIcon);
148
+                }
149
+                else
150
+                {
151
+                    // Large icons
152
+                    String[] split = valueString.split("/");
153
+
154
+                    String valueTruncated = "";
155
+                    
156
+                    for (int i=1; i<split.length-1; i++)
157
+                    {
158
+                        valueTruncated += "/" + split[i];
139
159
                     }
140
160
                     
141
-                    icons.put(valueTruncated, rendererIcon);
161
+                    valueTruncated += "/icon.jpg";
162
+                    
163
+                    System.out.println(valueTruncated);
164
+
165
+                    javax.swing.ImageIcon rendererIcon = icons.get(valueTruncated);
166
+
167
+                    if (rendererIcon == null)
168
+                    {
169
+                        if (new File(valueTruncated).exists())
170
+                        {
171
+                            rendererIcon = new javax.swing.ImageIcon(valueTruncated);
172
+                        }
173
+
174
+                        if (rendererIcon == null)
175
+                        {
176
+                            rendererIcon = new javax.swing.ImageIcon();
177
+                        }
178
+
179
+                        icons.put(valueTruncated, rendererIcon);
180
+                    }
181
+
182
+                    setIcon(rendererIcon);
142
183
                 }
143
-            
144
-                setIcon(rendererIcon);
145
184
             }
146
185
             else
147
186
             {