Changeset 778
- Timestamp:
- 01/29/14 11:22:51 (10 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/Spelling.java
r655 r778 11 11 import org.expeditee.gui.FrameIO; 12 12 import org.expeditee.gui.MessageBay; 13 import org.expeditee.settings. UserSettings;13 import org.expeditee.settings.folders.FolderSettings; 14 14 15 15 public class Spelling { … … 28 28 } 29 29 if (path == null) { 30 for (String possiblePath : UserSettings.FrameDirs.get()) {30 for (String possiblePath : FolderSettings.FrameDirs.get()) { 31 31 fullPath = FrameIO 32 32 .getFrameFullPathName(possiblePath, frameName); -
trunk/src/org/expeditee/agents/SearchTree.java
r655 r778 15 15 import org.expeditee.gui.FrameIO; 16 16 import org.expeditee.io.Conversion; 17 import org.expeditee.settings. UserSettings;17 import org.expeditee.settings.folders.FolderSettings; 18 18 19 19 public class SearchTree extends SearchAgent { … … 70 70 71 71 String fullPath = null; 72 for (String possiblePath : UserSettings.FrameDirs.get()) {72 for (String possiblePath : FolderSettings.FrameDirs.get()) { 73 73 fullPath = FrameIO.getFrameFullPathName(possiblePath, frameName); 74 74 if (fullPath != null) -
trunk/src/org/expeditee/agents/SearchTreeNoResults.java
r655 r778 14 14 import org.expeditee.gui.FrameIO; 15 15 import org.expeditee.io.Conversion; 16 import org.expeditee.settings. UserSettings;16 import org.expeditee.settings.folders.FolderSettings; 17 17 18 18 public class SearchTreeNoResults extends SearchAgent { … … 53 53 54 54 String fullPath = null; 55 for (String possiblePath : UserSettings.FrameDirs.get()) {55 for (String possiblePath : FolderSettings.FrameDirs.get()) { 56 56 fullPath = FrameIO.getFrameFullPathName(possiblePath, frameName); 57 57 if (fullPath != null) -
trunk/src/org/expeditee/gui/Frame.java
r749 r778 23 23 import org.expeditee.items.Dot; 24 24 import org.expeditee.items.Item; 25 import org.expeditee.items.Item.HighlightMode; 25 26 import org.expeditee.items.ItemAppearence; 26 27 import org.expeditee.items.ItemParentStateChangedEvent; … … 28 29 import org.expeditee.items.Line; 29 30 import org.expeditee.items.PermissionPair; 31 import org.expeditee.items.Text; 30 32 import org.expeditee.items.UserAppliedPermission; 31 import org.expeditee.items.Text;32 33 import org.expeditee.items.XRayable; 33 import org.expeditee.items.Item.HighlightMode;34 34 import org.expeditee.items.widgets.InteractiveWidget; 35 35 import org.expeditee.items.widgets.WidgetCorner; 36 36 import org.expeditee.settings.UserSettings; 37 import org.expeditee.settings.templates.TemplateSettings; 37 38 import org.expeditee.simple.UnitTestFailedException; 38 39 import org.expeditee.stats.Formatter; … … 149 150 private Collection<Item> _vectorItems = new LinkedHashSet<Item>(); 150 151 151 private Text _dotTemplate = UserSettings.DotTemplate.get().copy();152 private Text _dotTemplate = TemplateSettings.DotTemplate.get().copy(); 152 153 153 154 /** … … 165 166 166 167 private void resetDot() { 167 _dotTemplate.setColor( UserSettings.ColorWheel.get()[1]);168 _dotTemplate.setFillColor( UserSettings.FillColorWheel.get()[0]);168 _dotTemplate.setColor(TemplateSettings.ColorWheel.get()[1]); 169 _dotTemplate.setFillColor(TemplateSettings.FillColorWheel.get()[0]); 169 170 } 170 171 171 172 public void nextDot() { 172 173 _dotTemplate.setFillColor(ColorUtils.getNextColor(_dotTemplate 173 .getFillColor(), UserSettings.FillColorWheel.get(), null));174 .getFillColor(), TemplateSettings.FillColorWheel.get(), null)); 174 175 _dotTemplate.setColor(ColorUtils.getNextColor(_dotTemplate.getColor(), 175 UserSettings.ColorWheel.get(), null));176 TemplateSettings.ColorWheel.get(), null)); 176 177 177 178 if (_dotTemplate.getColor() == null || _dotTemplate.getColor().equals(Color.white)) { … … 435 436 436 437 if (frameTitle == null) { 437 if ( UserSettings.TitleTemplate.get() == null) {438 if (TemplateSettings.TitleTemplate.get() == null) { 438 439 frameTitle = new Text(getNextItemID(), title); 439 440 } else { 440 frameTitle = UserSettings.TitleTemplate.get().copy();441 frameTitle = TemplateSettings.TitleTemplate.get().copy(); 441 442 frameTitle.setID(this.getNextItemID()); 442 443 frameTitle.setText(title); … … 499 500 500 501 public Text getItemTemplate() { 501 return getTemplate( UserSettings.ItemTemplate.get(),502 return getTemplate(TemplateSettings.ItemTemplate.get(), 502 503 ItemUtils.TAG_ITEM_TEMPLATE); 503 504 } 504 505 505 506 public Text getAnnotationTemplate() { 506 Text t = getTemplate( UserSettings.AnnotationTemplate.get(),507 Text t = getTemplate(TemplateSettings.AnnotationTemplate.get(), 507 508 ItemUtils.TAG_ANNOTATION_TEMPLATE); 508 509 … … 516 517 public Text getStatTemplate() { 517 518 SessionStats.CreatedText(); 518 Text t = getTemplate( UserSettings.StatTemplate.get(),519 Text t = getTemplate(TemplateSettings.StatTemplate.get(), 519 520 ItemUtils.TAG_STAT_TEMPLATE); 520 521 … … 527 528 528 529 public Item getTooltipTextItem(String tooltipText) { 529 return getTextItem(tooltipText, UserSettings.TooltipTemplate.get().copy());530 return getTextItem(tooltipText, TemplateSettings.TooltipTemplate.get().copy()); 530 531 } 531 532 … … 551 552 552 553 public Text getCodeCommentTemplate() { 553 Text t = getTemplate( UserSettings.CommentTemplate.get(),554 Text t = getTemplate(TemplateSettings.CommentTemplate.get(), 554 555 ItemUtils.TAG_CODE_COMMENT_TEMPLATE); 555 556 … … 1904 1905 public void toggleBackgroundColor() { 1905 1906 setBackgroundColor(ColorUtils.getNextColor(_background, 1906 UserSettings.BackgroundColorWheel.get(), null));1907 TemplateSettings.BackgroundColorWheel.get(), null)); 1907 1908 } 1908 1909 -
trunk/src/org/expeditee/gui/FrameCreator.java
r676 r778 5 5 import org.expeditee.agents.ExistingFramesetException; 6 6 import org.expeditee.items.Item; 7 import org.expeditee.items.PermissionPair; 7 8 import org.expeditee.items.Text; 9 import org.expeditee.items.UserAppliedPermission; 8 10 9 11 public class FrameCreator { … … 279 281 previousButton.setLinkHistory(false); 280 282 previousButton.setLinkMark(false); 283 // previousButton.setPermission(new PermissionPair(UserAppliedPermission.followLinks)); 281 284 current.addItem(previousButton); 282 285 -
trunk/src/org/expeditee/gui/FrameIO.java
r761 r778 31 31 import org.expeditee.items.ItemUtils; 32 32 import org.expeditee.items.PermissionPair; 33 import org.expeditee.items.Text; 33 34 import org.expeditee.items.UserAppliedPermission; 34 import org.expeditee.items.Text;35 35 import org.expeditee.network.FrameShare; 36 36 import org.expeditee.settings.UserSettings; 37 import org.expeditee.settings.folders.FolderSettings; 38 import org.expeditee.settings.templates.TemplateSettings; 37 39 import org.expeditee.stats.Formatter; 38 40 import org.expeditee.stats.Logger; … … 218 220 } else { 219 221 220 for (String path : UserSettings.FrameDirs.get()) {222 for (String path : FolderSettings.FrameDirs.get()) { 221 223 loaded = LoadKnowPath(path, framename); 222 224 if (loaded != null) { … … 246 248 StringBuffer list = new StringBuffer(); 247 249 248 for (String path : UserSettings.FrameDirs.get()) {250 for (String path : FolderSettings.FrameDirs.get()) { 249 251 File files = new File(path); 250 252 if (!files.exists()) … … 308 310 } 309 311 310 for (String path : UserSettings.FrameDirs.get()) {312 for (String path : FolderSettings.FrameDirs.get()) { 311 313 if (getFrameFullPathName(path, frameName) != null) 312 314 return true; … … 319 321 String fullPath = null; 320 322 if (path == null) { 321 for (String possiblePath : UserSettings.FrameDirs.get()) {323 for (String possiblePath : FolderSettings.FrameDirs.get()) { 322 324 fullPath = getFrameFullPathName(possiblePath, frameName); 323 325 if (fullPath != null) … … 1251 1253 public static Boolean canAccessFrameset(String framesetName) { 1252 1254 framesetName = framesetName.toLowerCase(); 1253 for (String path : UserSettings.FrameDirs.get()) {1255 for (String path : FolderSettings.FrameDirs.get()) { 1254 1256 if ((new File(path + framesetName)).exists()) 1255 1257 return true; … … 1309 1311 Frame base = null; 1310 1312 try { 1311 base = LoadFrame( UserSettings.DefaultFrame.get());1313 base = LoadFrame(TemplateSettings.DefaultFrame.get()); 1312 1314 } catch (Exception e) { 1313 1315 } … … 1388 1390 1389 1391 // Search all the available directories for the directory 1390 for (String path : UserSettings.FrameDirs.get()) {1392 for (String path : FolderSettings.FrameDirs.get()) { 1391 1393 String source = path + framesetName.toLowerCase() + File.separator; 1392 1394 File framesetDirectory = new File(source); … … 1428 1430 // search through all the directories to find the frameset we are 1429 1431 // copying 1430 for (String path : UserSettings.FrameDirs.get()) {1432 for (String path : FolderSettings.FrameDirs.get()) { 1431 1433 String source = path + framesetToCopy.toLowerCase() 1432 1434 + File.separator; -
trunk/src/org/expeditee/gui/FrameKeyboardActions.java
r764 r778 4 4 import java.awt.Rectangle; 5 5 import java.awt.Toolkit; 6 import java.awt.datatransfer.DataFlavor;7 6 import java.awt.datatransfer.StringSelection; 8 7 import java.awt.event.KeyEvent; … … 16 15 import java.util.LinkedList; 17 16 import java.util.List; 18 import java.util.StringTokenizer;19 17 20 18 import org.expeditee.actions.Actions; … … 29 27 import org.expeditee.items.ItemUtils; 30 28 import org.expeditee.items.Line; 29 import org.expeditee.items.Text; 31 30 import org.expeditee.items.UserAppliedPermission; 32 import org.expeditee.items.StringUtils;33 import org.expeditee.items.Text;34 31 import org.expeditee.items.XRayable; 35 32 import org.expeditee.items.widgets.InteractiveWidget; … … 37 34 import org.expeditee.items.widgets.WidgetEdge; 38 35 import org.expeditee.settings.UserSettings; 36 import org.expeditee.settings.templates.TemplateSettings; 39 37 import org.expeditee.stats.Formatter; 40 38 import org.expeditee.stats.Logger; … … 1795 1793 color = null; 1796 1794 else 1797 color = ColorUtils.getNextColor(color, UserSettings.FillColorWheel.get(), toSet1795 color = ColorUtils.getNextColor(color, TemplateSettings.FillColorWheel.get(), toSet 1798 1796 .getGradientColor()); 1799 1797 … … 1823 1821 color = null; 1824 1822 else 1825 color = ColorUtils.getNextColor(color, UserSettings.ColorWheel.get(), toSet1823 color = ColorUtils.getNextColor(color, TemplateSettings.ColorWheel.get(), toSet 1826 1824 .getFillColor()); 1827 1825 … … 1904 1902 color = null; 1905 1903 else if (setBackgroundColor) { 1906 color = ColorUtils.getNextColor(color, UserSettings.FillColorWheel.get(), item1904 color = ColorUtils.getNextColor(color, TemplateSettings.FillColorWheel.get(), item 1907 1905 .getPaintColor()); 1908 1906 } else { 1909 color = ColorUtils.getNextColor(color, UserSettings.ColorWheel.get(),1907 color = ColorUtils.getNextColor(color, TemplateSettings.ColorWheel.get(), 1910 1908 currentFrame.getPaintBackgroundColor()); 1911 1909 } -
trunk/src/org/expeditee/gui/FrameUtils.java
r775 r778 47 47 import org.expeditee.settings.Settings; 48 48 import org.expeditee.settings.UserSettings; 49 import org.expeditee.settings.templates.TemplateSettings; 49 50 import org.expeditee.stats.Logger; 50 51 import org.expeditee.stats.SessionStats; … … 1512 1513 help.setFontStyle("Bold"); 1513 1514 help.setFamily("SansSerif"); 1514 help.setColor( UserSettings.ColorWheel.get()[3]);1515 help.setColor(TemplateSettings.ColorWheel.get()[3]); 1515 1516 1516 1517 xPos += 25; … … 1567 1568 templates.setFontStyle("Bold"); 1568 1569 templates.setFamily("SansSerif"); 1569 templates.setColor( UserSettings.ColorWheel.get()[3]);1570 templates.setColor(TemplateSettings.ColorWheel.get()[3]); 1570 1571 1571 1572 xPos += 25; -
trunk/src/org/expeditee/items/ItemUtils.java
r737 r778 26 26 import org.expeditee.items.widgets.WidgetCorner; 27 27 import org.expeditee.items.widgets.WidgetEdge; 28 import org.expeditee.settings.folders.FolderSettings; 28 29 29 30 //Static methods that provide functions for the objects\ … … 371 372 File file = null; 372 373 373 for (String dir : org.expeditee.settings.UserSettings.ImageDirs.get()) {374 for (String dir : FolderSettings.ImageDirs.get()) { 374 375 file = new File(dir + path); 375 376 if (file.exists() && !file.isDirectory()) -
trunk/src/org/expeditee/items/widgets/charts/AbstractChart.java
r729 r778 24 24 import org.expeditee.gui.FrameMouseActions; 25 25 import org.expeditee.gui.FunctionKey; 26 import org.expeditee.items.Item;27 26 import org.expeditee.items.Text; 28 27 import org.expeditee.items.widgets.DataFrameWidget; 29 import org.expeditee.settings. UserSettings;28 import org.expeditee.settings.templates.TemplateSettings; 30 29 import org.jfree.chart.ChartPanel; 31 30 import org.jfree.chart.JFreeChart; … … 110 109 Color newColor = ColorUtils.getNextColor( 111 110 getSource().getFillColor(), 112 UserSettings.BackgroundColorWheel.get(), null);111 TemplateSettings.BackgroundColorWheel.get(), null); 113 112 setSourceFillColor(newColor); 114 113 } … … 118 117 } else { 119 118 Color newColor = ColorUtils.getNextColor( 120 getSource().getColor(), UserSettings.ColorWheel.get(),119 getSource().getColor(), TemplateSettings.ColorWheel.get(), 121 120 null); 122 121 setSourceColor(newColor); -
trunk/src/org/expeditee/settings/Settings.java
r717 r778 13 13 import org.expeditee.gui.FrameIO; 14 14 import org.expeditee.gui.FrameUtils; 15 import org.expeditee.gui.MessageBay; 15 16 import org.expeditee.items.Item; 16 17 import org.expeditee.items.Text; … … 84 85 } 85 86 87 /** 88 * Parses the settings tree, then resets any settings that were not set 89 */ 86 90 public static void parseSettings(Text text) { 87 parseSettings(text, ""); 91 List<VariableSetting> set = parseSettings(text, ""); 92 List<VariableSetting> toDefault = new LinkedList<VariableSetting>(); 93 for(PageDescriptor pd : _pages.values()) { 94 toDefault.addAll(pd.settingsList); 95 } 96 toDefault.removeAll(set); 97 for(VariableSetting s : toDefault) { 98 try { 99 // System.out.println("Resetting " + s.getTooltip()); 100 s.reset(); 101 // System.out.println("Set " + f.getName() + " to default value " + f.get(null)); 102 } catch (Exception e) { 103 e.printStackTrace(); 104 } 105 } 88 106 } 89 107 … … 93 111 * @param text 94 112 * @param prefix 113 * 114 * @return List of VariableSettings that were changed 95 115 */ 96 private static void parseSettings(Text text, String prefix) { 97 116 private static List<VariableSetting> parseSettings(Text text, String prefix) { 117 118 List<VariableSetting> set = new LinkedList<VariableSetting>(); 98 119 Frame child = text.getChild(); 99 120 if(child == null) { 100 return ;121 return set; 101 122 } 102 123 String settingsPage = prefix + text.getText().trim().toLowerCase().replaceAll("^@", ""); 103 124 PageDescriptor pd = _pages.get(settingsPage); 104 125 if(pd == null) { 105 return ;126 return set; 106 127 } 107 128 try { 108 List<VariableSetting> toDefault = new LinkedList<VariableSetting>(pd.settingsList);109 129 // set the fields 110 130 List<Text> items = child.getBodyTextItems(false); … … 126 146 AttributeValuePair avp = new AttributeValuePair(t.getText(), false); 127 147 try { 148 String settingName = avp.getAttributeOrValue().trim().toLowerCase(); 128 149 // System.out.println(avp.getAttributeOrValue().trim().toLowerCase().replaceAll("^@", "")); 129 Setting s = pd.settings.get( avp.getAttributeOrValue().trim().toLowerCase());//.replaceAll("^@", ""));150 Setting s = pd.settings.get(settingName);//.replaceAll("^@", "")); 130 151 if(s == null) { 131 continue; 152 if(settingName.startsWith("//") || settingName.startsWith("@")) { 153 continue; 154 } 155 // System.out.println("Couldn't find setting \"" + settingName + "\""); 156 List<String> validPages = new LinkedList<String>(); 157 // if the setting isn't found on the current page, check all child pages 158 for(String k : _pages.keySet()) { 159 if(k.startsWith(settingsPage) && k.length() > settingsPage.length()) { 160 // System.out.println(k + " is a child of " + settingsPage); 161 PageDescriptor cpd = _pages.get(k); 162 Setting tmp = cpd.settings.get(settingName); 163 if(tmp != null) { 164 // System.out.println("Found setting in subpage: " + k); 165 s = tmp; 166 validPages.add(k); 167 } 168 } 169 } 170 // System.out.println(s); 171 if(s == null) { 172 continue; 173 } 174 if(validPages.size() > 1) { 175 StringBuffer warnMessage = new StringBuffer("Found multiple matching settings in the following settings subpages: "); 176 String lastPage = ""; 177 for(String page : validPages) { 178 warnMessage.append("\"" + page + "\","); 179 lastPage = page; 180 } 181 warnMessage.deleteCharAt(warnMessage.length() - 1); 182 warnMessage.append(" - choosing " + lastPage); 183 MessageBay.warningMessage(warnMessage.toString()); 184 } 132 185 } 133 if(s.setSetting(t) ) {134 toDefault.remove(s);186 if(s.setSetting(t) && s instanceof VariableSetting) { 187 set.add((VariableSetting) s); 135 188 } 136 189 } catch (Exception e) { … … 138 191 } 139 192 } 140 // set any unset fields to their default141 for(VariableSetting s : toDefault) {142 try {143 // System.out.println("Resetting " + s.getTooltip());144 s.reset();145 // System.out.println("Set " + f.getName() + " to default value " + f.get(null));146 } catch (Exception e) {147 e.printStackTrace();148 }149 }150 193 // call the onParsed method if one exists 151 194 if(pd.onParsed != null) { … … 154 197 } catch (Exception e) { 155 198 e.printStackTrace(); 156 return ;199 return set; 157 200 } 158 201 // if the page was a settings page, check if it has any subpages 159 202 for(Text t : child.getTextItems()) { 160 parseSettings(t, settingsPage + "."); 161 } 203 set.addAll(parseSettings(t, settingsPage + ".")); 204 } 205 return set; 162 206 } 163 207 … … 188 232 } 189 233 190 frames.setLastY( 150);234 frames.setLastY(frames.getLastY() + 20); 191 235 192 236 // add settings of the current page … … 201 245 String name = str.substring(0, 1).toUpperCase() + str.substring(1); 202 246 String value = ""; 203 if(s instanceof GenericSetting && ((GenericSetting ) s).isPrimitive()) {204 if(((GenericSetting ) s).get() != null) {205 value = ": " + ((GenericSetting ) s).get();247 if(s instanceof GenericSetting && ((GenericSetting<?>) s).isPrimitive()) { 248 if(((GenericSetting<?>) s).get() != null) { 249 value = ": " + ((GenericSetting<?>) s).get(); 206 250 } else { 207 251 value = ": "; … … 219 263 y = pw.getY(); 220 264 } else { 221 if(s instanceof GenericSetting && ((GenericSetting ) s).getType().equals(Text.class)) {222 t = ( (GenericSetting<Text>)s).get();265 if(s instanceof GenericSetting && ((GenericSetting<?>) s).getType().equals(Text.class)) { 266 t = (Text) ((GenericSetting<?>)s).get(); 223 267 if(t == null) { 224 268 System.err.println("Failed to get Text setting \"" + str + "\""); -
trunk/src/org/expeditee/settings/UserSettings.java
r777 r778 1 1 package org.expeditee.settings; 2 2 3 import java.awt.Color;4 import java.awt.Font;5 import java.awt.GraphicsEnvironment;6 3 import java.io.File; 7 4 import java.io.FileNotFoundException; 8 5 import java.io.IOException; 9 6 import java.util.ArrayList; 10 import java.util.Arrays;11 7 import java.util.LinkedList; 12 8 import java.util.List; … … 15 11 import org.expeditee.agents.mail.MailSession; 16 12 import org.expeditee.agents.wordprocessing.JSpellChecker; 17 import org.expeditee.gui.AttributeValuePair;18 import org.expeditee.gui.DisplayIO;19 13 import org.expeditee.gui.Frame; 20 14 import org.expeditee.gui.FrameIO; 21 15 import org.expeditee.gui.FrameUtils; 22 import org.expeditee.gui.FreeItems;23 16 import org.expeditee.gui.MessageBay; 24 import org.expeditee.items.Item;25 import org.expeditee.items.ItemUtils;26 17 import org.expeditee.items.Text; 27 import org.expeditee.setting.ArraySetting;28 18 import org.expeditee.setting.BooleanSetting; 29 19 import org.expeditee.setting.FloatSetting; … … 32 22 import org.expeditee.setting.IntegerSetting; 33 23 import org.expeditee.setting.ListSetting; 34 import org.expeditee.setting.Setting;35 24 import org.expeditee.setting.StringSetting; 36 import org.expeditee.setting .TextSetting;25 import org.expeditee.settings.folders.FolderSettings; 37 26 38 27 /** … … 72 61 } 73 62 }; 74 public static final StringSetting DefaultFrame = new StringSetting("The default frame", null) {75 @Override76 public boolean setSetting(Text text) {77 _value = FrameUtils.getLink(text, _value);78 return true;79 }80 };81 63 public static final IntegerSetting InitialWidth = new IntegerSetting("Initial width of Expeditee window", 1024); 82 64 83 65 public static final IntegerSetting InitialHeight = new IntegerSetting("Initial height of Expeditee window", 768); 84 66 85 public static final TextSetting ItemTemplate = new TextSetting("Template for normal text items") {86 @Override87 public Text generateText() {88 return new Text("ItemTemplate");89 }90 };91 public static final TextSetting AnnotationTemplate = new TextSetting("Template for annotation text items") {92 @Override93 public Text generateText() {94 Text t = new Text("AnnotationTemplate");95 t.setColor(Color.gray);96 return t;97 }98 };99 100 public static final TextSetting CommentTemplate = new TextSetting("Template for code comment text items") {101 @Override102 public Text generateText() {103 Text t = new Text("CommentTemplate");104 t.setColor(Color.green.darker());105 return t;106 }107 };108 109 public static final TextSetting StatTemplate = new TextSetting("Template for statistics (e.g. extracted attributes) text items") {110 @Override111 public Text generateText() {112 Text t = new Text("StatsTemplate");113 t.setColor(Color.BLACK);114 t.setBackgroundColor(new Color(0.9F, 0.9F, 0.9F));115 t.setFamily(Text.MONOSPACED_FONT);116 t.setSize(14);117 return t;118 }119 };120 121 67 /* 122 68 * General settings (no setter functions) … … 157 103 158 104 public static final StringSetting MenuFrame = new StringSetting("The menu frame", null); 159 160 /*161 * Directories162 */163 public static final ListSetting<String> FrameDirs = new ListSetting<String>("Directories to look in for frames") {164 @Override165 public boolean setSetting(Text text) {166 _value.addAll(FrameUtils.getDirs(text));167 return true;168 }169 };170 public static final Setting FramesetDir = new Setting("Adds a directory to look in for frames") {171 @Override172 public boolean setSetting(Text text) {173 if(text.getText().indexOf(':') == -1) {174 return false;175 }176 AttributeValuePair avp = new AttributeValuePair(text.getText());177 if(avp.getValue().trim().length() != 0) {178 String dir = FrameUtils.getDir(avp.getValue());179 if (dir != null) {180 UserSettings.FrameDirs.get().add(dir);181 return true;182 }183 }184 return false;185 }186 };187 188 public static ListSetting<String> ImageDirs = new ListSetting<String>("Directories to look in for images") {189 @Override190 public boolean setSetting(Text text) {191 _value.addAll(FrameUtils.getDirs(text));192 return true;193 }194 };195 public static final Setting ImageDir = new Setting("Adds a directory to look in for images") {196 @Override197 public boolean setSetting(Text text) {198 if(text.getText().indexOf(':') == -1) {199 return false;200 }201 AttributeValuePair avp = new AttributeValuePair(text.getText());202 if(avp.getValue().trim().length() != 0) {203 String dir = FrameUtils.getDir(avp.getValue());204 if(dir != null) {205 UserSettings.ImageDirs.get().add(0, dir);206 return true;207 }208 }209 return false;210 }211 };212 213 public static final Setting LogDir = new Setting("Set the directory to save logs") {214 @Override215 public boolean setSetting(Text text) {216 if(text.getText().indexOf(':') == -1) {217 return false;218 }219 AttributeValuePair avp = new AttributeValuePair(text.getText());220 if(avp.getValue().trim().length() != 0) {221 FrameIO.LOGS_DIR = FrameUtils.getDir(avp.getValue());222 }223 return true;224 }225 };226 227 /*228 * Templates229 */230 public static final TextSetting TitleTemplate = new TextSetting("Template for Title text item") {231 @Override232 public Text generateText() {233 Text t = new Text("TitleTemplate");234 t.setSize(30);235 t.setFontStyle("Bold");236 t.setFamily("SansSerif");237 t.setColor(Color.BLUE);238 t.setPosition(25, 50);239 return t;240 }241 };242 243 public static final TextSetting DotTemplate = new TextSetting("Template for dot items") {244 @Override245 public Text generateText() {246 return new Text("DotTemplate");247 }248 };249 250 public static final TextSetting TooltipTemplate = new TextSetting("Template for tooltips") {251 @Override252 public Text generateText() {253 Text t = new Text("TooltipTemplate");254 t.setColor(Color.BLACK);255 t.setBackgroundColor(new Color(0.7F, 0.7F, 0.9F));256 // t.setFamily(Text.MONOSPACED_FONT);257 t.setSize(14);258 return t;259 }260 };261 262 /*263 * Colorwheels264 */265 public static final ArraySetting<Color> ColorWheel = new ArraySetting<Color>("The colours of items in the child frame are used to populate the colour wheel",266 new Color[] { Color.BLACK, Color.RED, Color.BLUE, Item.GREEN, Color.MAGENTA, Color.YELLOW.darker(), Color.WHITE }) {267 @Override268 public boolean setSetting(Text text) {269 Frame child = text.getChild();270 if (child == null) {271 return false;272 }273 _value = FrameUtils.getColorWheel(child);274 return true;275 }276 };277 278 public static final ArraySetting<Color> FillColorWheel = new ArraySetting<Color>("The colours of items in the child frame are used to populate the colour wheel",279 new Color[] { new Color(255, 150, 150), new Color(150, 150, 255), new Color(150, 255, 150),280 new Color(255, 150, 255), new Color(255, 255, 100), Color.WHITE, Color.BLACK }) {281 @Override282 public boolean setSetting(Text text) {283 Frame child = text.getChild();284 if (child == null) {285 return false;286 }287 _value = FrameUtils.getColorWheel(child);288 return true;289 }290 };291 292 public static final ArraySetting<Color> BackgroundColorWheel = new ArraySetting<Color>("The colours of items in the child frame are used to populate the colour wheel",293 new Color[] { new Color(235, 235, 235), new Color(225, 225, 255), new Color(195, 255, 255),294 new Color(225, 255, 225), new Color(255, 255, 195), new Color(255, 225, 225),295 new Color(255, 195, 255), Color.WHITE, Color.GRAY, Color.DARK_GRAY, Color.BLACK, null }) {296 @Override297 public boolean setSetting(Text text) {298 Frame child = text.getChild();299 if (child == null) {300 return false;301 }302 _value = FrameUtils.getColorWheel(child);303 return true;304 }305 };306 105 307 106 /* … … 380 179 } 381 180 }; 382 383 public static final FrameSetting CursorFrame = new FrameSetting("Items on this frame will be used as the cursor (clearing the frame or removing the link will default back to a normal cursor)") {384 @Override385 public void run(Frame frame) {386 FreeItems.getCursor().addAll(ItemUtils.CopyItems(frame.getAllItems()));387 for (Item i : FreeItems.getCursor()) {388 i.setParent(null);389 }390 DisplayIO.setCursor(Item.HIDDEN_CURSOR);391 DisplayIO.setCursor(Item.DEFAULT_CURSOR);392 }393 };394 181 395 182 // add default values … … 402 189 } 403 190 404 UserSettings.FrameDirs.get().add(FrameIO.FRAME_PATH);405 UserSettings.FrameDirs.get().add(FrameIO.PUBLIC_PATH);406 UserSettings.FrameDirs.get().add(FrameIO.PROFILE_PATH);407 UserSettings.FrameDirs.get().add(FrameIO.HELP_PATH);408 UserSettings.FrameDirs.get().add(FrameIO.MESSAGES_PATH);409 UserSettings.FrameDirs.setDefault(UserSettings.FrameDirs.get());410 UserSettings.ImageDirs.get().add(FrameIO.IMAGES_PATH);411 UserSettings.ImageDirs.setDefault(UserSettings.ImageDirs.get());191 FolderSettings.FrameDirs.get().add(FrameIO.FRAME_PATH); 192 FolderSettings.FrameDirs.get().add(FrameIO.PUBLIC_PATH); 193 FolderSettings.FrameDirs.get().add(FrameIO.PROFILE_PATH); 194 FolderSettings.FrameDirs.get().add(FrameIO.HELP_PATH); 195 FolderSettings.FrameDirs.get().add(FrameIO.MESSAGES_PATH); 196 FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get()); 197 FolderSettings.ImageDirs.get().add(FrameIO.IMAGES_PATH); 198 FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get()); 412 199 } 413 200 -
trunk/src/org/expeditee/stats/DocumentStatsFast.java
r655 r778 12 12 import org.expeditee.gui.MessageBay; 13 13 import org.expeditee.io.Conversion; 14 import org.expeditee.settings. UserSettings;14 import org.expeditee.settings.folders.FolderSettings; 15 15 16 16 public class DocumentStatsFast extends Stats { … … 57 57 58 58 String fullPath = null; 59 for (String possiblePath : UserSettings.FrameDirs.get()) {59 for (String possiblePath : FolderSettings.FrameDirs.get()) { 60 60 fullPath = FrameIO.getFrameFullPathName(possiblePath, _name); 61 61 if (fullPath != null)
Note:
See TracChangeset
for help on using the changeset viewer.