Check-in [4c18cd8708]
Not logged in

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

Overview
Comment:Postings display started (text only)
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:4c18cd8708a8a933348ee6989dd88f2164e44715
User & Date: bernd 2019-03-13 21:44:49
Context
2019-03-13
22:35
Bump version number check-in: 03ba7f6a7b user: bernd tags: trunk, 0.8.8-20190313
21:44
Postings display started (text only) check-in: 4c18cd8708 user: bernd tags: trunk
2019-03-12
22:15
More work on Google+ display check-in: 2aa3b014ac user: bernd tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to gui.fs.

631
632
633
634
635
636
637











638
639
640
641


642
643
644
645





646



647
648

649
650
651
652
653

654
655
656
657
658
659

660
661
662
663
664
665
666
...
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
...
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
}scope

0 Value project-vp

{{
    $FFFFFFFF color, pres-frame
    {{











	glue*ll }}glue
	tex: vp-md
    glue*l ' vp-md }}vp vp[] dup to project-vp
    >o font-size# dpy-w @ s>f 25% f* fdup fnegate to borderv f+ to border o o>


}}z box[] to post-frame

: display-file ( addr u -- )
    2dup key| .key-id?





    over keysize + le-64@ .ticks space



    [ keysize $10 + ]L safe/string
    2dup "file:" string-prefix? IF

	5 /string [: ." ~+/" type ;] $tmp markdown-parse
	v-box project-vp .+child
	dpy-w @ s>f font-size# fover 25% f* f+ f2* f- ~~ p-format
    ELSE  2drop  THEN ;
: display-project ( addr u -- )

    project:branch$ $@ { d: branch }
    dvcs:new-project-log >o
    ?msg-log  last# msg-log@ 2dup { log u }
    bounds ?DO
	I $@ msg:display \ this will only set the URLs
    cell +LOOP

    log free
    dvcs-log:urls[] ['] display-file $[]map
    dvcs:dispose-dvcs-log o> throw ;
: .project-log ( -- )
    dvcs:new-dvcs >o  config>dvcs
    project:project$ $@ @/ 2drop 2dup load-msg
    display-project
................................................................................
: open-project { d: prj -- }
    ." open " prj .project cr
    prj 2dup keysize /string [: type '@' emit key| .key-id? ;] $tmp nick>chat
    >dir
    "posts" ~net2o-cache/
    handle-clone
    prj keysize /string set-dir throw
    .project-log
    dir> ;

:noname ( -- )
    glue*ll }}glue msg-box .child+
    dpy-w @ 90% fm* msg-par .par-split
    {{ msg-par unbox }}
    dup >r 0 ?DO  I pick box[] "unboxed" name! drop  LOOP  r>
................................................................................
lang:en include-locale lang/en

: ??lang ( addr u -- )
    ['] lang >body find-name-in ?dup-IF  execute  THEN ;

s" LANG" getenv '_' $split 2swap ??lang '.' $split ??lang ??lang

\ lsids .lsids

[IFDEF] load-cov  load-cov [THEN]

\\\
Local Variables:
forth-local-words:
    (







>
>
>
>
>
>
>
>
>
>
>
|
|
|
|
>
>


|
<
>
>
>
>
>
|
>
>
>
|

>

|
|


>






>







 







|







 







|







631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657

658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
...
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
....
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
}scope

0 Value project-vp

{{
    $FFFFFFFF color, pres-frame
    {{
	{{
	    glue*l $000000FF color, slide-frame dup .button1
	    {{
		\large whitish
		"⬅" }}text 40%b [: prev-slide ;] over click[]
		!i18n l" Post" }}text' !lit 40%b
		glue*l }}glue
	    }}h box[]
	}}z box[]
	{{
	    {{
		glue*ll }}glue
		tex: vp-md
	    glue*l ' vp-md }}vp vp[] dup to project-vp
	    >o font-size# dpy-w @ s>f 25% f* fdup fnegate to borderv f+ to border o o>
	dup font-size# 66% f* fdup vslider }}h box[]
    }}v box[]
}}z box[] to post-frame

