- Timestamp:
- 03/18/19 09:43:05 (5 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/DisplayController.java
r1244 r1245 70 70 71 71 // To help title calculations on frame 72 public static final int MINIMUM_FRAME_WIDTH = 512; 72 public static final int MINIMUM_FRAME_WIDTH = 512; 73 public static final int MINIMUM_FRAME_HEIGHT = 512; 74 75 private static boolean DISPLAYED_ABOVE_MINIMUM_FRAME_WIDTH = false; 73 76 74 77 /** Convenience definition of TwinFramesSide.LEFT. */ … … 1242 1245 } 1243 1246 1247 public static Dimension getSizeEnforceMinimum() { 1248 Dimension actual_dim = getFramePaintArea().getSize(); 1249 1250 int enforced_width = Math.max(actual_dim.width, MINIMUM_FRAME_WIDTH); 1251 int enforced_height = Math.max(actual_dim.height,MINIMUM_FRAME_HEIGHT); 1252 1253 Dimension enforced_dim = new Dimension(enforced_width,enforced_height); 1254 1255 return enforced_dim; 1256 } 1257 1244 1258 /** Tells the display controller to get the current window size. */ 1245 1259 public static void refreshWindowSize() … … 1247 1261 _windowSize = EcosystemManager.getGraphicsManager().getWindowSize(); 1248 1262 _refreshBuffer = Image.createImage(_windowSize, true); 1263 if (_windowSize.getWidth() > MINIMUM_FRAME_WIDTH) { 1264 DISPLAYED_ABOVE_MINIMUM_FRAME_WIDTH = true; 1265 } 1249 1266 refreshPaintAreas(); 1250 1267 } -
trunk/src/org/expeditee/items/ItemUtils.java
r1190 r1245 404 404 File file = null; 405 405 406 for (String dir : FolderSettings.ImageDirs.get ()) {406 for (String dir : FolderSettings.ImageDirs.getAbsoluteDirs()) { 407 407 file = new File(dir + path); 408 408 if (file.exists() && !file.isDirectory()) { -
trunk/src/org/expeditee/items/Text.java
r1244 r1245 2282 2282 int model_frame_name_x = modelFrame.getNameItem().getX(); 2283 2283 if (model_frame_name_x < DisplayController.MINIMUM_FRAME_WIDTH) { 2284 System.err.println(" resetTitlePostion(): value to be used as right margin from position of frameName < 512");2285 System.err.println(" Overriding to ensure reasonable width for title");2284 System.err.println("Text::resetTitlePostion(): value to be used as right margin from position of frameName < 512"); 2285 System.err.println(" Overriding to ensure reasonable width for title"); 2286 2286 model_frame_name_x = DisplayController.MINIMUM_FRAME_WIDTH; 2287 2287 } … … 2457 2457 2458 2458 public void resetFrameNamePosition() { 2459 Dimension maxSize = DisplayController.getFramePaintArea().getSize(); 2459 Dimension maxSize = DisplayController.getSizeEnforceMinimum(); 2460 2460 2461 if (maxSize != null) { 2461 2462 // setMaxWidth(maxSize.width); -
trunk/src/org/expeditee/setting/DirectoryListSetting.java
r1244 r1245 38 38 } 39 39 40 String abs = parent_folder + rel; 40 String abs = null; 41 File rel_file = new File(rel); 42 if (rel_file.isAbsolute()) { 43 // The directory being stored somehow wasn't relative to expeditee.home 44 // => use it 'as is' 45 abs = rel; 46 } 47 else { 48 abs = parent_folder + rel; 49 50 } 41 51 value_absolute_dir.add(abs); 42 52 } … … 46 56 47 57 public void addAbsoluteDir(String absolute_dir) { 48 String parent_folder = FrameIO.PARENT_FOLDER;49 58 boolean need_file_sep_replace = (!File.separator.equals("/")); 50 59 51 String rel = absolute_dir.substring(parent_folder.length()); 60 String rel = null; 61 if (absolute_dir.startsWith(FrameIO.PARENT_FOLDER)) { 62 // only remove parent_folder if it matches 63 rel = absolute_dir.substring(FrameIO.PARENT_FOLDER.length()); 64 } 65 else { 66 rel = absolute_dir; 67 } 52 68 53 69 if (need_file_sep_replace) { … … 55 71 } 56 72 57 /*58 String rel;59 if (absolute_dir.startsWith(parent_folder)) {60 rel = absolute_dir.substring(parent_folder.length());61 }62 else {63 rel = absolute_dir;64 }65 */66 67 73 _value.add(rel); 68 74 } -
trunk/src/org/expeditee/settings/UserSettings.java
r1244 r1245 263 263 // 1. resources-<username>\images Generated on user account creation and must be refreshed on user switching. 264 264 // 2. IMAGES_PATH <expeditee-home>\resources-public\images 265 FolderSettings.ImageDirs. get().add(FrameIO.IMAGES_PRIVATE_PATH);266 FolderSettings.ImageDirs. get().add(FrameIO.IMAGES_PATH);265 FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PRIVATE_PATH); 266 FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH); 267 267 FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get()); 268 268 269 FolderSettings.AudioDirs. get().add(FrameIO.AUDIO_PRIVATE_PATH);270 FolderSettings.AudioDirs. get().add(FrameIO.AUDIO_PATH);269 FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PRIVATE_PATH); 270 FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH); 271 271 FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get()); 272 272 … … 279 279 FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get()); 280 280 281 FolderSettings.ImageDirs. get().add(FrameIO.IMAGES_PATH);281 FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH); 282 282 FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get()); 283 283 284 FolderSettings.AudioDirs. get().add(FrameIO.AUDIO_PATH);284 FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH); 285 285 FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get()); 286 286 } -
trunk/src/org/expeditee/settings/folders/FolderSettings.java
r1244 r1245 59 59 }; 60 60 61 public static ListSetting<String> ImageDirs = new ListSetting<String>("Directories to look in for images", "ImageDirs") { 62 @Override 63 public boolean setSetting(Text text) { 64 _value.addAll(FrameUtils.getDirs(text)); 65 return true; 66 } 67 }; 61 public static DirectoryListSetting ImageDirs = new DirectoryListSetting("Directories to look in for images", "ImageDirs"); 62 68 63 public static final Setting ImageDir = new Setting("Adds a directory to look in for images", "ImageDir") { 69 64 @Override … … 91 86 92 87 93 public static ListSetting<String> AudioDirs = new ListSetting<String>("Directories to look in for audio", "AudioDirs") { 94 @Override 95 public boolean setSetting(Text text) { 96 _value.addAll(FrameUtils.getDirs(text)); 97 return true; 98 } 99 }; 88 public static DirectoryListSetting AudioDirs = new DirectoryListSetting("Directories to look in for audio", "AudioDirs"); 89 100 90 public static final Setting AudioDir = new Setting("Adds a directory to look in for audio", "AudioDir") { 101 91 @Override
Note:
See TracChangeset
for help on using the changeset viewer.