Not logged in
Check-in [704f470336]

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

Overview
Comment:Fixed some details for windows
Timelines: family | ancestors | descendants | both | trunk | release_8.1
Files: files | file ages | folders
SHA1: 704f470336cce7740f06b2705ec048be2de2824e
User & Date: ramsan 2012-04-25 13:04:44
Context
2012-05-01
13:00
* Fixed details in isearch and replace check-in: d6124672c2 user: ramsan tags: trunk
2012-04-25
13:04
Fixed some details for windows check-in: 704f470336 user: ramsan tags: trunk, release_8.1
11:17
Changes for version 8.1 Windows check-in: c9c88a87c6 user: ramsan tags: trunk
Changes

Changes to install/makefile.tcl.

172
173
174
175
176
177
178
179

180
181
182
183
184
185
186
	    set dir $topdir
	    set ico addons/ramdebugger.ico
	    set filesFT [list [list [give_package_dir commR] addons/commR .tcl] \
		    [list $topdir/Examples Examples .tcl]]
	}
	"vcs-ramdebugger" {
	    set file0 cvshandle.tcl
	    set files [list HelperWindows.tcl Images.tcl mini_compass_utils.tcl tclIndex ../help]

	    set dir $topdir/scripts
	    set ico ../addons/ramdebugger.ico
	    set filesFT ""
	}
	default {
	    error "error. program_name=$program_name"
	}







|
>







172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
	    set dir $topdir
	    set ico addons/ramdebugger.ico
	    set filesFT [list [list [give_package_dir commR] addons/commR .tcl] \
		    [list $topdir/Examples Examples .tcl]]
	}
	"vcs-ramdebugger" {
	    set file0 cvshandle.tcl
	    set files [list HelperWindows.tcl Images.tcl mini_compass_utils.tcl tclIndex ../help \
		    ../addons/tkcvs]
	    set dir $topdir/scripts
	    set ico ../addons/ramdebugger.ico
	    set filesFT ""
	}
	default {
	    error "error. program_name=$program_name"
	}

Changes to scripts/cvshandle.tcl.

2548
2549
2550
2551
2552
2553
2554

2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
....
2797
2798
2799
2800
2801
2802
2803

2804
2805
2806

2807
2808
2809

2810
2811

2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
		                }
		                if { !$found } {
		                    release_cwd
		                    snit_messageBox -message [_ "Could not find version to compare"] -parent $w
		                    return
		                }
		                set c [string range $checkin 0 9]

		                exec $fossil artifact $artifact $file.$c.$date
		                
		                if { [winfo screenheight .] > 500 } {
		                    set y [expr {[winfo screenheight .]-500+$num_open*40}]
		                    if { $y > [winfo screenheight .] - 100 } {
		                        set y [expr {[winfo screenheight .] - 100}]
		                    }
		                    set geom_opt [list -geometry 80x20+0+$y]
		                } else {
		                    set geom_opt ""
		                }
		                set err [catch { open_program -new_interp 1 tkdiff {*}$geom_opt {*}$ignore_blanks \
		                            $file $file.$c.$date } ret]
		                if { $err } {
		                    lappend errList $ret
		                } else {
		                    incr num_open
		                }
		                file delete -force $file.$c.$date
		            }
		        }
		    }
		    if { [llength $errList] } {
		        if { [llength $errList] > 5 } {
		            set errstr "[join [range $errList 0 4] ,]...[_ {More errors}]"
		        } else {
................................................................................
		snit_messageBox -message [_ "Select only one or two versions"] \
		    -parent $wD
	    } else {
		lassign [lindex $selecteditems 0] date1 checkin1 - - artifact1
		set c1 [string range $checkin1 0 9]
		get_cwd
		cd $dir

		exec $fossil artifact $artifact1 $file.$c1.$date1
		if { [llength $selecteditems] == 1 } {
		    set err [catch { open_program -new_interp 1 tkdiff {*}$ignore_blanks $file $file.$c1.$date1 } ret]

		} else {
		    lassign [lindex $selecteditems 1] date2 checkin2 - - artifact2
		    set c2 [string range $checkin2 0 9]

		    exec $fossil artifact $artifact2 $file.$c2.$date2
		    set err [catch { open_program -new_interp 1 tkdiff {*}$ignore_blanks $file.$c1.$date1 $file.$c2.$date2 } ret]

		}
		if { $err } {
		    snit_messageBox -message $ret -parent $wD
		}
		file delete -force $file.$c1.$date1
		if { [llength $selecteditems] == 2 } {
		    file delete -force $file.$c2.$date2
		}
		release_cwd
	    }
	}
	default {
	    error "error in update_recursive_cmd"
	}







