Check-in [ebf099f318]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Minor changes due to recent MINOS2 changes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:ebf099f31868195f0f72acea2980bf7daa4ace54
User & Date: bernd 2019-01-04 22:07:49
Context
2019-01-04
23:16
Work on creating a new nick through the GUI check-in: d1e3e9abdf user: bernd tags: trunk
22:07
Minor changes due to recent MINOS2 changes check-in: ebf099f318 user: bernd tags: trunk
2019-01-03
18:12
Add version to GUI spash screen check-in: bc7e0a156b user: bernd tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to doc/35c3-presentation.fs.

346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
	    \skip
	    l" Beware: applies to journals and TV, too" \\
	}}vt
	glue*ll }}glue
    }}v box[] >bdr
    {{
	glue*ll }}glue \tiny \mono dark-blue
	{{ glue*ll }}glue l" 🔗xkcd.com/386" }}text' }}h
	[: s" xdg-open https://xkcd.com/386" system ;] 0 click[]
	tex: duty-calls \normal \sans
	' duty-calls "duty_calls.png" 0.95e }}image-file drop /right
    }}v box[] >bdr blackish
    ' blackish >body f!  ' dark-blue >body f!
}}z box[] /flip dup >slides








|







346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
	    \skip
	    l" Beware: applies to journals and TV, too" \\
	}}vt
	glue*ll }}glue
    }}v box[] >bdr
    {{
	glue*ll }}glue \tiny \mono dark-blue
	{{ glue*ll }}glue l" 🔗" }}text' l" xkcd.com/386" }}text' _underline_ }}h
	[: s" xdg-open https://xkcd.com/386" system ;] 0 click[]
	tex: duty-calls \normal \sans
	' duty-calls "duty_calls.png" 0.95e }}image-file drop /right
    }}v box[] >bdr blackish
    ' blackish >body f!  ' dark-blue >body f!
}}z box[] /flip dup >slides

Changes to gui.fs.

239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
...
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
...
515
516
517
518
519
520
521

522

523
524
525
526
527
528
529

530

531
532
533
534
535
536
537
...
635
636
637
638
639
640
641

642
643
644
645

646

647
648
649
650
651
652
653
			pw-text-col# to x-color
			"" }}pw dup Value pw-field
			25%b >o config:passmode# @ to pw-mode o o>
			glue*lll }}glue
		    }}h
		    pw-field ' pw-done edit[]
		    {{
			\large \sans $FFFFFFFF text-color, to x-color "👁" }}text
			\normal \bold show-sign-color# to x-color "\" }}text dup value show-pw-sign /center blackish
		    }}z \regular
		    : pw-show/hide ( flag -- )
			dup IF  ['] transparent >body f@
			ELSE  show-sign-color#  THEN
			show-pw-sign >o to text-color o>
			2 config:passmode# @ 1 min rot select pw-field >o to pw-mode o>
................................................................................
    0.01e peers-box [: .vp-top fdrop title-vp .vp-top +sync +resize ;] >animate ;

\ messages

msg-class class
end-class wmsg-class

$88FF88FF Value my-signal#
$CCFFCCFF Value other-signal#
$CC00CCFF Value my-signal-otr#
$880088FF Value other-signal-otr#
$4444CCFF color: link-blue
$44CC44FF color: re-green
$CC4444FF color: obj-red
$BBDDDDFF color: msg-bg
$00BFFFFF color: light-blue
$44FF44FF color: greenish
$33883366 Value day-color#
$88333366 Value hour-color#

Variable last-bubble-pk
0 Value last-otr?
0 Value last-bubble
64#0 64Value last-tick
#300 #1000000000 um* d>64 64Constant delta-bubble

................................................................................
	fdup f2* to border
	0e to borderl fnegate f2* to bordert 0e to borderv
    THEN o o> ;
: add-dtms ( ticks -- )
    \small blackish
    1n fm* >day { day } day last-day <> IF
	{{

	    glue*l day-color# color, slide-frame dup .button1

	    \bold day ['] .day $tmp }}text 25%b \regular
	}}z /center msgs-box .child+
    THEN  day to last-day
    24 fm* fsplit { hour } hour last-hour <>
    60 fm* fsplit { minute } minute 10 / last-minute 10 / <> or
    IF
	{{

	    glue*l hour-color# color, slide-frame dup .button1

	    60 fm* fsplit minute hour
	    [: .## ':' emit .## ':' emit .## 'Z' emit ;] $tmp }}text 25%b
	}}z /center msgs-box .child+
    THEN  hour to last-hour  minute to last-minute
    fdrop \normal ;

: otr? ( tick -- flag )
................................................................................
    {{
	glue*l $FFCCCCFF color, slide-frame dup .button1
	string [: ."  GPS: " .coords ;] $tmp }}text 25%b
    }}z "gps" name! msg-box .child+
; wmsg-class to msg:coord
:noname { d: pk -- o }
    {{

	pk key|
	2dup 0 .pk@ key| str=
	last-otr? IF  my-signal-otr# other-signal-otr#
	ELSE  my-signal# other-signal#  THEN  rot select color,

	glue*l slide-frame dup .button1 40%b >r

	[: '@' emit .key-id ;] $tmp ['] utf8-sanitize $tmp }}text 25%b r> swap
    }}z msg-box .child+
; wmsg-class to msg:signal
:noname ( addr u -- )
    re-green [: ." [" 85type ." ]→" ;] $tmp }}text msg-box .child+
    text-color!