: display-file { d: prj -- }

    {{
	glue*l $000000FF color, slide-frame dup .button1
	{{
	    \large whitish prj key| ['] .key-id? $tmp }}text 40%b
	    glue*ll }}glue
	    \small prj drop keysize + le-64@ ['] .ticks $tmp }}text 40%b
	    \normal blackish
	}}h box[]
    }}z box[] project-vp .child+
    prj [ keysize $10 + ]L safe/string
    2dup "file:" string-prefix? IF
	0 to v-box
	5 /string [: ." ~+/" type ;] $tmp markdown-parse
	v-box project-vp .child+
	dpy-w @ s>f font-size# fover 25% f* f+ f2* f- p-format
    ELSE  2drop  THEN ;
: display-project ( addr u -- )
    project-vp >o dispose-childs  0 to active-w o>
    project:branch$ $@ { d: branch }
    dvcs:new-project-log >o
    ?msg-log  last# msg-log@ 2dup { log u }
    bounds ?DO
	I $@ msg:display \ this will only set the URLs
    cell +LOOP
    glue*lll }}glue project-vp .child+
    log free
    dvcs-log:urls[] ['] display-file $[]map
    dvcs:dispose-dvcs-log o> throw ;
: .project-log ( -- )
    dvcs:new-dvcs >o  config>dvcs
    project:project$ $@ @/ 2drop 2dup load-msg
    display-project
................................................................................
: open-project { d: prj -- }
    ." open " prj .project cr
    prj 2dup keysize /string [: type '@' emit key| .key-id? ;] $tmp nick>chat
    >dir
    "posts" ~net2o-cache/
    handle-clone
    prj keysize /string set-dir throw
    .project-log next-slide
    dir> ;

:noname ( -- )
    glue*ll }}glue msg-box .child+
    dpy-w @ 90% fm* msg-par .par-split
    {{ msg-par unbox }}
    dup >r 0 ?DO  I pick box[] "unboxed" name! drop  LOOP  r>
................................................................................
lang:en include-locale lang/en

