diff -Nru lazfuck-1.0.0/debian/bzr-builder.manifest lazfuck-1.0.0/debian/bzr-builder.manifest --- lazfuck-1.0.0/debian/bzr-builder.manifest 2017-01-02 02:01:30.000000000 +0000 +++ lazfuck-1.0.0/debian/bzr-builder.manifest 2017-06-21 15:46:39.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~80 -lp:lazfuck revid:svn-v4:8f951928-150e-425b-8e1e-bdb2ea7c2867:trunk:80 +# bzr-builder format 0.3 deb-version {debupstream}-0~81 +lp:lazfuck revid:svn-v4:8f951928-150e-425b-8e1e-bdb2ea7c2867:trunk:81 nest packaging lp:~chronoscz/lazfuck/debian-packaging debian revid:svn-v4:8f951928-150e-425b-8e1e-bdb2ea7c2867:trunk/Install/deb/debian:78 diff -Nru lazfuck-1.0.0/debian/changelog lazfuck-1.0.0/debian/changelog --- lazfuck-1.0.0/debian/changelog 2017-01-02 02:01:30.000000000 +0000 +++ lazfuck-1.0.0/debian/changelog 2017-06-21 15:46:39.000000000 +0000 @@ -1,8 +1,8 @@ -lazfuck (1.0.0-0~80~ubuntu16.10.1) yakkety; urgency=low +lazfuck (1.0.0-0~81~ubuntu16.10.1) yakkety; urgency=low * Auto build. - -- Jiří Hajda Mon, 02 Jan 2017 02:01:30 +0000 + -- Jiří Hajda Wed, 21 Jun 2017 15:46:39 +0000 lazfuck (1.0.0-0) precise; urgency=low diff -Nru lazfuck-1.0.0/Forms/UFormMain.lfm lazfuck-1.0.0/Forms/UFormMain.lfm --- lazfuck-1.0.0/Forms/UFormMain.lfm 2017-01-02 02:01:29.000000000 +0000 +++ lazfuck-1.0.0/Forms/UFormMain.lfm 2017-06-21 15:46:37.000000000 +0000 @@ -4,7 +4,7 @@ Top = 315 Width = 860 Caption = 'LazFuck' - ClientHeight = 554 + ClientHeight = 561 ClientWidth = 860 Menu = MainMenu1 OnClose = FormClose @@ -12,12 +12,12 @@ OnCreate = FormCreate OnDestroy = FormDestroy OnShow = FormShow - LCLVersion = '1.6.0.4' + LCLVersion = '1.6.4.0' WindowState = wsMaximized object StatusBarMain: TStatusBar Left = 0 Height = 28 - Top = 526 + Top = 533 Width = 860 Panels = < item @@ -130,7 +130,7 @@ end object PageControlRight: TPageControl Left = 467 - Height = 500 + Height = 507 Top = 26 Width = 393 ActivePage = TabSheetDebug @@ -140,13 +140,13 @@ TabPosition = tpRight object TabSheetDebug: TTabSheet Caption = 'Debug' - ClientHeight = 494 - ClientWidth = 319 + ClientHeight = 499 + ClientWidth = 359 object PanelInput: TPanel Left = 0 Height = 64 Top = 0 - Width = 319 + Width = 359 Align = alTop BevelOuter = bvNone TabOrder = 0 @@ -156,7 +156,7 @@ Left = 0 Height = 5 Top = 64 - Width = 319 + Width = 359 Align = alTop ResizeAnchor = akTop end @@ -164,7 +164,7 @@ Left = 0 Height = 259 Top = 69 - Width = 319 + Width = 359 Align = alTop BevelOuter = bvNone TabOrder = 2 @@ -174,7 +174,7 @@ Left = 0 Height = 5 Top = 328 - Width = 319 + Width = 359 Align = alTop ResizeAnchor = akTop end @@ -182,7 +182,7 @@ Left = 0 Height = 86 Top = 333 - Width = 319 + Width = 359 Align = alTop BevelOuter = bvNone TabOrder = 4 @@ -192,15 +192,15 @@ Left = 0 Height = 5 Top = 419 - Width = 319 + Width = 359 Align = alTop ResizeAnchor = akTop end object PanelMemory: TPanel Left = 0 - Height = 70 + Height = 75 Top = 424 - Width = 319 + Width = 359 Align = alClient BevelOuter = bvNone TabOrder = 6 @@ -209,7 +209,7 @@ end object Splitter1: TSplitter Left = 462 - Height = 500 + Height = 507 Top = 26 Width = 5 Align = alRight @@ -217,17 +217,17 @@ end object PanelLeft: TPanel Left = 0 - Height = 500 + Height = 507 Top = 26 Width = 462 Align = alClient BevelOuter = bvNone - ClientHeight = 500 + ClientHeight = 507 ClientWidth = 462 TabOrder = 4 object PageControlMain: TPageControl Left = 0 - Height = 377 + Height = 384 Top = 0 Width = 462 ActivePage = TabSheetSource @@ -245,7 +245,7 @@ object PageControlBottom: TPageControl Left = 0 Height = 118 - Top = 382 + Top = 389 Width = 462 ActivePage = TabSheetMessages Align = alBottom @@ -260,7 +260,7 @@ Cursor = crVSplit Left = 0 Height = 5 - Top = 377 + Top = 384 Width = 462 Align = alBottom ResizeAnchor = akBottom diff -Nru lazfuck-1.0.0/Forms/UFormMain.lrt lazfuck-1.0.0/Forms/UFormMain.lrt --- lazfuck-1.0.0/Forms/UFormMain.lrt 2017-01-02 02:01:29.000000000 +0000 +++ lazfuck-1.0.0/Forms/UFormMain.lrt 2017-06-21 15:46:37.000000000 +0000 @@ -1,39 +1,39 @@ -TFORMMAIN.CAPTION=LazFuck -TFORMMAIN.TOOLBUTTONTARGET.HINT=Target select -TFORMMAIN.TOOLBUTTONTARGET.CAPTION=Target select -TFORMMAIN.TABSHEETDEBUG.CAPTION=Debug -TFORMMAIN.TABSHEETSOURCE.CAPTION=Source code -TFORMMAIN.TABSHEETTARGET.CAPTION=Target code -TFORMMAIN.TABSHEETMESSAGES.CAPTION=Messages -TFORMMAIN.MENUITEM1.CAPTION=Project -TFORMMAIN.MENUITEMOPENRECENT.CAPTION=Open recent -TFORMMAIN.MENUITEM5.CAPTION=- -TFORMMAIN.MENUITEM9.CAPTION=Program -TFORMMAIN.MENUITEMTARGET.CAPTION=Target -TFORMMAIN.MENUITEM17.CAPTION=- -TFORMMAIN.MENUITEM24.CAPTION=Tools -TFORMMAIN.MENUITEM18.CAPTION=View -TFORMMAIN.MENUITEM10.CAPTION=Help -TFORMMAIN.APROJECTOPEN.CAPTION=Open -TFORMMAIN.APROJECTSAVE.CAPTION=Save -TFORMMAIN.APROJECTCLOSE.CAPTION=Close -TFORMMAIN.APROJECTSAVEAS.CAPTION=Save as... -TFORMMAIN.APROJECTNEW.CAPTION=New -TFORMMAIN.AEXIT.CAPTION=Exit -TFORMMAIN.APROGRAMCOMPILE.CAPTION=Compile -TFORMMAIN.APROGRAMRUN.CAPTION=Run -TFORMMAIN.AABOUT.CAPTION=About -TFORMMAIN.AHELP.CAPTION=Help -TFORMMAIN.APROGRAMPAUSE.CAPTION=Pause -TFORMMAIN.APROGRAMSTOP.CAPTION=Stop -TFORMMAIN.APROGRAMSTEPINTO.CAPTION=Step into -TFORMMAIN.APROGRAMSTEPOVER.CAPTION=Step over -TFORMMAIN.APROGRAMRUNTOCURSOR.CAPTION=Run to cursor -TFORMMAIN.APROGRAMSTEPOUT.CAPTION=Step out -TFORMMAIN.ABREAKPOINTTOGGLE.CAPTION=Toggle breakpoint -TFORMMAIN.AOPTIONS.CAPTION=Options -TFORMMAIN.AVIEWCOMPILERS.CAPTION=Compilers -TFORMMAIN.ASHOWTARGETPOSITION.CAPTION=Show position in target -TFORMMAIN.ASHOWSOURCEPOSITION.CAPTION=Show position in source -TFORMMAIN.APROGRAMSHOWEXECUTIONPOINT.CAPTION=Show execution point -TFORMMAIN.AVIEWLOG.CAPTION=Log +TFORMMAIN.CAPTION=LazFuck +TFORMMAIN.TOOLBUTTONTARGET.HINT=Target select +TFORMMAIN.TOOLBUTTONTARGET.CAPTION=Target select +TFORMMAIN.TABSHEETDEBUG.CAPTION=Debug +TFORMMAIN.TABSHEETSOURCE.CAPTION=Source code +TFORMMAIN.TABSHEETTARGET.CAPTION=Target code +TFORMMAIN.TABSHEETMESSAGES.CAPTION=Messages +TFORMMAIN.MENUITEM1.CAPTION=Project +TFORMMAIN.MENUITEMOPENRECENT.CAPTION=Open recent +TFORMMAIN.MENUITEM5.CAPTION=- +TFORMMAIN.MENUITEM9.CAPTION=Program +TFORMMAIN.MENUITEMTARGET.CAPTION=Target +TFORMMAIN.MENUITEM17.CAPTION=- +TFORMMAIN.MENUITEM24.CAPTION=Tools +TFORMMAIN.MENUITEM18.CAPTION=View +TFORMMAIN.MENUITEM10.CAPTION=Help +TFORMMAIN.APROJECTOPEN.CAPTION=Open +TFORMMAIN.APROJECTSAVE.CAPTION=Save +TFORMMAIN.APROJECTCLOSE.CAPTION=Close +TFORMMAIN.APROJECTSAVEAS.CAPTION=Save as... +TFORMMAIN.APROJECTNEW.CAPTION=New +TFORMMAIN.AEXIT.CAPTION=Exit +TFORMMAIN.APROGRAMCOMPILE.CAPTION=Compile +TFORMMAIN.APROGRAMRUN.CAPTION=Run +TFORMMAIN.AABOUT.CAPTION=About +TFORMMAIN.AHELP.CAPTION=Help +TFORMMAIN.APROGRAMPAUSE.CAPTION=Pause +TFORMMAIN.APROGRAMSTOP.CAPTION=Stop +TFORMMAIN.APROGRAMSTEPINTO.CAPTION=Step into +TFORMMAIN.APROGRAMSTEPOVER.CAPTION=Step over +TFORMMAIN.APROGRAMRUNTOCURSOR.CAPTION=Run to cursor +TFORMMAIN.APROGRAMSTEPOUT.CAPTION=Step out +TFORMMAIN.ABREAKPOINTTOGGLE.CAPTION=Toggle breakpoint +TFORMMAIN.AOPTIONS.CAPTION=Options +TFORMMAIN.AVIEWCOMPILERS.CAPTION=Compilers +TFORMMAIN.ASHOWTARGETPOSITION.CAPTION=Show position in target +TFORMMAIN.ASHOWSOURCEPOSITION.CAPTION=Show position in source +TFORMMAIN.APROGRAMSHOWEXECUTIONPOINT.CAPTION=Show execution point +TFORMMAIN.AVIEWLOG.CAPTION=Log diff -Nru lazfuck-1.0.0/Forms/UFormMain.pas lazfuck-1.0.0/Forms/UFormMain.pas --- lazfuck-1.0.0/Forms/UFormMain.pas 2017-01-02 02:01:29.000000000 +0000 +++ lazfuck-1.0.0/Forms/UFormMain.pas 2017-06-21 15:46:37.000000000 +0000 @@ -206,7 +206,7 @@ UpdateToolBarHints; UpdateTargetList; DockInit; - Core.PersistentForm1.Load(Self); + Core.PersistentForm1.Load(Self, wsMaximized); end; procedure TFormMain.TimerRefreshTimer(Sender: TObject); diff -Nru lazfuck-1.0.0/LazFuck.lpi lazfuck-1.0.0/LazFuck.lpi --- lazfuck-1.0.0/LazFuck.lpi 2017-01-02 02:01:29.000000000 +0000 +++ lazfuck-1.0.0/LazFuck.lpi 2017-06-21 15:46:37.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru lazfuck-1.0.0/Packages/Common/UPersistentForm.pas lazfuck-1.0.0/Packages/Common/UPersistentForm.pas --- lazfuck-1.0.0/Packages/Common/UPersistentForm.pas 2017-01-02 02:01:29.000000000 +0000 +++ lazfuck-1.0.0/Packages/Common/UPersistentForm.pas 2017-06-21 15:46:37.000000000 +0000 @@ -25,11 +25,12 @@ FormRestoredSize: TRect; FormWindowState: TWindowState; Form: TForm; + DefaultFormWindowState: TWindowState; procedure LoadFromRegistry(RegistryContext: TRegistryContext); procedure SaveToRegistry(RegistryContext: TRegistryContext); function CheckEntireVisible(Rect: TRect): TRect; function CheckPartVisible(Rect: TRect; Part: Integer): TRect; - procedure Load(Form: TForm; DefaultMaximized: Boolean = False); + procedure Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal); procedure Save(Form: TForm); constructor Create(AOwner: TComponent); override; property RegistryContext: TRegistryContext read FRegistryContext @@ -55,7 +56,6 @@ var I: Integer; WinControl: TWinControl; - Count: Integer; begin if Control is TListView then begin with Form, TRegistryEx.Create do @@ -134,7 +134,7 @@ FormRestoredSize.Bottom := ReadIntegerWithDefault('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top) + FormRestoredSize.Top; // Other state - FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal))); + FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(DefaultFormWindowState))); finally Free; end; @@ -215,11 +215,11 @@ end; end; -procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False); -var - LoadDefaults: Boolean; +procedure TPersistentForm.Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal); begin Self.Form := Form; + Self.DefaultFormWindowState := DefaultFormWindowState; + // Set default FormNormalSize := Bounds((Screen.Width - Form.Width) div 2, (Screen.Height - Form.Height) div 2, Form.Width, Form.Height); @@ -229,7 +229,7 @@ LoadFromRegistry(RegistryContext); if not EqualRect(FormNormalSize, FormRestoredSize) or - (LoadDefaults and DefaultMaximized) then begin + (FormWindowState = wsMaximized) then begin // Restore to maximized state Form.WindowState := wsNormal; if not EqualRect(FormRestoredSize, Form.BoundsRect) then diff -Nru lazfuck-1.0.0/UCore.pas lazfuck-1.0.0/UCore.pas --- lazfuck-1.0.0/UCore.pas 2017-01-02 02:01:29.000000000 +0000 +++ lazfuck-1.0.0/UCore.pas 2017-06-21 15:46:37.000000000 +0000 @@ -103,7 +103,7 @@ end; LastOpenedList.LoadFromRegistry(RegContext(Root, Key + '\' + RecentFilesRegKey)); Targets.LoadFromRegistry(Root, Key); - PersistentForm1.RegistryContext := RegContext(Root, Key + '\Forms'); + PersistentForm1.RegistryContext := RegContext(Root, Key); end; procedure TCore.SaveToRegistry(Root: HKEY; Key: string);