Changeset 810
- Timestamp:
- 02/03/14 12:20:27 (10 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/ExploratorySearchActions.java
r798 r810 111 111 // Clear new frame and add active overlay and @old 112 112 frame.removeAllItems(frame.getItems()); 113 Text t = (Text) frame.addText(1100, 50, "@ao: 2", null, "overlayset 2");113 Text t = (Text) frame.addText(1100, 50, "@ao: 2", null, "overlayset3"); 114 114 t.setAnchorLeft(1087.0f); 115 115 t = (Text) frame.addText(1100, 20, "@old", null); … … 119 119 } 120 120 121 /**122 * Halves the width of any JfxBrowser widget.123 */124 // public static void halfBrowser() {125 // for(Item i : DisplayIO.getCurrentFrame().getAllItems()) {126 // if(i instanceof InteractiveWidget)127 // }128 // }129 130 121 } -
trunk/src/org/expeditee/assets/resources/framesets/exploratorysearch/1.exp
r791 r810 1 V 1 181 V 128 2 2 U csl14A 3 3 D 12Dec2013[10:07] 4 4 M csl14A 5 d 30Jan2014[14:48]5 d 03Feb2014[12:04] 6 6 Z 7 7 … … 12 12 P 50 490 13 13 T @old 14 F exploratorysearch-old1 14 F exploratorysearch-old17 15 15 Q 0 16 16 o csl14A … … 27 27 d 50 50 50 100 28 28 R 37.0 29 P 50 70029 P 50 615 30 30 T @ao: 2 31 31 F overlayset1 … … 45 45 Z 46 46 47 ActiveTime:00: 39:0847 ActiveTime:00:40:37 48 48 DarkTime:00:46:25 49 04:02:324 350 64 Rd 50 04:02:387 350 64 Ru 51 04:02:675 715 385 Md 52 04:02:747 715 385 Mu 53 04:02:948 618 297 Rd 54 04:02:953 618 297 Md 55 04:05:345 524 501 kF9 56 04:05:857 524 501 kF9 57 04:08:827 78 610 Ld 58 04:08:891 78 610 Lu -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/1.exp
r798 r810 1 V 1 231 V 140 2 2 U csl14A 3 3 D 12Dec2013[10:13] 4 4 M csl14A 5 d 31Jan2014[15:49]5 d 03Feb2014[12:15] 6 6 Z 7 7 … … 37 37 d 0 0 0 100 38 38 R -2.0 39 N -41.0 39 40 P 0 30 40 41 T Exploratory 41 T Search :42 T Search 42 43 Q 0 43 44 o csl14A … … 55 56 d 100 0 0 100 56 57 R 140.0 58 N 70.0 57 59 P 140 70 58 60 Q 0 … … 67 69 d 100 0 0 100 68 70 R 0.0 71 N 70.0 69 72 P 0 70 70 73 Q 0 … … 78 81 s 12Dec2013[10:14.00] 79 82 R 7.0 83 N 72.0 80 84 P 20 100 81 85 T Go Browsing … … 93 97 s 12Dec2013[10:14.00] 94 98 R 7.0 99 N 102.0 95 100 P 20 130 96 101 T New Mindmap … … 109 114 d 100 0 0 100 110 115 R 0.0 116 N 500.0 111 117 P 0 500 112 118 Q 0 … … 121 127 d 100 0 0 100 122 128 R 140.0 129 N 500.0 123 130 P 140 500 124 131 Q 0 … … 133 140 d 50 50 50 100 134 141 R 50.0 135 P 52 514 142 N 486.0 143 P 52 518 136 144 T @i: home.png 36 137 145 X GoToHome … … 151 159 d 50 50 50 100 152 160 R 11.0 153 P 13 518 161 N 490.0 162 P 13 522 154 163 T @i: leftArrow.png 32 155 164 X Back … … 168 177 d 50 50 50 100 169 178 R 94.0 170 P 96 518 179 N 490.0 180 P 96 522 171 181 T @i: rightArrow.png 32 172 182 X Forward … … 183 193 S T 460 184 194 s 13Dec2013[14:33.39] 185 R 38.0 186 P 40 575 195 R 41.0 196 N 537.0 197 P 43 575 187 198 T HELP 188 199 F Documentation1 … … 202 213 d 100 0 0 100 203 214 R 0.0 215 N 590.0 204 216 P 0 590 205 217 Q 0 … … 213 225 d 100 0 0 100 214 226 R 140.0 227 N 590.0 215 228 P 140 590 216 229 Q 0 … … 225 238 d 50 50 50 100 226 239 R 38.0 227 P 40 611 240 N 582.0 241 P 40 646 228 242 T @i: es.png 64 229 243 x F … … 240 254 s 12Dec2013[10:14.00] 241 255 d 100 0 0 100 256 R 140.0 242 257 I -11.0 243 258 P 140 882 … … 253 268 s 12Dec2013[10:14.00] 254 269 d 100 0 0 100 270 R 0.0 255 271 I -11.0 256 272 P 0 882 … … 374 390 Z 375 391 376 ActiveTime:00:46:25 377 DarkTime:00:19:19 378 46:53:961 417 728 kShift 379 46:54:304 417 728 kA 380 46:54:504 430 728 kN 381 46:55:392 439 728 kC 382 46:55:520 447 728 kH 383 46:55:768 456 728 kO 384 46:55:888 465 728 kR 385 46:56:456 471 728 kShift 386 46:56:872 471 728 kSemicolon 387 46:59:768 476 728 kBackspace 388 47:00:040 471 728 kShift 389 47:00:539 471 728 kShift 390 47:00:572 471 728 kShift 391 47:00:605 471 728 kShift 392 47:00:638 471 728 kShift 393 47:00:671 471 728 kShift 394 47:00:704 471 728 kShift 395 47:00:737 471 728 kShift 396 47:00:770 471 728 kShift 397 47:00:803 471 728 kShift 398 47:00:836 471 728 kShift 399 47:00:869 471 728 kShift 400 47:00:902 471 728 kShift 401 47:00:935 471 728 kShift 402 47:00:968 471 728 kShift 403 47:01:001 471 728 kShift 404 47:01:034 471 728 kShift 405 47:01:067 471 728 kShift 406 47:01:100 471 728 kShift 407 47:01:133 471 728 kShift 408 47:01:166 471 728 kShift 409 47:01:199 471 728 kShift 410 47:01:953 471 728 kShift 411 47:02:345 471 728 kL 412 47:02:568 482 728 kE 413 47:02:704 490 728 kF 414 47:02:777 496 728 kT 415 47:03:057 501 728 kShift 416 47:03:424 501 728 kSemicolon 417 47:05:371 4 605 Rd 418 47:05:378 4 605 Ld 419 47:06:371 203 606 Md 420 47:06:378 203 606 Rd 421 47:07:283 139 603 Ld 422 47:07:290 139 603 Rd 423 47:08:507 201 592 Rd 424 47:08:530 201 592 Md 425 47:09:842 450 721 Rd 426 47:09:914 450 721 Ru 427 47:11:434 1 603 Md 428 47:11:483 1 603 Mu 429 47:12:747 482 724 Rd 430 47:12:827 482 724 Ru 431 47:14:139 142 603 Md 432 47:14:227 142 603 Mu 433 47:14:777 425 653 kShift 434 47:15:097 425 653 kA 435 47:15:345 438 653 kN 436 47:15:529 447 653 kC 437 47:15:809 455 653 kH 438 47:15:993 464 653 kO 439 47:16:136 473 653 kR 440 47:16:721 479 653 kShift 441 47:17:145 479 653 kB 442 47:17:457 491 653 kO 443 47:17:649 500 653 kT 444 47:17:808 505 653 kT 445 47:17:896 510 653 kO 446 47:18:032 519 653 kM 447 47:18:504 533 653 kShift 448 47:18:752 533 653 kSemicolon 449 47:18:864 538 653 kSpace 450 47:19:640 542 653 kMinus 451 47:19:984 548 653 k1 452 47:20:112 557 653 k1 453 47:21:243 490 645 Rd 454 47:21:322 490 644 Ru 455 47:22:868 0 602 Md 456 47:22:955 0 602 Mu 457 47:27:297 483 679 kShift 458 47:27:609 482 680 kA 459 47:27:937 495 680 kN 460 47:28:153 504 680 kC 461 47:28:257 512 680 kH 462 47:28:473 521 680 kO 463 47:28:601 530 680 kR 464 47:29:025 536 680 kShift 465 47:29:249 536 680 kB 466 47:29:641 548 680 kO 467 47:29:769 557 680 kT 468 47:29:921 562 680 kT 469 47:30:033 567 680 kO 470 47:30:209 576 680 kM 471 47:30:425 590 680 kShift 472 47:30:745 590 680 kSemicolon 473 47:32:332 562 679 Rd 474 47:32:388 562 679 Ru 475 47:33:933 1 880 Md 476 47:34:053 1 880 Mu 477 47:37:828 3 281 Rd 478 47:37:843 3 281 Ld 479 47:41:019 340 283 Rd 480 47:41:067 340 283 Md 481 47:41:474 496 386 kShift 482 47:41:938 496 386 kP 483 47:42:114 506 386 kO 484 47:42:226 515 386 kS 485 47:42:706 522 386 kI 486 47:42:842 527 386 kT 487 47:42:938 532 386 kI 488 47:42:994 537 386 kO 489 47:43:186 546 386 kN 490 47:43:394 555 386 kShift 491 47:43:874 555 386 kSemicolon 492 47:44:074 560 386 kSpace 493 47:44:194 565 386 k0 494 47:44:330 574 386 k0 495 47:45:274 583 386 kBackspace 496 47:45:353 574 386 kSpace 497 47:45:546 578 386 k0 498 47:46:700 534 382 Rd 499 47:46:756 534 382 Ru 500 47:47:813 4 282 Md 501 47:47:893 4 282 Mu 502 47:51:299 469 652 Rd 503 47:51:363 469 652 Ru 504 47:53:022 0 877 Md 505 47:53:126 0 877 Mu 506 47:54:140 468 649 Rd 507 47:54:228 468 649 Ru 508 47:56:132 140 879 Md 509 47:56:252 140 879 Mu 510 47:57:538 846 625 kF9 511 47:58:410 790 617 kF9 512 47:58:890 790 617 kF9 513 47:59:466 790 617 kF9 514 48:01:450 790 617 kF9 515 48:01:907 790 617 kF9 516 48:03:547 652 513 kShift 517 48:03:835 652 513 kA 518 48:04:098 665 513 kN 519 48:04:306 674 513 kC 520 48:04:466 682 513 kH 521 48:04:906 691 513 kO 522 48:05:026 700 513 kR 523 48:05:354 706 513 kShift 524 48:05:618 706 513 kT 525 48:05:770 717 513 kO 526 48:05:874 726 513 kP 527 48:06:298 735 513 kShift 528 48:06:554 735 513 kSemicolon 529 48:06:658 740 513 kSpace 530 48:07:282 744 513 k0 531 48:08:501 712 508 Rd 532 48:08:548 712 508 Ru 533 48:09:750 2 2 Md 534 48:09:854 2 2 Mu 535 48:10:874 689 229 kF9 536 48:11:643 691 243 kF9 537 48:12:685 704 504 Rd 538 48:12:752 701 504 Ru 539 48:14:459 775 256 kF9 540 48:15:107 812 261 kF9 541 48:16:742 139 0 Md 542 48:16:854 139 0 Mu 543 48:17:467 812 249 kF9 544 48:18:123 866 252 kF9 545 48:21:458 486 61 kF9 546 48:22:611 424 167 kF9 547 48:24:643 955 253 kF9 548 48:25:523 939 290 kF9 549 48:26:541 352 313 Rd 550 48:27:629 290 300 Rd 551 48:27:669 290 300 Ru 552 48:28:125 870 813 Md 553 48:28:216 864 810 Mu 554 48:28:622 782 710 Rd 555 48:28:638 782 710 Md 556 48:29:251 797 694 kF9 557 48:29:899 840 677 kF9 558 49:10:295 821 557 Ld 559 49:11:783 657 625 Ld 560 49:11:871 657 625 Lu 392 ActiveTime:01:07:21 393 DarkTime:00:20:24 394 15:26:102 884 700 kF9 395 15:26:613 884 700 kF9 396 15:27:088 884 700 Ld 397 15:27:159 884 700 Lu -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/2.exp
r798 r810 1 V 1 261 V 139 2 2 U csl14A 3 3 D 12Dec2013[10:14] 4 4 M csl14A 5 d 31Jan2014[15:49]5 d 03Feb2014[12:15] 6 6 Z 7 7 … … 10 10 d 100 0 0 100 11 11 R 0.0 12 N 0.0 12 13 P 0 0 13 14 Q 0 … … 22 23 d 100 0 0 100 23 24 H -11.0 24 P 1204 0 25 N 0.0 26 P 1679 0 25 27 Q 0 26 28 o csl14A … … 34 36 d 100 0 0 100 35 37 R 140.0 38 N 0.0 36 39 P 140 0 37 40 Q 0 … … 46 49 d 100 0 0 100 47 50 R 484.0 51 N 0.0 48 52 P 484 0 49 53 Q 0 … … 58 62 d 100 0 0 100 59 63 R 765.0 64 N 0.0 60 65 P 765 0 61 66 Q 0 … … 69 74 s 12Dec2013[10:14.45] 70 75 R 498.0 76 N -8.0 71 77 P 500 20 72 78 T Actions: … … 83 89 s 12Dec2013[10:14.45] 84 90 R 148.0 91 N -8.0 85 92 P 150 20 86 93 T Commands: … … 98 105 d 0 0 0 100 99 106 R 358.0 107 N -1.0 100 108 P 360 21 101 109 T [drop onto browser] … … 108 116 m 0.0 109 117 h -1.0 118 119 S P 1346 120 s 12Dec2013[10:14.45] 121 d 100 0 0 100 122 R 236.0 123 N 25.0 124 P 236 25 125 e 100 59 100 100 126 Q 0 127 o csl14A 128 v S 129 h 2.0 130 l 1350 131 132 S P 1347 133 s 12Dec2013[10:14.45] 134 d 100 0 0 100 135 R 150.0 136 N 25.0 137 P 150 25 138 e 100 59 100 100 139 Q 0 140 o csl14A 141 v S 142 h 2.0 143 l 1350 144 145 S P 1348 146 s 12Dec2013[10:14.45] 147 d 100 0 0 100 148 R 500.0 149 N 25.0 150 P 500 25 151 e 100 59 100 100 152 Q 0 153 o csl14A 154 v S 155 h 2.0 156 l 1351 157 158 S P 1349 159 s 12Dec2013[10:14.45] 160 d 100 0 0 100 161 R 560.0 162 N 25.0 163 P 560 25 164 e 100 59 100 100 165 Q 0 166 o csl14A 167 v S 168 h 2.0 169 l 1351 110 170 111 171 S T 1420 … … 113 173 d 50 50 50 100 114 174 H 45.0 115 P 1035 22 175 N -6.0 176 P 1510 26 116 177 T @i: home.png 36 117 178 X GoToHome … … 126 187 w 974 127 188 h -1.0 128 129 S P 1346130 s 12Dec2013[10:14.45]131 d 100 0 0 100132 R 236.0133 P 236 25134 e 100 59 100 100135 Q 0136 o csl14A137 v S138 h 2.0139 l 1350140 141 S P 1347142 s 12Dec2013[10:14.45]143 d 100 0 0 100144 R 150.0145 P 150 25146 e 100 59 100 100147 Q 0148 o csl14A149 v S150 h 2.0151 l 1350152 153 S P 1348154 s 12Dec2013[10:14.45]155 d 100 0 0 100156 R 500.0157 P 500 25158 e 100 59 100 100159 Q 0160 o csl14A161 v S162 h 2.0163 l 1351164 165 S P 1349166 s 12Dec2013[10:14.45]167 d 100 0 0 100168 R 560.0169 P 560 25170 e 100 59 100 100171 Q 0172 o csl14A173 v S174 h 2.0175 l 1351176 189 177 190 S T 1478 … … 179 192 d 50 50 50 100 180 193 H -37.0 181 P 1082 25 194 N -3.0 195 P 1557 29 182 196 T @i: rightArrow.png 32 183 197 X Forward … … 196 210 d 50 50 50 100 197 211 H 60.0 198 P 994 25 212 N -3.0 213 P 1469 29 199 214 T @i: leftArrow.png 32 200 215 X Back … … 213 228 d 0 0 0 100 214 229 R -2.0 230 N -41.0 215 231 P 0 30 216 232 T Web … … 230 246 s 12Dec2013[10:14.45] 231 247 R 489.0 248 N -9.0 232 249 P 502 41 233 250 T Give me a … … 246 263 s 12Dec2013[10:14.45] 247 264 R 597.0 265 N -9.0 248 266 P 610 41 249 267 T Drop url here to get … … 262 280 s 12Dec2013[10:14.45] 263 281 R 238.0 282 N 17.0 264 283 P 240 43 265 284 T www.example.com … … 276 295 s 18Dec2013[15:23.32] 277 296 H 10.0 278 P 1134 50 297 N 17.0 298 P 1609 55 279 299 T HELP 280 300 F Documentation1 … … 289 309 h -1.0 290 310 291 S T 1359292 s 12Dec2013[10:14.45]293 R 164.0294 P 166 63295 T back296 Q 0297 o csl14A298 v S299 f Roboto Condensed_r16300 t -1.0301 b 0.0302 m 0.0303 h -1.0304 305 311 S T 1360 306 312 s 12Dec2013[10:14.45] 307 313 R 230.0 314 N 37.0 308 315 P 232 63 309 316 T forward … … 320 327 s 12Dec2013[10:14.45] 321 328 R 310.0 329 N 37.0 322 330 P 312 63 323 331 T refresh … … 334 342 s 13Dec2013[15:28.40] 335 343 R 386.0 344 N 37.0 336 345 P 388 63 337 346 T convert … … 345 354 h -1.0 346 355 356 S T 1359 357 s 12Dec2013[10:14.45] 358 R 164.0 359 N 37.0 360 P 166 63 361 T back 362 Q 0 363 o csl14A 364 v S 365 f Roboto Condensed_r16 366 t -1.0 367 b 0.0 368 m 0.0 369 h -1.0 370 347 371 S P 1363 348 372 s 12Dec2013[10:14.45] 349 373 d 100 0 0 100 350 374 R 0.0 375 N 70.0 351 376 P 0 70 352 377 Q 0 … … 361 386 d 100 0 0 100 362 387 H -11.0 363 P 1204 70 388 N 70.0 389 P 1679 70 364 390 Q 0 365 391 o csl14A … … 374 400 d 100 0 0 100 375 401 R 140.0 402 N 70.0 376 403 P 140 70 377 404 Q 0 … … 386 413 d 100 0 0 100 387 414 R 484.0 415 N 70.0 388 416 P 484 70 389 417 Q 0 … … 398 426 d 100 0 0 100 399 427 R 765.0 428 N 70.0 400 429 P 765 70 401 430 Q 0 … … 1027 1056 Z 1028 1057 1029 ActiveTime:01: 04:581058 ActiveTime:01:24:45 1030 1059 DarkTime:00:10:14 1031 49:37:280 826 25Ld1032 49:37:336 826 25Lu1060 15:29:560 900 588 Ld 1061 15:29:607 900 588 Lu -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/3.exp
r798 r810 1 V 951 V 107 2 2 U csl14A 3 3 D 12Dec2013[10:15] 4 4 M csl14A 5 d 31Jan2014[15:43]5 d 03Feb2014[12:15] 6 6 Z 7 7 … … 10 10 d 100 0 0 100 11 11 H -11.0 12 N 0.0 12 13 P 1679 0 13 14 Q 0 … … 22 23 d 100 0 0 100 23 24 R 0.0 25 N 0.0 24 26 P 0 0 25 27 Q 0 … … 34 36 d 100 0 0 100 35 37 R 765.0 38 N 0.0 36 39 P 765 0 37 40 Q 0 … … 46 49 d 100 0 0 100 47 50 R 140.0 51 N 0.0 48 52 P 140 0 49 53 Q 0 … … 57 61 d 50 50 50 100 58 62 H 45.0 59 P 1510 22 63 N -6.0 64 P 1510 26 60 65 T @i: home.png 36 61 66 X GoToHome … … 75 80 d 50 50 50 100 76 81 H 60.0 77 P 1469 25 82 N -3.0 83 P 1469 29 78 84 T @i: leftArrow.png 32 79 85 X Back … … 92 98 d 50 50 50 100 93 99 H -37.0 94 P 1557 25 100 N -3.0 101 P 1557 29 95 102 T @i: rightArrow.png 32 96 103 X Forward … … 105 112 h -1.0 106 113 114 S T 88 115 s 12Dec2013[10:15.14] 116 R -2.0 117 N 7.0 118 P 0 45 119 T Mindmap 120 Q 0 121 o csl14A 122 v S 123 f Roboto Condensed_r25 124 t -1.0 125 b 0.0 126 m 0.0 127 w 140 128 k C 129 h -1.0 130 107 131 S T 438 108 132 s 18Dec2013[12:21.59] 109 133 R 587.0 134 N 17.0 110 135 P 600 45 111 136 T Get Hexagon … … 121 146 h -1.0 122 147 123 S T 88124 s 12Dec2013[10:15.14]125 R -2.0126 P 0 45127 T Mindmap128 Q 0129 o csl14A130 v S131 f Roboto Condensed_r25132 t -1.0133 b 0.0134 m 0.0135 w 140136 k C137 h -1.0138 139 148 S T 83 140 149 s 12Dec2013[10:15.14] 141 150 R 322.0 151 N 17.0 142 152 P 335 45 143 153 T Get Arrow … … 156 166 s 12Dec2013[10:15.14] 157 167 R 177.0 168 N 17.0 158 169 P 190 45 159 170 T Get Square … … 172 183 s 12Dec2013[10:15.14] 173 184 R 462.0 185 N 17.0 174 186 P 475 45 175 187 T Get Circle … … 188 200 s 15Jan2014[16:54.30] 189 201 H 10.0 190 P 1609 50 202 N 17.0 203 P 1609 55 191 204 T HELP 192 205 F Documentation1 … … 205 218 d 100 0 0 100 206 219 R 0.0 220 N 70.0 207 221 P 0 70 208 222 Q 0 … … 217 231 d 100 0 0 100 218 232 H -11.0 233 N 70.0 219 234 P 1679 70 220 235 Q 0 … … 230 245 d 100 0 0 100 231 246 R 765.0 247 N 70.0 232 248 P 765 70 233 249 Q 0 … … 242 258 d 100 0 0 100 243 259 R 140.0 260 N 70.0 244 261 P 140 70 245 262 Q 0 … … 297 314 Z 298 315 299 ActiveTime:00:36:39 300 DarkTime:00:00:00 301 43:51:698 1045 218 kLeft 316 ActiveTime:00:43:27 317 DarkTime:00:09:04 318 15:31:936 1625 42 Ld 319 15:31:983 1625 42 Lu -
trunk/src/org/expeditee/items/widgets/JfxBrowser.java
r809 r810 643 643 return r; 644 644 } 645 646 /** 647 * Override so anchoring JfxBrowser makes browser resize with screen 648 */ 649 @Override 650 public void setAnchorLeft(Float anchor) { 651 652 } 653 654 /** 655 * Override so anchoring JfxBrowser makes browser resize with screen 656 */ 657 @Override 658 public void setAnchorTop(Float anchor) { 659 660 } 661 662 /** 663 * Override so anchoring JfxBrowser makes browser resize with screen 664 */ 665 @Override 666 public void setAnchorRight(Float anchor) { 667 668 } 669 670 /** 671 * Override so anchoring JfxBrowser makes browser resize with screen 672 */ 673 @Override 674 public void setAnchorBottom(Float anchor) { 675 676 } 645 677 }
Note:
See TracChangeset
for help on using the changeset viewer.