Move FormProjectQtSettings into Legacy namespace

Change-Id: I30c7834cd83c86729153e80ac05b5dd2a29e4980
Reviewed-by: Miguel Costa <miguel.costa@qt.io>

7 files changed, 32 insertions, 48 deletions

diff --git a/QtVsTools.Package/Package/FormProjectQtSettings.Designer.cs b/QtVsTools.Package/Legacy/FormProjectQtSettings.Designer.cs
index bcdfbba2..766ffa3f 100644
--- a/QtVsTools.Package/Package/FormProjectQtSettings.Designer.cs
+++ b/QtVsTools.Package/Legacy/FormProjectQtSettings.Designer.cs
@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace QtVsTools
+namespace QtVsTools.Legacy
 {
     partial class FormProjectQtSettings
     {
@@ -57,7 +57,7 @@ namespace QtVsTools
             this.okButton.Name = "okButton";
             this.okButton.Size = new System.Drawing.Size(150, 44);
             this.okButton.TabIndex = 0;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            this.okButton.Click += new System.EventHandler(this.OkButton_Click);
             //
             // cancelButton
             //
diff --git a/QtVsTools.Package/Package/FormProjectQtSettings.cs b/QtVsTools.Package/Legacy/FormProjectQtSettings.cs
index 035d1cd4..fad42371 100644
--- a/QtVsTools.Package/Package/FormProjectQtSettings.cs
+++ b/QtVsTools.Package/Legacy/FormProjectQtSettings.cs
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt VS Tools.
@@ -31,10 +31,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using System.IO;
-using Microsoft.VisualStudio.Shell;
 using EnvDTE;
 
-namespace QtVsTools
+namespace QtVsTools.Legacy
 {
     using Core;
 
@@ -62,24 +61,24 @@ namespace QtVsTools
 
         public FormProjectQtSettings()
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
             InitializeComponent();
-            okButton.Text = SR.GetString("OK");
-            cancelButton.Text = SR.GetString("Cancel");
-            tabControl1.TabPages[0].Text = SR.GetString("ActionDialog_Properties");
-            tabControl1.TabPages[1].Text = SR.GetString("QtModules");
+            okButton.Text = "OK";
+            cancelButton.Text = "Cancel";
+            tabControl1.TabPages[0].Text = "Properties";
+            tabControl1.TabPages[1].Text = "Qt Modules";
 
             var modules = QtModules.Instance.GetAvailableModules()
                 .Where(x => x.Selectable)
                 .OrderBy(x => x.Name);
             foreach (var module in modules) {
-                var checkBox = new CheckBox();
-                checkBox.Location = new System.Drawing.Point(844, 152);
-                checkBox.Margin = new Padding(3, 2, 6, 2);
-                checkBox.Name = module.LibraryPrefix;
-                checkBox.Size = new System.Drawing.Size(256, 46);
-                checkBox.UseVisualStyleBackColor = true;
+                var checkBox = new CheckBox
+                {
+                    Location = new System.Drawing.Point(844, 152),
+                    Margin = new Padding(3, 2, 6, 2),
+                    Name = module.LibraryPrefix,
+                    Size = new System.Drawing.Size(256, 46),
+                    UseVisualStyleBackColor = true
+                };
                 flowLayoutPanel1.Controls.Add(checkBox);
                 checkBox.Text = module.Name;
                 AddMapping(checkBox, module.Id);
@@ -92,8 +91,7 @@ namespace QtVsTools
 
         private void FormProjectQtSettings_Shown(object sender, EventArgs e)
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
-            Text = SR.GetString("ProjectQtSettingsButtonText");
+            Text = "Qt Project Settings";
         }
 
         private void AddMapping(CheckBox checkbox, int moduleId)
@@ -118,7 +116,7 @@ namespace QtVsTools
             }
         }
 
-        private void okButton_Click(object sender, EventArgs e)
+        private void OkButton_Click(object sender, EventArgs e)
         {
             // Disable the buttons since some operations are quite expensive (e.g. changing
             // the Qt version) and take some to finish. Keeping the buttons enables allows to hit
@@ -127,7 +125,7 @@ namespace QtVsTools
             cancelButton.Enabled = false;
 
             qtSettings.SaveSettings();
-            saveModules();
+            SaveModules();
             okButton.DialogResult = DialogResult.OK;
             Close();
         }
@@ -166,7 +164,7 @@ namespace QtVsTools
             }
         }
 
