Changeset 36

Timestamp:

05/14/08 10:06:36 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (5 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -573 +573 @@
                                                 org.expeditee.gui.FrameIO.LOGS_DIR);
                         } else if (ItemUtils.isTag(item, "@ImageDir:")) {
-                                ArrayList<String> dirs = getDirs(item);
-                                if (dirs != null)
-                                        UserSettings.ImageDirs.addAll(dirs);
+                                String dir = getDir(item, null);
+                                if (dir != null)
+                                        UserSettings.ImageDirs.add(0, dir);
                         } else if (ItemUtils.isTag(item, "@Threading:")) {
                                 UserSettings.Threading = getBoolean(item,
@@ -613 +613 @@
                         }
                 }
-                return new Color[] { Color.black, Color.white };
+                return new Color[]{Color.black, Color.white};
         }
 
@@ -742 +742 @@
                         List<InteractiveWidget> widgets = toParse.getInteractiveWidgets();
 
-                         * for (Item i : items) { if (i instanceof Picture) {
-                         * toParse.removeItem(i); toParse.addItem(((Picture) i).getText()); }
-                         * else if (i instanceof WidgetCorner) { toParse.removeItem(i); }
-                         * else if (i instanceof WidgetEdge) { toParse.removeItem(i); } }
-                         */
                         for (Item i : items) {
                                 if (i instanceof Picture) {
@@ -756 +751 @@
                                         toParse.removeItem(i);
                                 }
-                                        InteractiveWidget iw = ((WidgetCorner) i).getWidgetSource();
-                                        if (!widgets.contains(iw)) { // hmmm I should be using a
-                                                // set... meh
-                                                widgets.add(iw);
-                                        }
-                                } else if (i instanceof WidgetEdge)
-                                        toParse.removeItem(i);
                         }
 
@@ -1270 +1258 @@
                                 for (File helpFrameset : helpFramesets) {
                                         String framesetName = helpFrameset.getName();
-                                        Frame indexFrame = FrameIO.LoadFrame(framesetName + '1');
+                                        Frame indexFrame = FrameIO.LoadFrame(framesetName+ '1');
                                         // Look through the folder for help index pages
                                         if (indexFrame != null