Changeset 766
- Timestamp:
- 01/28/14 16:46:08 (10 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 3 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/JfxBrowserActions.java
r748 r766 25 25 /** 26 26 * Launches items.widgets.JfxBrowser and uses Text item as URL. 27 * Note: currently doesn't work28 27 * @param text Text item which passes contents as URL for browser. 29 28 * @throws Exception … … 59 58 /** 60 59 * Text item becomes link to new frame containing items.widgets.JfxBrowser and uses Text item as URL for browser. 61 * Note: currently doesn't work62 60 * @param text Text item which passes contents as URL for browser and becomes link to the browser's new frame. 63 61 * @throws Exception … … 86 84 // Create widget via text annotation 87 85 Text wt = frame.addText(0, JfxBrowser.VERT_OFFSET, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - JfxBrowser.HORZ_CROP)+ 88 " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP ) + " : ".concat(text.getText()), null);86 " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP - JfxBrowser.VERT_OFFSET) + " : ".concat(text.getText()), null); 89 87 InteractiveWidget.createWidget(wt); 90 88 … … 111 109 } 112 110 113 /**114 * Adds a text item to the cursor which is linked to a new frame with the web browser active overlay and a JavaFX browser.115 * @param text The text item attached to the cursor.116 */117 public static void startBrowserSession(Text text) {118 try {119 if (!(text instanceof Text)) {120 MessageBay.errorMessage("Must be a text item.");121 return;122 }123 124 if(text.getLink() != null) { // text item can't already have a link125 MessageBay.errorMessage("Text item already has link.");126 return;127 }128 129 String url = "";130 131 // If no text with url is passed to action create a new text item132 if(!FreeItems.textOnlyAttachedToCursor()) {133 url = NetworkSettings.HomePage.get(); // use home page specified by settings134 text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(),135 "Web Browser Session", null);136 text.setParent(DisplayIO.getCurrentFrame());137 FrameMouseActions.pickup(text);138 } else {139 url = text.getText(); // get url from text attached to cursor if possible140 }141 142 // Set text to session id. TODO: set session id.143 text.setText("Web Browser Session");144 145 // Create new frame146 Frame frame = FrameIO.CreateNewFrame(text);147 text.setLink("" + frame.getNumber()); // link this text item to new frame148 149 // Remove everything from new page150 frame.removeAllItems(frame.getItems());151 152 // Add web browser active overlay153 frame.addText(1100, 50, "@ao: 2", null, "overlayset2");154 // Add @old155 frame.addText(1100, 20, "@old", null);156 157 // Create widget via text annotation158 Text wt = frame.addText(0, 80, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - JfxBrowser.HORZ_CROP)+159 " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP) + " : ".concat(url), null);160 InteractiveWidget.createWidget(wt);161 162 FrameIO.SaveFrame(frame); // save frame to disk163 } catch(Exception e) {164 e.printStackTrace();165 }166 }167 168 111 public static void gotoURL(Text link, String URL) { 169 112 Frame frame = FrameIO.CreateNewFrame(link); -
trunk/src/org/expeditee/actions/Misc.java
r748 r766 1177 1177 FrameUtils.CreateDefaultProfile(UserSettings.UserName.get(), homeFrame); 1178 1178 } 1179 1180 /**1181 * Adds a text item to the cursor which is linked to a new frame with the mindmap active overlay.1182 */1183 public static void startMindmapSession() {1184 // Replace any text item on cursor with link to a new mindmap1185 FreeItems.getInstance().clear();1186 Text text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), "Mindmap Session", null);1187 text.setParent(DisplayIO.getCurrentFrame());1188 FrameMouseActions.pickup(text);1189 Frame frame = FrameIO.CreateNewFrame(text);1190 text.setLink("" + frame.getNumber());1191 1192 // Clear new frame and add active overlay and @old1193 frame.removeAllItems(frame.getItems());1194 frame.addText(1100, 50, "@ao: 2", null, "overlayset3");1195 frame.addText(1100, 20, "@old", null);1196 1197 FrameIO.SaveFrame(frame);1198 }1199 1179 1200 1180 /** -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/1.exp
r716 r766 1 V 561 V 81 2 2 U csl14A 3 3 D 12Dec2013[10:13] 4 4 M csl14A 5 d 17Jan2014[16:57]5 d 28Jan2014[16:27] 6 6 Z 7 7 … … 124 124 T @i: home.png 36 125 125 X GoToHome 126 x F 126 127 Q 0 127 128 o csl14A … … 140 141 T @i: leftArrow.png 32 141 142 X Back 143 x F 142 144 Q 0 143 145 o csl14A … … 155 157 T @i: rightArrow.png 32 156 158 X Forward 159 x F 157 160 Q 0 158 161 o csl14A … … 169 172 T HELP 170 173 F Documentation1 171 Q 0 172 o csl14A 174 x F 175 Q 0 176 o csl14A 177 n F 173 178 v S 174 179 f sr25 … … 310 315 Z 311 316 312 ActiveTime:00: 29:42317 ActiveTime:00:33:05 313 318 DarkTime:00:19:19 314 57:08:244 1403 242 kRight 319 27:52:056 760 512 Rd 320 27:52:080 760 512 Md 321 27:52:576 670 587 Rd 322 27:52:625 695 594 Ru 323 27:53:016 902 689 Md 324 27:53:091 897 686 Mu 325 27:53:305 867 648 Rd 326 27:53:336 867 648 Md 327 27:54:037 678 617 kRight -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/2.exp
r716 r766 1 V 771 V 88 2 2 U csl14A 3 3 D 12Dec2013[10:14] 4 4 M csl14A 5 d 17Jan2014[17:02]5 d 28Jan2014[16:30] 6 6 Z 7 7 … … 152 152 T @i: home.png 36 153 153 X GoToHome 154 x F 154 155 Q 0 155 156 o csl14A … … 169 170 T @i: rightArrow.png 32 170 171 X Forward 172 x F 171 173 Q 0 172 174 o csl14A … … 185 187 T @i: leftArrow.png 32 186 188 X Back 189 x F 187 190 Q 0 188 191 o csl14A … … 262 265 Q 0 263 266 o csl14A 267 n F 264 268 v S 265 269 f sr25 … … 311 315 s 13Dec2013[15:28.40] 312 316 P 388 63 313 T getframe317 T convert 314 318 Q 0 315 319 o csl14A … … 998 1002 Z 999 1003 1000 ActiveTime:00: 35:231004 ActiveTime:00:40:58 1001 1005 DarkTime:00:10:14 1002 02:17:459 1342 394 Rd 1003 02:17:463 1342 394 Md 1004 02:18:263 1311 317 kRight 1006 30:05:613 435 57 kRight 1007 30:05:925 442 63 kRight 1008 30:06:813 451 63 kShift 1009 30:07:313 451 63 kShift 1010 30:07:346 451 63 kShift 1011 30:07:379 451 63 kShift 1012 30:07:412 451 63 kShift 1013 30:07:421 451 63 kC 1014 30:08:597 463 63 kBackspace 1015 30:08:789 451 63 kC 1016 30:09:525 459 63 kO 1017 30:10:021 468 63 kN 1018 30:10:301 477 63 kV 1019 30:10:381 485 63 kE 1020 30:10:509 494 63 kR 1021 30:10:637 499 63 kT 1022 30:11:213 504 63 kLeft 1023 30:11:381 499 63 kLeft 1024 30:11:525 494 63 kLeft 1025 30:11:677 485 63 kLeft 1026 30:11:829 477 63 kLeft 1027 30:11:981 468 63 kLeft 1028 30:12:533 459 63 kLeft 1029 30:12:909 451 63 kBackspace 1030 30:13:197 442 63 kBackspace 1031 30:13:332 429 63 kBackspace 1032 30:13:476 420 63 kBackspace 1033 30:13:620 415 63 kBackspace 1034 30:13:868 410 63 kBackspace 1035 30:14:124 406 63 kBackspace 1036 30:14:468 397 63 kBackspace 1037 30:39:405 535 174 Ld 1038 30:39:501 535 174 Lu -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/3.exp
r716 r766 1 V 7 21 V 74 2 2 U csl14A 3 3 D 12Dec2013[10:15] 4 4 M csl14A 5 d 17Jan2014[17:02]5 d 28Jan2014[16:28] 6 6 Z 7 7 … … 56 56 T @i: home.png 36 57 57 X GoToHome 58 x F 58 59 Q 0 59 60 o csl14A … … 73 74 T @i: rightArrow.png 32 74 75 X Forward 76 x F 75 77 Q 0 76 78 o csl14A … … 89 91 T @i: leftArrow.png 32 90 92 X Back 93 x F 91 94 Q 0 92 95 o csl14A … … 181 184 Q 0 182 185 o csl14A 186 n F 183 187 v S 184 188 f sr25 … … 280 284 Z 281 285 282 ActiveTime:00:28: 31286 ActiveTime:00:28:44 283 287 DarkTime:00:00:00 284 01:48:457 1407 133 Md 285 01:48:568 1407 133 Mu 286 01:51:734 1303 220 kF10 287 01:52:946 1319 282 Rd 288 01:53:025 1319 282 Ru 289 01:53:672 1444 108 Md 290 01:53:768 1444 108 Mu 291 01:54:246 1364 179 kF10 292 01:55:623 1380 186 kF10 293 01:56:751 1460 176 kF10 294 02:00:362 1547 59 Md 295 02:00:481 1547 59 Mu 296 02:01:401 1356 149 Md 297 02:01:521 1356 149 Mu 298 02:02:254 1281 168 kF10 299 02:03:314 1156 283 Rd 300 02:03:377 1156 283 Ru 301 02:04:249 1384 101 Md 302 02:04:336 1384 101 Mu 303 02:04:975 1386 163 kF10 304 02:06:067 1516 54 Rd 305 02:06:074 1516 54 Ld 306 02:07:601 1149 123 Rd 307 02:07:609 1149 123 Md 308 02:11:626 1163 313 Rd 309 02:11:706 1163 313 Ru 310 02:12:674 1514 43 Md 311 02:12:762 1514 43 Mu 312 02:15:707 1107 247 Md 313 02:15:714 1107 247 Rd 314 02:16:663 1485 326 kLeft 288 28:13:823 1404 128 Rd 289 28:13:886 1404 128 Ru 290 28:16:079 1465 48 Rd 291 28:16:135 1465 48 Ru 292 28:16:479 1516 47 Rd 293 28:16:555 1518 47 Ru 294 28:16:959 1567 45 Md 295 28:17:031 1567 45 Mu 296 28:18:126 1442 107 Md 297 28:18:222 1442 107 Mu 298 28:18:871 1629 44 Md 299 28:18:991 1629 44 Mu 300 28:19:750 1429 135 Rd 301 28:19:774 1429 135 Md 302 28:23:300 1191 164 kLeft -
trunk/src/org/expeditee/items/widgets/JfxBrowser.java
r748 r766 66 66 private static final String FORWARD = "forward"; 67 67 private static final String REFRESH = "refresh"; 68 private static final String GETFRAME = "getframe";69 70 public static final int VERT_OFFSET = 50;71 public static final int VERT_CROP = 88;72 public static final int HORZ_CROP = 1 5;68 private static final String CONVERT = "convert"; 69 70 public static final int VERT_OFFSET = 70; 71 public static final int VERT_CROP = 38; 72 public static final int HORZ_CROP = 16; 73 73 74 74 private WebBrowserPanel _browser; … … 563 563 } else if(carried.getText().toLowerCase().equals(REFRESH)) { 564 564 refresh(); 565 } else if(carried.getText().toLowerCase().equals( GETFRAME)) {565 } else if(carried.getText().toLowerCase().equals(CONVERT)) { 566 566 getFrame(); 567 567 } else {
Note:
See TracChangeset
for help on using the changeset viewer.