Changeset 669

Timestamp:

01/08/14 15:15:33 (10 years ago)

Author:

jts21

Message:

generateSettingsTree() now uses FrameCreator, and also now uses a single column of settings with info alongside instead of multiple columns with tooltips.

Location:

trunk/src/org/expeditee

Files:

• actions/Navigation.java (modified) (1 diff)
• gui/FrameCreator.java (modified) (4 diffs)
• gui/FrameGraphics.java (modified) (1 diff)
• items/Text.java (modified) (1 diff)
• settings/Settings.java (modified) (4 diffs)

trunk/src/org/expeditee/actions/Navigation.java

@@ -77 +77 @@
         public static void Goto(String frameName) {
                 FrameUtils.DisplayFrame(frameName);
+        }
+        
+        /**
+         * Goto a frame without adding it to history
+         */
+        public static void GotoQuiet(String frameName) {
+                FrameUtils.DisplayFrame(frameName, false, true);
         }
 

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

@@ -7 +7 @@
 import org.expeditee.items.Text;
 
-/**
- *  TODO: merge with @see org.expeditee.settings.Settings.generateSettingsTree
- */
 public class FrameCreator {
         public static final int INDENT_FROM_TITLE = 20;
+        
+        // offset between items
+        private int y_offset = 2;
 
         private int START_Y;
@@ -209 +209 @@
                                 save();
 
-                        _lastY = toAdd.getY() + toAdd.getBoundsHeight();
+                        _lastY = toAdd.getY() + toAdd.getBoundsHeight() + y_offset;
                         _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX);
 
@@ -233 +233 @@
         public void save() {
                 FrameIO.ForceSaveFrame(_current);
+        }
+        
+        public int getLastY() {
+                return _lastY;
+        }
+        
+        public void setLastY(int lastY) {
+                _lastY = lastY;
+        }
+        
+        public Frame getCurrentFrame() {
+                return _current;
         }
 
@@ -267 +279 @@
                 Item previousButton = template.copy();
                 previousButton.setID(current.getNextItemID());
-                previousButton.setLink(link);
+                // don't store button navigation in history,
+                // since it's annoying to have to click back through all of it to get back to the profile frame
+                previousButton.setAction("gotoQuiet " + link);
                 current.addItem(previousButton);
 

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

@@ -39 +39 @@
 
         // the maximum size that can be used to paint on
-        private static Dimension _MaxSize = new Dimension(1000, 1000);
+        private static Dimension _MaxSize = new Dimension(UserSettings.InitialWidth.get(), UserSettings.InitialHeight.get() - MessageBay.MESSAGE_BUFFER_HEIGHT);
 
         // Final passes to renderering the current frame

trunk/src/org/expeditee/items/Text.java

@@ -1392 +1392 @@
         // makes items copy really slowly when there are lots of lines of text!
         // This needs to be fixed!!
-        private void rebuild(boolean limitWidth) {
+        public void rebuild(boolean limitWidth) {
                 rebuild(limitWidth, true);
         }

trunk/src/org/expeditee/settings/Settings.java

@@ -10 +10 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameCreator;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
@@ -156 +157 @@
          * 
          * Generates settings tree
-         * TODO: merge with @see FrameCreator
          * 
          */
         private static void generateSettingsTree(String page, Text text) {
-                Frame frame = FrameIO.CreateFrame(text.getParentOrCurrentFrame().getFramesetName(), page, null);
-                text.setLink(frame.getName());
-                
-                int x = 50, y = 100;
-                int dY = UserSettings.ItemTemplate.get().getPolygon().getBounds().height + 1;
-                int maxY = UserSettings.InitialHeight.get() - 150;
+                FrameCreator frames = new FrameCreator(text.getParentOrCurrentFrame().getFramesetName(), text.getParentOrCurrentFrame().getPath(), page, false, false);
+                // Frame frame = FrameIO.CreateFrame(text.getParentOrCurrentFrame().getFramesetName(), page, null);
+                text.setLink(frames.getName());
                 
                 // add subpages of the current page
@@ -175 +172 @@
                                 }
                                 System.out.println("Generating " + name);
-                                generateSettingsTree(k, frame.addText(x, y, name.substring(0, 1).toUpperCase() + name.substring(1), null));
-                                y += dY;
-                                if(y >= maxY) {
-                                        x += 300;
-                                        y = 100;
-                                }
-                        }
-                }
-                
-                x += 200;
-                y = 100;
+                                generateSettingsTree(k, frames.addText(name.substring(0, 1).toUpperCase() + name.substring(1), null, null, null, false));
+                        }
+                }
+                
+                frames.setLastY(150);
                 
                 // add settings of the current page
@@ -205 +196 @@
                                         }
                                 }
+                                Text t;
                                 if(key.equals("pass")) {
-                                        Text t = frame.addText(x, y, "iw: org.expeditee.items.widgets.Password", null);
+                                        t = frames.addText("iw: org.expeditee.items.widgets.Password", null, null, null, false);
                                         Password pw = new Password(t, null);
                                         pw.setPassword((String) value);
-                                        frame.removeItem(t);
-                                        frame.addAllItems(pw.getItems());
-                                        y += pw.getHeight();
+                                        frames.getCurrentFrame().removeItem(t);
+                                        frames.getCurrentFrame().addAllItems(pw.getItems());
                                 } else if(s instanceof GenericSetting && ((GenericSetting) s).getType().equals(Text.class)) {
-                                        Text t = ((GenericSetting<Text>) s).get();
+                                        t = ((GenericSetting<Text>) s).get();
                                         if(t == null) continue;
                                         t = t.copy();
-                                        int h = t.getPolygon().getBounds().height + 1;
-                                        t.setID(frame.getNextItemID());
-                                        t.setX(x);
-                                        t.setY(y + h / 2);
+                                        t.setID(frames.getCurrentFrame().getNextItemID());
                                         t.setText(name);
-                                        t.setTooltip(s.getTooltip());
-                                        frame.addItem(t);
-                                        y += h;
+                                        frames.addItem(t, false);
                                 } else {
-                                        Text t = frame.addText(x, y + dY / 2, name + value, null);
-                                        t.setTooltip(s.getTooltip());
-                                        y += dY;
-                                }
-                                if(y >= maxY) {
-                                        x += 300;
-                                        y = 100;
-                                }
-                        }
-                }
-                
-                FrameIO.SaveFrame(frame);
+                                        t = frames.addText(name + value, null, null, null, false);
+                                }
+                                Text tt = frames.getCurrentFrame().addText(600, t.getY(), s.getTooltip(), null);
+                                tt.setWidth(400);
+                                // rebuild to get the correct height since setWidth() doesn't immediately rebuild
+                                tt.rebuild(true);
+                                if(tt.getY() + tt.getBoundsHeight() > frames.getLastY()) {
+                                        frames.setLastY(tt.getY() + tt.getBoundsHeight());
+                                }
+                        }
+                }
+                
+                frames.save();
+                //FrameIO.SaveFrame(frame);
         }
 }