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

Win32 GTK2 Widgetset added to Project Options

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5558 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2016-12-22 14:07:38 +00:00
parent e59459d457
commit dfd7cb0a8a
5 changed files with 98 additions and 3842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/json_packager/deploywin/json_packager.iss
View File

@ -1,6 +1,6 @@
[Setup]
AppName=External OPM JSON package Editor
AppVersion=0.2.8.0
AppVersion=0.2.8.1
DefaultDirName={pf}\OPMUtilities
DefaultGroupName=OPM
UninstallDisplayIcon={app}\jsoneditor.exe

58
applications/json_packager/jsonpackage.lpi
View File

@ -32,7 +32,7 @@
<BuildNr Value="1"/>
<StringTable Comments="Buld configured for Win Linux and Darwin" FileDescription="An editor for OnlinePackageManager update JSON files" InternalName="jsoneditor" LegalCopyright="(c)2016 usernames lainz and minesadorada @ forum.lazarus.freepascal.org" LegalTrademarks="GPL code" OriginalFilename="jsoneditor" ProductName="Lazarus and Freepascal" ProductVersion="1.x and 3.x"/>
</VersionInfo>
<BuildModes Count="6">
<BuildModes Count="7">
<Item1 Name="Win32" Default="True"/>
<Item2 Name="Win64">
<CompilerOptions>
@ -165,8 +165,12 @@
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
<TargetCPU Value="i386"/>
<TargetOS Value="darwin"/>
<Optimizations>
<OptimizationLevel Value="3"/>
</Optimizations>
</CodeGeneration>
<Linking>
<Debugging>
@ -174,6 +178,7 @@
<DebugInfoType Value="dsDwarf2Set"/>
<UseExternalDbgSyms Value="True"/>
</Debugging>
<LinkSmart Value="True"/>
<Options>
<Win32>
<GraphicApplication Value="True"/>
@ -183,6 +188,9 @@
<Other>
<CustomOptions Value="-FcUTF8
-dIGNOREPICTURE"/>
<OtherDefines Count="1">
<Define0 Value="IGNOREPICTURE"/>
</OtherDefines>
</Other>
</CompilerOptions>
</Item5>
@ -240,9 +248,48 @@
</Other>
</CompilerOptions>
</Item6>
<SharedMatrixOptions Count="2">
<Item7 Name="Win32GTK2">
<MacroValues Count="1">
<Macro3 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
<CompilerOptions>
<Version Value="11"/>
<PathDelim Value="\"/>
<Target>
<Filename Value="compiled\win32\jsoneditor"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
<TargetCPU Value="i386"/>
<TargetOS Value="win32"/>
</CodeGeneration>
<Linking>
<Debugging>
<GenerateDebugInfo Value="False"/>
<DebugInfoType Value="dsDwarf2Set"/>
<UseExternalDbgSyms Value="True"/>
</Debugging>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
<Other>
<CustomOptions Value="-dIGNOREPICTURE"/>
<OtherDefines Count="1">
<Define0 Value="IGNOREPICTURE"/>
</OtherDefines>
</Other>
</CompilerOptions>
</Item7>
<SharedMatrixOptions Count="3">
<Item1 ID="547331342457" Modes="Darwin32" Type="IDEMacro" MacroName="LCLWidgetType" Value="carbon"/>
<Item2 ID="825864852453" Modes="Linux64,Linux32" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/>
<Item3 ID="211572924205" Modes="Win32GTK2" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/>
</SharedMatrixOptions>
</BuildModes>
<PublishOptions>
@ -259,7 +306,7 @@
<PackageName Value="LCL"/>
</Item1>
</RequiredPackages>
<Units Count="4">
<Units Count="3">
<Unit0>
<Filename Value="jsonpackage.lpr"/>
<IsPartOfProject Value="True"/>
@ -275,11 +322,6 @@
<Filename Value="ugenericcollection.pas"/>
<IsPartOfProject Value="True"/>
</Unit2>
<Unit3>
<Filename Value="C:\NewPascal\projects\MDSUM\CryptINI\lockini.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="LockIni"/>
</Unit3>
</Units>
</ProjectOptions>
<CompilerOptions>

183
applications/json_packager/jsonpackage.lps
View File