-        private void saveModules()
+        private void SaveModules()
         {
             qtProject = QtProject.Create(project);
             for (var i = 0; i < moduleMap.Count; ++i) {
diff --git a/QtVsTools.Package/Package/FormProjectQtSettings.resx b/QtVsTools.Package/Legacy/FormProjectQtSettings.resx
index d58980a3..d58980a3 100644
--- a/QtVsTools.Package/Package/FormProjectQtSettings.resx
+++ b/QtVsTools.Package/Legacy/FormProjectQtSettings.resx
diff --git a/QtVsTools.Package/Package/QtMainMenu.cs b/QtVsTools.Package/Package/QtMainMenu.cs
index 0b394736..38c8021c 100644
--- a/QtVsTools.Package/Package/QtMainMenu.cs
+++ b/QtVsTools.Package/Package/QtMainMenu.cs
@@ -156,7 +156,7 @@ namespace QtVsTools
                     if (projectVersion >= Resources.qtMinFormatVersion_Settings) {
                         QtVsToolsPackage.Instance.Dte.ExecuteCommand("Project.Properties");
                     } else if (pro != null) {
-                        using (var formProjectQtSettings = new FormProjectQtSettings()) {
+                        using (var formProjectQtSettings = new Legacy.FormProjectQtSettings()) {
                             formProjectQtSettings.SetProject(pro);
                             formProjectQtSettings.StartPosition = FormStartPosition.CenterParent;
                             var ww = new MainWinWrapper(QtVsToolsPackage.Instance.Dte);
diff --git a/QtVsTools.Package/Package/QtProjectContextMenu.cs b/QtVsTools.Package/Package/QtProjectContextMenu.cs
index 32514b12..20f60f47 100644
--- a/QtVsTools.Package/Package/QtProjectContextMenu.cs
+++ b/QtVsTools.Package/Package/QtProjectContextMenu.cs
@@ -142,7 +142,7 @@ namespace QtVsTools
                     if (projectVersion >= Resources.qtMinFormatVersion_Settings) {
                         QtVsToolsPackage.Instance.Dte.ExecuteCommand("Project.Properties");
                     } else if (pro != null) {
-                        using (var formProjectQtSettings = new FormProjectQtSettings()) {
+                        using (var formProjectQtSettings = new Legacy.FormProjectQtSettings()) {
                             formProjectQtSettings.SetProject(pro);
                             formProjectQtSettings.StartPosition = FormStartPosition.CenterParent;
                             var ww = new MainWinWrapper(QtVsToolsPackage.Instance.Dte);
diff --git a/QtVsTools.Package/QtVsTools.Package.csproj b/QtVsTools.Package/QtVsTools.Package.csproj
index c5016622..634a02b7 100644
--- a/QtVsTools.Package/QtVsTools.Package.csproj
+++ b/QtVsTools.Package/QtVsTools.Package.csproj
@@ -357,10 +357,10 @@
     <Compile Include="Legacy\FormChangeQtVersion.Designer.cs">
       <DependentUpon>FormChangeQtVersion.cs</DependentUpon>
     </Compile>
-    <Compile Include="Package\FormProjectQtSettings.cs">
+    <Compile Include="Legacy\FormProjectQtSettings.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Package\FormProjectQtSettings.Designer.cs">
+    <Compile Include="Legacy\FormProjectQtSettings.Designer.cs">
       <DependentUpon>FormProjectQtSettings.cs</DependentUpon>
     </Compile>
     <Compile Include="Options\QtLegacyOptionsPage.cs">
@@ -515,8 +515,9 @@
     <EmbeddedResource Include="Legacy\FormChangeQtVersion.resx">
       <DependentUpon>FormChangeQtVersion.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Package\FormProjectQtSettings.resx">
+    <EmbeddedResource Include="Legacy\FormProjectQtSettings.resx">
       <DependentUpon>FormProjectQtSettings.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources.resx">
       <SubType>Designer</SubType>
@@ -602,19 +603,13 @@
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // NuGet native libs
   // -->
-  <PropertyGroup
-    Condition="'$(PkgStub_System_Data_SQLite_Core_NetFramework)' != ''">
-    <SQLitePkgDir Condition="'$(SQLitePkgDir)' == ''"
-      >$(PkgStub_System_Data_SQLite_Core_NetFramework)</SQLitePkgDir>
+  <PropertyGroup Condition="'$(PkgStub_System_Data_SQLite_Core_NetFramework)' != ''">
+    <SQLitePkgDir Condition="'$(SQLitePkgDir)' == ''">$(PkgStub_System_Data_SQLite_Core_NetFramework)</SQLitePkgDir>
   </PropertyGroup>
-  <PropertyGroup
-    Condition="'$(PkgStub_System_Data_SQLite_Core_NetFramework)' == ''">
-    <NuGetGlobalPkgDir Condition="'$(NuGetGlobalPkgDir)' == ''"
-      >$(USERPROFILE)\.nuget\packages</NuGetGlobalPkgDir>
-    <SQLitePkgRoot
-      >$(NuGetGlobalPkgDir)\Stub.System.Data.SQLite.Core.NetFramework</SQLitePkgRoot>
-    <SQLitePkgDir Condition="'$(SQLitePkgDir)' == ''"
-      >$(SQLitePkgRoot)\$(Version_Stub_System_Data_SQLite_Core_NetFramework)</SQLitePkgDir>
+  <PropertyGroup Condition="'$(PkgStub_System_Data_SQLite_Core_NetFramework)' == ''">
+    <NuGetGlobalPkgDir Condition="'$(NuGetGlobalPkgDir)' == ''">$(USERPROFILE)\.nuget\packages</NuGetGlobalPkgDir>
+    <SQLitePkgRoot>$(NuGetGlobalPkgDir)\Stub.System.Data.SQLite.Core.NetFramework</SQLitePkgRoot>
+    <SQLitePkgDir Condition="'$(SQLitePkgDir)' == ''">$(SQLitePkgRoot)\$(Version_Stub_System_Data_SQLite_Core_NetFramework)</SQLitePkgDir>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="$(SQLitePkgDir)\build\net46\x64\SQLite.Interop.dll">
diff --git a/QtVsTools.Package/Resources.resx b/QtVsTools.Package/Resources.resx
index 918de924..71f2807b 100644
--- a/QtVsTools.Package/Resources.resx
+++ b/QtVsTools.Package/Resources.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ActionDialog_Properties" xml:space="preserve">
-    <value>Properties</value>
-  </data>
   <data name="Cancel" xml:space="preserve">
     <value>&amp;Cancel</value>
   </data>
@@ -175,15 +172,9 @@ Converting project {0}/{1}: {2}...</value>
   <data name="IncompatibleMacros" xml:space="preserve">
     <value>The following macros are not compatible: {0}</value>
   </data>
-  <data name="ProjectQtSettingsButtonText" xml:space="preserve">
-    <value>Qt Project Settings</value>
-  </data>
   <data name="ProjectQtVersionNotFoundError" xml:space="preserve">
     <value>There's no Qt version assigned to project {0} for configuration {1}/{2}. Please use the 'Qt Project Settings' editor to change the 'Version' to a valid Qt version for this platform.</value>
   </data>
-  <data name="QtModules" xml:space="preserve">
-    <value>Qt Modules</value>
-  </data>
   <data name="ExportProject_ImportPriFile" xml:space="preserve">
     <value>Import from .pri File</value>
   </data>