diff --git a/xcom2-launcher/xcom2-launcher/Classes/XCOM/Xcom2Env.cs b/xcom2-launcher/xcom2-launcher/Classes/XCOM/Xcom2Env.cs index 1e32a56..72b4d72 100644 --- a/xcom2-launcher/xcom2-launcher/Classes/XCOM/Xcom2Env.cs +++ b/xcom2-launcher/xcom2-launcher/Classes/XCOM/Xcom2Env.cs @@ -14,8 +14,8 @@ internal class Xcom2Env : XcomEnvironment public string DataDirWotC => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\my games\XCOM2 War of the Chosen"; public string LogFilePath => DataDir + @"\XComGame\Logs\Launch.log"; public string LogFilePathWotC => DataDirWotC + @"\XComGame\Logs\Launch.log"; - private string UserConfigDir => DataDir + @"\my games\XCOM2\XComGame\Config"; - private string WotCUserConfigDir => DataDirWotC + @"\my games\XCOM2 War of the Chosen\XComGame\Config"; + private string UserConfigDir => DataDir + @"\XComGame\Config"; + private string WotCUserConfigDir => DataDirWotC + @"\XComGame\Config"; public override string DefaultConfigDir => Path.Combine(GameDir, @"XComGame\Config"); private string WotCDefaultConfigDir => Path.Combine(GameDir, @"XCom2-WarOfTheChosen\XComGame\Config"); diff --git a/xcom2-launcher/xcom2-launcher/Forms/MainForm.Designer.cs b/xcom2-launcher/xcom2-launcher/Forms/MainForm.Designer.cs index e8401cb..76322df 100644 --- a/xcom2-launcher/xcom2-launcher/Forms/MainForm.Designer.cs +++ b/xcom2-launcher/xcom2-launcher/Forms/MainForm.Designer.cs @@ -130,7 +130,6 @@ private void InitializeComponent() this.modlist_toggleGroupsButton = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); this.modlist_filterClearButton = new System.Windows.Forms.Button(); - this.modlist_FilterCueTextBox = new XCOM2Launcher.UserElements.CueTextBox(); this.modinfo_groupbox = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.modinfo_tabcontrol = new System.Windows.Forms.TabControl(); @@ -154,7 +153,6 @@ private void InitializeComponent() this.modinfo_config_tab = new System.Windows.Forms.TabPage(); this.modinfo_config_TableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.modinfo_ConfigFCTB = new FastColoredTextBoxNS.FastColoredTextBox(); - this.modinfo_config_FileSelectCueComboBox = new XCOM2Launcher.UserElements.CueComboBox(); this.modinfo_config_buttonsTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.modinfo_config_ExpandButton = new System.Windows.Forms.Button(); this.modinfo_config_CompareButton = new System.Windows.Forms.Button(); @@ -209,6 +207,8 @@ private void InitializeComponent() this.olvcSavedIni = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.fillPanel = new System.Windows.Forms.Panel(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.modlist_FilterCueTextBox = new XCOM2Launcher.UserElements.CueTextBox(); + this.modinfo_config_FileSelectCueComboBox = new XCOM2Launcher.UserElements.CueComboBox(); this.main_statusstrip.SuspendLayout(); this.main_menustrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.error_provider)).BeginInit(); @@ -395,7 +395,7 @@ private void InitializeComponent() // this.folderToX2InstallToolStripMenuItem.Name = "folderToX2InstallToolStripMenuItem"; this.folderToX2InstallToolStripMenuItem.Size = new System.Drawing.Size(262, 22); - this.folderToX2InstallToolStripMenuItem.Text = "XCOM 2 - Iinstallation"; + this.folderToX2InstallToolStripMenuItem.Text = "XCOM 2 - Installation"; // // folderToX2DataToolStripMenuItem // @@ -696,7 +696,7 @@ private void InitializeComponent() // this.horizontal_splitcontainer.Panel2.Controls.Add(this.modinfo_groupbox); this.horizontal_splitcontainer.Size = new System.Drawing.Size(970, 656); - this.horizontal_splitcontainer.SplitterDistance = 392; + this.horizontal_splitcontainer.SplitterDistance = 391; this.horizontal_splitcontainer.SplitterWidth = 5; this.horizontal_splitcontainer.TabIndex = 5; // @@ -750,7 +750,7 @@ private void InitializeComponent() this.modlist_ListObjectListView.Location = new System.Drawing.Point(0, 33); this.modlist_ListObjectListView.Name = "modlist_ListObjectListView"; this.modlist_ListObjectListView.ShowItemCountOnGroups = true; - this.modlist_ListObjectListView.Size = new System.Drawing.Size(970, 328); + this.modlist_ListObjectListView.Size = new System.Drawing.Size(970, 327); this.modlist_ListObjectListView.SortGroupItemsByPrimaryColumn = false; this.modlist_ListObjectListView.SpaceBetweenGroups = 10; this.modlist_ListObjectListView.TabIndex = 0; @@ -940,7 +940,7 @@ private void InitializeComponent() this.pModsLegend.Controls.Add(this.cFilterNotLoaded); this.pModsLegend.Controls.Add(this.cFilterDuplicate); this.pModsLegend.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pModsLegend.Location = new System.Drawing.Point(0, 361); + this.pModsLegend.Location = new System.Drawing.Point(0, 360); this.pModsLegend.Name = "pModsLegend"; this.pModsLegend.Size = new System.Drawing.Size(970, 31); this.pModsLegend.TabIndex = 5; @@ -1257,16 +1257,6 @@ private void InitializeComponent() this.modlist_filterClearButton.UseVisualStyleBackColor = true; this.modlist_filterClearButton.Click += new System.EventHandler(this.modlist_filterClearButton_Click); // - // modlist_FilterCueTextBox - // - this.modlist_FilterCueTextBox.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.modlist_FilterCueTextBox.CueText = "Filter Mods"; - this.modlist_FilterCueTextBox.Location = new System.Drawing.Point(3, 5); - this.modlist_FilterCueTextBox.Name = "modlist_FilterCueTextBox"; - this.modlist_FilterCueTextBox.Size = new System.Drawing.Size(175, 20); - this.modlist_FilterCueTextBox.TabIndex = 1; - this.modlist_FilterCueTextBox.TextChanged += new System.EventHandler(this.filterMods_TextChanged); - // // modinfo_groupbox // this.modinfo_groupbox.Controls.Add(this.tableLayoutPanel3); @@ -1275,7 +1265,7 @@ private void InitializeComponent() this.modinfo_groupbox.Margin = new System.Windows.Forms.Padding(0); this.modinfo_groupbox.Name = "modinfo_groupbox"; this.modinfo_groupbox.Padding = new System.Windows.Forms.Padding(0); - this.modinfo_groupbox.Size = new System.Drawing.Size(970, 259); + this.modinfo_groupbox.Size = new System.Drawing.Size(970, 260); this.modinfo_groupbox.TabIndex = 3; this.modinfo_groupbox.TabStop = false; this.modinfo_groupbox.Text = "Mod Info"; @@ -1293,7 +1283,7 @@ private void InitializeComponent() this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(970, 246); + this.tableLayoutPanel3.Size = new System.Drawing.Size(970, 247); this.tableLayoutPanel3.TabIndex = 10; // // modinfo_tabcontrol @@ -1311,7 +1301,7 @@ private void InitializeComponent() this.modinfo_tabcontrol.Margin = new System.Windows.Forms.Padding(0, 0, 2, 2); this.modinfo_tabcontrol.Name = "modinfo_tabcontrol"; this.modinfo_tabcontrol.SelectedIndex = 0; - this.modinfo_tabcontrol.Size = new System.Drawing.Size(768, 244); + this.modinfo_tabcontrol.Size = new System.Drawing.Size(768, 245); this.modinfo_tabcontrol.TabIndex = 9; this.modinfo_tabcontrol.Selected += new System.Windows.Forms.TabControlEventHandler(this.ModInfoTabSelected); // @@ -1332,7 +1322,7 @@ private void InitializeComponent() this.modinfo_details_tab.Location = new System.Drawing.Point(4, 22); this.modinfo_details_tab.Name = "modinfo_details_tab"; this.modinfo_details_tab.Padding = new System.Windows.Forms.Padding(3); - this.modinfo_details_tab.Size = new System.Drawing.Size(760, 218); + this.modinfo_details_tab.Size = new System.Drawing.Size(760, 219); this.modinfo_details_tab.TabIndex = 0; this.modinfo_details_tab.Text = "Info"; this.modinfo_details_tab.UseVisualStyleBackColor = true; @@ -1443,7 +1433,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.modinfo_info_DescriptionRichTextBox.Location = new System.Drawing.Point(96, 58); this.modinfo_info_DescriptionRichTextBox.Name = "modinfo_info_DescriptionRichTextBox"; - this.modinfo_info_DescriptionRichTextBox.Size = new System.Drawing.Size(661, 157); + this.modinfo_info_DescriptionRichTextBox.Size = new System.Drawing.Size(661, 158); this.modinfo_info_DescriptionRichTextBox.TabIndex = 8; this.modinfo_info_DescriptionRichTextBox.Text = ""; this.modinfo_info_DescriptionRichTextBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.ControlLinkClicked); @@ -1455,7 +1445,7 @@ private void InitializeComponent() this.modinfo_readme_tab.Location = new System.Drawing.Point(4, 22); this.modinfo_readme_tab.Name = "modinfo_readme_tab"; this.modinfo_readme_tab.Padding = new System.Windows.Forms.Padding(3); - this.modinfo_readme_tab.Size = new System.Drawing.Size(760, 218); + this.modinfo_readme_tab.Size = new System.Drawing.Size(760, 219); this.modinfo_readme_tab.TabIndex = 1; this.modinfo_readme_tab.Text = "ReadMe"; this.modinfo_readme_tab.UseVisualStyleBackColor = true; @@ -1480,7 +1470,7 @@ private void InitializeComponent() this.modinfo_inspect_tab.Location = new System.Drawing.Point(4, 22); this.modinfo_inspect_tab.Name = "modinfo_inspect_tab"; this.modinfo_inspect_tab.Padding = new System.Windows.Forms.Padding(3); - this.modinfo_inspect_tab.Size = new System.Drawing.Size(760, 218); + this.modinfo_inspect_tab.Size = new System.Drawing.Size(760, 219); this.modinfo_inspect_tab.TabIndex = 2; this.modinfo_inspect_tab.Text = "Inspect"; this.modinfo_inspect_tab.UseVisualStyleBackColor = true; @@ -1492,7 +1482,7 @@ private void InitializeComponent() this.modinfo_inspect_propertygrid.LineColor = System.Drawing.SystemColors.ControlDark; this.modinfo_inspect_propertygrid.Location = new System.Drawing.Point(3, 3); this.modinfo_inspect_propertygrid.Name = "modinfo_inspect_propertygrid"; - this.modinfo_inspect_propertygrid.Size = new System.Drawing.Size(754, 212); + this.modinfo_inspect_propertygrid.Size = new System.Drawing.Size(754, 213); this.modinfo_inspect_propertygrid.TabIndex = 9; this.modinfo_inspect_propertygrid.Layout += new System.Windows.Forms.LayoutEventHandler(this.modinfo_inspect_propertygrid_Layout); // @@ -1502,7 +1492,7 @@ private void InitializeComponent() this.modinfo_config_tab.Location = new System.Drawing.Point(4, 22); this.modinfo_config_tab.Name = "modinfo_config_tab"; this.modinfo_config_tab.Padding = new System.Windows.Forms.Padding(3); - this.modinfo_config_tab.Size = new System.Drawing.Size(760, 218); + this.modinfo_config_tab.Size = new System.Drawing.Size(760, 219); this.modinfo_config_tab.TabIndex = 3; this.modinfo_config_tab.Text = "Config"; this.modinfo_config_tab.UseVisualStyleBackColor = true; @@ -1525,7 +1515,7 @@ private void InitializeComponent() this.modinfo_config_TableLayoutPanel.RowCount = 2; this.modinfo_config_TableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); this.modinfo_config_TableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.modinfo_config_TableLayoutPanel.Size = new System.Drawing.Size(754, 212); + this.modinfo_config_TableLayoutPanel.Size = new System.Drawing.Size(754, 213); this.modinfo_config_TableLayoutPanel.TabIndex = 13; // // modinfo_ConfigFCTB @@ -1553,7 +1543,6 @@ private void InitializeComponent() this.modinfo_ConfigFCTB.Cursor = System.Windows.Forms.Cursors.IBeam; this.modinfo_ConfigFCTB.DisabledColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); this.modinfo_ConfigFCTB.Dock = System.Windows.Forms.DockStyle.Fill; - this.modinfo_ConfigFCTB.Font = new System.Drawing.Font("Courier New", 9.75F); this.modinfo_ConfigFCTB.IsReplaceMode = false; this.modinfo_ConfigFCTB.Location = new System.Drawing.Point(2, 30); this.modinfo_ConfigFCTB.Margin = new System.Windows.Forms.Padding(2, 0, 2, 2); @@ -1561,25 +1550,12 @@ private void InitializeComponent() this.modinfo_ConfigFCTB.Paddings = new System.Windows.Forms.Padding(0); this.modinfo_ConfigFCTB.SelectionColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(255))))); this.modinfo_ConfigFCTB.ServiceColors = ((FastColoredTextBoxNS.ServiceColors)(resources.GetObject("modinfo_ConfigFCTB.ServiceColors"))); - this.modinfo_ConfigFCTB.Size = new System.Drawing.Size(750, 180); + this.modinfo_ConfigFCTB.Size = new System.Drawing.Size(750, 181); this.modinfo_ConfigFCTB.TabIndex = 11; this.modinfo_ConfigFCTB.WordWrap = true; this.modinfo_ConfigFCTB.Zoom = 100; this.modinfo_ConfigFCTB.TextChanged += new System.EventHandler(this.modinfo_ConfigFCTB_TextChanged); // - // modinfo_config_FileSelectCueComboBox - // - this.modinfo_config_FileSelectCueComboBox.CueText = "Select INI to edit"; - this.modinfo_config_FileSelectCueComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.modinfo_config_FileSelectCueComboBox.FormattingEnabled = true; - this.modinfo_config_FileSelectCueComboBox.Location = new System.Drawing.Point(3, 3); - this.modinfo_config_FileSelectCueComboBox.Name = "modinfo_config_FileSelectCueComboBox"; - this.modinfo_config_FileSelectCueComboBox.Size = new System.Drawing.Size(194, 21); - this.modinfo_config_FileSelectCueComboBox.TabIndex = 12; - this.toolTip.SetToolTip(this.modinfo_config_FileSelectCueComboBox, "Select an INI file to view or edit"); - this.modinfo_config_FileSelectCueComboBox.DropDown += new System.EventHandler(this.AdjustWidthComboBox_DropDown); - this.modinfo_config_FileSelectCueComboBox.SelectedIndexChanged += new System.EventHandler(this.modinfo_config_FileSelectCueComboBox_SelectedIndexChanged); - // // modinfo_config_buttonsTableLayoutPanel // this.modinfo_config_buttonsTableLayoutPanel.ColumnCount = 5; @@ -1671,7 +1647,7 @@ private void InitializeComponent() this.modinfo_changelog_tab.Location = new System.Drawing.Point(4, 22); this.modinfo_changelog_tab.Name = "modinfo_changelog_tab"; this.modinfo_changelog_tab.Padding = new System.Windows.Forms.Padding(3); - this.modinfo_changelog_tab.Size = new System.Drawing.Size(760, 218); + this.modinfo_changelog_tab.Size = new System.Drawing.Size(760, 219); this.modinfo_changelog_tab.TabIndex = 4; this.modinfo_changelog_tab.Text = "Changelog"; this.modinfo_changelog_tab.UseVisualStyleBackColor = true; @@ -1683,7 +1659,7 @@ private void InitializeComponent() this.modinfo_changelog_richtextbox.Location = new System.Drawing.Point(3, 3); this.modinfo_changelog_richtextbox.Name = "modinfo_changelog_richtextbox"; this.modinfo_changelog_richtextbox.ReadOnly = true; - this.modinfo_changelog_richtextbox.Size = new System.Drawing.Size(754, 212); + this.modinfo_changelog_richtextbox.Size = new System.Drawing.Size(754, 213); this.modinfo_changelog_richtextbox.TabIndex = 0; this.modinfo_changelog_richtextbox.Text = ""; this.modinfo_changelog_richtextbox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.ControlLinkClicked); @@ -1694,7 +1670,7 @@ private void InitializeComponent() this.modinfo_dependencies_tab.Location = new System.Drawing.Point(4, 22); this.modinfo_dependencies_tab.Name = "modinfo_dependencies_tab"; this.modinfo_dependencies_tab.Padding = new System.Windows.Forms.Padding(3); - this.modinfo_dependencies_tab.Size = new System.Drawing.Size(760, 218); + this.modinfo_dependencies_tab.Size = new System.Drawing.Size(760, 219); this.modinfo_dependencies_tab.TabIndex = 5; this.modinfo_dependencies_tab.Text = "Dependencies"; this.modinfo_dependencies_tab.UseVisualStyleBackColor = true; @@ -1711,7 +1687,7 @@ private void InitializeComponent() this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(754, 212); + this.tableLayoutPanel1.Size = new System.Drawing.Size(754, 213); this.tableLayoutPanel1.TabIndex = 4; // // panel4 @@ -1853,7 +1829,7 @@ private void InitializeComponent() this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(3, 109); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(748, 100); + this.panel5.Size = new System.Drawing.Size(748, 101); this.panel5.TabIndex = 3; // // olvDependentMods @@ -1884,7 +1860,7 @@ private void InitializeComponent() this.olvDependentMods.Name = "olvDependentMods"; this.olvDependentMods.ShowGroups = false; this.olvDependentMods.ShowItemCountOnGroups = true; - this.olvDependentMods.Size = new System.Drawing.Size(748, 82); + this.olvDependentMods.Size = new System.Drawing.Size(748, 83); this.olvDependentMods.SortGroupItemsByPrimaryColumn = false; this.olvDependentMods.TabIndex = 2; this.olvDependentMods.TintSortColumn = true; @@ -2195,6 +2171,29 @@ private void InitializeComponent() this.fillPanel.TabIndex = 6; this.fillPanel.Visible = false; // + // modlist_FilterCueTextBox + // + this.modlist_FilterCueTextBox.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.modlist_FilterCueTextBox.CueText = "Filter Mods"; + this.modlist_FilterCueTextBox.Location = new System.Drawing.Point(3, 5); + this.modlist_FilterCueTextBox.Name = "modlist_FilterCueTextBox"; + this.modlist_FilterCueTextBox.Size = new System.Drawing.Size(175, 20); + this.modlist_FilterCueTextBox.TabIndex = 1; + this.modlist_FilterCueTextBox.TextChanged += new System.EventHandler(this.filterMods_TextChanged); + // + // modinfo_config_FileSelectCueComboBox + // + this.modinfo_config_FileSelectCueComboBox.CueText = "Select INI to edit"; + this.modinfo_config_FileSelectCueComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.modinfo_config_FileSelectCueComboBox.FormattingEnabled = true; + this.modinfo_config_FileSelectCueComboBox.Location = new System.Drawing.Point(3, 3); + this.modinfo_config_FileSelectCueComboBox.Name = "modinfo_config_FileSelectCueComboBox"; + this.modinfo_config_FileSelectCueComboBox.Size = new System.Drawing.Size(194, 21); + this.modinfo_config_FileSelectCueComboBox.TabIndex = 12; + this.toolTip.SetToolTip(this.modinfo_config_FileSelectCueComboBox, "Select an INI file to view or edit"); + this.modinfo_config_FileSelectCueComboBox.DropDown += new System.EventHandler(this.AdjustWidthComboBox_DropDown); + this.modinfo_config_FileSelectCueComboBox.SelectedIndexChanged += new System.EventHandler(this.modinfo_config_FileSelectCueComboBox_SelectedIndexChanged); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/xcom2-launcher/xcom2-launcher/Forms/SettingsDialog.Designer.cs b/xcom2-launcher/xcom2-launcher/Forms/SettingsDialog.Designer.cs index 97f2511..9befdaf 100644 --- a/xcom2-launcher/xcom2-launcher/Forms/SettingsDialog.Designer.cs +++ b/xcom2-launcher/xcom2-launcher/Forms/SettingsDialog.Designer.cs @@ -49,6 +49,7 @@ private void InitializeComponent() this.autoNumberModIndexesCheckBox = new System.Windows.Forms.CheckBox(); this.neverAdoptTagsAndCatFromprofile = new System.Windows.Forms.CheckBox(); this.useDuplicateModWorkaround = new System.Windows.Forms.CheckBox(); + this.onlyUpdateEnabledAndNew = new System.Windows.Forms.CheckBox(); this.showHiddenEntriesCheckBox = new System.Windows.Forms.CheckBox(); this.useTranslucentModListSelection = new System.Windows.Forms.CheckBox(); this.useSentry = new System.Windows.Forms.CheckBox(); @@ -65,7 +66,6 @@ private void InitializeComponent() this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.hideRunX2Button = new System.Windows.Forms.CheckBox(); this.hideChallengeModeButton = new System.Windows.Forms.CheckBox(); - this.onlyUpdateEnabledAndNew = new System.Windows.Forms.CheckBox(); this.quickArgumentsTextBox = new XCOM2Launcher.UserElements.AutoCompleteTextBox(); this.argumentsTextBox = new XCOM2Launcher.UserElements.AutoCompleteTextBox(); this.groupBox1.SuspendLayout(); @@ -87,7 +87,7 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.tableLayoutPanel2); this.groupBox1.Location = new System.Drawing.Point(12, 8); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(655, 158); + this.groupBox1.Size = new System.Drawing.Size(655, 200); this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "Game options"; @@ -119,13 +119,13 @@ private void InitializeComponent() this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(641, 162); + this.tableLayoutPanel2.Size = new System.Drawing.Size(641, 175); this.tableLayoutPanel2.TabIndex = 6; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(4, 143); + this.label2.Location = new System.Drawing.Point(4, 156); this.label2.Margin = new System.Windows.Forms.Padding(4, 6, 3, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(119, 13); @@ -135,7 +135,7 @@ private void InitializeComponent() // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(4, 118); + this.label1.Location = new System.Drawing.Point(4, 131); this.label1.Margin = new System.Windows.Forms.Padding(4, 6, 3, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(89, 13); @@ -148,13 +148,13 @@ private void InitializeComponent() this.modPathsListbox.FormattingEnabled = true; this.modPathsListbox.Location = new System.Drawing.Point(133, 33); this.modPathsListbox.Name = "modPathsListbox"; - this.modPathsListbox.Size = new System.Drawing.Size(432, 76); + this.modPathsListbox.Size = new System.Drawing.Size(432, 89); this.modPathsListbox.TabIndex = 4; // // ShowQuickLaunchArgumentsToggle // this.ShowQuickLaunchArgumentsToggle.AutoSize = true; - this.ShowQuickLaunchArgumentsToggle.Location = new System.Drawing.Point(571, 140); + this.ShowQuickLaunchArgumentsToggle.Location = new System.Drawing.Point(571, 153); this.ShowQuickLaunchArgumentsToggle.Name = "ShowQuickLaunchArgumentsToggle"; this.ShowQuickLaunchArgumentsToggle.Padding = new System.Windows.Forms.Padding(3, 3, 0, 0); this.ShowQuickLaunchArgumentsToggle.Size = new System.Drawing.Size(62, 19); @@ -200,7 +200,7 @@ private void InitializeComponent() this.flowLayoutPanel1.Location = new System.Drawing.Point(568, 30); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(73, 82); + this.flowLayoutPanel1.Size = new System.Drawing.Size(73, 95); this.flowLayoutPanel1.TabIndex = 12; // // addModPathButton @@ -238,7 +238,7 @@ private void InitializeComponent() this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox2.Controls.Add(this.tableLayoutPanel3); - this.groupBox2.Location = new System.Drawing.Point(12, 278); + this.groupBox2.Location = new System.Drawing.Point(12, 297); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(655, 82); this.groupBox2.TabIndex = 10; @@ -318,6 +318,19 @@ private void InitializeComponent() this.toolTip.SetToolTip(this.useDuplicateModWorkaround, resources.GetString("useDuplicateModWorkaround.ToolTip")); this.useDuplicateModWorkaround.UseVisualStyleBackColor = true; // + // onlyUpdateEnabledAndNew + // + this.onlyUpdateEnabledAndNew.AutoSize = true; + this.tableLayoutPanel3.SetColumnSpan(this.onlyUpdateEnabledAndNew, 2); + this.onlyUpdateEnabledAndNew.Location = new System.Drawing.Point(216, 29); + this.onlyUpdateEnabledAndNew.Name = "onlyUpdateEnabledAndNew"; + this.onlyUpdateEnabledAndNew.Padding = new System.Windows.Forms.Padding(3, 3, 0, 0); + this.onlyUpdateEnabledAndNew.Size = new System.Drawing.Size(240, 20); + this.onlyUpdateEnabledAndNew.TabIndex = 18; + this.onlyUpdateEnabledAndNew.Text = "Only update enabled or new mods on startup"; + this.toolTip.SetToolTip(this.onlyUpdateEnabledAndNew, resources.GetString("onlyUpdateEnabledAndNew.ToolTip")); + this.onlyUpdateEnabledAndNew.UseVisualStyleBackColor = true; + // // showHiddenEntriesCheckBox // this.showHiddenEntriesCheckBox.AutoSize = true; @@ -415,7 +428,7 @@ private void InitializeComponent() // bOK // this.bOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.bOK.Location = new System.Drawing.Point(453, 483); + this.bOK.Location = new System.Drawing.Point(453, 502); this.bOK.Name = "bOK"; this.bOK.Size = new System.Drawing.Size(104, 24); this.bOK.TabIndex = 12; @@ -427,7 +440,7 @@ private void InitializeComponent() // this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.bCancel.Location = new System.Drawing.Point(563, 483); + this.bCancel.Location = new System.Drawing.Point(563, 502); this.bCancel.Name = "bCancel"; this.bCancel.Size = new System.Drawing.Size(104, 24); this.bCancel.TabIndex = 11; @@ -439,7 +452,7 @@ private void InitializeComponent() this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox3.Controls.Add(this.tableLayoutPanel1); - this.groupBox3.Location = new System.Drawing.Point(12, 195); + this.groupBox3.Location = new System.Drawing.Point(12, 214); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(655, 77); this.groupBox3.TabIndex = 13; @@ -474,7 +487,7 @@ private void InitializeComponent() this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox4.Controls.Add(this.tableLayoutPanel4); - this.groupBox4.Location = new System.Drawing.Point(12, 366); + this.groupBox4.Location = new System.Drawing.Point(12, 385); this.groupBox4.Name = "groupBox4"; this.groupBox4.Size = new System.Drawing.Size(655, 111); this.groupBox4.TabIndex = 11; @@ -528,23 +541,10 @@ private void InitializeComponent() this.hideChallengeModeButton.Text = "Hide \"Run Challenge Mode\" button"; this.hideChallengeModeButton.UseVisualStyleBackColor = true; // - // onlyUpdateEnabledAndNew - // - this.onlyUpdateEnabledAndNew.AutoSize = true; - this.tableLayoutPanel3.SetColumnSpan(this.onlyUpdateEnabledAndNew, 2); - this.onlyUpdateEnabledAndNew.Location = new System.Drawing.Point(216, 29); - this.onlyUpdateEnabledAndNew.Name = "onlyUpdateEnabledAndNew"; - this.onlyUpdateEnabledAndNew.Padding = new System.Windows.Forms.Padding(3, 3, 0, 0); - this.onlyUpdateEnabledAndNew.Size = new System.Drawing.Size(240, 20); - this.onlyUpdateEnabledAndNew.TabIndex = 18; - this.onlyUpdateEnabledAndNew.Text = "Only update enabled or new mods on startup"; - this.toolTip.SetToolTip(this.onlyUpdateEnabledAndNew, resources.GetString("onlyUpdateEnabledAndNew.ToolTip")); - this.onlyUpdateEnabledAndNew.UseVisualStyleBackColor = true; - // // quickArgumentsTextBox // this.quickArgumentsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.quickArgumentsTextBox.Location = new System.Drawing.Point(133, 140); + this.quickArgumentsTextBox.Location = new System.Drawing.Point(133, 153); this.quickArgumentsTextBox.Name = "quickArgumentsTextBox"; this.quickArgumentsTextBox.Size = new System.Drawing.Size(432, 20); this.quickArgumentsTextBox.TabIndex = 16; @@ -553,7 +553,7 @@ private void InitializeComponent() // argumentsTextBox // this.argumentsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.argumentsTextBox.Location = new System.Drawing.Point(133, 115); + this.argumentsTextBox.Location = new System.Drawing.Point(133, 128); this.argumentsTextBox.Name = "argumentsTextBox"; this.argumentsTextBox.Size = new System.Drawing.Size(432, 20); this.argumentsTextBox.TabIndex = 15; @@ -563,7 +563,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(679, 519); + this.ClientSize = new System.Drawing.Size(679, 538); this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); this.Controls.Add(this.bOK);