- Timestamp:
- 05/23/19 12:20:07 (5 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/assets/resources-public/framesets/authentication/1.exp
r1368 r1369 1 V 82 61 V 828 2 2 p 40 3 3 U authadmin 4 4 D 23Nov2018[12:31] 5 M authadmin6 d 23May2019[1 0:29]5 M nobody 6 d 23May2019[12:15] 7 7 B 100 100 39 100 8 8 Z … … 546 546 Z 547 547 548 ActiveTime:18992043:12:17 549 DarkTime:-18982463:-8:-10 550 29:18:317 516 406 Ld 551 29:18:605 516 406 Rd 552 29:18:866 516 406 Ru 553 29:18:882 516 406 Lu 554 29:21:389 737 384 Rd 555 29:21:404 737 384 Md 556 29:21:562 737 384 Ru 557 29:21:578 737 384 Mu 558 29:21:826 828 455 kRIGHT_ARROW 548 ActiveTime:19857915:43:23 549 DarkTime:-19848023:-39:-16 550 15:44:927 669 287 kBACKSPACE 551 15:45:427 655 287 kBACKSPACE 552 15:45:460 641 287 kBACKSPACE 553 15:45:493 627 287 kBACKSPACE 554 15:45:526 613 287 kBACKSPACE 555 15:45:559 599 287 kBACKSPACE 556 15:45:592 585 287 kBACKSPACE 557 15:45:624 571 287 kBACKSPACE 558 15:45:658 557 287 kBACKSPACE 559 15:45:691 543 287 kBACKSPACE 560 15:45:724 529 287 kBACKSPACE 561 15:45:757 515 287 kBACKSPACE 562 15:45:791 501 287 kBACKSPACE 563 15:45:825 487 287 kBACKSPACE 564 15:45:867 473 287 kBACKSPACE 565 15:45:894 459 287 kBACKSPACE 566 15:46:135 445 287 kBACKSPACE 567 15:46:313 431 287 kBACKSPACE 568 15:46:489 417 287 kBACKSPACE 569 15:49:442 762 228 kSHIFT 570 15:49:609 762 228 kT 571 15:50:288 773 228 kO 572 15:50:489 782 228 kG 573 15:50:626 791 228 kG 574 15:50:708 799 228 kL 575 15:50:799 804 228 kE 576 15:50:985 813 228 kSHIFT 577 15:51:040 813 228 kA 578 15:51:181 826 228 kU 579 15:51:328 835 228 kT 580 15:51:408 840 228 kH 581 15:51:688 849 228 kCTRL 582 15:51:912 849 228 kA 583 15:53:555 801 220 Ld 584 15:53:719 801 220 Lu 585 15:55:337 797 218 Md 586 15:55:400 797 218 Rd 587 15:55:494 797 218 Ru 588 15:55:527 797 218 Mu 589 15:57:033 721 219 kSHIFT 590 15:57:111 721 219 kM 591 15:57:329 737 219 kA 592 15:57:569 745 219 kX 593 15:57:760 754 219 kSHIFT 594 15:57:977 754 219 kW 595 15:58:304 771 219 kI 596 15:58:403 776 219 kD 597 15:58:601 785 219 kT 598 15:58:671 790 219 kH 599 15:58:809 798 219 kSHIFT 600 16:02:263 789 216 Md 601 16:02:383 789 216 Mu 602 16:03:697 790 222 kRIGHT_ARROW -
trunk/src/org/expeditee/assets/resources-public/framesets/authentication/2.exp
r1368 r1369 1 V 2 881 V 292 2 2 p 40 3 3 U authadmin 4 4 D 07Dec2018[12:19] 5 5 M authadmin 6 d 23May2019[1 0:23]6 d 23May2019[12:16] 7 7 B 100 100 39 100 8 8 Z … … 127 127 p 44 128 128 _ph Password 129 _maxW 300 129 130 130 131 S T 130 … … 150 151 p 44 151 152 _ph Password Again 153 _maxW 300 152 154 153 155 S T 672 … … 172 174 p 44 173 175 _ph Email Again 176 _maxW 300 174 177 175 178 S T 671 … … 194 197 p 44 195 198 _ph Email 199 _maxW 300 196 200 197 201 S T 190 … … 496 500 Z 497 501 498 ActiveTime:01:2 0:28502 ActiveTime:01:21:37 499 503 DarkTime:01:32:58 500 23:46:958 183 338 Ld 501 23:47:092 183 338 Rd 502 23:47:242 183 338 Ru 503 23:47:250 183 338 Lu 504 23:48:621 136 388 Md 505 23:48:706 136 388 Rd 506 23:48:818 136 388 Ru 507 23:48:841 136 388 Mu 508 23:49:603 110 475 kRIGHT_ARROW 504 16:45:082 190 331 Ld 505 16:45:153 190 331 Rd 506 16:45:287 190 331 Ru 507 16:45:295 190 331 Lu 508 16:46:234 73 272 Md 509 16:46:298 73 272 Rd 510 16:46:399 73 272 Ru 511 16:46:431 73 272 Mu 512 16:47:249 612 348 kCTRL 513 16:47:401 612 348 kS 514 16:48:151 591 338 Ld 515 16:48:217 591 338 Rd 516 16:48:327 591 338 Lu 517 16:48:335 591 338 Ru 518 16:48:858 640 279 Md 519 16:48:919 640 279 Rd 520 16:49:119 640 279 Ru 521 16:49:143 640 279 Mu 522 16:49:810 571 391 Ld 523 16:49:881 571 391 Rd 524 16:49:991 571 391 Lu 525 16:49:992 571 391 Ru 526 16:50:649 605 290 Md 527 16:50:689 605 290 Rd 528 16:50:823 605 290 Ru 529 16:50:847 605 290 Mu 530 16:51:728 180 393 Ld 531 16:51:775 180 393 Rd 532 16:51:879 180 393 Lu 533 16:51:887 180 393 Ru 534 16:52:448 108 280 Md 535 16:52:495 108 280 Rd 536 16:52:623 108 280 Ru 537 16:52:639 108 280 Mu 538 16:53:456 108 280 kLEFT_ARROW -
trunk/src/org/expeditee/assets/resources-public/framesets/authentication/3.exp
r1368 r1369 1 V 9 41 V 98 2 2 p 40 3 3 U authadmin 4 4 D 07Jan2019[14:34] 5 M nobody6 d 23May2019[1 0:36]5 M authadmin 6 d 23May2019[12:16] 7 7 B 100 100 39 100 8 8 Z … … 123 123 p 44 124 124 _ph New Password 125 _maxW 300 125 126 126 127 S T 81 … … 144 145 p 44 145 146 _ph New Password Again 147 _maxW 300 146 148 147 149 S T 45 … … 286 288 Z 287 289 288 ActiveTime:00:16:1 0290 ActiveTime:00:16:15 289 291 DarkTime:00:20:25 290 37:16:179 496 492 Rd 291 37:16:341 496 492 Ru 292 37:17:121 496 492 kRIGHT_ARROW 292 16:39:689 115 222 kCTRL 293 16:40:095 115 222 kS 294 16:41:371 537 319 Ld 295 16:41:464 537 319 Rd 296 16:41:631 537 319 Ru 297 16:41:647 537 319 Lu 298 16:42:602 121 249 Md 299 16:42:681 121 249 Rd 300 16:42:775 121 249 Ru 301 16:42:823 121 249 Mu 302 16:43:865 20 240 kLEFT_ARROW -
trunk/src/org/expeditee/assets/resources-public/framesets/authentication/4.exp
r1368 r1369 1 V 2 181 V 222 2 2 p 40 3 3 U authadmin 4 4 D 07Jan2019[14:34] 5 M nobody6 d 23May2019[1 0:37]5 M authadmin 6 d 23May2019[12:16] 7 7 B 100 100 39 100 8 8 Z … … 83 83 p 44 84 84 _ph Username 85 _maxW 300 85 86 86 87 S T 333 … … 142 143 p 44 143 144 _ph Identity Number 145 _maxW 300 144 146 145 147 S T 515 … … 207 209 p 44 208 210 _ph Password Piece Two 211 _maxW 300 209 212 210 213 S T 603 … … 227 230 p 44 228 231 _ph Password Piece One 232 _maxW 300 229 233 230 234 S T 417 … … 248 252 p 44 249 253 _ph New Password Again 254 _maxW 300 250 255 251 256 S T 418 … … 269 274 p 44 270 275 _ph New Password 276 _maxW 300 271 277 272 278 S T 503 … … 561 567 Z 562 568 563 ActiveTime:01:3 6:47569 ActiveTime:01:37:02 564 570 DarkTime:02:33:57 565 38:34:241 956 28 Ld 566 38:34:327 956 28 Rd 567 38:34:437 956 28 Ru 568 38:34:445 956 28 Lu 569 38:36:496 846 150 kRIGHT_ARROW 571 16:31:593 895 405 kCTRL 572 16:31:978 895 405 kS 573 16:34:563 219 335 Ld 574 16:34:657 219 335 Rd 575 16:34:783 219 335 Ru 576 16:34:799 219 335 Lu 577 16:37:970 115 222 Md 578 16:38:071 115 222 Rd 579 16:38:231 115 222 Ru 580 16:38:255 115 222 Mu 581 16:39:199 115 222 kLEFT_ARROW -
trunk/src/org/expeditee/gui/AttributeUtils.java
r1296 r1369 289 289 _Attrib.put("MinWidth", Item.class.getMethod("getMinWidthToSave"), 290 290 Item.class.getMethod("setMinWidth", pIntO)); 291 _Attrib.put("MaxWidth", Item.class.getMethod("getMaxWidthToSave"), 292 Item.class.getMethod("setMaxWidth", pIntO)); 291 293 _Attrib.put("X", null, 292 294 Item.class.getMethod("setX", pFloat)); -
trunk/src/org/expeditee/io/DefaultFrameReader.java
r1322 r1369 178 178 179 179 _ItemTagsExt.put("_ph", Text.class.getMethod("setPlaceholder", pString)); 180 _ItemTagsExt.put("_maxW", Text.class.getMethod("setMaxWidth", pIntO)); 180 181 } catch (Exception e) { 181 182 e.printStackTrace(); -
trunk/src/org/expeditee/io/DefaultFrameWriter.java
r1321 r1369 153 153 _ItemTags.put('/', Item.class.getMethod("getMagnetizedItemBottom")); 154 154 155 //_ItemTags.put('=', Text.class.getMethod("getPlaceholder"));156 155 _ItemTagsExt.put("_ph", Text.class.getMethod("getPlaceholder")); 156 _ItemTagsExt.put("_maxW", Text.class.getMethod("getMaxWidthToSave")); 157 157 } catch (Exception e) { 158 158 e.printStackTrace(); -
trunk/src/org/expeditee/items/Item.java
r1258 r1369 1170 1170 return getMinWidth(); 1171 1171 } 1172 1173 public Integer getMaxWidthToSave() { 1174 return getMaxWidth(); 1175 } 1172 1176 1173 1177 public Integer getWidth() … … 1177 1181 1178 1182 public Integer getMinWidth() { 1183 return null; 1184 } 1185 1186 public Integer getMaxWidth() { 1179 1187 return null; 1180 1188 } … … 2296 2304 throw new UnsupportedOperationException("Item type does not support minwidth attribute."); 2297 2305 } 2306 2307 public void setMaxWidth(Integer width) throws UnsupportedOperationException { 2308 throw new UnsupportedOperationException("Item type does not support maxwidth attribute"); 2309 } 2298 2310 2299 2311 public void setRightMargin(int i, boolean fixWidth) -
trunk/src/org/expeditee/items/Text.java
r1296 r1369 136 136 * the user. Initially set to be as wide as possible. 137 137 */ 138 private Integer _width = -Integer.MAX_VALUE; 139 140 private Integer _minWidth = -Integer.MAX_VALUE; 141 138 142 private Integer _maxWidth = -Integer.MAX_VALUE; 139 140 private Integer _minWidth = -Integer.MAX_VALUE;141 143 142 144 private Justification _justification = Justification.left; … … 186 188 // The font to display this text in 187 189 private Font _font; 190 private Font _substituteFont; 191 private boolean _useSubstituteFont = false; 188 192 189 193 // The optional mask character to us in place of the text's content. … … 395 399 } 396 400 397 _ maxWidth = width;401 _width = width; 398 402 rebuild(true); 399 403 invalidateAll(); … … 414 418 invalidateAll(); 415 419 } 420 421 public void setMaxWidth(Integer width) { 422 invalidateAll(); 423 424 if (width == null) { 425 setJustification(Justification.left); 426 setRightMargin(DisplayController.getFramePaintAreaWidth(), false); 427 return; 428 } 429 430 _maxWidth = width; 431 rebuild(true); 432 invalidateAll(); 433 } 434 416 435 417 436 /** … … 428 447 @Override 429 448 public Integer getWidth() { 430 if (_ maxWidth == null || _maxWidth <= 0) {449 if (_width == null || _width <= 0) { 431 450 return null; 432 451 } 433 452 434 return _ maxWidth;453 return _width; 435 454 } 436 455 437 456 public Integer getAbsoluteWidth() { 438 if (_ maxWidth == null) {457 if (_width == null) { 439 458 return Integer.MAX_VALUE; 440 459 } 441 460 442 return Math.abs(_ maxWidth);461 return Math.abs(_width); 443 462 } 444 463 … … 449 468 return _minWidth; 450 469 } 470 471 public Integer getMaxWidth() { 472 if (_maxWidth == null || _maxWidth <= 0) { 473 return null; 474 } 475 return _maxWidth; 476 } 451 477 452 478 public Integer getAbsoluteMinWidth() { … … 456 482 return Math.abs(_minWidth); 457 483 } 458 484 485 public Integer getAbsoluteMaxWidth() { 486 if (_maxWidth == null) { 487 return Integer.MIN_VALUE; 488 } 489 return Math.abs(_maxWidth); 490 } 491 459 492 @Override 460 493 public Colour getHighlightColor() { … … 1300 1333 */ 1301 1334 public Font getPaintFont() { 1302 finalFont f = getFont();1335 Font f = getFont(); 1303 1336 if (f == null) { 1304 1337 _font = EcosystemManager.getFontManager().getDefaultFont().clone(); 1305 return _font; 1338 f = _font; 1339 1340 if (_useSubstituteFont) { 1341 f = _substituteFont; 1342 } 1306 1343 } 1307 1344 return f; … … 1693 1730 1694 1731 int minWidth = getAbsoluteMinWidth(); 1732 int maxWidth = getAbsoluteMaxWidth(); 1695 1733 1696 1734 minX = Math.min(minX, bounds.getMinX()); 1697 1735 maxX = minWidth < Integer.MAX_VALUE ? Math.max(minX + minWidth, bounds.getMaxX()) 1698 1736 : Math.max(maxX, bounds.getMaxX()); 1737 if ((maxWidth - minX) < maxX) { 1738 this._useSubstituteFont = true; 1739 this._substituteFont.setSize(this._substituteFont.getSize() - 1); 1740 } else { 1741 this._useSubstituteFont = false; 1742 this._substituteFont = this._font; 1743 } 1699 1744 minY = Math.min(minY, (int) (bounds.getMinY() + y)); 1700 1745 maxY = Math.max(maxY, (int) (bounds.getMaxY() + y)); … … 1808 1853 float width = Float.MAX_VALUE; 1809 1854 if (limitWidth) { 1810 if (_ maxWidth == null) {1855 if (_width == null) { 1811 1856 width = DisplayController.getFramePaintAreaWidth() - getX(); 1812 1857 } else { … … 1889 1934 1890 1935 private boolean hasFixedWidth() { 1891 assert (_ maxWidth != null);1892 if (_ maxWidth == null) {1936 assert (_width != null); 1937 if (_width == null) { 1893 1938 justify(false); 1894 1939 } 1895 return _ maxWidth > 0;1940 return _width > 0; 1896 1941 } 1897 1942
Note:
See TracChangeset
for help on using the changeset viewer.