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

Merge pull request #119 from AShifter/master

Browse source 
fix advanced fs
This commit is contained in:
Michael VanOverbeek 2017-05-05 11:54:14 -04:00 committed by GitHub
commit 9a2373ec42
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,10 +69,9 @@ namespace ShiftOS.WinForms.Applications
//
// lvitems
//
this.lvitems.Dock = System.Windows.Forms.DockStyle.Right;
this.lvitems.Location = new System.Drawing.Point(120, 0);
this.lvitems.Location = new System.Drawing.Point(135, 0);
this.lvitems.Name = "lvitems";
this.lvitems.Size = new System.Drawing.Size(514, 332);
this.lvitems.Size = new System.Drawing.Size(499, 332);
this.lvitems.TabIndex = 0;
this.lvitems.UseCompatibleStateImageBehavior = false;
this.lvitems.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.lvitems_ItemSelectionChanged);
@ -81,8 +80,8 @@ namespace ShiftOS.WinForms.Applications
//
// panel1
//
this.panel1.Controls.Add(this.pinnedItems);
this.panel1.Controls.Add(this.lvitems);
this.panel1.Controls.Add(this.pinnedItems);
this.panel1.Controls.Add(this.lbcurrentfolder);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 24);
@ -92,10 +91,10 @@ namespace ShiftOS.WinForms.Applications
//
// pinnedItems
//
this.pinnedItems.Dock = System.Windows.Forms.DockStyle.Left;
this.pinnedItems.Dock = System.Windows.Forms.DockStyle.Fill;
this.pinnedItems.Location = new System.Drawing.Point(0, 0);
this.pinnedItems.Name = "pinnedItems";
this.pinnedItems.Size = new System.Drawing.Size(114, 332);
this.pinnedItems.Size = new System.Drawing.Size(634, 332);
this.pinnedItems.TabIndex = 3;
//
// lbcurrentfolder

10
ShiftOS.WinForms/Applications/Skin Loader.cs
View file

@ -313,7 +313,15 @@ namespace ShiftOS.WinForms.Applications
{
AppearanceManager.SetupDialog(new FileDialog(new[] { ".skn" }, FileOpenerStyle.Open, new Action<string>((filename) =>
{
LoadedSkin = JsonConvert.DeserializeObject<Skin>(ShiftOS.Objects.ShiftFS.Utils.ReadAllText(filename));
try
{
LoadedSkin = JsonConvert.DeserializeObject<Skin>(ShiftOS.Objects.ShiftFS.Utils.ReadAllText(filename));
}
catch
{
Infobox.Show("Invalid Skin", "This skin is not compatible with this version of ShiftOS.");
}
SetupUI();
})));
}