From 6eb418dec83188b8d4efbf74b6557ac2cbdedb0f Mon Sep 17 00:00:00 2001 From: AShifter Date: Fri, 5 May 2017 10:34:46 -0600 Subject: [PATCH] actually fix file skimmer don't copy dat floppy --- .../Applications/FileSkimmer.Designer.cs | 12 ++++++------ ShiftOS.WinForms/Applications/FileSkimmer.cs | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs b/ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs index d19d639..ea9fcec 100644 --- a/ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs +++ b/ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs @@ -69,9 +69,10 @@ namespace ShiftOS.WinForms.Applications // // lvitems // - this.lvitems.Location = new System.Drawing.Point(135, 0); + this.lvitems.Dock = System.Windows.Forms.DockStyle.Fill; + this.lvitems.Location = new System.Drawing.Point(0, 0); this.lvitems.Name = "lvitems"; - this.lvitems.Size = new System.Drawing.Size(499, 332); + this.lvitems.Size = new System.Drawing.Size(634, 332); this.lvitems.TabIndex = 0; this.lvitems.UseCompatibleStateImageBehavior = false; this.lvitems.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.lvitems_ItemSelectionChanged); @@ -80,8 +81,8 @@ namespace ShiftOS.WinForms.Applications // // panel1 // - this.panel1.Controls.Add(this.lvitems); this.panel1.Controls.Add(this.pinnedItems); + this.panel1.Controls.Add(this.lvitems); this.panel1.Controls.Add(this.lbcurrentfolder); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 24); @@ -91,10 +92,9 @@ namespace ShiftOS.WinForms.Applications // // pinnedItems // - this.pinnedItems.Dock = System.Windows.Forms.DockStyle.Fill; - this.pinnedItems.Location = new System.Drawing.Point(0, 0); + this.pinnedItems.Location = new System.Drawing.Point(437, 208); this.pinnedItems.Name = "pinnedItems"; - this.pinnedItems.Size = new System.Drawing.Size(634, 332); + this.pinnedItems.Size = new System.Drawing.Size(197, 124); this.pinnedItems.TabIndex = 3; // // lbcurrentfolder diff --git a/ShiftOS.WinForms/Applications/FileSkimmer.cs b/ShiftOS.WinForms/Applications/FileSkimmer.cs index 6309775..c1ffd40 100644 --- a/ShiftOS.WinForms/Applications/FileSkimmer.cs +++ b/ShiftOS.WinForms/Applications/FileSkimmer.cs @@ -34,7 +34,6 @@ using System.Threading.Tasks; using System.Windows.Forms; using static ShiftOS.Objects.ShiftFS.Utils; -using Newtonsoft.Json; using ShiftOS.Engine; namespace ShiftOS.WinForms.Applications @@ -423,14 +422,14 @@ namespace ShiftOS.WinForms.Applications { if (result == true) { - if (currentdir != "__system") + if (currentdir != "__system" && lvitems.SelectedItems[0].Text != "Up one") { pinDirectory(currentdir + "/" + lvitems.SelectedItems[0].Text); ResetList(); } else { - Infobox.Show("Cannot Pin", "You cannot pin a system drive."); + Infobox.Show("Cannot Pin", "You can only pin files or folders."); } }