@ -3,15 +3,14 @@
<ProjectSession>
<PathDelim Value="\"/>
<Version Value="10"/>
<BuildModes Active="Linux64"/>
<Units Count="56">
<BuildModes Active="Win32"/>
<Units Count="59">
<Unit0>
<Filename Value="jsonpackage.lpr"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="6"/>
<EditorIndex Value="-1"/>
<CursorPos X="25" Y="28"/>
<UsageCount Value="185"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="umain.pas"/>
@ -20,14 +19,13 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<TopLine Value="673"/>
<CursorPos X="57" Y="681"/>
<TopLine Value="810"/>
<CursorPos X="3" Y="815"/>
<ExtraEditorCount Value="1"/>
<ExtraEditor1>
<EditorIndex Value="-1"/>
<WindowIndex Value="-1"/>
<TopLine Value="311"/>
<CursorPos Y="498"/>
<TopLine Value="185"/>
<CursorPos X="40" Y="211"/>
</ExtraEditor1>
<UsageCount Value="185"/>
<Bookmarks Count="3">
@ -45,7 +43,6 @@
</Unit2>
<Unit3>
<Filename Value="C:\NewPascal\projects\MDSUM\CryptINI\lockini.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="LockIni"/>
<EditorIndex Value="-1"/>
<CursorPos X="40" Y="9"/>
@ -170,8 +167,8 @@
<Unit19>
<Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="1402"/>
<CursorPos X="74" Y="346"/>
<WindowIndex Value="-1"/>
<CursorPos Y="15"/>
<UsageCount Value="11"/>
</Unit19>
<Unit20>
@ -333,11 +330,10 @@
</Unit41>
<Unit42>
<Filename Value="D:\lazarustrunk\common_components\onlinepackagemanager\onlinepackagemanager\opkman_downloader.pas"/>
<EditorIndex Value="3"/>
<EditorIndex Value="-1"/>
<TopLine Value="19"/>
<CursorPos X="23" Y="25"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit42>
<Unit43>
<Filename Value="D:\lazarustrunk\common_components\onlinepackagemanager\onlinepackagemanager\opkman_visualtree.pas"/>
@ -362,11 +358,10 @@
</Unit45>
<Unit46>
<Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\fileinfo.pp"/>
<EditorIndex Value="5"/>
<EditorIndex Value="-1"/>
<TopLine Value="88"/>
<CursorPos X="26" Y="110"/>
<UsageCount Value="39"/>
<Loaded Value="True"/>
</Unit46>
<Unit47>
<Filename Value="C:\NewPascalDarwin\lazarus\lcl\interfaces\fpgui\fpguiint.pp"/>
@ -384,29 +379,26 @@
<Unit49>
<Filename Value="C:\trunklatest\lazarus\components\lazutils\lazfileutils.pas"/>
<UnitName Value="LazFileUtils"/>
<EditorIndex Value="4"/>
<EditorIndex Value="-1"/>
<TopLine Value="83"/>
<CursorPos X="10" Y="105"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit49>
<Unit50>
<Filename Value="C:\trunklatest\lazarus\lcl\forms.pp"/>
<UnitName Value="Forms"/>
<EditorIndex Value="7"/>
<EditorIndex Value="-1"/>
<TopLine Value="1517"/>
<CursorPos X="23" Y="1549"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit50>
<Unit51>
<Filename Value="C:\trunklatest\lazarus\lcl\popupnotifier.pas"/>
<UnitName Value="PopupNotifier"/>
<EditorIndex Value="2"/>
<EditorIndex Value="-1"/>
<TopLine Value="241"/>
<CursorPos X="42" Y="264"/>
<UsageCount Value="12"/>
<Loaded Value="True"/>
</Unit51>
<Unit52>
<Filename Value="C:\trunklatest\lazarus\lcl\include\control.inc"/>
@ -418,18 +410,17 @@
<Unit53>
<Filename Value="C:\trunklatest\lazarus\lcl\lcltranslator.pas"/>
<UnitName Value="LCLTranslator"/>
<EditorIndex Value="1"/>
<EditorIndex Value="-1"/>
<TopLine Value="70"/>
<CursorPos X="3" Y="495"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit53>
<Unit54>
<Filename Value="C:\trunklatest\lazarus\lcl\controls.pp"/>
<UnitName Value="Controls"/>
<EditorIndex Value="-1"/>
<TopLine Value="2282"/>
<CursorPos X="29" Y="2304"/>
<TopLine Value="1917"/>
<CursorPos X="12" Y="1937"/>
<UsageCount Value="10"/>
</Unit54>
<Unit55>
@ -440,131 +431,41 @@
<CursorPos X="3" Y="1045"/>
<UsageCount Value="10"/>
</Unit55>
<Unit56>
<Filename Value="C:\NewPascalDarwin\fpgui_src_1.4.1\fpgui-1.4.1\src\corelib\gdi\fpg_impl.pas"/>
<EditorIndex Value="-1"/>
<CursorPos X="3" Y="8"/>
<UsageCount Value="10"/>
</Unit56>
<Unit57>
<Filename Value="C:\trunklatest\lazarus\lcl\spin.pp"/>
<UnitName Value="Spin"/>
<EditorIndex Value="-1"/>
<TopLine Value="26"/>
<CursorPos X="43" Y="32"/>
<UsageCount Value="10"/>
</Unit57>
<Unit58>
<Filename Value="C:\trunklatest\lazarus\lcl\stdctrls.pp"/>
<UnitName Value="StdCtrls"/>
<EditorIndex Value="-1"/>
<TopLine Value="684"/>
<CursorPos X="34" Y="697"/>
<UsageCount Value="10"/>
</Unit58>
</Units>
<OtherDefines Count="1">
<Define0 Value="IGNOREPICTURE"/>
</OtherDefines>
<JumpHistory Count="30" HistoryIndex="29">
<JumpHistory Count="2" HistoryIndex="1">
<Position1>
<Filename Value="umain.pas"/>
<Caret Line="140" Column="50" TopLine="132"/>
<Caret Line="120" Column="40" TopLine="100"/>
</Position1>
<Position2>
<Filename Value="umain.pas"/>
<Caret Line="812" Column="20" TopLine="804"/>
<Caret Line="1400" Column="24" TopLine="1383"/>
</Position2>
<Position3>
<Filename Value="umain.pas"/>
<Caret Line="1230" Column="14" TopLine="1224"/>
</Position3>
<Position4>
<Filename Value="umain.pas"/>
<Caret Line="858" Column="16" TopLine="829"/>
</Position4>
<Position5>
<Filename Value="umain.pas"/>
<Caret Line="1247" Column="22" TopLine="1230"/>
</Position5>
<Position6>
<Filename Value="umain.pas"/>
<Caret Line="772" Column="21" TopLine="758"/>
</Position6>
<Position7>
<Filename Value="umain.pas"/>
<Caret Line="1039" Column="19" TopLine="1035"/>
</Position7>
<Position8>
<Filename Value="umain.pas"/>
<Caret Line="1239" Column="7" TopLine="1218"/>
</Position8>
<Position9>
<Filename Value="umain.pas"/>
<Caret Line="1236" Column="58" TopLine="1218"/>
</Position9>
<Position10>
<Filename Value="umain.pas"/>
<Caret Line="1227" Column="21" TopLine="1218"/>
</Position10>
<Position11>
<Filename Value="umain.pas"/>
<Caret Line="1038" Column="37" TopLine="1035"/>
</Position11>
<Position12>
<Filename Value="umain.pas"/>
<Caret Line="1246" Column="12" TopLine="1212"/>
</Position12>
<Position13>
<Filename Value="umain.pas"/>
<Caret Line="1039" TopLine="1035"/>
</Position13>
<Position14>
<Filename Value="umain.pas"/>
<Caret Line="1241" Column="42" TopLine="1230"/>
</Position14>
<Position15>
<Filename Value="umain.pas"/>
<Caret Line="853" TopLine="814"/>
</Position15>
<Position16>
<Filename Value="umain.pas"/>
<Caret Line="69" Column="13" TopLine="43"/>
</Position16>
<Position17>
<Filename Value="umain.pas"/>
<Caret Line="779" Column="27" TopLine="758"/>
</Position17>
<Position18>
<Filename Value="umain.pas"/>
<Caret Line="857" Column="5" TopLine="835"/>
</Position18>
<Position19>
<Filename Value="umain.pas"/>
<Caret Line="868" Column="40" TopLine="856"/>
</Position19>
<Position20>
<Filename Value="umain.pas"/>
<Caret Line="278" Column="24" TopLine="268"/>
</Position20>
<Position21>
<Filename Value="umain.pas"/>
<Caret Line="1095" TopLine="1062"/>
</Position21>
<Position22>
<Filename Value="umain.pas"/>
<Caret Line="1067" Column="17" TopLine="1050"/>
</Position22>
<Position23>
<Filename Value="umain.pas"/>
<Caret Line="1068" Column="37" TopLine="1035"/>
</Position23>
<Position24>
<Filename Value="umain.pas"/>
<Caret Line="1426" Column="46" TopLine="1397"/>
</Position24>
<Position25>
<Filename Value="umain.pas"/>
<Caret Line="970" Column="50" TopLine="948"/>
</Position25>
<Position26>
<Filename Value="umain.pas"/>
<Caret Line="622" Column="19" TopLine="590"/>
</Position26>
<Position27>
<Filename Value="C:\trunklatest\lazarus\lcl\popupnotifier.pas"/>
<Caret Line="264" Column="42" TopLine="241"/>
</Position27>
<Position28>
<Filename Value="umain.pas"/>
<Caret Line="827" Column="6" TopLine="797"/>
</Position28>
<Position29>
<Filename Value="umain.pas"/>
<Caret Line="825" Column="33" TopLine="805"/>
</Position29>
<Position30>
<Filename Value="umain.pas"/>
<Caret Line="828" TopLine="801"/>
</Position30>
</JumpHistory>
</ProjectSession>
</CONFIG>

3691
applications/json_packager/umain.lfm
View File

File diff suppressed because it is too large Load Diff

6
applications/json_packager/umain.pas
View File

@ -685,7 +685,7 @@ begin
end;
procedure TfrmMain.ResetPackageFileControlsToOne;
// Used in File/New
// Used in File/New and File/Load
var
iCount: integer;
begin
@ -827,8 +827,8 @@ begin
{$ENDIF}
popup_hint.vNotifierForm.AlphaBlend:=TRUE;
popup_hint.vNotifierForm.AlphaBlendValue:=200;
if (lcl_major > 0) and (lcl_minor > 6) then
popup_hint.vNotifierForm.Scaled:=TRUE;
if (lcl_major > 0) and (lcl_minor > 7) then
{$IFNDEF DARWIN}popup_hint.vNotifierForm.Scaled:=TRUE;{$ENDIF}
// ToDo: TApplication.HintPause:=2000;
// Defaults
slErrorList := TStringList.Create;