Skip to content

Linux hack #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
runesoeknudsen wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Linux hack #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
653d120
When generating the bitmap of the PCB it expect low case. And as Linu…
runesoeknudsen Oct 31, 2017
ec33378
Extract the embedded ico and bitmaps from the resources, to make it w…
runesoeknudsen Nov 9, 2017
bec300d
Make the treeview and instance dialog visible on Linux
runesoeknudsen Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GerberLibrary/Core/GerberPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,7 @@ public List<string> SaveOutlineTo(string p, string combinedfilename)
{
List<string> R = new List<string>();
string DrillFile = Path.Combine(p, "tabdrills.TXT");
string OutlineFile = Path.Combine(p, combinedfilename + ".GKO");
string OutlineFile = Path.Combine(p, combinedfilename + ".gko");
R.Add(DrillFile);
// R.Add(OutlineFile);
ExcellonFile EF = new ExcellonFile();
Expand Down
20 changes: 11 additions & 9 deletions GerberLibrary/GerberLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GerberLibrary</RootNamespace>
<AssemblyName>GerberLibrary</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -42,6 +44,8 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<WarningLevel>4</WarningLevel>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
Expand All @@ -51,25 +55,23 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Triangle, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\Triangle.0.0.6-Beta3\lib\net45\Triangle.dll</HintPath>
<Reference Include="DotNetZip">
<HintPath>..\DotNetZip.dll</HintPath>
</Reference>
<Reference Include="Triangle">
<HintPath>..\Triangle.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion GerberPanelizer/Explanation And Warning.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions GerberPanelizer/GerberPanelize.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

137 changes: 74 additions & 63 deletions GerberPanelizer/GerberPanelize.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GerberCombinerBuilder</RootNamespace>
<AssemblyName>GerberPanelizer</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand All @@ -26,9 +25,11 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand All @@ -51,40 +52,34 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>favicon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.1.1.2349.61993\lib\NET40\OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK.GLControl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Triangle, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\Triangle.0.0.6-Beta3\lib\net45\Triangle.dll</HintPath>
<Private>True</Private>
<Reference Include="OpenTK.GLControl">
<HintPath>..\OpenTK.GLControl.dll</HintPath>
</Reference>
<Reference Include="DotNetZip">
<HintPath>..\DotNetZip.dll</HintPath>
</Reference>
<Reference Include="OpenTK">
<HintPath>packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="Triangle">
<HintPath>..\Triangle.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -111,14 +106,14 @@
<Compile Include="GerberPanelize.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GerberPanelize.Designer.cs">
<DependentUpon>GerberPanelize.cs</DependentUpon>
</Compile>
<Compile Include="GerberPanelizerParent.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GerberPanelizerParent.Designer.cs">
<DependentUpon>GerberPanelizerParent.cs</DependentUpon>
<DeployService-Deploy>True</DeployService-Deploy>
<DeployService-UseProjectRelativePath>True</DeployService-UseProjectRelativePath>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="Helper.cs" />
<Compile Include="InstanceDialog.cs">
Expand Down Expand Up @@ -162,43 +157,11 @@
<Compile Include="WelcomeForm.Designer.cs">
<DependentUpon>WelcomeForm.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="AboutBox1.resx">
<DependentUpon>AboutBox1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Explanation And Warning.resx">
<DependentUpon>Explanation And Warning.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GerberPanelize.resx">
<DependentUpon>GerberPanelize.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GerberPanelizerParent.resx">
<DependentUpon>GerberPanelizerParent.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="InstanceDialog.resx">
<DependentUpon>InstanceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="PanelProperties.resx">
<DependentUpon>PanelProperties.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Progress.resx">
<DependentUpon>Progress.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="Treeview.resx">
<DependentUpon>Treeview.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="WelcomeForm.resx">
<DependentUpon>WelcomeForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.manifest" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
Expand All @@ -210,6 +173,22 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="OpenTK.dll.config" />
<None Include="Explanation And Warning.resx">
<DependentUpon>Explanation And Warning.cs</DependentUpon>
</None>
<None Include="AboutBox1.resx">
<DependentUpon>AboutBox1.cs</DependentUpon>
</None>
<None Include="Properties\Resources.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</None>
<Compile Include="GerberPanelize.Designer.cs">
<DependentUpon>GerberPanelize.cs</DependentUpon>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
Expand Down Expand Up @@ -240,18 +219,21 @@
</Content>
<Content Include="QuickFont\ChangeLog.txt" />
<Content Include="favicon.ico" />
<Content Include="600dpi-logo-met-text.png" />
<Content Include="600dpi-logo-met-text.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Help\welcome.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\RotateRight.jpg" />
<None Include="Resources\RotateLeft.jpg" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GerberLibrary\GerberLibrary.csproj">
<Project>{e1c3aa23-3a02-485f-976b-50a96052f00a}</Project>
<Name>GerberLibrary</Name>
</ProjectReference>
<Content Include="GerberPanelizer.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Resources\RotateLeft.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Resources\RotateRight.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand All @@ -261,4 +243,33 @@
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<ProjectReference Include="..\GerberLibrary\GerberLibrary.csproj">
<Project>{E1C3AA23-3A02-485F-976B-50A96052F00A}</Project>
<Name>GerberLibrary</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="GerberPanelizerParent.resx">
<DependentUpon>GerberPanelizerParent.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="InstanceDialog.resx">
<DependentUpon>InstanceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GerberPanelize.resx">
<DependentUpon>GerberPanelize.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="PanelProperties.resx">
<DependentUpon>PanelProperties.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Progress.resx">
<DependentUpon>Progress.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="WelcomeForm.resx">
<DependentUpon>WelcomeForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Treeview.resx">
<DependentUpon>Treeview.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
</Project>
15 changes: 0 additions & 15 deletions GerberPanelizer/GerberPanelize.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,4 @@
<value>629, 56</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
</root>
Binary file added GerberPanelizer/GerberPanelizer.ico
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion GerberPanelizer/GerberPanelizerParent.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading