diff --git a/src/BloatyNosy/BloatyNosy.csproj b/src/BloatyNosy/BloatyNosy.csproj index 12c8f58..ffaf2a0 100644 --- a/src/BloatyNosy/BloatyNosy.csproj +++ b/src/BloatyNosy/BloatyNosy.csproj @@ -29,7 +29,7 @@ true - AnyCPU + x64 true full false diff --git a/src/BloatyNosy/MainForm.Designer.cs b/src/BloatyNosy/MainForm.Designer.cs index 9b60461..a28eb22 100644 --- a/src/BloatyNosy/MainForm.Designer.cs +++ b/src/BloatyNosy/MainForm.Designer.cs @@ -209,13 +209,13 @@ // this.lblTools.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblTools.AutoSize = true; - this.lblTools.Font = new System.Drawing.Font("Segoe UI Variable Text", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblTools.Font = new System.Drawing.Font("Segoe UI Variable Text Semibold", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblTools.ForeColor = System.Drawing.Color.DeepPink; - this.lblTools.Location = new System.Drawing.Point(32, 749); + this.lblTools.Location = new System.Drawing.Point(32, 758); this.lblTools.Name = "lblTools"; - this.lblTools.Size = new System.Drawing.Size(38, 30); + this.lblTools.Size = new System.Drawing.Size(35, 15); this.lblTools.TabIndex = 25; - this.lblTools.Text = "More\r\nApps!"; + this.lblTools.Text = "NEW!"; // // cmbTools // @@ -230,7 +230,7 @@ this.cmbTools.ItemHeight = 21; this.cmbTools.Location = new System.Drawing.Point(75, 750); this.cmbTools.Name = "cmbTools"; - this.cmbTools.Size = new System.Drawing.Size(338, 29); + this.cmbTools.Size = new System.Drawing.Size(150, 29); this.cmbTools.TabIndex = 19; this.cmbTools.SelectedIndexChanged += new System.EventHandler(this.cmbTools_SelectedIndexChanged); // diff --git a/src/BloatyNosy/MainForm.cs b/src/BloatyNosy/MainForm.cs index b7d1f4c..76e611f 100644 --- a/src/BloatyNosy/MainForm.cs +++ b/src/BloatyNosy/MainForm.cs @@ -64,7 +64,7 @@ namespace BloatyNosy cmbTools.Items.Add("InstaPackage"); cmbTools.Items.Add("BloatFinder"); cmbTools.Items.Add("WinModder"); - cmbTools.Items.Insert(0, "Select..."); + cmbTools.Items.Insert(0, "More Apps"); cmbTools.SelectedIndex = 0; } @@ -234,7 +234,7 @@ namespace BloatyNosy private async void btnAnalyze_Click(object sender, EventArgs e) { Reset(); - + btnAnalyze.Enabled = false; int performFeaturesCount = 0; List selectedFeatures = CollectFeatureNodes(); @@ -286,11 +286,10 @@ namespace BloatyNosy sum.Append($"We've checked {selectedFeatures.Count} features of your Windows 11 installation.\r\n"); sum.Append($"We like {selectedFeatures.Count - performFeaturesCount} of these features (no need for action).\r\n"); - logger.Log(sum.ToString(), ""); - + logger.Log(sum.ToString(), ""); btnAnalyze.Enabled = true; lnkSubHeader.Text = $"There are {performFeaturesCount} features we don't like and which should be fixed (click for details).\r\n"; - } + private void SelectFeatureNodes(TreeNodeCollection trNodeCollection, bool isCheck) { foreach (TreeNode trNode in trNodeCollection) @@ -387,7 +386,7 @@ namespace BloatyNosy { if (string.IsNullOrWhiteSpace(rtbLog.Text)) { - MessageBox.Show("No analyze has taken place yet"); + MessageBox.Show("No analyze has taken place yet."); return; } @@ -509,6 +508,5 @@ namespace BloatyNosy MessageBox.Show("Profile has been successfully exported.", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information); } } - } } \ No newline at end of file diff --git a/src/BloatyNosy/Properties/AssemblyInfo.cs b/src/BloatyNosy/Properties/AssemblyInfo.cs index dc977e8..c70966a 100644 --- a/src/BloatyNosy/Properties/AssemblyInfo.cs +++ b/src/BloatyNosy/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.31.0")] -[assembly: AssemblyFileVersion("0.31.0")] \ No newline at end of file +[assembly: AssemblyVersion("0.32.0")] +[assembly: AssemblyFileVersion("0.32.0")] \ No newline at end of file diff --git a/src/BloatyNosy/Views/IModsPageView.Designer.cs b/src/BloatyNosy/Views/IModsPageView.Designer.cs index 91ba50e..b31abe2 100644 --- a/src/BloatyNosy/Views/IModsPageView.Designer.cs +++ b/src/BloatyNosy/Views/IModsPageView.Designer.cs @@ -110,7 +110,7 @@ this.btnInstall.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInstall.Font = new System.Drawing.Font("Segoe UI Variable Text Semiligh", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnInstall.ForeColor = System.Drawing.Color.White; - this.btnInstall.Location = new System.Drawing.Point(689, 38); + this.btnInstall.Location = new System.Drawing.Point(704, 38); this.btnInstall.Name = "btnInstall"; this.btnInstall.Size = new System.Drawing.Size(181, 30); this.btnInstall.TabIndex = 207; diff --git a/src/BloatyNosy/Views/IModsPageView.cs b/src/BloatyNosy/Views/IModsPageView.cs index b182b83..8282637 100644 --- a/src/BloatyNosy/Views/IModsPageView.cs +++ b/src/BloatyNosy/Views/IModsPageView.cs @@ -73,7 +73,7 @@ namespace BloatyNosy foreach (ListViewItem item in listView.Items) { var feature = item.SubItems[3].Text; - if (File.Exists(HelperTool.Utils.Data.DataRootDir + feature.Split('/').Last()) + if (File.Exists(HelperTool.Utils.Data.DataRootDir + feature.Split('/').Last()) || File.Exists(HelperTool.Utils.Data.ModsRootDir + feature.Split('/').Last()) || File.Exists(AppDomain.CurrentDomain.BaseDirectory + feature.Split('/').Last())) item.ForeColor = Color.Gray; @@ -144,12 +144,14 @@ namespace BloatyNosy try { - if (fileExt == ".ps1") + if (fileExt == ".ps1" || fileExt == ".ini") await client.DownloadFileTaskAsync(uri, HelperTool.Utils.Data.ModsRootDir + filename); else - await client.DownloadFileTaskAsync(uri, AppDomain.CurrentDomain.BaseDirectory + filename - - ); + { + HelperTool.Utils.CreateDataDir(); // Create appData folder + await client.DownloadFileTaskAsync(uri, HelperTool.Utils.Data.DataRootDir + filename + ); + } } catch (Exception ex) { @@ -197,7 +199,6 @@ namespace BloatyNosy private void listView_DrawItem(object sender, DrawListViewItemEventArgs e) => e.DrawDefault = true; - private void lnkGetModsOnline_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) => HelperTool.Utils.LaunchUri("https://www.builtbybel.com/blog/about-debloos"); diff --git a/src/BloatyNosy/Views/ModsPageView.Designer.cs b/src/BloatyNosy/Views/ModsPageView.Designer.cs index 9241102..882a4d6 100644 --- a/src/BloatyNosy/Views/ModsPageView.Designer.cs +++ b/src/BloatyNosy/Views/ModsPageView.Designer.cs @@ -39,7 +39,6 @@ this.btnHMenu = new System.Windows.Forms.Button(); this.btnBack = new System.Windows.Forms.Button(); this.lnkExploreMods = new System.Windows.Forms.LinkLabel(); - this.lblNoMods = new System.Windows.Forms.Label(); this.tabD = new System.Windows.Forms.TabControl(); this.tabDescription = new System.Windows.Forms.TabPage(); this.rtbDesc = new System.Windows.Forms.RichTextBox(); @@ -98,7 +97,6 @@ this.pnlMain.Controls.Add(this.btnHMenu); this.pnlMain.Controls.Add(this.btnBack); this.pnlMain.Controls.Add(this.lnkExploreMods); - this.pnlMain.Controls.Add(this.lblNoMods); this.pnlMain.Controls.Add(this.tabD); this.pnlMain.Controls.Add(this.textSearch); this.pnlMain.Controls.Add(this.lnkCode); @@ -115,15 +113,15 @@ // // lblStatus // - this.lblStatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.lblStatus.AutoEllipsis = true; - this.lblStatus.Font = new System.Drawing.Font("Segoe UI Variable Text Semiligh", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblStatus.ForeColor = System.Drawing.Color.DeepPink; - this.lblStatus.Location = new System.Drawing.Point(92, 94); + this.lblStatus.AutoSize = true; + this.lblStatus.Font = new System.Drawing.Font("Segoe UI Variable Text", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblStatus.ForeColor = System.Drawing.Color.HotPink; + this.lblStatus.Location = new System.Drawing.Point(88, 106); this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(802, 23); - this.lblStatus.TabIndex = 205; + this.lblStatus.Size = new System.Drawing.Size(94, 17); + this.lblStatus.TabIndex = 206; + this.lblStatus.Text = "Mods installed"; // // lblHeader // @@ -181,19 +179,6 @@ this.lnkExploreMods.Text = "Explore Mods"; this.lnkExploreMods.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkExploreMods_LinkClicked); // - // lblNoMods - // - this.lblNoMods.AutoEllipsis = true; - this.lblNoMods.AutoSize = true; - this.lblNoMods.Font = new System.Drawing.Font("Segoe UI Variable Text Semibold", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblNoMods.ForeColor = System.Drawing.Color.Thistle; - this.lblNoMods.Location = new System.Drawing.Point(386, 4); - this.lblNoMods.Name = "lblNoMods"; - this.lblNoMods.Size = new System.Drawing.Size(168, 26); - this.lblNoMods.TabIndex = 200; - this.lblNoMods.Text = "No Mods installed"; - this.lblNoMods.Visible = false; - // // tabD // this.tabD.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) @@ -312,7 +297,7 @@ // this.progress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.progress.Location = new System.Drawing.Point(92, 120); + this.progress.Location = new System.Drawing.Point(92, 129); this.progress.Name = "progress"; this.progress.Size = new System.Drawing.Size(857, 5); this.progress.TabIndex = 196; @@ -389,7 +374,6 @@ private System.Windows.Forms.TabPage tabCode; private System.Windows.Forms.RichTextBox rtbCode; private System.Windows.Forms.Panel pnlMain; - private System.Windows.Forms.Label lblNoMods; private System.Windows.Forms.TextBox textSearch; private System.Windows.Forms.LinkLabel lnkCode; private System.Windows.Forms.LinkLabel lnkDesc; @@ -400,7 +384,7 @@ private System.Windows.Forms.Label lblHeader; private System.Windows.Forms.Button btnHMenu; private System.Windows.Forms.Button btnBack; - private System.Windows.Forms.Label lblStatus; public System.Windows.Forms.LinkLabel lnkExploreMods; + private System.Windows.Forms.Label lblStatus; } } diff --git a/src/BloatyNosy/Views/ModsPageView.cs b/src/BloatyNosy/Views/ModsPageView.cs index b9edcf2..8957911 100644 --- a/src/BloatyNosy/Views/ModsPageView.cs +++ b/src/BloatyNosy/Views/ModsPageView.cs @@ -79,7 +79,7 @@ namespace BloatyNosy ModsList.Add(Path.GetFileNameWithoutExtension(manifest)); } } - catch { lblNoMods.Visible = true; btnApply.Visible = false; btnCancel.Visible = false; } + catch { lblStatus.Text = "No Mods installed"; btnApply.Visible = false; btnCancel.Visible = false; } } private async void DoMods(string language) @@ -133,7 +133,7 @@ namespace BloatyNosy break; } - lblStatus.Text = ""; + lblStatus.Text = "Installed Mods"; progress.Visible = false; btnCancel.Visible = false; btnApply.Enabled = true; diff --git a/src/BloatyNosy/Views/PackagesPageView.Designer.cs b/src/BloatyNosy/Views/PackagesPageView.Designer.cs index 17cd154..1e6d4f2 100644 --- a/src/BloatyNosy/Views/PackagesPageView.Designer.cs +++ b/src/BloatyNosy/Views/PackagesPageView.Designer.cs @@ -57,7 +57,7 @@ this.groupBox2.Size = new System.Drawing.Size(411, 648); this.groupBox2.TabIndex = 49; this.groupBox2.TabStop = false; - this.groupBox2.Text = "Available packages"; + this.groupBox2.Text = "Online packages"; // // listRemote // @@ -141,12 +141,13 @@ // // btnInstall // + this.btnInstall.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnInstall.BackColor = System.Drawing.Color.MediumVioletRed; this.btnInstall.FlatAppearance.BorderColor = System.Drawing.Color.Orchid; this.btnInstall.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInstall.Font = new System.Drawing.Font("Segoe UI Variable Text Semiligh", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnInstall.ForeColor = System.Drawing.Color.White; - this.btnInstall.Location = new System.Drawing.Point(797, 49); + this.btnInstall.Location = new System.Drawing.Point(825, 49); this.btnInstall.Name = "btnInstall"; this.btnInstall.Size = new System.Drawing.Size(181, 30); this.btnInstall.TabIndex = 51; diff --git a/src/BloatyNosy/Views/PackagesPageView.cs b/src/BloatyNosy/Views/PackagesPageView.cs index 9a34db9..631ef71 100644 --- a/src/BloatyNosy/Views/PackagesPageView.cs +++ b/src/BloatyNosy/Views/PackagesPageView.cs @@ -16,6 +16,8 @@ namespace BloatyNosy private List Packages = new List(); private List remoteApps = new List(); + private string fPackagesLocal = HelperTool.Utils.Data.DataRootDir + "InstaPackage.app"; + public PackagesPageView() { InitializeComponent(); @@ -23,6 +25,8 @@ namespace BloatyNosy RequestPackagesRemote(); listRemote.Items.AddRange(remoteApps.ToArray()); + GetPackagesLocal(); + SetStyle(); } @@ -63,6 +67,24 @@ namespace BloatyNosy { MessageBox.Show(ex.Message); } } + public void GetPackagesLocal() + { + if (File.Exists(fPackagesLocal)) + { + string[] appsInstall = File.ReadAllLines(fPackagesLocal); + + listRemote.Items.Clear(); + groupBox2.Text = "Offline ppackages"; + foreach (var currentApp in appsInstall) + { + if (!currentApp.StartsWith("#") && (!string.IsNullOrEmpty(currentApp))) + { + listRemote.Items.Add(currentApp.ToString()); + } + } + } + else return; + } private void textSearch_TextChanged(object sender, EventArgs e) {