Skip to content
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

Jump to bottom

DRAFT: Added HiDPI settings #398

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+1,508 −838
Open

DRAFT: Added HiDPI settings #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2667804
Added HiDPI settings
smakhtin May 12, 2024
dbbbf15
Autoscaled Main, Button and About forms
smakhtin May 12, 2024
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
66 changes: 34 additions & 32 deletions GRBL-Plotter/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="GrblPlotter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="GRBL_Plotter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="GrblPlotter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="GRBL_Plotter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<runtime>
Expand All @@ -12,7 +12,7 @@
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<userSettings>
<GrblPlotter.Properties.Settings>
Expand Down Expand Up @@ -62,10 +62,10 @@
<value>0</value>
</setting>
<setting name="cameraIndexNameFix" serializeAs="String">
<value />
<value/>
</setting>
<setting name="cameraIndexNameXy" serializeAs="String">
<value />
<value/>
</setting>
<setting name="cameraIndexXy" serializeAs="String">
<value>0</value>
Expand Down Expand Up @@ -506,19 +506,19 @@
<value>G92 X0 Y0 (Zero X and Y)</value>
</setting>
<setting name="gamePadButtons11" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons12" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons13" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons14" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons15" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons2" serializeAs="String">
<value>#F100 (Feedrate =100%)</value>
Expand Down Expand Up @@ -1001,7 +1001,7 @@
<value>0</value>
</setting>
<setting name="guiPathSaveCode" serializeAs="String">
<value />
<value/>
</setting>
<setting name="guiPenUpDownButtonsShow" serializeAs="String">
<value>False</value>
Expand Down Expand Up @@ -1073,7 +1073,7 @@
<value>4</value>
</setting>
<setting name="importBarcode1DName" serializeAs="String">
<value />
<value/>
</setting>
<setting name="importBarcode1DScanGap" serializeAs="String">
<value>0.2</value>
Expand All @@ -1088,7 +1088,7 @@
<value>True</value>
</setting>
<setting name="importBarcode2DFacebook" serializeAs="String">
<value />
<value/>
</setting>
<setting name="importBarcode2DHeight" serializeAs="String">
<value>20</value>
Expand Down Expand Up @@ -1274,7 +1274,7 @@
<value>False</value>
</setting>
<setting name="importGCFooter" serializeAs="String">
<value />
<value/>
</setting>
<setting name="importGCHeader" serializeAs="String">
<value>G54; </value>
Expand Down Expand Up @@ -1513,8 +1513,7 @@
<setting name="importGraphicClipShowOrigPosition" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicClipShowOrigPositionShiftTileProcessed"
serializeAs="String">
<setting name="importGraphicClipShowOrigPositionShiftTileProcessed" serializeAs="String">
<value>True</value>
</setting>
<setting name="importGraphicClipSkipCode" serializeAs="String">
Expand Down Expand Up @@ -2067,13 +2066,13 @@
<value>True</value>
</setting>
<setting name="notifierPushbulletChannel" serializeAs="String">
<value />
<value/>
</setting>
<setting name="notifierPushbulletEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="notifierPushbulletToken" serializeAs="String">
<value />
<value/>
</setting>
<setting name="overrideFRBtm" serializeAs="String">
<value>100</value>
Expand Down Expand Up @@ -2193,10 +2192,10 @@
<value>1</value>
</setting>
<setting name="processDataLastFile" serializeAs="String">
<value />
<value/>
</setting>
<setting name="processLastFile" serializeAs="String">
<value />
<value/>
</setting>
<setting name="processLocation" serializeAs="String">
<value>0, 0</value>
Expand Down Expand Up @@ -2486,7 +2485,7 @@
<value>Wood|0|106|0|237|123|246|True|True|False|10|100|0.5|2.0|</value>
</setting>
<setting name="camShapeSet4" serializeAs="String">
<value />
<value/>
</setting>
<setting name="camShapeSize" serializeAs="String">
<value>100</value>
Expand Down Expand Up @@ -2756,19 +2755,19 @@
<value>G92 X0 Y0 (Zero X and Y)</value>
</setting>
<setting name="gamePadButtons11" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons12" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons13" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons14" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons15" serializeAs="String">
<value />
<value/>
</setting>
<setting name="gamePadButtons2" serializeAs="String">
<value>#F100 (Feedrate =100%)</value>
Expand Down Expand Up @@ -3167,7 +3166,7 @@
<value>D:\</value>
</setting>
<setting name="guiPathSaveCode" serializeAs="String">
<value />
<value/>
</setting>
<setting name="guiPenUpDownButtonsShow" serializeAs="String">
<value>False</value>
Expand Down Expand Up @@ -3233,7 +3232,7 @@
<value>True</value>
</setting>
<setting name="importBarcode2DFacebook" serializeAs="String">
<value />
<value/>
</setting>
<setting name="importBarcode2DHeight" serializeAs="String">
<value>20</value>
Expand Down Expand Up @@ -3908,13 +3907,13 @@
<value>True</value>
</setting>
<setting name="notifierPushbulletChannel" serializeAs="String">
<value />
<value/>
</setting>
<setting name="notifierPushbulletEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="notifierPushbulletToken" serializeAs="String">
<value />
<value/>
</setting>
<setting name="overrideFRBtm" serializeAs="String">
<value>100</value>
Expand Down Expand Up @@ -4130,6 +4129,9 @@
</GRBL_Plotter.Properties.Settings>
</userSettings>
<connectionStrings>
<add name="DefaultConnection" connectionString="Data Source = |SQL/CE|" />
<add name="DefaultConnection" connectionString="Data Source = |SQL/CE|"/>
</connectionStrings>
</configuration>
<System.Windows.Forms.ApplicationConfigurationSection>
<add key="DpiAwareness" value="PerMonitorV2" />
</System.Windows.Forms.ApplicationConfigurationSection>
</configuration>
2 changes: 1 addition & 1 deletion GRBL-Plotter/GRBL-Plotter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GrblPlotter</RootNamespace>
<AssemblyName>GRBL-Plotter</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<IsWebBootstrapper>false</IsWebBootstrapper>
Expand Down
2 changes: 1 addition & 1 deletion GRBL-Plotter/GUI/AboutForm.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