From b0308ca5e5f3d2dfc8ac7b8f0021fe1579703f46 Mon Sep 17 00:00:00 2001 From: Jason Lautzenheiser Date: Sat, 12 Feb 2022 12:53:34 -0500 Subject: [PATCH] Revert "update project to .net 6" --- .gitignore | 3 - Domain/StatusBar/ZoomStatusWidget.cs | 24 +- Program.cs | 5 +- Trizbort.csproj | 372 ++++++++++++++++++++++++--- Trizbort.sln | 15 +- appsettings.json | 4 - packages.config | 6 + 7 files changed, 374 insertions(+), 55 deletions(-) delete mode 100644 appsettings.json create mode 100644 packages.config diff --git a/.gitignore b/.gitignore index f9ae3693..36a3dfce 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ TestResults *.suo *.user *.sln.docstates -*.idea # Build results [Dd]ebug/ @@ -114,5 +113,3 @@ UpgradeLog*.XML /*.DotSettings /.vs/Trizbort/v15/sqlite3/storage.ide .vs -.upgrade-assistant -/upgrade-assistant.clef diff --git a/Domain/StatusBar/ZoomStatusWidget.cs b/Domain/StatusBar/ZoomStatusWidget.cs index 259210b3..00e95fda 100644 --- a/Domain/StatusBar/ZoomStatusWidget.cs +++ b/Domain/StatusBar/ZoomStatusWidget.cs @@ -7,7 +7,7 @@ namespace Trizbort.Domain.StatusBar { public class ZoomStatusWidget : IStatusWidget { - // ContextMenu menu; + ContextMenu menu; public StatusItems Id => StatusItems.tsb_CapsLock; public string Name => "Zoom"; @@ -21,20 +21,20 @@ public string DisplayText() { } public void ClickHandler() { - // menu.Show(Project.Current.Canvas, Cursor.Position); + menu.Show(Project.Current.Canvas, Cursor.Position); } public ZoomStatusWidget() { - // menu = new ContextMenu(); - // menu.MenuItems.Add("Zoom 300%", (o, args) => setZoom(o, 3.00f)); - // menu.MenuItems.Add("Zoom 250%", (o, args) => setZoom(o, 2.50f)); - // menu.MenuItems.Add("Zoom 200%", (o, args) => setZoom(o, 2.00f)); - // menu.MenuItems.Add("Zoom 175%", (o, args) => setZoom(o, 1.75f)); - // menu.MenuItems.Add("Zoom 150%", (o, args) => setZoom(o, 1.50f)); - // menu.MenuItems.Add("Zoom 125%", (o, args) => setZoom(o, 1.25f)); - // menu.MenuItems.Add("Zoom 100%", (o, args) => setZoom(o, 1.00f)); - // menu.MenuItems.Add("Zoom 75%", (o, args) => setZoom(o, 0.75f)); - // menu.MenuItems.Add("Zoom 50%", (o, args) => setZoom(o, 0.50f)); + menu = new ContextMenu(); + menu.MenuItems.Add("Zoom 300%", (o, args) => setZoom(o, 3.00f)); + menu.MenuItems.Add("Zoom 250%", (o, args) => setZoom(o, 2.50f)); + menu.MenuItems.Add("Zoom 200%", (o, args) => setZoom(o, 2.00f)); + menu.MenuItems.Add("Zoom 175%", (o, args) => setZoom(o, 1.75f)); + menu.MenuItems.Add("Zoom 150%", (o, args) => setZoom(o, 1.50f)); + menu.MenuItems.Add("Zoom 125%", (o, args) => setZoom(o, 1.25f)); + menu.MenuItems.Add("Zoom 100%", (o, args) => setZoom(o, 1.00f)); + menu.MenuItems.Add("Zoom 75%", (o, args) => setZoom(o, 0.75f)); + menu.MenuItems.Add("Zoom 50%", (o, args) => setZoom(o, 0.50f)); } private void setZoom(object sender, float zoomFactor) { diff --git a/Program.cs b/Program.cs index 2ff6c5e3..e8680b86 100644 --- a/Program.cs +++ b/Program.cs @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2010-2018 by Genstein and Jason Lautzenheiser. This file is (or was originally) part of Trizbort, the Interactive Fiction Mapper. @@ -41,7 +41,6 @@ internal static class Program private static void Main(string[] args) { System.Windows.Forms.Application.EnableVisualStyles(); - Application.SetHighDpiMode(HighDpiMode.PerMonitorV2); System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false); Console.WriteLine(AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName); @@ -54,4 +53,4 @@ private static void Main(string[] args) } } } -} +} \ No newline at end of file diff --git a/Trizbort.csproj b/Trizbort.csproj index 48926f73..345474be 100644 --- a/Trizbort.csproj +++ b/Trizbort.csproj @@ -1,10 +1,26 @@ - + + - net6.0-windows + Debug x86 + x86 + 9.0.30729 + 2.0 + {F462E085-AFBE-46EC-936E-AEF63C83A796} WinExe + Properties + Trizbort + Trizbort + v4.8 + 512 Map.ico + + + + + 3.5 false + D:\Projects\trizbort-publish\ true Disk @@ -22,11 +38,28 @@ false true true - false - true - true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + false + x86 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 false - false + false 71A85D8D5FAB2D322CD5C932858769833F7E8882 @@ -44,10 +77,15 @@ app.manifest + x64 bin\x64\Debug\ + TRACE;DEBUG + x64 bin\x64\Release\ + true + TRACE Trizbort.Program @@ -57,29 +95,308 @@ False lib\AutoUpdater.NET.dll + + packages\CommandLineParser.2.8.0\lib\net461\CommandLine.dll + + + packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + packages\PDFsharp-gdi.1.50.5147\lib\net20\PdfSharp-gdi.dll + + + packages\PDFsharp-gdi.1.50.5147\lib\net20\PdfSharp.Charting-gdi.dll + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Component - + Component - + + + + + + + True + True + Settings.settings + + + + + + + Form + + + AboutDialog.cs + + + Form + + + AppSettingsDialog.cs + + + Form + + + AutomapDialog.cs + + + Form + + + AutomapRoomSameDirectionDialog.cs + + + Form + + + ConnectionPropertiesDialog.cs + + UserControl - + + AutomapBar.cs + + UserControl - + UserControl - + + Canvas.cs + + UserControl + + Minimap.cs + + + Form + + + DisambiguateRoomsDialog.cs + + + Form + + + MainForm.cs + + + Form + + + MapStatisticsView.cs + + + Form + + + QuickFind.cs + + + Form + + + RegionSettings.cs + + + Form + + + RoomPropertiesDialog.cs + + + Form + + + SettingsDialog.cs + + + + + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + AboutDialog.cs + + + AppSettingsDialog.cs + + + AutomapDialog.cs + + + AutomapRoomSameDirectionDialog.cs + + + ConnectionPropertiesDialog.cs + + + AutomapBar.cs + + + Canvas.cs + + + Minimap.cs + + + DisambiguateRoomsDialog.cs + + + MainForm.cs + + + MapStatisticsView.cs + + + QuickFind.cs + + + RegionSettings.cs + + + RoomPropertiesDialog.cs + + + SettingsDialog.cs + + + + + + + + + + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + + + + + + + + + + + + @@ -103,22 +420,17 @@ true - - - - - - - all - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/Trizbort.sln b/Trizbort.sln index 650f1e3d..d3b3e08d 100644 --- a/Trizbort.sln +++ b/Trizbort.sln @@ -20,9 +20,18 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|Any CPU.ActiveCfg = Debug|x86 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|Any CPU.Build.0 = Debug|x86 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|x64.ActiveCfg = Debug|x64 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|x64.Build.0 = Debug|x64 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|x86.ActiveCfg = Debug|x86 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Debug|x86.Build.0 = Debug|x86 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Release|Any CPU.ActiveCfg = Release|x86 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Release|Any CPU.Build.0 = Release|x86 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Release|x64.ActiveCfg = Debug|x64 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Release|x64.Build.0 = Debug|x64 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Release|x86.ActiveCfg = Release|x86 + {F462E085-AFBE-46EC-936E-AEF63C83A796}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appsettings.json b/appsettings.json deleted file mode 100644 index 70bd6184..00000000 --- a/appsettings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "SendKeys": "SendInput", - "ClientSettingsProvider.ServiceUri": "" -} \ No newline at end of file diff --git a/packages.config b/packages.config new file mode 100644 index 00000000..25bc6fb2 --- /dev/null +++ b/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file