Eskil

Diff
Login

Differences From Artifact [830907cfab]:

To Artifact [5d5c1a8c8f]:


884
885
886
887
888
889
890
891

892
893
894
895
896
897

898
899
900
901
902
903
904
884
885
886
887
888
889
890

891
892
893
894
895
896

897
898
899
900
901
902
903
904







-
+





-
+







        ttk::button $win.bu -text "Up Both" -command [mymethod UpDir] \
                -underline 0
        bind $win <Alt-u> "$win.bu invoke"
        
        #catch {font delete myfont}
        #font create myfont -family $Pref(fontfamily) -size $Pref(fontsize)

        ttk::entry $win.e1 -textvariable dirdiff(leftDir)
        ttk::entryX $win.e1 -textvariable dirdiff(leftDir)
        ttk::button $win.bu1 -text "Up" -command [mymethod UpDir 1]
        ttk::button $win.bb1 -text "Browse" \
                -command "[list BrowseDir dirdiff(leftDir) $win.e1]
                          [mymethod DoDirCompare]"
        $win.e1 xview end
        ttk::entry $win.e2 -textvariable dirdiff(rightDir)
        ttk::entryX $win.e2 -textvariable dirdiff(rightDir)
        ttk::button $win.bu2 -text "Up" -command [mymethod UpDir 2]
        ttk::button $win.bb2 -text "Browse" \
                -command "[list BrowseDir dirdiff(rightDir) $win.e2]
                          [mymethod DoDirCompare]"
        $win.e2 xview end
        bind $win.e1 <Return> [mymethod DoDirCompare]
        bind $win.e2 <Return> [mymethod DoDirCompare]
1014
1015
1016
1017
1018
1019
1020
1021

1022
1023

1024
1025

1026
1027

1028
1029
1030
1031
1032
1033
1034
1014
1015
1016
1017
1018
1019
1020

1021
1022

1023
1024

1025
1026

1027
1028
1029
1030
1031
1032
1033
1034







-
+

-
+

-
+

-
+







    set opts [ttk::labelframe $top.opts -text "Options" -padding 3]
    ttk::checkbutton $opts.cb1 -variable TmpPref(dir,ignorekey) \
            -text "Ignore \$Keyword:\$"
    eval pack [winfo children $opts] -side top -anchor w 

    set filter [ttk::labelframe $top.filter -text "Filter" -padding 3]
    ttk::label $filter.l1 -text "Include Files" -anchor w
    ttk::entry $filter.e1 -width 20 -textvariable TmpPref(dir,incfiles)
    ttk::entryX $filter.e1 -width 20 -textvariable TmpPref(dir,incfiles)
    ttk::label $filter.l2 -text "Exclude Files" -anchor w
    ttk::entry $filter.e2 -width 20 -textvariable TmpPref(dir,exfiles)
    ttk::entryX $filter.e2 -width 20 -textvariable TmpPref(dir,exfiles)
    ttk::label $filter.l3 -text "Include Dirs" -anchor w
    ttk::entry $filter.e3 -width 20 -textvariable TmpPref(dir,incdirs)
    ttk::entryX $filter.e3 -width 20 -textvariable TmpPref(dir,incdirs)
    ttk::label $filter.l4 -text "Exclude Dirs" -anchor w
    ttk::entry $filter.e4 -width 20 -textvariable TmpPref(dir,exdirs)
    ttk::entryX $filter.e4 -width 20 -textvariable TmpPref(dir,exdirs)
    ttk::checkbutton $filter.cb1 -text "Only revision controlled" \
            -variable TmpPref(dir,onlyrev)
    grid $filter.l1 $filter.e1 -sticky we -padx 3 -pady 3
    grid $filter.l2 $filter.e2 -sticky we -padx 3 -pady 3
    grid $filter.l3 $filter.e3 -sticky we -padx 3 -pady 3
    grid $filter.l4 $filter.e4 -sticky we -padx 3 -pady 3
    grid $filter.cb1 - -sticky w -padx 3 -pady 3
1058
1059
1060
1061
1062
1063
1064
1065
1066


1067
1068
1069
1070
1071
1072
1073
1058
1059
1060
1061
1062
1063
1064


1065
1066
1067
1068
1069
1070
1071
1072
1073







-
-
+
+







    } else {
        destroy $top
        toplevel $top
    }

    wm title $top "Eskil Dir Preprocess"

    ttk::entry $top.e1 -textvariable ::dirdiff(pattern) -width 15
    ttk::entry $top.e2 -textvariable ::dirdiff(replace) -width 15
    ttk::entryX $top.e1 -textvariable ::dirdiff(pattern) -width 15
    ttk::entryX $top.e2 -textvariable ::dirdiff(replace) -width 15

    ttk::label $top.l1 -text "Pattern" -anchor w
    ttk::label $top.l2 -text "Subst"   -anchor w
    
    grid $top.l1 $top.e1 -sticky we
    grid $top.l2 $top.e2 -sticky we
    grid columnconfigure $top 1 -weight 1