15047. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 8/19/2017 8:20:22 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

15047.1 Files compared

# Location File Last Modified
1 OSCIF_VSE_v1.3.2_SD_5_3_671.zip\ClinSchd\Desktop\ClinSchd.Modules.Ribbon\Views UserPreferencesV.xaml Thu Jun 22 16:59:16 2017 UTC
2 OSCIF_VSE_v1.3.2_SD_5_3_671.zip\ClinSchd\Desktop\ClinSchd.Modules.Ribbon\Views UserPreferencesV.xaml Sat Aug 19 14:50:41 2017 UTC

15047.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 182
Changed 1 2
Inserted 0 0
Removed 0 0

15047.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

15047.4 Active regular expressions

No regular expressions were active.

15047.5 Comparison detail

  1   <models:Ba seDialogVi ew
  2       x:Clas s="ClinSch d.Modules. Ribbon.Vie ws.UserPre ferencesV"
  3       xmlns= "http://sc hemas.micr osoft.com/ winfx/2006 /xaml/pres entation"
  4       xmlns: x="http:// schemas.mi crosoft.co m/winfx/20 06/xaml"
  5       xmlns: mc="http:/ /schemas.o penxmlform ats.org/ma rkup-compa tibility/2 006"
  6       xmlns: d="http:// schemas.mi crosoft.co m/expressi on/blend/2 008"
  7       xmlns: telerik="h ttp://sche mas.teleri k.com/2008 /xaml/pres entation"
  8       xmlns: models="cl r-namespac e:ClinSchd .Infrastru cture.Mode ls;assembl y=ClinSchd .Infrastru cture"
  9       mc:Ign orable="d"
  10       Title= "{Binding  Title}"
  11       SizeTo Content="W idthAndHei ght" Loade d="BaseDia logView_Lo aded"
  12       Previe wKeyUp="Ho tKeyHandle r"
  13       Window StartupLoc ation="Man ual"
  14       Window Style="Too lWindow"
  15       Resize Mode="NoRe size"
  16       Icon=" /ClinSchd. Modules.Ri bbon;compo nent/Resou rces/UserP referenceI con.ico">
  17  
  18       <Windo w.Resource s>
  19           <R esourceDic tionary>
  20                <Resourc eDictionar y.MergedDi ctionaries >
  21                    <Res ourceDicti onary>
  22                         <BooleanTo Visibility Converter  x:Key="Boo lToVisibil ityConvert er" />
  23                    </Re sourceDict ionary>
  24                </Resour ceDictiona ry.MergedD ictionarie s>
  25           </ ResourceDi ctionary>
  26       </Wind ow.Resourc es>
  27  
  28       <Grid  Background ="#FFA0B0C 1">
  29           <G rid.RowDef initions>
  30                <RowDefi nition Hei ght="Auto"  />
  31                <RowDefi nition Hei ght="Auto"  />
  32                <RowDefi nition />
  33           </ Grid.RowDe finitions>
  34           <S tackPanel  Grid.Row=" 0" Orienta tion="Hori zontal" Ma rgin="5">
  35                <Image S ource="../ Resources/ UserPrefer enceIcon.i co" />
  36                <TextBlo ck Margin= "8,5,5,5"  Text="Sele ct sort or der:" />
  37           </ StackPanel >
  38  
  39           <L istView Na me="Column s" Grid.Ro w="1" Item sSource="{ Binding Co lumnSettin gs}" MinHe ight="100"  Margin="5 " Selectio nMode="Sin gle" Alter nationCoun t="2" Allo wDrop="Tru e">
  40                <ListVie w.View>
  41                    <Gri dView>
  42                         <GridViewC olumn  Hea der="Colum n" Display MemberBind ing="{Bind ing Name}"  Width="14 0" />
  43  
  44                         <GridViewC olumn Head er="" Widt h="250">
  45                             <GridV iewColumn. CellTempla te>
  46                                 <D ataTemplat e>
  47                                      <StackPa nel Orient ation="Ver tical">
  48                                          <Tex tBlock Hei ght="6"/>
  49                                          <Tex tBlock Hor izontalAli gnment="Le ft" Text=" {Binding F ilterInfo} " DataCont ext="{Bind ing}" Tool Tip="{Bind ing Filter Info}" />
  50                                          <Tex tBlock Hei ght="6" />
  51                                      </StackP anel>
  52                                 </ DataTempla te>
  53                             </Grid ViewColumn .CellTempl ate>
  54                         </GridView Column>
  55  
  56                         <GridViewC olumn Head er="Filter " Width="5 0">
  57                             <GridV iewColumn. CellTempla te>
  58                                 <D ataTemplat e>
  59                                      <CheckBo x IsChecke d="{Bindin g IsFilter ed}" Margi n="9,0,0,0 " DataCont ext="{Bind ing}" Comm and="{Bind ing Filter Command}"
  60                                                 Visibili ty="{Bindi ng ShowFil terCB, Con verter={St aticResour ce BoolToV isibilityC onverter}} " />
  61                                 </ DataTempla te>
  62                             </Grid ViewColumn .CellTempl ate>
  63                         </GridView Column>
  64                          <!-- artf2 0768 : 04/ 06/2017 :  PII  : Sort co lumn remov ed until f urther not ice 
  65                         <GridViewC olumn Head er="Sort O rder"   Wi dth="60">
  66                             <GridV iewColumn. CellTempla te>
  67                                 <D ataTemplat e>
  68                                      <ComboBo x Horizont alAlignmen t="Center"  ItemsSour ce="{Bindi ng SortLis t}" Select edValue="{ Binding So rtOrder}"  Width="35"                                               
  69                                                 Horizont alContentA lignment=" Center" Da taContext= "{Binding} " Selectio nChanged=" ComboBox_S electionCh anged" />
  70                                 </ DataTempla te>
  71                             </Grid ViewColumn .CellTempl ate>
  72                         </GridView Column>
  73                         -->
  74                    </Gr idView>
  75                </ListVi ew.View>
  76           </ ListView>
  77  
  78           <! --Visibili ty="{Bindi ng ButtonN eeded, Con verter={St aticResour ce BoolToV isibilityC onverter}} "-->
  79           <G rid Grid.R ow="2" Bac kground="# FFC6DBF0">
  80                <Grid.Co lumnDefini tions>
  81                    <Col umnDefinit ion Width= "Auto" />
  82                    <Col umnDefinit ion Width= "Auto" />
  83                    <Col umnDefinit ion Width= "*" />
  84                    <Col umnDefinit ion Width= "Auto" />
  85                </Grid.C olumnDefin itions>
  86                <telerik :RadButton  Grid.Colu mn="0" Mar gin="3" Ta bIndex="30 " Horizont alAlignmen t="Center"  Width="70 " Content= "OK"     C ommand="{B inding Sav eCommand}"   Name="Ok Button" Is Default="T rue" Focus VisualStyl e="{Dynami cResource  VSEFocusVi sualStyle} " />
  87                <telerik :RadButton  Grid.Colu mn="1" Mar gin="3" Ta bIndex="31 " Horizont alAlignmen t="Center"  Width="70 " Content= "Cancel" C ommand="{B inding Clo seCommand} " Name="Ca ncelButton " IsCancel ="True" Fo cusVisualS tyle="{Dyn amicResour ce VSEFocu sVisualSty le}" />
  88                <telerik :RadButton  Grid.Colu mn="2" Mar gin="3" Ta bIndex="32 " Horizont alAlignmen t="Center"  Width="70 " Content= "Clear"  C ommand="{B inding Cle arCommand} " Name="Cl earButton"  FocusVisu alStyle="{ DynamicRes ource VSEF ocusVisual Style}" />
  89                <CheckBo x           Grid.Colu mn="3" Mar gin="3,3,8 ,3" TabInd ex="32" Co ntent="Sav e as Defau lt View" I sChecked=" {Binding S aveAsDefau ltView}" V erticalAli gnment="Ce nter" Focu sVisualSty le="{Dynam icResource  VSEFocusV isualStyle }" />
  90           </ Grid>
  91       </Grid >
  92   </models:B aseDialogV iew>