shiftos-archive/ShiftOS-C-
1
0
Fork 0
mirror of https://github.com/seriocomedy/ShiftOS-C-.git synced 2025-01-23 01:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial commit.

Browse source
This commit is contained in:
MichaelTheShifter 2016-07-19 14:04:41 -04:00
parent 98fe96c5d3
commit 9322701aa1
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/WindowsFormsApplication1/Controls/SyntaxHighlighter.cs
View file

@ -51,7 +51,7 @@ protected override void WndProc(ref System.Windows.Forms.Message m)
public void SetLanguage(SyntaxSettings.Language lang)
{
Color white = Color.Black;
Color keyword = Color.Red;
Color keyword = Color.Orange;
Color integer = Color.LightGreen;
Color comment = Color.DarkGray;
Color str = Color.Orange;
@ -76,7 +76,7 @@ public void SetLanguage(SyntaxSettings.Language lang)
switch (lang)
{
case SyntaxSettings.Language.Lua:
var kw = new List<string>() { "function", "local", "return", "if", "else", "elseif", "while", "true", "do", "next", "end", "for", "pairs", "in", "{", "}", "false", "=", "+", "-", "/", "*", "..", "," };
var kw = new List<string>() { "function", "then", "local", "return", "if", "else", "elseif", "while", "true", "do", "next", "end", "for", "pairs", "in", "{", "}", "false", "=", "+", "-", "/", "*", "..", "," };
Settings.Keywords.Clear();
foreach (var k in kw)
{

33
source/WindowsFormsApplication1/SkinEngine/skins.cs
View file

@ -10,6 +10,7 @@
namespace Skinning
{
[Obsolete("ShiftOS is moving to the new ShiftUI framework which has a built-in skinning engine. This Skin class is mostly un-needed now.")]
public class Skin {
//Widget Positions
public string ALPosition = "Top";
@ -561,29 +562,21 @@ private static void saveimage(Image img, string Name)
/// </summary>
public static void loadskin()
{
if(Directory.Exists(Paths.LoadedSkin))
if (Directory.Exists(Paths.LoadedSkin))
{
try {
string rawData = File.ReadAllText(Paths.LoadedSkin + "data.json");
loadedSkin = JsonConvert.DeserializeObject<Skin>(rawData);
if (File.Exists(Paths.LoadedSkin + "panels.json"))
{
string panels = File.ReadAllText(Paths.LoadedSkin + "panels.json");
loadedSkin.DesktopPanels = JsonConvert.DeserializeObject<List<DesktopPanel>>(panels);
LoadPanels();
}
loadimages();
LoadEmbeddedNamePack();
}
catch
string rawData = File.ReadAllText(Paths.LoadedSkin + "data.json");
loadedSkin = JsonConvert.DeserializeObject<Skin>(rawData);
if (File.Exists(Paths.LoadedSkin + "panels.json"))
{
//No skin to load.
loadedSkin = new Skin();
loadedskin_images = new Images();
saveskin();
string panels = File.ReadAllText(Paths.LoadedSkin + "panels.json");
loadedSkin.DesktopPanels = JsonConvert.DeserializeObject<List<DesktopPanel>>(panels);
LoadPanels();
}
} else
loadimages();
LoadEmbeddedNamePack();
}
else
{
loadedSkin = new Skin();
loadedskin_images = new Images();