--- dao/DelphiScanner/Main.dfm 2016/06/27 11:53:04 3054 +++ dao/DelphiScanner/Main.dfm 2016/08/23 14:08:44 3107 @@ -2,8 +2,8 @@ Left = 300 Top = 131 Caption = 'Scanning af pakker' - ClientHeight = 858 - ClientWidth = 1000 + ClientHeight = 883 + ClientWidth = 1065 Color = clBtnFace Constraints.MinHeight = 750 Constraints.MinWidth = 1000 @@ -3628,8 +3628,8 @@ OnDestroy = FormDestroy OnKeyPress = FormKeyPress DesignSize = ( - 1000 - 858) + 1065 + 883) PixelsPerInch = 96 TextHeight = 19 object Image1: TImage @@ -3968,8 +3968,8 @@ end object ListBox1: TListBox Left = 8 - Top = 430 - Width = 874 + Top = 486 + Width = 939 Height = 163 Hint = 'Log vindue viser handlinger og meddelelser fra programmet' Style = lbOwnerDrawFixed @@ -3979,7 +3979,7 @@ OnDrawItem = ListBox1DrawItem end object BtnDownloadKontrolfil: TButton - Left = 904 + Left = 969 Top = 484 Width = 88 Height = 47 @@ -3993,9 +3993,9 @@ end object ListBox2: TListBox Left = 8 - Top = 600 - Width = 874 - Height = 237 + Top = 655 + Width = 939 + Height = 225 Hint = 'Status vindue viser hvad der endnu ikke er scannet' Style = lbOwnerDrawFixed Anchors = [akLeft, akTop, akRight, akBottom] @@ -4004,8 +4004,8 @@ OnDrawItem = ListBox1DrawItem end object BtnOpdaterListen: TButton - Left = 904 - Top = 793 + Left = 969 + Top = 833 Width = 88 Height = 47 Hint = 'Henter oplysning om de pakker der endnu ikke er scannet modtaget' @@ -4017,7 +4017,7 @@ OnClick = BtnOpdaterListenClick end object BtnUploadLogfil: TButton - Left = 904 + Left = 969 Top = 430 Width = 88 Height = 47 @@ -4030,7 +4030,7 @@ OnClick = BtnUploadLogfilClick end object BtnDownloadRuteskiftFil: TButton - Left = 904 + Left = 969 Top = 537 Width = 88 Height = 47 @@ -4063,8 +4063,8 @@ OnClick = chkAltidPrintLabelClick end object BtnEKLoverforsel: TButton - Left = 905 - Top = 740 + Left = 969 + Top = 780 Width = 88 Height = 47 Hint = 'Overf'#248'r de scannede pakker til EKL systemet' @@ -4090,17 +4090,18 @@ TabOrder = 18 end object chkScanTjekkode: TCheckBox - Left = 24 - Top = 365 + Left = 64 + Top = 537 Width = 353 Height = 26 Hint = 'Markeres n'#229'r der ogs'#229' skal scannes en tjekkode label' Caption = 'Scan ogs'#229' tjekkoden' TabOrder = 19 + Visible = False OnClick = chkScanTjekkodeClick end object PanelValgA: TPanel - Left = 807 + Left = 872 Top = 7 Width = 185 Height = 41 @@ -4113,7 +4114,7 @@ OnClick = PanelValgAClick end object PanelValg1: TPanel - Left = 807 + Left = 872 Top = 59 Width = 185 Height = 41 @@ -4128,7 +4129,7 @@ OnClick = PanelValg1Click end object PanelValg2: TPanel - Left = 807 + Left = 872 Top = 100 Width = 185 Height = 41 @@ -4143,7 +4144,7 @@ OnClick = PanelValg2Click end object PanelValg3: TPanel - Left = 807 + Left = 872 Top = 143 Width = 185 Height = 41 @@ -4158,7 +4159,7 @@ OnClick = PanelValg3Click end object PanelValg4: TPanel - Left = 807 + Left = 872 Top = 196 Width = 185 Height = 41 @@ -4171,7 +4172,7 @@ OnClick = PanelValg4Click end object PanelValg5: TPanel - Left = 807 + Left = 872 Top = 249 Width = 185 Height = 41 @@ -4184,7 +4185,7 @@ OnClick = PanelValg5Click end object PanelValg6: TPanel - Left = 807 + Left = 872 Top = 291 Width = 185 Height = 41 @@ -4199,8 +4200,8 @@ OnClick = PanelValg6Click end object Button1: TButton - Left = 436 - Top = 440 + Left = 675 + Top = 435 Width = 125 Height = 38 Margins.Left = 5 @@ -4213,7 +4214,7 @@ OnClick = Button1Click end object StaticTextManglendePakker: TStaticText - Left = 528 + Left = 593 Top = 349 Width = 272 Height = 52 @@ -4233,7 +4234,7 @@ TabOrder = 27 end object PanelManglendePakker1: TPanel - Left = 953 + Left = 1018 Top = 54 Width = 46 Height = 23 @@ -4251,7 +4252,7 @@ Visible = False end object PanelManglendePakker2: TPanel - Left = 954 + Left = 1019 Top = 96 Width = 46 Height = 23 @@ -4269,7 +4270,7 @@ Visible = False end object PanelManglendePakker3: TPanel - Left = 954 + Left = 1019 Top = 137 Width = 46 Height = 23 @@ -4287,7 +4288,7 @@ Visible = False end object PanelManglendePakker4: TPanel - Left = 954 + Left = 1019 Top = 191 Width = 46 Height = 23 @@ -4305,7 +4306,7 @@ Visible = False end object PanelManglendePakker5: TPanel - Left = 954 + Left = 1019 Top = 244 Width = 46 Height = 23 @@ -4323,7 +4324,7 @@ Visible = False end object PanelManglendePakker6: TPanel - Left = 954 + Left = 1019 Top = 286 Width = 46 Height = 23 @@ -4341,7 +4342,7 @@ Visible = False end object PanelValg7: TPanel - Left = 806 + Left = 871 Top = 377 Width = 185 Height = 41 @@ -4357,20 +4358,28 @@ end object chkForstorTilDirekte: TCheckBox Left = 24 - Top = 397 - Width = 238 + Top = 374 + Width = 321 Height = 22 - Caption = 'For stor til DAO Direkte' + Caption = 'For stor til DAO Direkte (Shop/Direkte)' TabOrder = 35 end object chkEmballageRepareret: TCheckBox - Left = 268 - Top = 397 + Left = 24 + Top = 402 Width = 181 Height = 22 Caption = 'Emballage Repareret' TabOrder = 36 end + object chkUdenforSpecifikation: TCheckBox + Left = 24 + Top = 430 + Width = 254 + Height = 17 + Caption = 'Pakke over m'#229'l - returneres' + TabOrder = 37 + end object IdHTTP1: TIdHTTP AllowCookies = True ProxyParams.BasicAuthentication = False @@ -4387,22 +4396,22 @@ Request.Ranges.Units = 'bytes' Request.Ranges = <> HTTPOptions = [hoForceEncodeParams] - Left = 88 - Top = 423 + Left = 128 + Top = 703 end object XMLDocument1: TXMLDocument - Left = 200 - Top = 463 + Left = 240 + Top = 743 DOMVendorDesc = 'MSXML' end object ApplicationEvents1: TApplicationEvents OnIdle = ApplicationEvents1Idle - Left = 336 - Top = 431 + Left = 376 + Top = 711 end object MainMenu1: TMainMenu - Left = 136 - Top = 447 + Left = 176 + Top = 727 object Afslut1: TMenuItem Caption = 'Afslut' object Lukprogrammet1: TMenuItem @@ -4427,10 +4436,10 @@ Caption = 'Scan ogs'#229' tjekkoden' OnClick = Scanogstjekkoden1Click end - object Automatisktjekkodestyring1: TMenuItem + object menuAutomatiskTjekkodeStyring: TMenuItem AutoCheck = True Caption = 'Automatisk tjekkode styring' - OnClick = Automatisktjekkodestyring1Click + OnClick = menuAutomatiskTjekkodeStyringClick end object N2: TMenuItem Caption = '-' @@ -4484,19 +4493,19 @@ object N4: TMenuItem Caption = '-' end - object Storepakker1: TMenuItem + object menuStorePakker: TMenuItem AutoCheck = True Caption = 'Store pakker' GroupIndex = 1 RadioItem = True - OnClick = Storepakker1Click + OnClick = menuStorePakkerClick end - object Smpakker1: TMenuItem + object menuSmaaPakker: TMenuItem AutoCheck = True Caption = 'Sm'#229' pakker' GroupIndex = 1 RadioItem = True - OnClick = Smpakker1Click + OnClick = menuSmaaPakkerClick end end object Hjlp1: TMenuItem @@ -4559,13 +4568,13 @@ NATKeepAlive.IntervalMS = 0 ProxySettings.ProxyType = fpcmNone ProxySettings.Port = 0 - Left = 264 - Top = 431 + Left = 304 + Top = 711 end object Timer1: TTimer Interval = 60000 OnTimer = Timer1Timer - Left = 40 - Top = 431 + Left = 80 + Top = 711 end end