>
|











|





|







 







>
|

|
>



>
|
|
>




|

|







2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
....
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
		                }
		                if { !$found } {
		                    release_cwd
		                    snit_messageBox -message [_ "Could not find version to compare"] -parent $w
		                    return
		                }
		                set c [string range $checkin 0 9]
		                set afile [cu::file::correct_name $file.$c.$date]
		                exec $fossil artifact $artifact $afile
		                
		                if { [winfo screenheight .] > 500 } {
		                    set y [expr {[winfo screenheight .]-500+$num_open*40}]
		                    if { $y > [winfo screenheight .] - 100 } {
		                        set y [expr {[winfo screenheight .] - 100}]
		                    }
		                    set geom_opt [list -geometry 80x20+0+$y]
		                } else {
		                    set geom_opt ""
		                }
		                set err [catch { open_program -new_interp 1 tkdiff {*}$geom_opt {*}$ignore_blanks \
		                            $file $afile } ret]
		                if { $err } {
		                    lappend errList $ret
		                } else {
		                    incr num_open
		                }
		                file delete -force $afile
		            }
		        }
		    }
		    if { [llength $errList] } {
		        if { [llength $errList] > 5 } {
		            set errstr "[join [range $errList 0 4] ,]...[_ {More errors}]"
		        } else {
................................................................................
		snit_messageBox -message [_ "Select only one or two versions"] \
		    -parent $wD
	    } else {
		lassign [lindex $selecteditems 0] date1 checkin1 - - artifact1
		set c1 [string range $checkin1 0 9]
		get_cwd
		cd $dir
		set afile1 [cu::file::correct_name $file.$c1.$date1]
		exec $fossil artifact $artifact1 $afile1
		if { [llength $selecteditems] == 1 } {
		    set err [catch { open_program -new_interp 1 tkdiff {*}$ignore_blanks \
		                $file $afile1 } ret]
		} else {
		    lassign [lindex $selecteditems 1] date2 checkin2 - - artifact2
		    set c2 [string range $checkin2 0 9]
		    set afile2 [cu::file::correct_name $file.$c2.$date2]
		    exec $fossil artifact $artifact2 $afile2
		    set err [catch { open_program -new_interp 1 tkdiff {*}$ignore_blanks \
		                $afile1 $afile2 } ret]
		}
		if { $err } {
		    snit_messageBox -message $ret -parent $wD
		}
		file delete -force $afile1
		if { [llength $selecteditems] == 2 } {
		    file delete -force $afile2
		}
		release_cwd
	    }
	}
	default {
	    error "error in update_recursive_cmd"
	}

Changes to scripts/mini_compass_utils.tcl.

993
994
995
996
997
998
999







1000
1001
1002
1003
1004
1005
1006
		if { $pattern ne "" && $cmd eq "grep -i $pattern" } { continue }
		lappend retList [list $cmd $pid $stime "$cputime ($pcpu)" $size]
	    }
	    return $retList
	}
    }
}








proc cu::file::execute { args } {
    
    set optional {
	{ -workdir directory "" }
	{ -wait boolean 0 }
	{ -hide_window boolean 0 }







>
>
>
>
>
>
>







993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
		if { $pattern ne "" && $cmd eq "grep -i $pattern" } { continue }
		lappend retList [list $cmd $pid $stime "$cputime ($pcpu)" $size]
	    }
	    return $retList
	}
    }
}

proc cu::file::correct_name { file } {
    if { $::tcl_platform(platform) eq "windows" } {
	regsub -all {[:*?""<>|]} $file {_} file
    }
    return [string trim $file]
}

proc cu::file::execute { args } {
    
    set optional {
	{ -workdir directory "" }
	{ -wait boolean 0 }
	{ -hide_window boolean 0 }