UpTool/UpTool2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide CLI in GUI-Installer (no longer used)

Browse Source
This commit is contained in:
JFronny 2020-05-16 18:29:50 +02:00
parent a42b9b624d
commit 802340e418
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installer/Installer.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<ApplicationIcon>..\UpTool2.ico</ApplicationIcon> <ApplicationIcon>..\UpTool2.ico</ApplicationIcon>

40
Installer/InstallerForm.Designer.cs generated
View File

@ -27,8 +27,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Installer.InstallerForm));
new System.ComponentModel.ComponentResourceManager(typeof(Installer.InstallerForm));
this.install = new System.Windows.Forms.Button(); this.install = new System.Windows.Forms.Button();
this.installLabel = new System.Windows.Forms.Label(); this.installLabel = new System.Windows.Forms.Label();
this.progress = new System.Windows.Forms.ProgressBar(); this.progress = new System.Windows.Forms.ProgressBar();
@ -38,10 +37,7 @@
this.pathBox = new System.Windows.Forms.CheckBox(); this.pathBox = new System.Windows.Forms.CheckBox();
this.updateAppsBox = new System.Windows.Forms.CheckBox(); this.updateAppsBox = new System.Windows.Forms.CheckBox();
this.SuspendLayout(); this.SuspendLayout();
this.install.Anchor = this.install.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right)));
((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Bottom |
System.Windows.Forms.AnchorStyles.Left) |
System.Windows.Forms.AnchorStyles.Right)));
this.install.Location = new System.Drawing.Point(12, 116); this.install.Location = new System.Drawing.Point(12, 116);
this.install.Name = "install"; this.install.Name = "install";
this.install.Size = new System.Drawing.Size(539, 27); this.install.Size = new System.Drawing.Size(539, 27);
@ -55,29 +51,21 @@
this.installLabel.Size = new System.Drawing.Size(550, 75); this.installLabel.Size = new System.Drawing.Size(550, 75);
this.installLabel.TabIndex = 1; this.installLabel.TabIndex = 1;
this.installLabel.Text = resources.GetString("installLabel.Text"); this.installLabel.Text = resources.GetString("installLabel.Text");
this.progress.Anchor = this.progress.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right)));
((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Bottom |
System.Windows.Forms.AnchorStyles.Left) |
System.Windows.Forms.AnchorStyles.Right)));
this.progress.Location = new System.Drawing.Point(12, 116); this.progress.Location = new System.Drawing.Point(12, 116);
this.progress.Maximum = 8; this.progress.Maximum = 8;
this.progress.Name = "progress"; this.progress.Name = "progress";
this.progress.Size = new System.Drawing.Size(539, 27); this.progress.Size = new System.Drawing.Size(539, 27);
this.progress.TabIndex = 2; this.progress.TabIndex = 2;
this.progress.Visible = false; this.progress.Visible = false;
this.processLabel.Anchor = this.processLabel.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right)));
((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Bottom |
System.Windows.Forms.AnchorStyles.Left) |
System.Windows.Forms.AnchorStyles.Right)));
this.processLabel.ForeColor = System.Drawing.SystemColors.ControlText; this.processLabel.ForeColor = System.Drawing.SystemColors.ControlText;
this.processLabel.Location = new System.Drawing.Point(386, 91); this.processLabel.Location = new System.Drawing.Point(386, 91);
this.processLabel.Name = "processLabel"; this.processLabel.Name = "processLabel";
this.processLabel.Size = new System.Drawing.Size(165, 22); this.processLabel.Size = new System.Drawing.Size(165, 22);
this.processLabel.TabIndex = 3; this.processLabel.TabIndex = 3;
this.processLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; this.processLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
this.log.Anchor = this.log.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top |
System.Windows.Forms.AnchorStyles.Right)));
this.log.Location = new System.Drawing.Point(524, 3); this.log.Location = new System.Drawing.Point(524, 3);
this.log.Name = "log"; this.log.Name = "log";
this.log.Size = new System.Drawing.Size(36, 23); this.log.Size = new System.Drawing.Size(36, 23);
@ -86,9 +74,7 @@
this.log.UseVisualStyleBackColor = true; this.log.UseVisualStyleBackColor = true;
this.log.Visible = false; this.log.Visible = false;
this.log.Click += new System.EventHandler(this.log_Click); this.log.Click += new System.EventHandler(this.log_Click);
this.startupBox.Anchor = this.startupBox.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom |
System.Windows.Forms.AnchorStyles.Left)));
this.startupBox.AutoSize = true; this.startupBox.AutoSize = true;
this.startupBox.Enabled = false; this.startupBox.Enabled = false;
this.startupBox.Location = new System.Drawing.Point(130, 91); this.startupBox.Location = new System.Drawing.Point(130, 91);
@ -97,9 +83,7 @@
this.startupBox.TabIndex = 5; this.startupBox.TabIndex = 5;
this.startupBox.Text = "Update on Startup"; this.startupBox.Text = "Update on Startup";
this.startupBox.CheckedChanged += new System.EventHandler(this.startupBox_CheckedChanged); this.startupBox.CheckedChanged += new System.EventHandler(this.startupBox_CheckedChanged);
this.pathBox.Anchor = this.pathBox.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom |
System.Windows.Forms.AnchorStyles.Left)));
this.pathBox.AutoSize = true; this.pathBox.AutoSize = true;
this.pathBox.Location = new System.Drawing.Point(12, 91); this.pathBox.Location = new System.Drawing.Point(12, 91);
this.pathBox.Name = "pathBox"; this.pathBox.Name = "pathBox";
@ -107,9 +91,7 @@
this.pathBox.TabIndex = 6; this.pathBox.TabIndex = 6;
this.pathBox.Text = "Register in PATH"; this.pathBox.Text = "Register in PATH";
this.pathBox.CheckedChanged += new System.EventHandler(this.pathBox_CheckedChanged); this.pathBox.CheckedChanged += new System.EventHandler(this.pathBox_CheckedChanged);
this.updateAppsBox.Anchor = this.updateAppsBox.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom |
System.Windows.Forms.AnchorStyles.Left)));
this.updateAppsBox.AutoSize = true; this.updateAppsBox.AutoSize = true;
this.updateAppsBox.Enabled = false; this.updateAppsBox.Enabled = false;
this.updateAppsBox.Location = new System.Drawing.Point(258, 91); this.updateAppsBox.Location = new System.Drawing.Point(258, 91);
@ -136,16 +118,16 @@
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
} }
#endregion
private System.Windows.Forms.Button install; private System.Windows.Forms.Button install;
private System.Windows.Forms.Label installLabel; private System.Windows.Forms.Label installLabel;
private System.Windows.Forms.ProgressBar progress;
private System.Windows.Forms.Label processLabel;
private System.Windows.Forms.Button log; private System.Windows.Forms.Button log;
private System.Windows.Forms.CheckBox pathBox; private System.Windows.Forms.CheckBox pathBox;
private System.Windows.Forms.Label processLabel;
private System.Windows.Forms.ProgressBar progress;
private System.Windows.Forms.CheckBox startupBox; private System.Windows.Forms.CheckBox startupBox;
private System.Windows.Forms.CheckBox updateAppsBox; private System.Windows.Forms.CheckBox updateAppsBox;
#endregion
} }
} }

2
UpToolCLI/PackageManagement.cs
View File

@ -176,7 +176,7 @@ namespace UpToolCLI
App tmp = apps.First(); App tmp = apps.First();
if ((tmp.Status & Status.Installed) == Status.Installed) if ((tmp.Status & Status.Installed) == Status.Installed)
{ {
Console.WriteLine($"Purgeing {tmp.Name}"); Console.WriteLine($"Purging {tmp.Name}");
AppExtras.Remove(tmp, true); AppExtras.Remove(tmp, true);
} }
else else