519. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:56:49 PM Eastern Standard 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.

519.1 Files compared

# Location File Last Modified
1 C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM\trunk\SDK\SampleCode\CS\ModernAndMobileApps\ModernOdataApp MainPage.xaml Tue Dec 20 19:51:47 2016 UTC
2 Wed Feb 1 19:56:49 2017 UTC

519.2 Comparison summary

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

519.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

519.4 Active regular expressions

No regular expressions were active.

519.5 Comparison detail

1   <Page        
2       x:Clas s="ModernO dataApp.Ma inPage"        
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: local="usi ng:ModernO dataApp"        
6       xmlns: d="http:// schemas.mi crosoft.co m/expressi on/blend/2 008"        
7       xmlns: mc="http:/ /schemas.o penxmlform ats.org/ma rkup-compa tibility/2 006"        
8       mc:Ign orable="d" >        
9          
10     <Page.Re sources>        
11          
12       <!-- C ollection  of items d isplayed b y this pag e -->        
13       <Colle ctionViewS ource        
14                x:Name=" itemsViewS ource"        
15                Source=" {Binding I tems}"/>        
16          
17       <!-- T ODO: Delet e this lin e if the k ey AppName  is declar ed in App. xaml -->        
18       <x:Str ing x:Key= "AppName"> Windows 8  CRM App</x :String>        
19       <DataT emplate x: Key="GridV iewItemTem plate">        
20         <Gri d Horizont alAlignmen t="Left" W idth="250"  Height="2 50">        
21           <B order Back ground="{S taticResou rce ListVi ewItemPlac eholderBac kgroundThe meBrush}">        
22              <Image Sou rce="{Bind ing Image} " Stretch= "UniformTo Fill" Auto mationProp erties.Nam e="{Bindin g Title}"/ >        
23           </ Border>        
24           <S tackPanel  VerticalAl ignment="B ottom" Bac kground="{ StaticReso urce ListV iewItemOve rlayBackgr oundThemeB rush}">        
25              <TextBlock  Text="{Bi nding Item Name}" For eground="{ StaticReso urce ListV iewItemOve rlaySecond aryForegro undThemeBr ush}" Styl e="{Static Resource C aptionText Style}" Te xtWrapping ="NoWrap"  Margin="15 ,0,15,10"/ >        
26           </ StackPanel >        
27         </Gr id>        
28       </Data Template>        
29     </Page.R esources>        
30          
31          
32     <Grid Ba ckground=" {StaticRes ource Appl icationPag eBackgroun dThemeBrus h}">        
33          
34           <G rid.RowDef initions>        
35                <RowDefi nition Hei ght="140"/ >        
36                <RowDefi nition Hei ght="*"/>        
37           </ Grid.RowDe finitions>        
38          
39                <Grid>        
40                    <Gri d.ColumnDe finitions>        
41                         <ColumnDef inition Wi dth="Auto" />        
42                         <ColumnDef inition Wi dth="*"/>        
43                    </Gr id.ColumnD efinitions >        
44                    <Tex tBlock x:N ame="pageT itle" Grid .Column="1 " Text="Co nnecting t o Dynamics  CRM" Marg in="50,10, 10,10" Sty le="{Stati cResource  PageHeader TextStyle} "/>        
45                </Grid>        
46          
47                <Grid x: Name="Cont entPanel"  Grid.Row=" 1" Margin= "50,10">        
48                    <Pro gressBar H eight="50"  Horizonta lAlignment ="Stretch"  Margin="0 ,1,0,0" Na me="progre ssBar" Ver ticalAlign ment="Top"  IsIndeter minate="Tr ue" Visibi lity="Coll apsed" />                       
49                </Grid>        
50       <!-- H orizontal  scrolling  grid used  in most vi ew states  -->        
51       <GridV iew        
52                x:Name=" itemGridVi ew"        
53                Automati onProperti es.Automat ionId="Ite msGridView "        
54                Automati onProperti es.Name="I tems"        
55                TabIndex ="1"        
56                Grid.Row Span="2"        
57                Padding= "116,136,1 16,46"        
58                ItemsSou rce="{Bind ing Source ={StaticRe source ite msViewSour ce}}"        
59                ItemTemp late="{Sta ticResourc e GridView ItemTempla te}"        
60                Selectio nMode="Non e"        
61                IsSwipeE nabled="fa lse"        
62                IsItemCl ickEnabled ="true"        
63                ItemClic k="itemGri dView_Item Click"        
64                />        
65          
66     </Grid>        
67          
68     <Page.Bo ttomAppBar >        
69       <AppBa r x:Name=" UserPrefer ences">        
70         <Sta ckPanel Or ientation= "Horizonta l" Horizon talAlignme nt="Left">        
71           <B utton Cont ent="Tasks " Horizont alAlignmen t="Right"  />        
72         </St ackPanel>        
73       </AppB ar>        
74     </Page.B ottomAppBa r>        
75          
76   </Page>        

Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.