shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #121 from AShifter/master

Browse source 
actually fix something
This commit is contained in:
Michael VanOverbeek 2017-05-05 12:43:37 -04:00 committed by GitHub
commit ba585e7614
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs generated
View file

@ -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

5
ShiftOS.WinForms/Applications/FileSkimmer.cs
View file

@ -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.");
}
}