; msg-class to msg:re







|







 







|
|
|
|
|
|
|
|
|
|
|
|







 







>
|
>







>
|
>







 







>


<
|
>
|
>







239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
...
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
...
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
...
639
640
641
642
643
644
645
646
647
648

649
650
651
652
653
654
655
656
657
658
659
			pw-text-col# to x-color
			"" }}pw dup Value pw-field
			25%b >o config:passmode# @ to pw-mode o o>
			glue*lll }}glue
		    }}h
		    pw-field ' pw-done edit[]
		    {{
			\large \sans whitish "👁" }}text
			\normal \bold show-sign-color# to x-color "\" }}text dup value show-pw-sign /center blackish
		    }}z \regular
		    : pw-show/hide ( flag -- )
			dup IF  ['] transparent >body f@
			ELSE  show-sign-color#  THEN
			show-pw-sign >o to text-color o>
			2 config:passmode# @ 1 min rot select pw-field >o to pw-mode o>
................................................................................
    0.01e peers-box [: .vp-top fdrop title-vp .vp-top +sync +resize ;] >animate ;

\ messages

msg-class class
end-class wmsg-class

$88FF88FF color: my-signal
$CCFFCCFF color: other-signal
$CC00CCFF color: my-signal-otr
$880088FF color: other-signal-otr
$4444CCFF text-color: link-blue
$44CC44FF text-color: re-green
$CC4444FF text-color: obj-red
$BBDDDDFF text-color: msg-bg
$00BFFFFF text-color: light-blue
$44FF44FF text-color: greenish
$33883366 color: day-color
$88333366 color: hour-color

Variable last-bubble-pk
0 Value last-otr?
0 Value last-bubble
64#0 64Value last-tick
#300 #1000000000 um* d>64 64Constant delta-bubble

................................................................................
	fdup f2* to border
	0e to borderl fnegate f2* to bordert 0e to borderv
    THEN o o> ;
: add-dtms ( ticks -- )
    \small blackish
    1n fm* >day { day } day last-day <> IF
	{{
	    x-color { f: xc }
	    glue*l day-color x-color slide-frame dup .button1
	    xc to x-color
	    \bold day ['] .day $tmp }}text 25%b \regular
	}}z /center msgs-box .child+
    THEN  day to last-day
    24 fm* fsplit { hour } hour last-hour <>
    60 fm* fsplit { minute } minute 10 / last-minute 10 / <> or
    IF
	{{
	    x-color { f: xc }
	    glue*l hour-color x-color slide-frame dup .button1
	    xc to x-color
	    60 fm* fsplit minute hour
	    [: .## ':' emit .## ':' emit .## 'Z' emit ;] $tmp }}text 25%b
	}}z /center msgs-box .child+
    THEN  hour to last-hour  minute to last-minute
    fdrop \normal ;

: otr? ( tick -- flag )
................................................................................
    {{
	glue*l $FFCCCCFF color, slide-frame dup .button1
	string [: ."  GPS: " .coords ;] $tmp }}text 25%b
    }}z "gps" name! msg-box .child+
; wmsg-class to msg:coord
:noname { d: pk -- o }
    {{
	x-color { f: xc }
	pk key|
	2dup 0 .pk@ key| str=

	last-otr? IF  IF  my-signal-otr  ELSE  other-signal-otr  THEN
	ELSE  IF  my-signal  ELSE  other-signal  THEN  THEN
	x-color glue*l slide-frame dup .button1 40%b >r
	xc to x-color
	[: '@' emit .key-id ;] $tmp ['] utf8-sanitize $tmp }}text 25%b r> swap
    }}z msg-box .child+
; wmsg-class to msg:signal
:noname ( addr u -- )
    re-green [: ." [" 85type ." ]→" ;] $tmp }}text msg-box .child+
    text-color!
; msg-class to msg:re