1.1 --- a/Client/MainForm.cs	Sat Dec 26 17:43:41 2015 +0100
     1.2 +++ b/Client/MainForm.cs	Sat Dec 26 23:27:55 2015 +0100
     1.3 @@ -52,7 +52,7 @@
     1.4          {
     1.5              InitializeComponent();
     1.6              Alignment = ContentAlignment.MiddleLeft;
     1.7 -            iTextFieldTop = new TextField(0);
     1.8 +            iTextFieldTop = new TextField();
     1.9          }
    1.10  
    1.11          public void OnCloseOrder()
    1.12 @@ -212,8 +212,8 @@
    1.13  			//Set our fields
    1.14  			iClient.CreateFields(new DataField[]
    1.15              {
    1.16 -                new TextField(0, textBoxTop.Text, Alignment),
    1.17 -                new TextField(1, textBoxBottom.Text, Alignment)
    1.18 +                new TextField(textBoxTop.Text, Alignment, 0, 0),
    1.19 +                new TextField(textBoxBottom.Text, Alignment, 0, 1)
    1.20              });
    1.21  
    1.22  		}
    1.23 @@ -234,10 +234,10 @@
    1.24              //Set texts
    1.25              iClient.CreateFields(new DataField[]
    1.26              {                
    1.27 -                new TextField(0, textBoxTop.Text, Alignment),
    1.28 -                new TextField(1, textBoxBottom.Text, Alignment),
    1.29 -                new TextField(2, "Third text field", Alignment),
    1.30 -                new TextField(3, "Forth text field", Alignment),
    1.31 +                new TextField(textBoxTop.Text, Alignment, 0, 0),
    1.32 +                new TextField(textBoxBottom.Text, Alignment, 0, 1),
    1.33 +                new TextField("Third text field", Alignment, 1, 0),
    1.34 +                new TextField("Forth text field", Alignment, 1, 1),
    1.35                  recording
    1.36              });
    1.37  
    1.38 @@ -260,7 +260,7 @@
    1.39                  graphics.DrawLine(blackPen, x1, y2, x2, y1);
    1.40              }
    1.41  
    1.42 -            DataField field = new BitmapField(0, bitmap);
    1.43 +            DataField field = new BitmapField(bitmap);
    1.44              //field.ColumnSpan = 2;
    1.45              iClient.SetField(field);
    1.46          }
    1.47 @@ -301,16 +301,15 @@
    1.48              }
    1.49  
    1.50              //Create a bitmap field from the bitmap we just created
    1.51 -            BitmapField field = new BitmapField(0, bitmap);
    1.52              //We want our bitmap field to span across two rows
    1.53 -            field.RowSpan = 2;
    1.54 -
    1.55 +            BitmapField bitmapField = new BitmapField(bitmap, 0, 0, 1, 2);
    1.56 +            
    1.57              //Set texts
    1.58              iClient.CreateFields(new DataField[]
    1.59              {
    1.60 -                field,
    1.61 -                new TextField(1, textBoxTop.Text, Alignment),
    1.62 -                new TextField(2, textBoxBottom.Text, Alignment)
    1.63 +                bitmapField,
    1.64 +                new TextField(textBoxTop.Text, Alignment, 1, 0),
    1.65 +                new TextField(textBoxBottom.Text, Alignment, 1, 1)
    1.66              });
    1.67  
    1.68          }
    1.69 @@ -343,21 +342,17 @@
    1.70              }
    1.71  
    1.72              //Create a bitmap field from the bitmap we just created
    1.73 -            DataField indicator1 = new BitmapField(2, bitmap);
    1.74 +            DataField indicator1 = new BitmapField(bitmap, 1, 0);
    1.75              //Create a bitmap field from the bitmap we just created
    1.76 -            DataField indicator2 = new BitmapField(3, bitmap);
    1.77 +            DataField indicator2 = new BitmapField(bitmap, 1, 1);
    1.78              //Create a bitmap field from the bitmap we just created
    1.79 -            DataField indicator3 = new BitmapField(4, bitmap);
    1.80 +            DataField indicator3 = new BitmapField(bitmap, 1, 2);
    1.81              //Create a bitmap field from the bitmap we just created
    1.82 -            DataField indicator4 = new BitmapField(5, bitmap);
    1.83 +            DataField indicator4 = new BitmapField(bitmap, 1, 3);
    1.84  
    1.85              //
    1.86 -            TextField textFieldTop = new TextField(0, textBoxTop.Text, Alignment);
    1.87 -            textFieldTop.RowSpan = 2;
    1.88 -
    1.89 -            TextField textFieldBottom = new TextField(1, textBoxBottom.Text, Alignment);
    1.90 -            textFieldBottom.RowSpan = 2;
    1.91 -
    1.92 +            TextField textFieldTop = new TextField(textBoxTop.Text, Alignment, 0, 0, 1, 2);
    1.93 +            TextField textFieldBottom = new TextField(textBoxBottom.Text, Alignment, 0, 2, 1, 2);
    1.94  
    1.95              //Set texts
    1.96              iClient.CreateFields(new DataField[]
    1.97 @@ -377,8 +372,8 @@
    1.98  
    1.99              bool res = iClient.SetFields(new DataField[]
   1.100              {
   1.101 -                new TextField(0, textBoxTop.Text, Alignment),
   1.102 -                new TextField(1, textBoxBottom.Text, Alignment)
   1.103 +                new TextField(textBoxTop.Text, Alignment,0,0),
   1.104 +                new TextField(textBoxBottom.Text, Alignment,0,1)
   1.105              });
   1.106  
   1.107              if (!res)
   1.108 @@ -397,7 +392,7 @@
   1.109  			//Set our fields
   1.110  			iClient.CreateFields(new DataField[]
   1.111              {
   1.112 -                new TextField(0, textBoxTop.Text, Alignment)
   1.113 +                new TextField(textBoxTop.Text, Alignment)
   1.114              });
   1.115  		}
   1.116      }