Fossil SCM

Merged mjanssen's timeline updates

jnc 2007-09-24 23:58 trunk merge
Commit 798a48ee468a15085a89f636977ea49379dde8b7
Parent b8cc22ebdf58e37…
3 files changed +1 -1 +2 +2
~ src/timeline.c ~ tools/fossil_chat.tcl ~ tools/fossil_chat.tcl
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -443,11 +443,11 @@
443443
 const char *timeline_query_for_tty(void){
444444
 static const char zBaseSql[] =
445445
 @ SELECT
446446
 @ blob.rid,
447447
 @ uuid,
448
- @ datetime(event.mtime,'utc'),
448
+ @ datetime(event.mtime,'localtime'),
449449
 @ coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')',
450450
 @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
451451
 @ (SELECT count(*) FROM plink WHERE cid=blob.rid)
452452
 @ FROM event, blob
453453
 @ WHERE blob.rid=event.objid
454454
--- src/timeline.c
+++ src/timeline.c
@@ -443,11 +443,11 @@
443 const char *timeline_query_for_tty(void){
444 static const char zBaseSql[] =
445 @ SELECT
446 @ blob.rid,
447 @ uuid,
448 @ datetime(event.mtime,'utc'),
449 @ coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')',
450 @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
451 @ (SELECT count(*) FROM plink WHERE cid=blob.rid)
452 @ FROM event, blob
453 @ WHERE blob.rid=event.objid
454
--- src/timeline.c
+++ src/timeline.c
@@ -443,11 +443,11 @@
443 const char *timeline_query_for_tty(void){
444 static const char zBaseSql[] =
445 @ SELECT
446 @ blob.rid,
447 @ uuid,
448 @ datetime(event.mtime,'localtime'),
449 @ coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')',
450 @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
451 @ (SELECT count(*) FROM plink WHERE cid=blob.rid)
452 @ FROM event, blob
453 @ WHERE blob.rid=event.objid
454
M tools/fossil_chat.tcl
+2
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -219,14 +219,16 @@
219219
 } elseif {$cmd=="message"||$cmd=="private_message"} {
220220
 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
221221
 set from [lindex $line 1]
222222
 .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
223223
 .msg.t see end
224
+ set current_focus [focus]
224225
 bell
225226
 wm deiconify .
226227
 update
227228
 raise .
229
+ focus $current_focus
228230
 } elseif {$cmd=="noop"} {
229231
 # do nothing
230232
 } elseif {$cmd=="meta"} {
231233
 set now [clock seconds]
232234
 set time [clock format $now -format {%H:%M} -gmt 1]
233235
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -219,14 +219,16 @@
219 } elseif {$cmd=="message"||$cmd=="private_message"} {
220 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
221 set from [lindex $line 1]
222 .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
223 .msg.t see end
 
224 bell
225 wm deiconify .
226 update
227 raise .
 
228 } elseif {$cmd=="noop"} {
229 # do nothing
230 } elseif {$cmd=="meta"} {
231 set now [clock seconds]
232 set time [clock format $now -format {%H:%M} -gmt 1]
233
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -219,14 +219,16 @@
219 } elseif {$cmd=="message"||$cmd=="private_message"} {
220 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
221 set from [lindex $line 1]
222 .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
223 .msg.t see end
224 set current_focus [focus]
225 bell
226 wm deiconify .
227 update
228 raise .
229 focus $current_focus
230 } elseif {$cmd=="noop"} {
231 # do nothing
232 } elseif {$cmd=="meta"} {
233 set now [clock seconds]
234 set time [clock format $now -format {%H:%M} -gmt 1]
235
M tools/fossil_chat.tcl
+2
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -219,14 +219,16 @@
219219
 } elseif {$cmd=="message"||$cmd=="private_message"} {
220220
 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
221221
 set from [lindex $line 1]
222222
 .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
223223
 .msg.t see end
224
+ set current_focus [focus]
224225
 bell
225226
 wm deiconify .
226227
 update
227228
 raise .
229
+ focus $current_focus
228230
 } elseif {$cmd=="noop"} {
229231
 # do nothing
230232
 } elseif {$cmd=="meta"} {
231233
 set now [clock seconds]
232234
 set time [clock format $now -format {%H:%M} -gmt 1]
233235
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -219,14 +219,16 @@
219 } elseif {$cmd=="message"||$cmd=="private_message"} {
220 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
221 set from [lindex $line 1]
222 .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
223 .msg.t see end
 
224 bell
225 wm deiconify .
226 update
227 raise .
 
228 } elseif {$cmd=="noop"} {
229 # do nothing
230 } elseif {$cmd=="meta"} {
231 set now [clock seconds]
232 set time [clock format $now -format {%H:%M} -gmt 1]
233
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -219,14 +219,16 @@
219 } elseif {$cmd=="message"||$cmd=="private_message"} {
220 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
221 set from [lindex $line 1]
222 .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
223 .msg.t see end
224 set current_focus [focus]
225 bell
226 wm deiconify .
227 update
228 raise .
229 focus $current_focus
230 } elseif {$cmd=="noop"} {
231 # do nothing
232 } elseif {$cmd=="meta"} {
233 set now [clock seconds]
234 set time [clock format $now -format {%H:%M} -gmt 1]
235

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button