From 44d2b2a31f179fd28e17ee89ac5751d21f65eb1a Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 29 Jun 2019 20:10:29 +0000 Subject: [PATCH] LazImageEditor: Fix compilation. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7019 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- applications/lazimageeditor/DLBitmap.pas | 2 +- .../lazimageeditor/lazimageeditor.ini | 2 +- .../lazimageeditor/lazimageeditor.lpi | 41 ++++++------------ .../lazimageeditor/lazimageeditor.res | Bin 23632 -> 24596 bytes .../lazimageeditor/resizepaperdialog.lrs | 2 - 5 files changed, 16 insertions(+), 31 deletions(-) diff --git a/applications/lazimageeditor/DLBitmap.pas b/applications/lazimageeditor/DLBitmap.pas index 4d3d913ab..2c72c9ce6 100644 --- a/applications/lazimageeditor/DLBitmap.pas +++ b/applications/lazimageeditor/DLBitmap.pas @@ -283,7 +283,7 @@ var begin oBmp := TPicture.Create; try - oBmp.LoadFromClipboardFormat(PredefinedClipboardFormat(pcfDelphiBitmap)); + oBmp.LoadFromClipboardFormat(PredefinedClipboardFormat(pcfBitmap)); Width := oBmp.Width; Height := oBmp.Height; Canvas.Draw(0, 0, oBmp.Graphic); diff --git a/applications/lazimageeditor/lazimageeditor.ini b/applications/lazimageeditor/lazimageeditor.ini index 3ed8894cf..d5446b872 100644 --- a/applications/lazimageeditor/lazimageeditor.ini +++ b/applications/lazimageeditor/lazimageeditor.ini @@ -2,4 +2,4 @@ Language=0 [UNIX] -MyDirectory=T:\ImageEditor\ +MyDirectory=D:\Prog_Lazarus\svn\lazarus-ccr\applications\lazimageeditor\ diff --git a/applications/lazimageeditor/lazimageeditor.lpi b/applications/lazimageeditor/lazimageeditor.lpi index 13acc15ff..ad07c2cce 100644 --- a/applications/lazimageeditor/lazimageeditor.lpi +++ b/applications/lazimageeditor/lazimageeditor.lpi @@ -1,11 +1,13 @@ - + - + + + + - <ResourceType Value="res"/> <UseXPManifest Value="True"/> @@ -14,9 +16,6 @@ <i18n> <EnableI18N LFM="False"/> </i18n> - <VersionInfo> - <StringTable ProductVersion=""/> - </VersionInfo> <BuildModes Count="2"> <Item1 Name="Debug" Default="True"/> <Item2 Name="Release"> @@ -43,25 +42,24 @@ </Win32> </Options> </Linking> - <Other> - <CompilerMessages> - <UseMsgFile Value="True"/> - </CompilerMessages> - <CompilerPath Value="$(CompPath)"/> - </Other> </CompilerOptions> </Item2> </BuildModes> <PublishOptions> <Version Value="2"/> - <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> - <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/> </PublishOptions> <RunParams> <local> - <FormatVersion Value="1"/> - <LaunchingApplication PathPlusParams="\usr\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="\usr\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> </local> + <FormatVersion Value="2"/> + <Modes Count="1"> + <Mode0 Name="default"> + <local> + <LaunchingApplication PathPlusParams="\usr\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> + </local> + </Mode0> + </Modes> </RunParams> <RequiredPackages Count="3"> <Item1> @@ -80,7 +78,6 @@ <Unit0> <Filename Value="lazimageeditor.pas"/> <IsPartOfProject Value="True"/> - <UnitName Value="lazimageeditor"/> </Unit0> <Unit1> <Filename Value="main.pas"/> @@ -151,7 +148,6 @@ <Unit10> <Filename Value="DLBitmap.pas"/> <IsPartOfProject Value="True"/> - <UnitName Value="DLBitmap"/> </Unit10> <Unit11> <Filename Value="DLBmpUtils.inc"/> @@ -165,19 +161,16 @@ <Unit13> <Filename Value="appsettings.pas"/> <IsPartOfProject Value="True"/> - <UnitName Value="appsettings"/> </Unit13> <Unit14> <Filename Value="lieconstants.pas"/> <IsPartOfProject Value="True"/> - <UnitName Value="lieconstants"/> </Unit14> <Unit15> <Filename Value="iconsizeselection.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="SelectIconSizeForm"/> <ResourceBaseClass Value="Form"/> - <UnitName Value="iconsizeselection"/> </Unit15> </Units> </ProjectOptions> @@ -202,12 +195,6 @@ </Win32> </Options> </Linking> - <Other> - <CompilerMessages> - <UseMsgFile Value="True"/> - </CompilerMessages> - <CompilerPath Value="$(CompPath)"/> - </Other> </CompilerOptions> <Debugging> <Exceptions Count="3"> diff --git a/applications/lazimageeditor/lazimageeditor.res b/applications/lazimageeditor/lazimageeditor.res index b0e84d7897b6b63a77fa1cb4979874615831830f..3a8b6b3b120665f68e70c8a7fe1e9ab9fd93ae6f 100644 GIT binary patch delta 964 zcmbu8&yLeD5XM!IKtfuc!CNkHn8uFn#Hq5C_JXtr{z#Qzk4$2F8!2g`I&7&BinwuP z1#hw!jywVnz>SyS25HiwvTXOl(Vxe^`84zS+n2%TuY-@|*7rLX!(VrgtLiBh=F`JL ze3=b?4DORSEsF~4EXne$zIgwj**&jD=WIARxJO8gRh4IHTUgFJfy9RZ<YhM3<<gNC znX8ciY_8nvswx+?(a)yjL>~>`8lN&IWC%=(00d7ZptJ@kRoWQCHMjKLka&}Wrfv2& zJG_C*CF3fI5TuS;u1z#3<7+@)2<rRNMjU(YKUj4=w(0x|^sTQ92g#ENgb)l8j8f1+ zqy-8L3|ITOBX&Kx12Y?hK^g|2s9_*{9zi6N1QgfQ2Ab*y!+m5%ZvZPpZHUZ=#3sC* zgi+AWMS@UPONvZlv^xp!>ONzyU;Lv!39I!cV|2wiAMccsH$^^o<4(W$aM<u|I=aGT zpN6Ta>ui4J`r@PEtgfrE=ecxd3Us3)OBbapZ9Qr`debK-o=>UtHc{F>?!hG1Rd&3@ zg_%6Y+?m+>b6%&iiM`(9mCl>U{--Gx>@l@&P2#+qzdC!4^{n@2dw;FEBX(bBzsIfp Voe8(r*Qzr`lCLJ0r?-Ee{sv6jC(!@^ delta 55 zcmbPofbqf(#t8~c;>;73{<BBsmlin|6in7&v|&}qNG(d;oWl5+k;g_qvA8%jHz}vm Lj$yM5`;Q0!9uN~O diff --git a/applications/lazimageeditor/resizepaperdialog.lrs b/applications/lazimageeditor/resizepaperdialog.lrs index 914d83637..36beddf30 100644 --- a/applications/lazimageeditor/resizepaperdialog.lrs +++ b/applications/lazimageeditor/resizepaperdialog.lrs @@ -1,5 +1,3 @@ -{ This is an automatically generated lazarus resource file } - LazarusResources.Add('TResizePaperDialogForm','FORMDATA',[ 'TPF0'#241#22'TResizePaperDialogForm'#21'ResizePaperDialogForm'#6'Height'#3 +#251#1#5'Width'#3'j'#1#7'Caption'#6#12'Resize paper'#12'ClientHeight'#3#251#1