: ??lang ( addr u -- )
    ['] lang >body find-name-in ?dup-IF  execute  THEN ;

s" LANG" getenv '_' $split 2swap ??lang '.' $split ??lang ??lang

lsids .lsids

[IFDEF] load-cov  load-cov [THEN]

\\\
Local Variables:
forth-local-words:
    (

Changes to html/parser.fs.

219
220
221
222
223
224
225

226
227
228
229
230
231
232
...
256
257
258
259
260
261
262
263





264
265
266
267
268
269
270

$100 buffer: escape-chars
'\' escape-chars '*' + c!
'\' escape-chars '_' + c!
'\' escape-chars '\' + c!
'\' escape-chars '~' + c!
'\' escape-chars '[' + c!

'\' escape-chars '`' + c!

: type-esc'd ( addr u -- )
    bounds ?DO
	I c@ dup escape-chars + c@ ?dup-IF  emit  THEN  emit
    LOOP ;

................................................................................
    ELSE  html-throw throw  THEN ;

\ post-process to cleanup

: process-pattern ( addr u -- addr' u' )
    2dup "_**_"     string-prefix? IF  4 safe/string ." **"  EXIT  THEN
    2dup "**+++ "   string-prefix? IF  6 safe/string ." # "  EXIT  THEN
    2dup " +++**\n" string-prefix? IF  7 safe/string ."  #" cr  EXIT  THEN





    dup IF  over c@ emit 1 safe/string  THEN ;
: process-patterns ( addr u -- )
    BEGIN  process-pattern  dup 0<=  UNTIL  2drop ;

Variable html$

: html-untag ( addr u -- ) config-wl >r  html$ $free







>







 







|
>
>
>
>
>







219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
...
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276

$100 buffer: escape-chars
'\' escape-chars '*' + c!
'\' escape-chars '_' + c!
'\' escape-chars '\' + c!
'\' escape-chars '~' + c!
'\' escape-chars '[' + c!
'\' escape-chars ']' + c!
'\' escape-chars '`' + c!

: type-esc'd ( addr u -- )
    bounds ?DO
	I c@ dup escape-chars + c@ ?dup-IF  emit  THEN  emit
    LOOP ;

................................................................................
    ELSE  html-throw throw  THEN ;

\ post-process to cleanup

: process-pattern ( addr u -- addr' u' )
    2dup "_**_"     string-prefix? IF  4 safe/string ." **"  EXIT  THEN
    2dup "**+++ "   string-prefix? IF  6 safe/string ." # "  EXIT  THEN
    2dup " +++**\n" string-prefix? IF  7 safe/string ."  #" cr
    ELSE
	dup 2 u>= IF  2dup #lf skip nip over swap - >r
	    r@ 1 = IF  '\' emit  THEN
	    over r@ type r> safe/string  THEN
    THEN
    dup IF  over c@ emit 1 safe/string  THEN ;
: process-patterns ( addr u -- )
    BEGIN  process-pattern  dup 0<=  UNTIL  2drop ;

Variable html$

: html-untag ( addr u -- ) config-wl >r  html$ $free

Changes to json/g+-import.fs.

171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
...
375
376
377
378
379
380
381

382
383
384
385
386
387
388
389

: .html ( -- )
    comments:content$ html-untag cr ;
: .plain ( -- )
    comments:content$ html>text ;
: .link ( -- )
    comments:link{} ?dup-IF cr >o
	'[' emit link:title$ type ." ](" link:url$ type ')' emit cr
	o>  THEN ;

0 Value img-req-fid

: .mfile { d: fn -- }
    fn basedir+name pics# #@ 2dup d0= IF
	2drop fn .url
................................................................................

Variable comment#

: add-comment ( dvcs -- )
    comment-file add-file ;

: create>never ( o:comments -- )

    comments:creationTime! comments:updateTime! 64umax 64#-1 sigdate le-128! ;

: wrap-key ( ... xt key -- )
    my-key-default >r to my-key-default catch r> to my-key-default throw ;

: add-comments { dvcs-o -- }
    comments:comments[] $@ bounds U+DO
	I @ >o







|







 







>
|







171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
...
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390

: .html ( -- )
    comments:content$ html-untag cr ;
: .plain ( -- )
    comments:content$ html>text ;
: .link ( -- )
    comments:link{} ?dup-IF cr >o
	'[' emit link:title$ type-esc'd ." ](" link:url$ type ')' emit cr
	o>  THEN ;

0 Value img-req-fid

: .mfile { d: fn -- }
    fn basedir+name pics# #@ 2dup d0= IF
	2drop fn .url
................................................................................

Variable comment#

: add-comment ( dvcs -- )
    comment-file add-file ;

: create>never ( o:comments -- )
    comments:creationTime! ( comments:updateTime! 64umax )
    64#-1 sigdate le-128! ;

: wrap-key ( ... xt key -- )
    my-key-default >r to my-key-default catch r> to my-key-default throw ;

: add-comments { dvcs-o -- }
    comments:comments[] $@ bounds U+DO
	I @ >o

Changes to lang/de.

8
9
10
11
12
13
14

15
16
Neue Passphrase nochmal eingeben
Spitznamen
Öffentlicher Schlüssel
Schlüsselsignaturdatum
Meine Schlüssel
Meine Gruppen
Meine Freunde

Plaudertagebuch
Senden







>


8
9
10
11
12
13
14
15
16
17
Neue Passphrase nochmal eingeben
Spitznamen
Öffentlicher Schlüssel
Schlüsselsignaturdatum
Meine Schlüssel
Meine Gruppen
Meine Freunde
Posting
Plaudertagebuch
Senden

Changes to lang/en.

1

2
3
4
5
6
7
8
9
10
11
12
13
14

15
16
Gforth

⚪
net2o GUI
Wrong passphrase!
Enter passphrase to unlock
Create new ID
Enter new passphrase
Enter new passphrase again
Nick+Pet
Public key
Key signature date
My keys
My groups
My peers

chat log
send
<
>


|





|
|
|


>
|
|

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

FORTH
⚪
net2o GUI
wrong passphrase!
Enter passphrase to unlock
Create new ID
Enter new passphrase
Enter new passphrase again
Nick+Pet
Pubkey
Key date
My key
My groups
My peers
Post
Chat Log
Send

Changes to lang/zh.

8
9
10
11
12
13
14

15
16
再次输入新的密码
昵称
公钥
关键签名日期
我的钥匙
我的集团
我的朋友

聊天记录
发送







>


8
9
10
11
12
13
14
15
16
17
再次输入新的密码
昵称
公钥
关键签名日期
我的钥匙
我的集团
我的朋友
贴子
聊天记录
发送