pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Various Mac OS X fixes for exceptions

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1724 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-06-30 19:48:00 +00:00
parent 6d72de8412
commit fb5c2019e9
5 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/lazimageeditor/createbundle.sh
View File

@ -56,6 +56,7 @@ else
mkdir $appfolder/Contents
mkdir $appfolder/Contents/MacOS
mkdir $appfolder/Contents/Resources
mkdir $appfolder/Contents/Resources/images
#
# For a debug bundle,
@ -69,8 +70,10 @@ else
fi
# Copy the resource files to the correct place
# cp *.bmp $appfolder/Contents/Resources
# cp icon3.ico $appfolder/Contents/Resources
cp default.pal $appfolder/Contents/Resources/
cp images/*.svg $appfolder/Contents/Resources/images
cp images/*.png $appfolder/Contents/Resources/images
cp images/*.ico $appfolder/Contents/Resources/images
# cp icon3.png $appfolder/Contents/Resources
# cp macicon.icns $appfolder/Contents/Resources
# cp docs/*.* $appfolder/Contents/Resources

38
applications/lazimageeditor/lazimageeditor.lpi
View File

@ -16,8 +16,39 @@
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>
<BuildModes Count="2">
<Item1 Name="Debug" Default="True"/>
<Item2 Name="Release">
<CompilerOptions>
<Version Value="10"/>
<PathDelim Value="\"/>
<Target>
<Filename Value="lazimageeditor"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<OtherUnitFiles Value="."/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Debugging>
<UseLineInfoUnit Value="False"/>
<StripSymbols Value="True"/>
</Debugging>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item2>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
@ -154,7 +185,8 @@
</SearchPaths>
<Linking>
<Debugging>
<UseLineInfoUnit Value="False"/>
<GenerateDebugInfo Value="True"/>
<GenerateDwarf Value="True"/>
</Debugging>
<Options>
<Win32>

4
applications/lazimageeditor/lazimageeditor.pas
View File

@ -31,7 +31,9 @@ begin
// show new picture dialog
MainForm.Show;
//MainForm.FileNewExecute(nil);
if ParamCount > 0 then
// With OS X app, ParamStr not meaningful unless launched with --args switch.
if (ParamCount > 0) {$IFDEF DARWIN} and (Copy(ParamStr(1), 1, 4) <> '-psn') {$ENDIF} then
MainForm.OpenImageFile(ParamStr(1))
else
MainForm.FileNewOnStart;

1
applications/lazimageeditor/lieconstants.pas
View File

@ -9,6 +9,7 @@ uses
const
DefaultDirectory = '/usr/share/lazimageeditor/';
BundleResourcesDirectory = '/Contents/Resources/';
SectionGeneral = 'General';
IdentLanguage = 'Language';

11
applications/lazimageeditor/main.pas
View File

@ -33,7 +33,8 @@ uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Menus,
ExtCtrls, ComCtrls, ActnList, StdActns, ExtDlgs, Buttons, StdCtrls, Spin,
ColorBox, NewDialog, ResizeDialog, ResizePaperDialog, AboutDialog, DLBitmap,
PictureManager, PictureCtrls, ColorPalette;
PictureManager, PictureCtrls, ColorPalette,
appsettings;
type
@ -1017,7 +1018,7 @@ begin
UpdatePictureToolsEnabled;
UpdateToolSettings;
Palette.LoadPalette('default.pal');
Palette.LoadPalette(vConfigurations.MyDirectory + 'default.pal');
// Main Form
Caption := lieMain;
@ -1182,9 +1183,11 @@ begin
end;
procedure TMainForm.FileNewOnStart;
var i: integer;
var
i: integer;
begin
if ParamCount > 0 then
// With OS X app, ParamStr not meaningful unless launched with --args switch.
if (ParamCount > 0) {$IFDEF DARWIN} and (Copy(ParamStr(1), 1, 4) <> '-psn') {$ENDIF} then
begin
for i := 1 to ParamCount - 1 do
Pictures.Load(ParamStr(i));