diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,83 +1,85 @@
 syntax: glob
 
 .vs
 .vscode
 .DS_Store
 lib
 *.o
 *.obj
 *.d
 *.VC.db
 *.orig
 *.Matthew
 *.matthew
 *.user
 */.DS_Store
 *.xcuserstate
 *.xcbkptlist
 xcschememanagement.plist
 contents.xcworkspacedata
 */IDEWorkspaceChecks.plist
 
 x64ReleaseNoOptimize*
 x64Debug*
 x64Release*
 Debug
 Release
 makefile
 src/mac/cocoa/DerivedData
 
 */haikuPassword.txt
 ide/makefile
 ide/lgiide.txt
 ide/mac/build
 ide/mac/DerivedData
 
 rvc/Lvc.xml
 rvc/lvc
 rvc/mac/build
 lvc/mac/DerivedData
+lvc/mac/build/XCBuildData
 
 resourceEditor/mac/build
 resourceEditor/lgires
 resourceEditor/mac/DerivedData
 
 ScriptingUnitTests/Win32*
 ScriptingUnitTests/x64*
 
 src/common/Gdc2/Path/test/*.sdf
 src/common/Gdc2/Path/test/*.suo
 src/common/Gdc2/Path/test/x64*
 src/mac/carbon/build
 src/mac/cocoa/build
 src/mac/lldb_callback/build
 src/common/INet/libntlm-0.4.2/build-win32/Win32*
 src/common/INet/libntlm-0.4.2/build-win32/x64*
 
 Static_Win32*
 Static_x64*
 
 tests/Debug
 tests/Release
 tests/x64
 test/HtmlViewer/Files
 test/HtmlViewer/Output
 test/HtmlViewer/HtmlTestSuite
 test/HtmlViewer/mac/DerivedData
 test/HtmlEditor/testcases
 test/HtmlEditor/htmleditor
 test/GuiTest/gui_test
 test/GuiTest/gui_test.txt
 test/GuiTest/Lgi Test App.xml
 test/GuiTest/Mac/DerivedData
 test/GuiTest/Mac/build
+test/UnitTests/mac/DerivedData
 
 utils/SlogViewer/slogviewer
 
 Updater/Win32*
 Updater/x64*
 
 VsLaunch/VsLaunch*.sdf
 VsLaunch/VsLaunch*.suo
 VsLaunch/Win32*
 VsLaunch/x64*
diff --git a/lvc/src/Main.cpp b/lvc/src/Main.cpp
--- a/lvc/src/Main.cpp
+++ b/lvc/src/Main.cpp
@@ -1,2059 +1,2061 @@
 #include "lgi/common/Lgi.h"
 #include "lgi/common/TableLayout.h"
 #include "lgi/common/TextLog.h"
 #include "lgi/common/Button.h"
 #include "lgi/common/XmlTreeUi.h"
 #include "lgi/common/Tree.h"
 #include "lgi/common/FileSelect.h"
 #include "lgi/common/StructuredLog.h"
 #include "lgi/common/PopupNotification.h"
 
 #include "Lvc.h"
 #include "resdefs.h"
 #ifdef WINDOWS
 #include "resource.h"
 #endif
 
 //////////////////////////////////////////////////////////////////
 const char *AppName =			"Lvc";
 #define DEFAULT_BUILD_FIX_MSG	"Build fix."
 #define OPT_Hosts				"Hosts"
 #define OPT_Host				"Host"
 
 AppPriv::~AppPriv()
 {
 	if (CurFolder)
 		CurFolder->Empty();
 }
 	
 #if HAS_LIBSSH
 SshConnection *AppPriv::GetConnection(const char *Uri, bool Create)
 {
 	LUri u(Uri);
 	u.sPath.Empty();
 	auto s = u.ToString();
 	auto Conn = Connections.Find(s);
 	if (!Conn && Create)
 		Connections.Add(s, Conn = new SshConnection(Log, s, "matthew@*$ "));
 	return Conn;
 }
 #endif
 
 VersionCtrl AppPriv::DetectVcs(VcFolder *Fld)
 {
 	char p[MAX_PATH_LEN];
 	LUri u = Fld->GetUri();
 
 	if (!u.IsFile() || !u.sPath)
 	{
 		#if HAS_LIBSSH
 			auto c = GetConnection(u.ToString());
 			if (!c)
 				return VcError;
 			
 			auto type = c->Types.Find(u.sPath);
 			if (type)
 				return type;
 
 			c->DetectVcs(Fld);
 			Fld->GetCss(true)->Color(LColour::Blue);
 			Fld->Update();
 			return VcPending;
 		#else
 			return VcError;
 		#endif
 	}
 
 	auto Path = u.sPath.Get();
 	#ifdef WINDOWS
 		if (*Path == '/')
 			Path++;
 	#endif
 
 	if (LMakePath(p, sizeof(p), Path, ".git") &&
 		LDirExists(p))
 		return VcGit;
 
 	if (LMakePath(p, sizeof(p), Path, ".svn") &&
 		LDirExists(p))
 		return VcSvn;
 
 	if (LMakePath(p, sizeof(p), Path, ".hg") &&
 		LDirExists(p))
 		return VcHg;
 
 	if (LMakePath(p, sizeof(p), Path, "CVS") &&
 		LDirExists(p))
 		return VcCvs;
 
 	return VcNone;
 }
 
 
 class DiffView : public LTextLog
 {
 public:
 	DiffView(int id) : LTextLog(id)
 	{
 	}
 
 	void PourStyle(size_t Start, ssize_t Length)
 	{
 		for (auto ln : LTextView3::Line)
 		{
 			if (!ln->c.IsValid())
 			{
 				char16 *t = Text + ln->Start;
 				
 				if (*t == '+')
 				{
 					ln->c = LColour::Green;
 					ln->Back.Rgb(245, 255, 245);
 				}
 				else if (*t == '-')
 				{
 					ln->c = LColour::Red;
 					ln->Back.Rgb(255, 245, 245);
 				}
 				else if (*t == '@')
 				{
 					ln->c.Rgb(128, 128, 128);
 					ln->Back.Rgb(235, 235, 235);
 				}
 				else
 					ln->c = LColour(L_TEXT);
 			}
 		}
 	}
 };
 
 class EditAuthor : public LDialog
 {
 	VcFolder *folder = NULL;
 
 public:
 	EditAuthor(VcFolder *f) : folder(f)
 	{
 		SetParent(folder->GetTree());
 		LoadFromResource(IDD_AUTHOR);
 
 		f->GetAuthor(true, [this](auto name, auto email)
 		{
 			SetCtrlName(IDC_LOCAL_NAME, name);
 			SetCtrlName(IDC_LOCAL_EMAIL, email);
 		});
 
 		f->GetAuthor(false, [this](auto name, auto email)
 		{
 			SetCtrlName(IDC_GLOBAL_NAME, name);
 			SetCtrlName(IDC_GLOBAL_EMAIL, email);
 		});
 	}
 
 	int OnNotify(LViewI *Ctrl, LNotification n)
 	{
 		switch (Ctrl->GetId())
 		{
 			case IDOK:
 			{
 				folder->SetAuthor(true,  GetCtrlName(IDC_LOCAL_NAME),  GetCtrlName(IDC_LOCAL_EMAIL));
 				folder->SetAuthor(false, GetCtrlName(IDC_GLOBAL_NAME), GetCtrlName(IDC_GLOBAL_EMAIL));
 				// fall through
 			}
 			case IDCANCEL:
 			{
 				EndModal(Ctrl->GetId() == IDOK);
 				break;
 			}
 		}
 
 		return 0;
 	}
 };
 
 class ToolBar : public LLayout, public LResourceLoad
 {
 public:
 	ToolBar()
 	{
 		LString Name;
 		LRect Pos;
 		if (LoadFromResource(IDD_TOOLBAR, this, &Pos, &Name))
 		{
 			OnPosChange();
 		}
 		else LAssert(!"Missing toolbar resource");
 	}
 
 	void OnCreate()
 	{
 		AttachChildren();
 	}
 
 	void OnPosChange()
 	{
 		LRect Cli = GetClient();
 
 		LTableLayout *v;
 		if (GetViewById(IDC_TABLE, v))
 		{
 			v->SetPos(Cli);
 				
 			v->OnPosChange();
 			auto r = v->GetUsedArea();
 			if (r.Y() <= 1)
 				r.Set(0, 0, 30, 30);
 			
 			// printf("Used = %s\n", r.GetStr());
 			LCss::Len NewSz(LCss::LenPx, (float)r.Y()+3);
 			auto OldSz = GetCss(true)->Height();
 			if (OldSz != NewSz)
 			{
 				GetCss(true)->Height(NewSz);
 				SendNotify(LNotifyTableLayoutRefresh);
 			}
 		}
 		else LAssert(!"Missing table ctrl");
 	}
 
 	void OnPaint(LSurface *pDC)
 	{
 		pDC->Colour(LColour(L_MED));
 		pDC->Rectangle();
 	}
 };
 
 class CommitCtrls : public LLayout, public LResourceLoad
 {
 public:
 	CommitCtrls()
 	{
 		LString Name;
 		LRect Pos;
 		if (LoadFromResource(IDD_COMMIT, this, &Pos, &Name))
 		{
 			LTableLayout *v;
 			if (GetViewById(IDC_COMMIT_TABLE, v))
 			{
 				v->GetCss(true)->PaddingRight("8px");
 				LRect r = v->GetPos();
 				r.Offset(-r.x1, -r.y1);
 				r.x2++;
 				v->SetPos(r);
 				
 				v->OnPosChange();
 				r = v->GetUsedArea();
 				if (r.Y() <= 1)
 					r.Set(0, 0, 30, 30);
 				GetCss(true)->Height(LCss::Len(LCss::LenPx, (float)r.Y()));
 			}
 			else LAssert(!"Missing table ctrl");
 		}
 		else LAssert(!"Missing toolbar resource");
 	}
 
 	void OnPosChange()
 	{
 		LTableLayout *v;
 		if (GetViewById(IDC_COMMIT_TABLE, v))
 			v->SetPos(GetClient());
 	}
 
 	void OnCreate()
 	{
 		AttachChildren();
 	}
 };
 
 LString::Array GetProgramsInPath(const char *Program)
 {
 	LString::Array Bin;
 	LString Prog = Program;
 	#ifdef WINDOWS
 	Prog += LGI_EXECUTABLE_EXT;
 	#endif
 
 	LString::Array a = LGetPath();
 	for (auto p : a)
 	{
 		LFile::Path c(p, Prog);
 		if (c.Exists())
 			Bin.New() = c.GetFull();
 	}
 
 	return Bin;
 }
 
 class OptionsDlg : public LDialog, public LXmlTreeUi
 {
 	LOptionsFile &Opts;
 
 public:
 	OptionsDlg(LViewI *Parent, LOptionsFile &opts) : Opts(opts)
 	{
 		SetParent(Parent);
 
 		Map("svn-path", IDC_SVN, GV_STRING);
 		Map("svn-limit", IDC_SVN_LIMIT);
 
 		Map("git-path", IDC_GIT, GV_STRING);
 		Map("git-limit", IDC_GIT_LIMIT);
 
 		Map("hg-path", IDC_HG, GV_STRING);
 		Map("hg-limit", IDC_HG_LIMIT);
 
 		Map("cvs-path", IDC_CVS, GV_STRING);
 		Map("cvs-limit", IDC_CVS_LIMIT);
 
 		if (LoadFromResource(IDD_OPTIONS))
 		{
 			MoveSameScreen(Parent);
 			Convert(&Opts, this, true);
 		}
 	}
 
 	void Browse(int EditId)
 	{
 		auto s = new LFileSelect;
 		s->Parent(this);
 		s->Open([this, EditId](auto s, auto status)
 		{
 			if (status)
 				SetCtrlName(EditId, s->Name());
 			delete s;
 		});
 	}
 
 	void BrowseFiles(LViewI *Ctrl, const char *Bin, int EditId)
 	{
 		LRect Pos = Ctrl->GetPos();
 		LPoint Pt(Pos.x1, Pos.y2 + 1);
 		PointToScreen(Pt);
 		
 		LSubMenu s;
 
 		LString::Array Bins = GetProgramsInPath(Bin);
 		for (unsigned i=0; i<Bins.Length(); i++)
 		{
 			s.AppendItem(Bins[i], 1000+i);
 		}
 
 		if (Bins.Length() == 0)
 		{
 			Browse(EditId);
 		}
 		else
 		{
 			s.AppendSeparator();
 			s.AppendItem("Browse...", 1);
 			int Cmd = s.Float(this, Pt.x, Pt.y, LSubMenu::BtnLeft);
 			switch (Cmd)
 			{
 				case 1:
 					Browse(EditId);
 					break;
 				default:
 					if (Cmd >= 1000)
 					{
 						LString Bin = Bins[Cmd - 1000];
 						if (Bin)
 							SetCtrlName(EditId, Bin);
 					}
 					break;
 			}
 		}
 	}
 
 	int OnNotify(LViewI *Ctrl, LNotification n)
 	{
 		switch (Ctrl->GetId())
 		{
 			case IDC_SVN_BROWSE:
 				BrowseFiles(Ctrl, "svn", IDC_SVN);
 				break;
 			case IDC_GIT_BROWSE:
 				BrowseFiles(Ctrl, "git", IDC_GIT);
 				break;
 			case IDC_HG_BROWSE:
 				BrowseFiles(Ctrl, "hg", IDC_HG);
 				break;
 			case IDC_CVS_BROWSE:
 				BrowseFiles(Ctrl, "cvs", IDC_CVS);
 				break;
 			case IDOK:
 				Convert(&Opts, this, false);
 				// fall
 			case IDCANCEL:
 			{
 				EndModal(Ctrl->GetId() == IDOK);
 				break;
 			}
 		}
 
 		return LDialog::OnNotify(Ctrl, n);
 	}
 };
 
 int CommitDataCmp(VcCommit **_a, VcCommit **_b)
 {
 	auto a = *_a;
 	auto b = *_b;
 	return a->GetTs().Compare(&b->GetTs());
 }
 
 LString::Array AppPriv::GetCommitRange()
 {
 	LString::Array r;
 
 	if (Commits)
 	{
 		LArray<VcCommit*> Sel;
 		Commits->GetSelection(Sel);
 		if (Sel.Length() > 1)
 		{
 			Sel.Sort(CommitDataCmp);
 			r.Add(Sel[0]->GetRev());
 			r.Add(Sel.Last()->GetRev());
 		}
 		else if (Sel.Length() == 1)
 		{
 			r.Add(Sel[0]->GetRev());
 		}
 	}
 	else LAssert(!"No commit list ptr");
 
 	return r;
 }
 
 LArray<VcCommit*> AppPriv::GetRevs(LString::Array &Revs)
 {
 	LArray<VcCommit*> a;
 	
 	for (auto i = Commits->begin(); i != Commits->end(); i++)
 	{
 		VcCommit *c = dynamic_cast<VcCommit*>(*i);
 		if (c)
 		{
 			for (auto r: Revs)
 			{
 				if (r.Equals(c->GetRev()))
 				{
 					a.Add(c);
 					break;
 				}
 			}
 		}
 	}
 
 	return a;
 }
 
 class CommitList : public LList
 {
 public:
 	CommitList(int id) : LList(id, 0, 0, 200, 200)
 	{
 	}
 
 	void SelectRevisions(LString::Array &Revs, const char *BranchHint = NULL)
 	{
 		VcCommit *Scroll = NULL;
 		LArray<VcCommit*> Matches;
 		for (auto i: *this)
 		{
 			VcCommit *item = dynamic_cast<VcCommit*>(i);
 			if (!item)
 				continue;
 
 			bool IsMatch = false;
 			for (auto r: Revs)
 			{
 				if (item->IsRev(r))
 				{
 					IsMatch = true;
 					break;
 				}
 			}
 			if (IsMatch)
 				Matches.Add(item);
 			else if (i->Select())
 				i->Select(false);
 		}
 
 		for (auto item: Matches)
 		{
 			auto b = item->GetBranch();
 			if (BranchHint)
 			{
 				if (!b || Stricmp(b, BranchHint))
 					continue;
 			}
 			else if (b)
 			{
 				continue;
 			}
 
 			if (!Scroll)
 				Scroll = item;
 			item->Select(true);
 		}
 		if (!Scroll && Matches.Length() > 0)
 		{
 			Scroll = Matches[0];
 			Scroll->Select(true);
 		}
 
 		if (Scroll)
 			Scroll->ScrollTo();
 	}
 
 	bool OnKey(LKey &k)
 	{
 		switch (k.c16)
 		{
 			case 'p':
 			case 'P':
 			{
 				if (k.Down())
 				{
 					LArray<VcCommit*> Sel;
 					GetSelection(Sel);
 					if (Sel.Length())
 					{
 						auto first = Sel[0];
 						auto branch = first->GetBranch();
 						auto p = first->GetParents();
 						if (p->Length() == 0)
 							break;
 
 						for (auto c:Sel)
 							c->Select(false);
 
 						SelectRevisions(*p, branch);
 					}
 				}
 				return true;
 			}
 			case 'c':
 			case 'C':
 			{
 				if (k.Down())
 				{
 					LArray<VcCommit*> Sel;
 					GetSelection(Sel);
 					if (Sel.Length())
 					{
 						LHashTbl<StrKey<char>,VcCommit*> Map;
 						for (auto s:Sel)
 							Map.Add(s->GetRev(), s);
 						
 						LString::Array n;
 						for (auto it = begin(); it != end(); it++)
 						{
 							VcCommit *c = dynamic_cast<VcCommit*>(*it);
 							if (c)
 							{
 								for (auto r:*c->GetParents())
 								{
 									if (Map.Find(r))
 									{
 										n.Add(c->GetRev());
 										break;
 									}
 								}
 							}
 						}
 
 						for (auto c:Sel)
 							c->Select(false);
 
 						SelectRevisions(n, Sel[0]->GetBranch());
 					}
 				}
 				return true;
 			}
 		}
 
 		return LList::OnKey(k);
 	}
 };
 
 int LstCmp(LListItem *a, LListItem *b, int Col)
 {
 	VcCommit *A = dynamic_cast<VcCommit*>(a);
 	VcCommit *B = dynamic_cast<VcCommit*>(b);
 
 	if (A == NULL || B == NULL)
 	{
 		return (A ? 1 : -1) - (B ? 1 : -1);
 	}
 
 	auto f = A->GetFolder();
 	auto flds = f->GetFields();
 	if (!flds.Length())
 	{
 		LgiTrace("%s:%i - No fields?\n", _FL);
 		return 0;
 	}
 		
 	auto fld = flds[Col];
 	switch (fld)
 	{
 		case LGraph:
 		case LIndex:
 		case LParents:
 		case LRevision:
 		default:
 			return (int) (B->GetIndex() - A->GetIndex());
 
 		case LBranch:
 		case LAuthor:
 		case LMessageTxt:
 			return Stricmp(A->GetFieldText(fld), B->GetFieldText(fld));
 
 		case LTime:
 			return B->GetTs().Compare(&A->GetTs());
 	}
 
 	return 0;
 }
 
 struct TestThread : public LThread
 {
 public:
     TestThread() : LThread("test")
     {
         Run();
     }
     
     int Main()
     {
         auto Path = LGetPath();
         LSubProcess p("python", "/Users/matthew/CodeLib/test.py");
         
         auto t = LString(LGI_PATH_SEPARATOR).Join(Path);
         for (auto s: Path)
             printf("s: %s\n", s.Get());
         p.SetEnvironment("PATH", t);
         if (p.Start())
         {
             LStringPipe s;
             p.Communicate(&s);
             printf("Test: %s\n", s.NewLStr().Get());
         }
         return 0;
     }
 };
 
 class RemoteFolderDlg : public LDialog
 {
 	class App *app;
 	LTree *tree;
 	struct SshHost *root, *newhost;
 	LXmlTreeUi Ui;
 
 public:
 	LString Uri;
 
 	RemoteFolderDlg(App *application);
 	~RemoteFolderDlg();
 
 	int OnNotify(LViewI *Ctrl, LNotification n);
 };
 
 class VcDiffFile : public LTreeItem
 {
 	AppPriv *d;
 	LString File;
 	uint64 modTime = 0;
 	
 public:
 	VcDiffFile(AppPriv *priv, LString file) : d(priv), File(file)
 	{
 	}
 	
 	const char *GetText(int i = 0) override
 	{
 		return i ? NULL : File.Get();
 	}
 	
 	LString StripFirst(LString s)
 	{
 		return s.Replace("\\","/").SplitDelimit("/", 1).Last();
 	}
 	
 	void Reload()
 	{
 		Select(true);
 	}
 	
 	void OnPulse()
 	{
 		LDirectory dir;
 		if (dir.First(File))
 		{
 			if (modTime)
 			{
 				if (modTime != dir.GetLastWriteTime())
 				{
 					modTime = dir.GetLastWriteTime();
 					Reload();
 				}
 			}
 			else
 			{
 				modTime = dir.GetLastWriteTime();
 			}
 		}
 		// else LgiTrace("%s:%i couldn't get stat for '%s'\n", _FL, File.Get());
 	}
 	
 	void OnMouseClick(LMouse &m)
 	{
 		if (m.IsContextMenu())
 		{
 			LSubMenu s;
 			s.AppendItem("Remove", IDM_DELETE);
 			switch (s.Float(GetTree(), m))
 			{
 				case IDM_DELETE:
 				{
 					if (LTreeItem::Select())
 						d->Files->Empty();
 					delete this;
 					return;
 				}
 			}
 		}
 	}
 
 	void Select(bool selected) override
 	{
 		LTreeItem::Select(selected);
 		if (!selected)
 			return;
 
 		d->Files->Empty();
 		d->Diff->Name(NULL);
 			
 		LFile in(File, O_READ);
 		LString s = in.Read();
 		if (!s)
 			return;
 			
 		LString NewLine("\n");
 		LString::Array a = s.Replace("\r").Split("\n");
 		LArray<LString> index;
 		LString oldName, newName;
 		LString::Array Diff;
 		VcFile *f = NULL;
 		bool InPreamble = false;
 		bool InDiff = false;
 		for (unsigned i=0; i<a.Length(); i++)
 		{
 			const char *Ln = a[i];
 			if (!Strnicmp(Ln, "diff ", 5))
 			{
 				if (f)
 				{
 					f->SetDiff(NewLine.Join(Diff));
 					f->Select(false);
 				}
 
 				Diff.Empty();
 				oldName.Empty();
 				newName.Empty();
 				InDiff = false;
 				InPreamble = true;
 			}
 			else if (!Strnicmp(Ln, "Index", 5))
 			{
 				if (InPreamble)
 					index = a[i].SplitDelimit(": ", 1).Slice(1);
 			}
 			else if (!strncmp(Ln, "--- ", 4))
 			{
 				auto p = a[i].SplitDelimit(" \t", 1);
 				if (p.Length() > 1)
 					oldName = p[1];
 			}
 			else if (!strncmp(Ln, "+++ ", 4))
 			{
 				auto p = a[i].SplitDelimit(" \t", 1);
 				if (p.Length() > 1)
 					newName = p[1];
 
 				if (oldName && newName)
 				{
 					InDiff = true;
 					InPreamble = false;
 
 					f = d->FindFile(newName);
 					if (!f)
 						f = new VcFile(d, NULL, LString(), false);
 
 					const char *nullFn = "dev/null";
 					auto Path = StripFirst(oldName);
 					f->SetUri(LString("file:///") + Path);
 					if (newName.Find(nullFn) >= 0)
 					{
 						// Delete
 						f->SetText(Path, COL_FILENAME);
 						f->SetText("D", COL_STATE);
 					}
 					else
 					{
 						f->SetText(Path, COL_FILENAME);
 						if (oldName.Find(nullFn) >= 0)
 							// Add
 							f->SetText("A", COL_STATE);
 						else
 							// Modify
 							f->SetText("M", COL_STATE);
 					}
 
 					f->GetStatus();
 					d->Files->Insert(f);
 				}
 			}
 			else if (!_strnicmp(Ln, "------", 6))
 			{
 				InPreamble = !InPreamble;
 			}
 			else if (!_strnicmp(Ln, "======", 6))
 			{
 				InPreamble = false;
 				InDiff = true;
 			}
 			else if (InDiff)
 			{
 				Diff.Add(a[i]);
 			}
 		}
 		if (f && Diff.Length())
 		{
 			f->SetDiff(NewLine.Join(Diff));
 			Diff.Empty();
 		}
 	}
 };
 
 #ifdef HAIKU
 enum PipeIndexes
 {
 	READ_END,
 	WRITE_END,
 };
 
 #include <sys/ioctl.h>
 
 int peekPipe(int fd, char *buf, size_t sz)
 {
 	int bytesAvailable = 0;
 	int r = ioctl(fd, FIONREAD, &bytesAvailable);
 	// printf("ioctl=%i %i\n", r, bytesAvailable);
 	if (r)
 		return 0;
 		
 	// printf("starting read\n");
 	auto rd = read(fd, buf, MIN(bytesAvailable, sz));
 	// printf("read=%i\n", (int)rd);
 	return rd;
 }
 
 LString RunProcess(const char *exe, const char *args)
 {
 	LStringPipe r;
 	
 	int fd[2];
 	pipe(fd);
 
 	printf("Running %s...\n", exe);
 	auto pid = fork();
 	if (pid == 0)
 	{
 		// Child...
 	    dup2(fd[WRITE_END], STDOUT_FILENO);
 	    close(fd[READ_END]);
 	    close(fd[WRITE_END]);
 	    execlp(exe, exe, args, (char*) NULL);
 	    fprintf(stderr, "Failed to execute '%s'\n", exe);
 	    exit(1);
 	}
 	else
 	{
 		// Parent...
         int status;
         pid_t result;
 
 		#if 0
 			// More basic...
 	        close(fd[READ_END]);
 	        close(fd[WRITE_END]);
 	        result = waitpid(pid, &status, 0);
 			printf("waitpid=%i\n", result);
 		#else
 			// Read the output
 			do
 			{
 				result = waitpid(pid, &status, WNOHANG);
 				
 				char buf[256];
 				auto rd = peekPipe(fd[READ_END], buf, sizeof(buf));
 				if (rd > 0)
 					r.Write(buf, rd);
 				//printf("waitpid=%i rd=%i\n", result, rd);
 			}
 			while (result == 0);
 
 	        close(fd[READ_END]);
 	        close(fd[WRITE_END]);
         #endif
 	}
 
 	printf("RunProcess done.\n");
 	return r.NewLStr();
 }
 #endif
 
 class GetVcsVersions : public LThread
 {
 	AppPriv *d = NULL;
 
 public:
 	GetVcsVersions(AppPriv *priv) : LThread("GetVcsVersions")
 	{
 		d = priv;
 		Run();
 	}
 
 	bool ParseVersion(int Result, VersionCtrl type, LString s)
 	{
 		if (Result)
 			return false;
 
 		// printf("s=%s\n", s.Get());
 		auto p = s.SplitDelimit();
 		switch (type)
 		{
 			case VcGit:
 			{
 				if (p.Length() > 2)
 				{
 					ToolVersion[type] = Ver2Int(p[2]);
 					d->Log->Print("Git version: %s\n", p[2].Get());
 				}
 				break;
 			}
 			case VcSvn:
 			{
 				if (p.Length() > 2)
 				{
 					ToolVersion[type] = Ver2Int(p[2]);
 					d->Log->Print("Svn version: %s\n", p[2].Get());
 				}
 				break;
 			}
 			case VcHg:
 			{
 				if (p.Length() >= 5)
 				{
 					auto Ver = p[4].Strip("()");
 					ToolVersion[type] = Ver2Int(Ver);
 					d->Log->Print("Hg version: %s\n", Ver.Get());
 				}
 				break;
 			}
 			case VcCvs:
 			{
 				if (p.Length() > 1)
 				{
 					auto Ver = p[2];
 					ToolVersion[type] = Ver2Int(Ver);
 					d->Log->Print("Cvs version: %s\n", Ver.Get());
 				}
 				break;
 			}
 			default:
 				break;
 		}
 
 		return false;
 	}
 
 
 	int Main()
 	{
 		VersionCtrl types[] = {
 			#ifndef HAIKU
 				// Enabling these causes lock error in the parent process...
 				VcCvs,
 				VcSvn,
 			#endif
 			VcHg,
 			VcGit
 		};
 
 		for (int i=0; i<CountOf(types); i++)
 		{
 			auto Exe = d->GetVcName(types[i]);
 			
 			#ifdef HAIKU
 			
 			// Something funky is going on with launching subprocesses on Haiku...
 			// So lets do an absolute minimal example of fork/exec to test whether it's
 			// something in the LSubProcess classes?
 			
 			auto result = RunProcess(Exe, "--version");
 			ParseVersion(0, types[i], result);
 			
 			#else
 			
 			LSubProcess sub(Exe, "--version");
 			if (sub.Start())
 			{
 				LStringPipe p;
 				auto result = sub.Communicate(&p);
 				ParseVersion(result, types[i], p.NewLStr());
 			}
 			
 			#endif
 		}
 		
 		printf("GetVcsVersions finished.\n");
 
 		return 0;
 	}
 };
 
 class App : public LWindow, public AppPriv
 {
 	LAutoPtr<LImageList> ImgLst;
 	LBox *FoldersBox = NULL;
 
 	bool CallMethod(const char *MethodName, LScriptArguments &Args)
 	{
 		if (!Stricmp(MethodName, METHOD_GetContext))
 		{
 			*Args.GetReturn() = (AppPriv*)this;
 			return true;
 		}
 
 		return false;
 	}
 
 public:
 	App()
 	{
 		LString AppRev;
 		AppRev.Printf("%s v%s", AppName, APP_VERSION);
 		Name(AppRev);
 
 		LRect r(0, 0, 1400, 800);
 		SetPos(r);
 		MoveToCenter();
 		SetQuitOnClose(true);
 
 		Opts.SerializeFile(false);
 		SerializeState(&Opts, "WndPos", true);
 
 		#ifdef WINDOWS
 		SetIcon(MAKEINTRESOURCEA(IDI_ICON1));
 		#else
 		SetIcon("icon32.png");
 		#endif
 
 		ImgLst.Reset(LLoadImageList("image-list.png", 16, 16));
 
 		if (Attach(0))
 		{
 			SetPulse(200);
 			DropTarget(true);
 			Visible(true);
 		}
 	}
 
 	~App()
 	{
 		SerializeState(&Opts, "WndPos", false);
 		SaveFolders();
 	}
 	
 	void OnCreate()
 	{
 		if ((Menu = new LMenu))
 		{
 			Menu->SetPrefAndAboutItems(IDM_OPTIONS, IDM_ABOUT);
 			Menu->Attach(this);
 			Menu->Load(this, "IDM_MENU");
 		}
 
 		auto ToolsBox = new LBox(IDC_TOOLS_BOX, true, "ToolsBox");
 		FoldersBox = new LBox(IDC_FOLDERS_BOX, false, "FoldersBox");
 		auto CommitsBox = new LBox(IDC_COMMITS_BOX, true, "CommitsBox");
 
 		auto Tools = new ToolBar;
 
 		ToolsBox->Attach(this);
 		Tools->Attach(ToolsBox);
 		FoldersBox->Attach(ToolsBox);
 
 		auto FolderLayout = new LTableLayout(IDC_FOLDER_TBL);
 		auto c = FolderLayout->GetCell(0, 0, true, 2);
 			Tree = new LTree(IDC_TREE, 0, 0, 320, 200);
 			Tree->SetImageList(ImgLst, false);
 			Tree->ColumnHeaders(true);
 			Tree->AddColumn("Folder", 250);
 			Tree->AddColumn("Counts", 50);
 			c->Add(Tree);
 		c = FolderLayout->GetCell(0, 1);
 			c->Add(new LEdit(IDC_FILTER_FOLDERS, 0, 0, -1, -1));
 		c = FolderLayout->GetCell(1, 1);
 			c->Add(new LButton(IDC_CLEAR_FILTER_FOLDERS, 0, 0, -1, -1, "x"));
 		FolderLayout->Attach(FoldersBox);
 		CommitsBox->Attach(FoldersBox);
 
 		auto CommitsLayout = new LTableLayout(IDC_COMMITS_TBL);
 		c = CommitsLayout->GetCell(0, 0, true, 2);
 			Commits = new CommitList(IDC_LIST);
 			c->Add(Commits);
 		c = CommitsLayout->GetCell(0, 1);
 			c->Add(new LEdit(IDC_FILTER_COMMITS, 0, 0, -1, -1));
 		c = CommitsLayout->GetCell(1, 1);
 			c->Add(new LButton(IDC_CLEAR_FILTER_COMMITS, 0, 0, -1, -1, "x"));
 		CommitsLayout->Attach(CommitsBox);
 		CommitsLayout->GetCss(true)->Height("40%");
 
 		LBox *FilesBox = new LBox(IDC_FILES_BOX, false);
 		FilesBox->Attach(CommitsBox);
 
 		auto FilesLayout = new LTableLayout(IDC_FILES_TBL);
 		c = FilesLayout->GetCell(0, 0, true, 2);
 			Files = new LList(IDC_FILES, 0, 0, 200, 200);
 			Files->AddColumn("[ ]", 30);
 			Files->AddColumn("State", 100);
 			Files->AddColumn("Name", 400);
 			c->Add(Files);
 		c = FilesLayout->GetCell(0, 1);
 			c->Add(new LEdit(IDC_FILTER_FILES, 0, 0, -1, -1));
 		c = FilesLayout->GetCell(1, 1);
 			c->Add(new LButton(IDC_CLEAR_FILTER_FILES, 0, 0, -1, -1, "x"));
 		FilesLayout->GetCss(true)->Width("35%");
 		FilesLayout->Attach(FilesBox);
 
 		auto MsgBox = new LBox(IDC_MSG_BOX, true);
 		MsgBox->Attach(FilesBox);
 		
 		auto Commit = new CommitCtrls;
 		Commit->Attach(MsgBox);
 		Commit->GetCss(true)->Height("30%");
 		if (Commit->GetViewById(IDC_MSG, Msg))
 		{
 			auto Tv = dynamic_cast<LTextView3*>(Msg);
 			if (Tv)
 			{
 				Tv->Sunken(true);
 				Tv->SetWrapType(L_WRAP_NONE);
 			}
 		}
 		else LAssert(!"No ctrl?");
 
 		Tabs = new LTabView(IDC_TAB_VIEW);
 		Tabs->Attach(MsgBox);
 		auto Style = "Padding: 0px 8px 8px 0px";
 		Tabs->GetCss(true)->Parse(Style);
 
 		auto p = Tabs->Append("Diff");
 		p->Append(Diff = new DiffView(IDC_TXT));
 		// Diff->Sunken(true);
 		Diff->SetWrapType(L_WRAP_NONE);
 
 		p = Tabs->Append("Log");
 		p->Append(Log = new LTextLog(IDC_LOG));
 		// Log->Sunken(true);
 		Log->SetWrapType(L_WRAP_NONE);
 		
 		SetCtrlValue(IDC_UPDATE, true);
 
 		AttachChildren();
 
 		auto f = Opts.LockTag(OPT_Folders, _FL);
 		if (!f)
 		{
 			Opts.CreateTag(OPT_Folders);
 			f = Opts.LockTag(OPT_Folders, _FL);
 		}
 		if (f)
 		{
 			new GetVcsVersions(this);
 
 			for (auto c: f->Children)
 			{
 				if (c->IsTag(OPT_Folder))
 				{
 					auto f = new VcFolder(this, c);
 					Tree->Insert(f);
 				}
 			}
 			Opts.Unlock();
 			
 			LRect Large(0, 0, 2000, 200);
 			Tree->SetPos(Large);
 			Tree->ResizeColumnsToContent();
 			
 			LItemColumn *c;
 			int i = 0, px = 0;
 			while ((c = Tree->ColumnAt(i++)))
 			{
 				px += c->Width();
 			}
 			
 			FoldersBox->Value(MAX(320, px + 20));
             
             // new TestThread();
 		}
 	}
 	
 	void SaveFolders()
 	{
 		LXmlTag *f = Opts.LockTag(OPT_Folders, _FL);
 		if (!f)
 			return;
 
 		f->EmptyChildren();
 
 		for (auto i: *Tree)
 		{
 			VcFolder *vcf = dynamic_cast<VcFolder*>(i);
 			if (vcf)
 				f->InsertTag(vcf->Save());
 		}
 
 		Opts.Unlock();
 		Opts.SerializeFile(true);
 	}
 
 	LMessage::Result OnEvent(LMessage *Msg)
 	{
 		switch (Msg->Msg())
 		{
 			#if HAS_LIBSSH
 			case M_RESPONSE:
 			{
 				SshConnection::HandleMsg(Msg);
 				break;
 			}
 			#endif
 			case M_HANDLE_CALLBACK:
 			{
 				LAutoPtr<ProcessCallback> Pc((ProcessCallback*)Msg->A());
 				if (Pc)
 					Pc->OnComplete();
 				break;
 			}
 		}
 
 		return LWindow::OnEvent(Msg);
 	}
 
 	void OnReceiveFiles(LArray<const char*> &Files)
 	{
 		for (auto f : Files)
 		{
 			if (LDirExists(f))
 				OpenLocalFolder(f);
 		}
 	}
 
 	int OnCommand(int Cmd, int Event, OsView Wnd)
 	{
 		switch (Cmd)
 		{
 			case IDM_PATCH_VIEWER:
 			{
 				OpenPatchViewer(this, &Opts);
 				break;
 			}
 			case IDM_OPEN_LOCAL:
 			{
 				OpenLocalFolder();
 				break;
 			}
 			case IDM_OPEN_REMOTE:
 			{
 				OpenRemoteFolder();
 				break;
 			}
 			case IDM_OPEN_DIFF:
 			{
 				auto s = new LFileSelect;
 				s->Parent(this);
 				s->Open([this](auto dlg, auto status)
 				{
 					if (status)
 						OpenDiff(dlg->Name());
 					delete dlg;
 				});
 				break;
 			}
 			case IDM_OPTIONS:
 			{
 				auto Dlg = new OptionsDlg(this, Opts);
 				Dlg->DoModal([](auto dlg, auto ctrlId)
 				{
 					delete dlg;
 				});
 				break;
 			}
 			case IDM_FIND:
 			{
 				auto i = new LInput(this, "", "Search string:");
 				i->DoModal([this, i](auto dlg, auto ctrlId)
 				{
 					if (ctrlId == IDOK)
 					{
 						LString::Array Revs;
 						Revs.Add(i->GetStr());
 
 						CommitList *cl;
 						if (GetViewById(IDC_LIST, cl))
 							cl->SelectRevisions(Revs);
 					}
 					delete dlg;
 				});
 				break;
 			}
 			case IDM_UNTRACKED:
 			{
 				auto mi = GetMenu()->FindItem(IDM_UNTRACKED);
 				if (!mi)
 					break;
 
 				mi->Checked(!mi->Checked());
 
 				LArray<VcFolder*> Flds;
 				Tree->GetSelection(Flds);
 				for (auto f : Flds)
 				{
 					f->Refresh();
 				}
 				break;
 			}
 			case IDM_REFRESH:
 			{
 				LArray<VcFolder*> Flds;
 				Tree->GetSelection(Flds);
 				for (auto f: Flds)
 					f->Refresh();
 				break;
 			}
 			case IDM_PULL:
 			{
 				LArray<VcFolder*> Flds;
 				Tree->GetSelection(Flds);
 				for (auto f: Flds)
 					f->Pull();
 				break;
 			}
 			case IDM_PUSH:
 			{
 				LArray<VcFolder*> Flds;
 				Tree->GetSelection(Flds);
 				for (auto f: Flds)
 					f->Push();
 				break;
 			}
 			case IDM_STATUS:
 			{
 				LArray<VcFolder*> Flds;
 				Tree->GetSelection(Flds);
 				for (auto f: Flds)
 					f->FolderStatus();
 				break;
 			}
 			case IDM_UPDATE_SUBS:
 			{
 				LArray<VcFolder*> Flds;
 				Tree->GetSelection(Flds);
 				for (auto f: Flds)
 					f->UpdateSubs();
 				break;
 				break;
 			}
 			case IDM_EXIT:
 			{
 				LCloseApp();
 				break;
 			}
 		}
 
 		return 0;
 	}
 
 	void OnPulse()
 	{
 		for (auto i: *Tree)
 			i->OnPulse();
 	}
 
 	void OpenLocalFolder(const char *Fld = NULL)
 	{
 		auto Load = [this](const char *Fld)
 		{
 			// Check the folder isn't already loaded...
 			VcFolder *Has = NULL;
 			LArray<VcFolder*> Folders;
 			Tree->GetAll(Folders);
 			for (auto f: Folders)
 			{
 				if (f->GetUri().IsFile() &&
 					!Stricmp(f->LocalPath().Get(), Fld))
 				{
 					Has = f;
 					break;
 				}
 			}
 
 			if (Has)
 			{
 				Has->Select(true);
-				LPopupNotification::Message(this, LString::Fmt("'%s' is already open", Has->LocalPath()));
+				LPopupNotification::Message(this,
+											LString::Fmt("'%s' is already open",
+														Has->LocalPath().Get()));
 			}
 			else
 			{
 				LUri u;
 				u.SetFile(Fld);
 				
 				auto f = new VcFolder(this, u.ToString());
 				if (f)
 				{
 					Tree->Insert(f);
 					SaveFolders();
 				}
 			}
 		};
 
 		if (!Fld)
 		{
 			auto s = new LFileSelect;
 			s->Parent(this);
 			s->OpenFolder([this, Load](auto s, auto status)
 			{
 				if (status)
 					Load(s->Name());
 				delete s;
 			});
 		}
 		else Load(Fld);
 	}
 
 	void OpenRemoteFolder()
 	{
 		auto Dlg = new RemoteFolderDlg(this);
 		Dlg->DoModal([this, Dlg](auto dlg, auto status)
 		{
 			if (status)
 			{
 				Tree->Insert(new VcFolder(this, Dlg->Uri));
 				SaveFolders();
 			}
 			delete dlg;
 		});
 	}
 	
 	void OpenDiff(const char *File)
 	{
 		Tree->Insert(new VcDiffFile(this, File));
 	}
 
 	void OnFilterFolders()
 	{
 		if (!Tree)
 			return;
 
 		for (auto i = Tree->GetChild(); i; i = i->GetNext())
 		{
 			auto n = i->GetText();
 			bool vis = !FolderFilter || Stristr(n, FolderFilter.Get()) != NULL;
 			i->GetCss(true)->Display(vis ? LCss::DispBlock : LCss::DispNone);
 		}
 
 		Tree->UpdateAllItems();
 		Tree->Invalidate();
 	}
 
 	void OnFilterCommits()
 	{
 		if (!Commits || !CurFolder)
 			return;
 
 		if (CommitFilter)
 		{
 			// Filtered logging:
 			CurFolder->LogFilter(CommitFilter);
 		}
 		else
 		{
 			// Regular full logging:
 			CurFolder->ClearLog();
 			CurFolder->Select(true);
 		}
 			
 	}
 
 	void OnFilterFiles()
 	{
 		VcFolder *f = dynamic_cast<VcFolder*>(Tree->Selection());
 		if (f)
 			f->FilterCurrentFiles();
 	}
 
 	VcFolder *GetCurrent()
 	{
 		if (!Tree)
 			return NULL;
 		return dynamic_cast<VcFolder*>(Tree->Selection());
 	}
 
 	int OnNotify(LViewI *c, LNotification n)
 	{
 		switch (c->GetId())
 		{
 			case IDC_CLEAR_FILTER_FOLDERS:
 			{
 				SetCtrlName(IDC_FILTER_FOLDERS, NULL);
 				// Fall through
 			}
 			case IDC_FILTER_FOLDERS:
 			{
 				if (n.Type == LNotifyEscapeKey)
 					SetCtrlName(IDC_FILTER_FOLDERS, NULL);
 					
 				LString n = GetCtrlName(IDC_FILTER_FOLDERS);
 				if (n != FolderFilter)
 				{
 					FolderFilter = n;
 					OnFilterFolders();
 				}
 				break;
 			}
 			case IDC_CLEAR_FILTER_COMMITS:
 			{
 				SetCtrlName(IDC_FILTER_COMMITS, NULL);
 				// Fall through
 			}
 			case IDC_FILTER_COMMITS:
 			{
 				if (n.Type == LNotifyEscapeKey)
 					SetCtrlName(IDC_FILTER_COMMITS, NULL);
 
 				LString n = GetCtrlName(IDC_FILTER_COMMITS);
 				if (n != CommitFilter)
 				{
 					CommitFilter = n;
 					OnFilterCommits();
 				}
 				break;
 			}
 			case IDC_CLEAR_FILTER_FILES:
 			{
 				SetCtrlName(IDC_FILTER_FILES, NULL);
 				// Fall through
 			}
 			case IDC_FILTER_FILES:
 			{
 				if (n.Type == LNotifyEscapeKey)
 					SetCtrlName(IDC_FILTER_FILES, NULL);
 
 				LString n = GetCtrlName(IDC_FILTER_FILES);
 				if (n != FileFilter)
 				{
 					FileFilter = n;
 					OnFilterFiles();
 				}
 				break;
 			}
 			case IDC_FILES:
 			{
 				switch (n.Type)
 				{
 					case LNotifyItemColumnClicked:
 					{
 						int Col = -1;
 						LMouse m;
 						if (Files->GetColumnClickInfo(Col, m))
 						{
 							if (Col == 0)
 							{
 								// Select / deselect all check boxes..
 								List<VcFile> n;
 								if (Files->GetAll(n))
 								{
 									bool Checked = false;
 									for (auto f: n)
 										Checked |= f->Checked() > 0;
 									for (auto f: n)
 										f->Checked(Checked ? 0 : 1);
 								}
 							}
 						}
 						break;
 					}
 					default:
 						break;
 				}
 				break;
 			}
 			case IDC_OPEN:
 			{
 				OpenLocalFolder();
 				break;
 			}
 			case IDC_TREE:
 			{
 				switch (n.Type)
 				{
 					case LNotifyContainerClick:
 					{
 						LMouse m;
 						c->GetMouse(m);
 						if (m.Right())
 						{
 							LSubMenu s;
 							s.AppendItem("Add Local", IDM_ADD_LOCAL);
 							s.AppendItem("Add Remote", IDM_ADD_REMOTE);
 							s.AppendItem("Add Diff File", IDM_ADD_DIFF_FILE);
 							int Cmd = s.Float(c->GetGView(), m);
 							switch (Cmd)
 							{
 								case IDM_ADD_LOCAL:
 								{
 									OpenLocalFolder();
 									break;
 								}
 								case IDM_ADD_REMOTE:
 								{
 									OpenRemoteFolder();
 									break;
 								}
 								case IDM_ADD_DIFF_FILE:
 								{
 									auto s = new LFileSelect;
 									s->Parent(this);
 									s->Open([this](auto dlg, auto status)
 									{
 										if (status)
 											OpenDiff(dlg->Name());
 										delete dlg;
 									});
 									break;
 								}
 							}
 						}
 						break;
 					}
 					case (LNotifyType)LvcCommandStart:
 					{
 						SetCtrlEnabled(IDC_PUSH, false);
 						SetCtrlEnabled(IDC_PULL, false);
 						SetCtrlEnabled(IDC_PULL_ALL, false);
 						break;
 					}
 					case (LNotifyType)LvcCommandEnd:
 					{
 						SetCtrlEnabled(IDC_PUSH, true);
 						SetCtrlEnabled(IDC_PULL, true);
 						SetCtrlEnabled(IDC_PULL_ALL, true);
 						break;
 					}
 					default:
 						break;
 				}
 				break;
 			}
 			case IDC_COMMIT_AND_PUSH:
 			case IDC_COMMIT:
 			{
 				auto BuildFix = GetCtrlValue(IDC_BUILD_FIX);
 				const char *Msg = GetCtrlName(IDC_MSG);
 				if (BuildFix || ValidStr(Msg))
 				{
 					auto Sel = Tree->Selection();
 					if (Sel)
 					{
 						VcFolder *f = dynamic_cast<VcFolder*>(Sel);
 						if (!f)
 						{
 							for (auto p = Sel->GetParent(); p; p = p->GetParent())
 							{
 								f = dynamic_cast<VcFolder*>(p);
 								if (f)
 									break;
 							}
 						}
 						if (f)
 						{
 							auto Branch = GetCtrlName(IDC_BRANCH);
 							bool AndPush = c->GetId() == IDC_COMMIT_AND_PUSH;
 							f->Commit(BuildFix ? DEFAULT_BUILD_FIX_MSG : Msg, ValidStr(Branch) ? Branch : NULL, AndPush);
 						}
 					}
 				}
 				else LgiMsg(this, "No message for commit.", AppName);
 				break;
 			}
 			case IDC_EDIT_AUTHOR:
 			{
 				if (auto f = GetCurrent())
 				{
 					auto dlg = new EditAuthor(f);
 					dlg->DoModal(NULL);
 				}
 				break;
 			}
 			case IDC_PUSH:
 			{
 				if (auto f = GetCurrent())
 					f->Push();
 				break;
 			}
 			case IDC_PULL:
 			{
 				if (auto f = GetCurrent())
 					f->Pull();
 				break;
 			}
 			case IDC_PULL_ALL:
 			{
 				LArray<VcFolder*> Folders;
 				Tree->GetAll(Folders);
 				bool AndUpdate = GetCtrlValue(IDC_UPDATE) != 0;
 				
 				for (auto f : Folders)
 				{
 					f->Pull(AndUpdate, LogSilo);
 				}
 				break;
 			}
 			case IDC_STATUS:
 			{
 				LArray<VcFolder*> Folders;
 				Tree->GetAll(Folders);
 				for (auto f : Folders)
 				{
 					f->FolderStatus();
 				}
 				break;
 			}
 			case IDC_BRANCHES:
 			{
 				if (n.Type == LNotifyValueChanged)
 				{
 					VcFolder *f = dynamic_cast<VcFolder*>(Tree->Selection());
 					auto branch = c->Name();
 					if (!f || !branch)
 					{
 						Log->Print("%s:%i - Missing param: %p %p\n", _FL, f, branch);
 						break;
 					}
 					
 					if (f->GetCurrentBranch() != branch)
 						f->Checkout(branch, true);
 				}
 				break;
 			}
 			case IDC_LIST:
 			{
 				switch (n.Type)
 				{
 					case LNotifyItemColumnClicked:
 					{
 						int Col = -1;
 						LMouse Ms;
 						Commits->GetColumnClickInfo(Col, Ms);
 						Commits->Sort(LstCmp, Col);
 						break;
 					}
 					case LNotifyItemDoubleClick:
 					{
 						VcFolder *f = dynamic_cast<VcFolder*>(Tree->Selection());
 						if (!f)
 							break;
 
 						LArray<VcCommit*> s;
 						if (Commits->GetSelection(s) && s.Length() == 1)
 							f->Checkout(s[0]->GetRev(), false);
 						break;
 					}
 					default:
 						break;
 				}
 				break;
 			}
 		}
 
 		return 0;
 	}
 };
 
 struct SshHost : public LTreeItem
 {
 	LXmlTag *t;
 	LString Host, User, Pass;
 
 	SshHost(LXmlTag *tag = NULL)
 	{
 		t = tag;
 		if (t)
 		{
 			Serialize(false);
 			SetText(Host);
 		}
 	}
 
 	void Serialize(bool WriteToTag)
 	{
 		if (WriteToTag)
 		{
 			LUri u;
 			u.sProtocol = "ssh";
 			u.sHost = Host;
 			u.sUser = User;
 			u.sPass = Pass;
 			t->SetContent(u.ToString());
 		}
 		else
 		{
 			LUri u(t->GetContent());
 			if (!Stricmp(u.sProtocol.Get(), "ssh"))
 			{
 				Host = u.sHost;
 				User = u.sUser;
 				Pass = u.sPass;
 			}
 		}
 	}
 };
 
 RemoteFolderDlg::RemoteFolderDlg(App *application) : app(application), root(NULL), newhost(NULL), tree(NULL)
 {
 	SetParent(app);
 	LoadFromResource(IDD_REMOTE_FOLDER);
 
 	if (GetViewById(IDC_HOSTS, tree))
 	{
 		printf("tree=%p\n", tree);
 
 		tree->Insert(root = new SshHost());
 		root->SetText("Ssh Hosts");
 	}
 	else return;
 	
 	LViewI *v;
 	if (GetViewById(IDC_HOSTNAME, v))
 		v->Focus(true);
 
 	Ui.Map("Host", IDC_HOSTNAME);
 	Ui.Map("User", IDC_USER);
 	Ui.Map("Password", IDC_PASS);
 
 	LXmlTag *hosts = app->Opts.LockTag(OPT_Hosts, _FL);
 	if (hosts)
 	{
 		SshHost *h;
 		for (auto c: hosts->Children)
 			if (c->IsTag(OPT_Host) && (h = new SshHost(c)))
 				root->Insert(h);
 		app->Opts.Unlock();
 	}
 
 	root->Insert(newhost = new SshHost());
 	newhost->SetText("New Host");
 	root->Expanded(true);
 	newhost->Select(true);
 }
 
 RemoteFolderDlg::~RemoteFolderDlg()
 {
 }
 
 int RemoteFolderDlg::OnNotify(LViewI *Ctrl, LNotification n)
 {
 	SshHost *cur = tree ? dynamic_cast<SshHost*>(tree->Selection()) : NULL;
 
 	#define CHECK_SPECIAL() \
 		if (cur == newhost) \
 		{ \
 			root->Insert(cur = new SshHost()); \
 			cur->Select(true); \
 		} \
 		if (cur == root) \
 			break;
 
 	switch (Ctrl->GetId())
 	{
 		case IDC_HOSTS:
 		{
 			switch (n.Type)
 			{
 				case LNotifyItemSelect:
 				{
 					bool isRoot = cur == root;
 					SetCtrlEnabled(IDC_HOSTNAME, !isRoot);
 					SetCtrlEnabled(IDC_USER, !isRoot);
 					SetCtrlEnabled(IDC_PASS, !isRoot);
 					SetCtrlEnabled(IDC_DELETE, !isRoot && !(cur == newhost));
 					
 					SetCtrlName(IDC_HOSTNAME, cur ? cur->Host.Get() : NULL);
 					SetCtrlName(IDC_USER, cur ? cur->User.Get() : NULL);
 					SetCtrlName(IDC_PASS, cur ? cur->Pass.Get() : NULL);
 					break;
 				}
 				default:
 					break;
 			}			
 			break;
 		}
 		case IDC_HOSTNAME:
 		{
 			CHECK_SPECIAL()
 			if (cur)
 			{
 				cur->Host = Ctrl->Name();
 				cur->SetText(cur->Host ? cur->Host : "<empty>");
 			}
 			break;
 		}
 		case IDC_DELETE:
 		{
 			auto sel = tree ? dynamic_cast<SshHost*>(tree->Selection()) : NULL;
 			if (!sel)
 				break;
 
 			LXmlTag *hosts = app->Opts.LockTag(OPT_Hosts, _FL);
 			if (!hosts)
 			{
 				LAssert(!"Couldn't lock tag.");
 				break;
 			}
 
 			if (hosts->Children.HasItem(sel->t))
 			{
 				sel->t->RemoveTag();
 				DeleteObj(sel->t);
 				delete sel;
 			}
 			
 			app->Opts.Unlock();
 			break;
 		}
 		case IDC_USER:
 		{
 			CHECK_SPECIAL()
 			if (cur)
 				cur->User = Ctrl->Name();
 			break;
 		}
 		case IDC_PASS:
 		{
 			CHECK_SPECIAL()
 			if (cur)
 				cur->Pass = Ctrl->Name();
 			break;
 		}
 		case IDOK:
 		{
 			LXmlTag *hosts;
 			if (!(hosts = app->Opts.LockTag(OPT_Hosts, _FL)))
 			{
 				if (!(app->Opts.CreateTag(OPT_Hosts) && (hosts = app->Opts.LockTag(OPT_Hosts, _FL))))
 					break;
 			}
 			LAssert(hosts != NULL);
 			
 			for (auto i = root->GetChild(); i; i = i->GetNext())
 			{
 				SshHost *h = dynamic_cast<SshHost*>(i);
 				if (!h || h == newhost)
 					continue;
 
 				if (h->t)
 					;
 				else if ((h->t = new LXmlTag(OPT_Host)))
 					hosts->InsertTag(cur->t);
 				else
 					return false;
 
 				h->Serialize(true);
 			}
 
 			app->Opts.Unlock();
 
 			LUri u;
 			u.sProtocol = "ssh";
 			u.sHost = GetCtrlName(IDC_HOSTNAME);
 			u.sUser = GetCtrlName(IDC_USER);
 			u.sPass = GetCtrlName(IDC_PASS);
 			u.sPath = GetCtrlName(IDC_REMOTE_PATH);
 			Uri = u.ToString();
 
 			// Fall through
 		}
 		case IDCANCEL:
 		{
 			EndModal(Ctrl->GetId() == IDOK);
 			break;
 		}
 	}
 
 	return 0;
 }
 
 const char* toString(VersionCtrl v)
 {
 	switch (v)
 	{
 		case VcCvs: return "VcCvs";
 		case VcSvn: return "VcSvn";
 		case VcGit: return "VcGit";
 		case VcHg:  return "VcHg";
 
 		case VcPending: return "VcPending";
 		case VcError: return "VcError";
 	}
 
 	return "VcNone";
 }
 
 //////////////////////////////////////////////////////////////////
 #include "lgi/common/IniFile.h"
 void LIniFileTest()
 {
 	auto fn = "C:\\Users\\Matthew\\temp\\mercurial.ini";
 	LIniFile ini(fn);
 	LAssert(ini);
 	auto user = ini.Get("ui", "username");
 	LAssert(user.Find("fret@memecode.com")>=0);
 	ini.Set("ui", "username", "Matthew Allen2 <fret@memecode.com>");
 	auto res = ini.Write();
 	LAssert(res);
 }
 
 int LgiMain(OsAppArguments &AppArgs)
 {
 	LApp a(AppArgs, AppName);
 	if (a.IsOk())
 	{
 		// LStructuredLog::UnitTest();
 		// LIniFileTest();
 
 		a.AppWnd = new App;
 		a.Run();
 		
 		DeleteObj(a.AppWnd);
 	}
 
 	LAssert(VcCommit::Instances == 0);
 	return 0;
 }
 
diff --git a/src/common/General/TimeZone.cpp b/src/common/General/TimeZone.cpp
--- a/src/common/General/TimeZone.cpp
+++ b/src/common/General/TimeZone.cpp
@@ -1,465 +1,465 @@
 #include "lgi/common/Lgi.h"
 #include "lgi/common/DateTime.h"
 
 // From HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones
 
 static LTimeZone AllTimeZones[] =
 {
 	{-12.00,	"Dateline (Eniwetok, Kwajalein)"},
 	{-11.00,	"Samoa (Midway Island, Samoa)"},
 	{-10.00,	"Hawaiian (Hawaii)"},
 	{-9.00,		"Alaskan (Alaska)"},
 	{-8.00,		"Pacific (Pacific Time (US & Canada); Tijuana)"},
 	{-7.00,		"Mountain (Mountain Time (US & Canada))"},
 	{-7.00,		"US Mountain (Arizona)"},
 	{-6.00,		"Canada Central (Saskatchewan)"},
 	{-6.00,		"Central America (Central America)"},
 	{-6.00,		"Central (Central Time (US & Canada))"},
 	{-6.00,		"Mexico (Mexico City)"},
 	{-5.00,		"Eastern (Eastern Time (US & Canada))"},
 	{-5.00,		"SA Pacific (Bogota, Lima, Quito)"},
 	{-5.00,		"US Eastern (Indiana (East))"},
 	{-4.00,		"Atlantic (Atlantic Time (Canada))"},
 	{-4.00,		"Pacific SA (Santiago)"},
 	{-4.00,		"SA Western (Caracas, La Paz)"},
 	{-3.00,		"East South America (Brasilia)"},
 	{-3.00,		"Greenland (Greenland)"},
 	{-3.00,		"SA Eastern (Buenos Aires, Georgetown)"},
 	{-2.50,		"Newfoundland (Newfoundland)"},
 	{-2.00,		"Mid-Atlantic (Mid-Atlantic)"},
 	{-1.00,		"Azores (Azores)"},
 	{-1.00,		"Cape Verde (Cape Verde Is.)"},
 	{0.00,		"GMT"},
 	{1.00,		"Central Europe (Belgrade, Bratislava, Budapest, Ljubljana, Prague)"},
 	{1.00,		"Central European (Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb)"},
 	{1.00,		"Romance (Brussels, Copenhagen, Madrid, Paris)"},
 	{1.00,		"West Central Africa (West Central Africa)"},
 	{1.00,		"West Europe (Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna)"},
 	{2.00,		"East Europe (Bucharest)"},
 	{2.00,		"Egypt (Cairo)"},
 	{2.00,		"FLE (Helsinki, Riga, Tallin, Vilnius)"},
 	{2.00,		"GTB (Athens, Istanbul, Minsk)"},
 	{2.00,		"Jerusalem (Jerusalem)"},
 	{2.00,		"South Africa (Harare, Pretoria)"},
 	{3.00,		"Arab (Kuwait, Riyadh)"},
 	{3.00,		"Arabic (Baghdad)"},
 	{3.00,		"East Africa (Nairobi)"},
 	{3.00,		"Russian (Moscow, St. Petersburg, Volgograd)"},
 	{3.50,		"Iran (Tehran)"},
 	{4.00,		"Arabian (Abu Dhabi, Muscat)"},
 	{4.00,		"Caucasus (Baku, Tbilisi, Yerevan)"},
 	{4.50,		"Afghanistan (Kabul)"},
 	{5.00,		"Ekaterinburg (Ekaterinburg)"},
 	{5.00,		"West Asia (Islamabad, Karachi, Tashkent)"},
 	{5.50,		"India (Calcutta, Chennai, Mumbai, New Delhi)"},
 	{5.75,		"Nepal (Kathmandu)"},
 	{6.00,		"Central Asia (Astana, Dhaka)"},
 	{6.00,		"N. Central Asia (Almaty, Novosibirsk)"},
 	{6.00,		"Sri Lanka (Sri Jayawardenepura)"},
 	{6.50,		"Myanmar (Rangoon)"},
 	{7.00,		"North Asia (Krasnoyarsk)"},
 	{7.00,		"SE Asia (Bangkok, Hanoi, Jakarta)"},
 	{8.00,		"China (Beijing, Chongqing, Hong Kong, Urumqi)"},
 	{8.00,		"North Asia East (Irkutsk, Ulaan Bataar)"},
 	{8.00,		"Malay Peninsula (Kuala Lumpur, Singapore)"},
 	{8.00,		"Taipei (Taipei)"},
 	{8.00,		"West Australia (Perth)"},
 	{9.00,		"Korea (Seoul)"},
 	{9.00,		"Tokyo (Osaka, Sapporo, Tokyo)"},
 	{9.00,		"Yakutsk (Yakutsk)"},
 	{9.50,		"AUS Central (Darwin)"},
 	{9.50,		"Cen. Australia (Adelaide)"},
 	{10.00,		"AUS Eastern (Canberra, Melbourne, Sydney)"},
 	{10.00,		"East Australia (Brisbane)"},
 	{10.00,		"Tasmania (Hobart)"},
 	{10.00,		"Vladivostok (Vladivostok)"},
 	{10.00,		"West Pacific (Guam, Port Moresby)"},
 	{11.00,		"Central Pacific (Magadan, Solomon Is., New Caledonia)"},
 	{12.00,		"Fiji (Fiji, Kamchatka, Marshall Is.)"},
 	{12.00,		"New Zealand (Auckland, Wellington)"},
 	{13.00,		"Tonga (Nuku'alofa)"},
 	{0,			0}
 };
 
 LTimeZone *LTimeZone::GetTimeZones()
 {
 	return AllTimeZones;
 }
 
 LDateTime LDstInfo::GetLocal()
 {
 	LDateTime d;
 	d.Set(Utc);
 	d.SetTimeZone(0, false);
 	d.SetTimeZone(Offset, true);
 	return d;
 }
 
 bool LTimeZone::GetDaylightSavingsInfo(LArray<LDstInfo> &Info, LDateTime &Start, LDateTime *End)
 {
 	bool Status = false;
 	
 	#if defined(WIN32)
 
 		TIME_ZONE_INFORMATION Tzi;
 		auto r = GetTimeZoneInformation(&Tzi);
 		if (r > TIME_ZONE_ID_UNKNOWN)
 		{
 			Info.Length(0);
 
 			// Find the dates for the previous year from Start. This allows
 			// us to cover the start of the current year.
 			LDateTime s = ConvertSysTime(Tzi.StandardDate, Start.Year() - 1);
 			LDateTime d = ConvertSysTime(Tzi.DaylightDate, Start.Year() - 1);
 
 			// Create initial Info entry, as the last change in the previous year
 			auto *i = &Info.New();
 			if (s < d)
 			{
 				// Year is: Daylight->Standard->Daylight
 				LDateTime tmp = d;
 				i->Offset = -(Tzi.Bias + Tzi.DaylightBias);
 				tmp.AddMinutes(-i->Offset);
 				i->Utc = tmp;
 			}
 			else
 			{
 				// Year is: Standard->Daylight->Standard
 				LDateTime tmp = s;
 				i->Offset = -(Tzi.Bias + Tzi.StandardBias);
 				tmp.AddMinutes(-i->Offset);
 				i->Utc = tmp;
 			}
 				
 			for (auto y=Start.Year(); y<=(End?End->Year():Start.Year()); y++)
 			{
 				if (s < d)
 				{
 					// Cur year, first event: end of DST
 					i = &Info.New();
 					auto tmp = ConvertSysTime(Tzi.StandardDate, y);
 					i->Offset = -(Tzi.Bias + Tzi.StandardBias);
 					tmp.AddMinutes(-i->Offset);
 					i->Utc = tmp;
 
 					// Cur year, second event: start of DST
 					i = &Info.New();
 					tmp = ConvertSysTime(Tzi.DaylightDate, y);
 					i->Offset = -(Tzi.Bias + Tzi.DaylightBias);
 					tmp.AddMinutes(-i->Offset);
 					i->Utc = tmp;
 				}
 				else
 				{
 					// Cur year, first event: start of DST
 					i = &Info.New();
 					auto tmp = ConvertSysTime(Tzi.DaylightDate, Start.Year());
 					i->Offset = -(Tzi.Bias + Tzi.DaylightBias);
 					tmp.AddMinutes(-i->Offset);
 					i->Utc = tmp;
 
 					// Cur year, second event: end of DST
 					i = &Info.New();
 					tmp = ConvertSysTime(Tzi.StandardDate, Start.Year());
 					i->Offset = -(Tzi.Bias + Tzi.StandardBias);
 					tmp.AddMinutes(-i->Offset);
 					i->Utc = tmp;
 				}
 			}
 
 			Status = true;
 		}
 	
 	#elif defined(MAC)
 	
 		LDateTime From = Start;
 		From.AddMonths(-6);
 		LDateTime To = End ? *End : Start;
 		To.AddMonths(6);
 		auto ToUnix = To.GetUnix();
 
 		auto tz = [NSTimeZone systemTimeZone];
-		auto startDate = [[NSDate alloc] initWithTimeIntervalSince1970:(From.Ts().Get() / Second64Bit) - Offset1800];
+		auto startDate = [[NSDate alloc] initWithTimeIntervalSince1970:(From.Ts().Get() / LDateTime::Second64Bit) - LDateTime::Offset1800];
 		while (startDate)
 		{
 			auto next = [tz nextDaylightSavingTimeTransitionAfterDate:startDate];
 			auto &i = Info.New();
 			
 			auto nextTs = (time_t)[next timeIntervalSince1970];
 			i.Utc = nextTs;
 			i.Offset = (int)([tz secondsFromGMTForDate:[next dateByAddingTimeInterval:60]]/60);
 			
 			#if DEBUG_DST_INFO
 			{
 				LDateTime dt;
 				dt.Set(i.Utc);
 				LgiTrace("%s:%i - Ts=%s Off=%i\n", _FL, dt.Get().Get(), i.Offset);
 			}
 			#endif
 
 			if (nextTs >= ToUnix)
 				break;
 
 			[startDate release];
 			startDate = next;
 		}
 		if (startDate)
 			[startDate release];
 
 	#elif USE_ZDUMP
 
 		if (!Zdump.Length())
 		{
 			static bool First = true;
 			
 			auto linkLoc = "/etc/localtime";
 			#if defined(LINUX)
 				auto zoneLoc = "/usr/share/zoneinfo";
 			#elif defined(HAIKU)
 				auto zoneLoc = "/boot/system/data/zoneinfo";
 			#else
 				#error "Impl me"
 			#endif
 
 			if (!LFileExists(linkLoc))
 			{
 				if (First)
 				{
 					LgiTrace("%s:%i - LDateTime::GetDaylightSavingsInfo error: '%s' doesn't exist.\n"
 							 "    It should link to something in the '%s' tree.\n",
 							 _FL,
 							 linkLoc,
 							 zoneLoc);
 					#ifdef HAIKU
 					LgiTrace("    To fix that: pkgman install timezone_data and then create the '%s' link.\n", linkLoc);
 					#endif
 				}
 				return First = false;
 			}
 
 			auto f = popen(LString::Fmt("zdump -v %s", linkLoc), "r");
 			if (f)
 			{
 				char s[1024];
 				size_t r;
 				LStringPipe p(1024);
 				while ((r = fread(s, 1, sizeof(s), f)) > 0)
 					p.Write(s, (int)r);
 
 				fclose(f);
 				Zdump = p.NewLStr().Split("\n");
 			}
 			else
 			{
 				if (First)
 				{
 					LgiTrace("%s:%i - LDateTime::GetDaylightSavingsInfo error: zdump didn't run.\n", _FL);
 					#ifdef HAIKU
 					LgiTrace("To fix that: pkgman install timezone_data\n");
 					#endif
 				}
 				return First = false;
 			}
 		}
 			
 		MonthHash Lut;
 		LDateTime Prev;
 		int PrevOff = 0;
 		for (auto Line: Zdump)
 		{
 			auto l = Line.SplitDelimit(" \t");
 			if (l.Length() >= 16 &&
 				l[0].Equals("/etc/localtime"))
 			{
 				// /etc/localtime  Sat Oct  3 15:59:59 2037 UTC = Sun Oct  4 01:59:59 2037 EST isdst=0 gmtoff=36000
 				// 0               1   2    3 4        5    6   7 8   9    10 11      12   13  14      15
 				
 				LDateTime Utc;
 				Utc.Year(l[5].Int());
 
 				#if DEBUG_DST_INFO
 				if (Utc.Year() < 2020)
 					continue;
 				// printf("DST: %s\n", Line.Get());
 				#endif				
 
 				auto Tm = l[4].SplitDelimit(":");
 				if (Tm.Length() != 3)
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Tm '%s' has wrong parts: %s\n", _FL, l[4].Get(), Line.Get());
 					#endif
 					continue;
 				}
 
 				Utc.Hours(Tm[0].Int());
 				Utc.Minutes(Tm[1].Int());
 				Utc.Seconds(Tm[2].Int());
 				if (Utc.Minutes() < 0)
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Mins is zero: %s\n", _FL, l[4].Get());
 					#endif
 					continue;
 				}
 
 				int m = Lut.Find(l[2]);
 				if (!m)
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Unknown month '%s'\n", _FL, l[2].Get());
 					#endif
 					continue;
 				}
 
 				Utc.Day(l[3].Int());
 				Utc.Month(m);
 
 				LString Var, Val;
 				if (!ParseValue(l[14], Var, Val) ||
 					Var != "isdst")
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Unknown value for isdst\n", _FL);
 					#endif
 					continue;
 				}
 				
 				if (!ParseValue(l[15], Var, Val) ||
 					Var != "gmtoff")
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Unknown value for isdst\n", _FL);
 					#endif
 					continue;
 				}
 				
 				int Off = atoi(Val) / 60;
 
 				if (Utc.Ts().Valid() == 0)
 					continue;
 
 				if (Prev.Year() &&
 					Prev < Start &&
 					Start < Utc)
 				{
 					// Emit initial entry for 'start'
 					auto &inf = Info.New();
 					Prev.Get(inf.Utc);
 					inf.Offset = PrevOff;
 					#if DEBUG_DST_INFO
 					printf("Info: Start=%s %i\n", Prev.Get().Get(), inf.Offset);
 					#endif
 				}
 				
 				if (Utc > Start)
 				{
 					// Emit furthur entries for DST events between start and end.
 					auto &inf = Info.New();
 					Utc.Get(inf.Utc);
 					inf.Offset = Off;
 					#if DEBUG_DST_INFO
 					printf("Info: Next=%s %i\n", Utc.Get().Get(), inf.Offset);
 					#endif
 					
 					if (End && Utc > *End)
 					{
 						// printf("Utc after end: %s > %s\n", Utc.Get().Get(), End->Get().Get());
 						break;
 					}
 				}
 
 				Prev = Utc;
 				PrevOff = Off;
 			}
 		}
 		Status = Info.Length() > 1;
 
 	#elif defined(HAIKU)
 
 		LTimeZoneInfo tzinfo;
 		
 		if (!tzinfo.Read())
 		{
 			#if DEBUG_DST_INFO
 			LgiTrace("%s:%i - info read failed.\n", _FL);
 			#endif
 			return false;
 		}
 		
 		Status = tzinfo.GetDaylightSavingsInfo(Info, Start, End);
 		#if DEBUG_DST_INFO
 		if (!Status)
 			printf("%s:%i - GetDaylightSavingsInfo failed.\n", _FL);
 		#endif
 		
 	
 	#else
 
 		LAssert(!"Not implemented.");
 
 	#endif
 
 	return Status;
 }
 
 bool LTimeZone::DstToLocal(LArray<LDstInfo> &Dst, LDateTime &dt)
 {
 	if (dt.GetTimeZone())
 	{
 		LAssert(!"Should be a UTC date.");
 		return true;
 	}
 
 	#if DEBUG_DST_INFO
 	LgiTrace("DstToLocal: %s\n", dt.Get().Get());
 	#endif
 	LAssert(Dst.Length() > 1); // Needs to have at least 2 entries...?
 	for (size_t i=0; i<Dst.Length()-1; i++)
 	{
 		auto &a = Dst[i];
 		auto &b = Dst[i+1];
 		LDateTime start, end;
 		start.Set(a.Utc);
 		end.Set(b.Utc);
 
 		auto InRange = dt >= start && dt < end;
 		if (InRange)
 		{
 			dt.SetTimeZone(a.Offset, true);
 			#if DEBUG_DST_INFO
 			LgiTrace("\tRng[%i]: %s -> %s, SetTimeZone(%g), dt=%s\n",
 				(int)i,
 				start.Get().Get(), end.Get().Get(),
 				(double)a.Offset/60.0,
 				dt.Get().Get());
 			#endif
 			return true;
 		}
 	}
 
 	auto Last = Dst.Last();
 	LDateTime d;
 	d.Set(Last.Utc);
 	if (dt >= d && dt.Year() == d.Year())
 	{
 		// If it's after the last DST change but in the same year... it's ok...
 		// Just use the last offset.
 		dt.SetTimeZone(Last.Offset, true);
 		return true;
 	}
 
 	#if DEBUG_DST_INFO
 	for (auto d: Dst)
 		LgiTrace("Dst: %s = %i\n", d.GetLocal().Get().Get(), d.Offset);
 	#endif
 	LgiTrace("%s:%i - No valid DST range for: %s\n", _FL, dt.Get().Get());
 	static bool first = true;
 	if (first)
 	{
 		first = false;
 		LAssert(!"No valid DST range for this date.");
 	}
 	return false;
 }
 
diff --git a/src/mac/cocoa/File.mm b/src/mac/cocoa/File.mm
--- a/src/mac/cocoa/File.mm
+++ b/src/mac/cocoa/File.mm
@@ -1,1902 +1,1902 @@
 /*hdr
  **	FILE:			File.mm
  **	AUTHOR:			Matthew Allen
  **	DATE:			8/10/2000
  **	DESCRIPTION:	The new file subsystem
  **
  **	Copyright (C) 2000, Matthew Allen
  **		fret@memecode.com
  */
 
 /****************************** Includes **********************************/
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <dirent.h>
 #include <sys/time.h>
 
 #include "lgi/common/File.h"
 #include "lgi/common/Containers.h"
 #include "lgi/common/Gdc2.h"
 #include "lgi/common/LgiCommon.h"
 #include "lgi/common/LgiString.h"
 #include "lgi/common/SubProcess.h"
 
 #if LGI_COCOA
 #include <Cocoa/Cocoa.h>
 #endif
 
 /****************************** Defines ***********************************/
 
 #define stat64					stat
 #define lseek64					lseek
 #define ftrucate64				ftruncate
 #define O_LARGEFILE				0
 
 /****************************** Globals ***********************************/
 
 LString LFile::Path::Sep(DIR_STR);
 
 bool LFile::Path::FixCase()
 {
 	return false;
 }
 
 struct ErrorCodeType
 {
 	const char *Name;
 	int Code;
 	const char *Desc;
 }
 ErrorCodes[] =
 {
 #if defined(WIN32)
 	
 	{"EPERM", 1, "Not owner"},
 	{"ENOENT", 2, "No such file"},
 	{"ESRCH", 3, "No such process"},
 	{"EINTR", 4, "Interrupted system"},
 	{"EIO", 5, "I/O error"},
 	{"ENXIO", 6, "No such device"},
 	{"E2BIG", 7, "Argument list too long"},
 	{"ENOEXEC", 8, "Exec format error"},
 	{"EBADF", 9, "Bad file number"},
 	{"ECHILD", 10, "No children"},
 	{"EAGAIN", 11, "No more processes"},
 	{"ENOMEM", 12, "Not enough core"},
 	{"EACCES", 13, "Permission denied"},
 	{"EFAULT", 14, "Bad address"},
 	{"ENOTBLK", 15, "Block device required"},
 	{"EBUSY", 16, "Mount device busy"},
 	{"EEXIST", 17, "File exists"},
 	{"EXDEV", 18, "Cross-device link"},
 	{"ENODEV", 19, "No such device"},
 	{"ENOTDIR", 20, "Not a directory"},
 	{"EISDIR", 21, "Is a directory"},
 	{"EINVAL", 22, "Invalid argument"},
 	{"ENFILE", 23, "File table overflow"},
 	{"EMFILE", 24, "Too many open file"},
 	{"ENOTTY", 25, "Not a typewriter"},
 	{"ETXTBSY", 26, "Text file busy"},
 	{"EFBIG", 27, "File too large"},
 	{"ENOSPC", 28, "No space left on"},
 	{"ESPIPE", 29, "Illegal seek"},
 	{"EROFS", 30, "Read-only file system"},
 	{"EMLINK", 31, "Too many links"},
 	{"EPIPE", 32, "Broken pipe"},
 	{"EWOULDBLOCK", 35, "Operation would block"},
 	{"EINPROGRESS", 36, "Operation now in progress"},
 	{"EALREADY", 37, "Operation already in progress"},
 	{"ENOTSOCK", 38, "Socket operation on"},
 	{"EDESTADDRREQ", 39, "Destination address required"},
 	{"EMSGSIZE", 40, "Message too long"},
 	{"EPROTOTYPE", 41, "Protocol wrong type"},
 	{"ENOPROTOOPT", 42, "Protocol not available"},
 	{"EPROTONOSUPPORT", 43, "Protocol not supported"},
 	{"ESOCKTNOSUPPORT", 44, "Socket type not supported"},
 	{"EOPNOTSUPP", 45, "Operation not supported"},
 	{"EPFNOSUPPORT", 46, "Protocol family not supported"},
 	{"EAFNOSUPPORT", 47, "Address family not supported"},
 	{"EADDRINUSE", 48, "Address already in use"},
 	{"EADDRNOTAVAIL", 49, "Can't assign requested address"},
 	{"ENETDOWN", 50, "Network is down"},
 	{"ENETUNREACH", 51, "Network is unreachable"},
 	{"ENETRESET", 52, "Network dropped connection"},
 	{"ECONNABORTED", 53, "Software caused connection"},
 	{"ECONNRESET", 54, "Connection reset by peer"},
 	{"ENOBUFS", 55, "No buffer space available"},
 	{"EISCONN", 56, "Socket is already connected"},
 	{"ENOTCONN", 57, "Socket is not connected"	},
 	{"ESHUTDOWN", 58, "Can't send after shutdown"},
 	{"ETOOMANYREFS", 59, "Too many references"},
 	{"ETIMEDOUT", 60, "Connection timed out"},
 	{"ECONNREFUSED", 61, "Connection refused"},
 	{"ELOOP", 62, "Too many levels of nesting"},
 	{"ENAMETOOLONG", 63, "File name too long"	},
 	{"EHOSTDOWN", 64, "Host is down"},
 	{"EHOSTUNREACH", 65, "No route to host"},
 	{"ENOTEMPTY", 66, "Directory not empty"},
 	{"EPROCLIM", 67, "Too many processes"},
 	{"EUSERS", 68, "Too many users"},
 	{"EDQUOT", 69, "Disc quota exceeded"},
 	{"ESTALE", 70, "Stale NFS file handle"},
 	{"EREMOTE", 71, "Too many levels of remote in the path"},
 	{"ENOSTR", 72, "Device is not a stream"},
 	{"ETIME", 73, "Timer expired"},
 	{"ENOSR", 74, "Out of streams resources"},
 	{"ENOMSG", 75, "No message"},
 	{"EBADMSG", 76, "Trying to read unreadable message"},
 	{"EIDRM", 77, "Identifier removed"},
 	{"EDEADLK", 78, "Deadlock condition"},
 	{"ENOLCK", 79, "No record locks available"},
 	{"ENONET", 80, "Machine is not on network"},
 	{"ERREMOTE", 81, "Object is remote"},
 	{"ENOLINK", 82, "The link has been severed"},
 	{"EADV", 83, "ADVERTISE error"},
 	{"ESRMNT", 84, "SRMOUNT error"},
 	{"ECOMM", 85, "Communication error"},
 	{"EPROTO", 86, "Protocol error"},
 	{"EMULTIHOP", 87, "Multihop attempted"},
 	{"EDOTDOT", 88, "Cross mount point"},
 	{"EREMCHG", 89, "Remote address change"},
 	
 #elif defined(MAC)
 	
 	{"EPERM",			EPERM, "Operation not permitted"},
 	{"ENOENT",			ENOENT, "No such file or directory"},
 	{"ESRCH",			ESRCH, "No such process"},
 	{"EINTR",			EINTR, "Interrupted system call"},
 	{"EIO",				EIO, "I/O error"},
 	{"ENXIO",			ENXIO, "No such device or address"},
 	{"E2BIG",			E2BIG, "Argument list too long"},
 	{"ENOEXEC",			ENOEXEC, "Exec format error"},
 	{"EBADF",			EBADF, "Bad file number"},
 	{"ECHILD",			ECHILD, "No child processes"},
 	{"EAGAIN",			EAGAIN, "Try again"},
 	{"ENOMEM",			ENOMEM, "Out of memory"},
 	{"EACCES",			EACCES, "Permission denied"},
 	{"EFAULT",			EFAULT, "Bad address"},
 	{"ENOTBLK",			ENOTBLK, "Block device required"},
 	{"EBUSY",			EBUSY, "Device or resource busy"},
 	{"EEXIST",			EEXIST, "File exists"},
 	{"EXDEV",			EXDEV, "Cross-device link"},
 	{"ENODEV",			ENODEV, "No such device"},
 	{"ENOTDIR",			ENOTDIR, "Not a directory"},
 	{"EISDIR",			EISDIR, "Is a directory"},
 	{"EINVAL",			EINVAL, "Invalid argument"},
 	{"ENFILE",			ENFILE, "File table overflow"},
 	{"EMFILE",			EMFILE, "Too many open files"},
 	{"ENOTTY",			ENOTTY, "Not a typewriter"},
 	{"ETXTBSY",			ETXTBSY, "Text file busy"},
 	{"EFBIG",			EFBIG, "File too large"},
 	{"ENOSPC",			ENOSPC, "No space left on device"},
 	{"ESPIPE",			ESPIPE, "Illegal seek"},
 	{"EROFS",			EROFS, "Read-only file system"},
 	{"EMLINK",			EMLINK, "Too many links"},
 	{"EPIPE",			EPIPE, "Broken pipe"},
 	{"EDOM",			EDOM, "Math argument out of domain of func"},
 	{"ERANGE",			ERANGE, "Math result not representable"},
 	{"EDEADLK",			EDEADLK, "Resource deadlock would occur"},
 	{"ENAMETOOLONG",	ENAMETOOLONG, "File name too long"},
 	{"ENOLCK",			ENOLCK, "No record locks available"},
 	{"ENOSYS",			ENOSYS, "Function not implemented"},
 	{"ENOTEMPTY",		ENOTEMPTY, "Directory not empty"},
 	{"ELOOP",			ELOOP, "Too many symbolic links encountered"},
 	{"EWOULDBLOCK",		EWOULDBLOCK, "Operation would block"},
 	{"ENOMSG",			ENOMSG, "No message of desired type"},
 	{"EIDRM",			EIDRM, "Identifier removed"},
 	{"EREMOTE",			EREMOTE, "Object is remote"},
 	{"EOVERFLOW",		EOVERFLOW, "Value too large for defined data type"},
 	{"EILSEQ",			EILSEQ, "Illegal byte sequence"},
 	{"EUSERS",			EUSERS, "Too many users"},
 	{"ENOTSOCK",		ENOTSOCK, "Socket operation on non-socket"},
 	{"EDESTADDRREQ",	EDESTADDRREQ, "Destination address required"},
 	{"EMSGSIZE",		EMSGSIZE, "Message too long"},
 	{"EPROTOTYPE",		EPROTOTYPE, "Protocol wrong type for socket"},
 	{"ENOPROTOOPT",		ENOPROTOOPT, "Protocol not available"},
 	{"EPROTONOSUPPORT",	EPROTONOSUPPORT, "Protocol not supported"},
 	{"ESOCKTNOSUPPORT",	ESOCKTNOSUPPORT, "Socket type not supported"},
 	{"EOPNOTSUPP",		EOPNOTSUPP, "Operation not supported on transport endpoint"},
 	{"EPFNOSUPPORT",	EPFNOSUPPORT, "Protocol family not supported"},
 	{"EAFNOSUPPORT",	EAFNOSUPPORT, "Address family not supported by protocol"},
 	{"EADDRINUSE",		EADDRINUSE, "Address already in use"},
 	{"EADDRNOTAVAIL",	EADDRNOTAVAIL, "Cannot assign requested address"},
 	{"ENETDOWN",		ENETDOWN, "Network is down"},
 	{"ENETUNREACH",		ENETUNREACH, "Network is unreachable"},
 	{"ENETRESET",		ENETRESET, "Network dropped connection because of reset"},
 	{"ECONNABORTED",	ECONNABORTED, "Software caused connection abort"},
 	{"ECONNRESET",		ECONNRESET, "Connection reset by peer"},
 	{"ENOBUFS",			ENOBUFS, "No buffer space available"},
 	{"EISCONN",			EISCONN, "Transport endpoint is already connected"},
 	{"ENOTCONN",		ENOTCONN, "Transport endpoint is not connected"},
 	{"ESHUTDOWN",		ESHUTDOWN, "Cannot send after transport endpoint shutdown"},
 	{"ETOOMANYREFS",	ETOOMANYREFS, "Too many references: cannot splice"},
 	{"ETIMEDOUT",		ETIMEDOUT, "Connection timed out"},
 	{"ECONNREFUSED",	ECONNREFUSED, "Connection refused"},
 	{"EHOSTDOWN",		EHOSTDOWN, "Host is down"},
 	{"EHOSTUNREACH",	EHOSTUNREACH, "No route to host"},
 	{"EALREADY",		EALREADY, "Operation already in progress"},
 	{"EINPROGRESS",		EINPROGRESS, "Operation now in progress"},
 	{"ESTALE",			ESTALE, "Stale NFS file handle"},
 	{"EDQUOT",			EDQUOT, "Quota exceeded"},
 	
 #else
 #error impl me
 #endif
 	
 	{"NONE", 0, "No error"},
 };
 
 const char *GetErrorName(int e)
 {
 	for (ErrorCodeType *c=ErrorCodes; c->Code; c++)
 	{
 		if (e == c->Code)
 		{
 			return c->Name;
 		}
 	}
 	
 	static char s[32];
 	snprintf(s, sizeof(s), "Unknown(%i)", e);
 	return s;
 }
 
 const char *GetErrorDesc(int e)
 {
 	for (ErrorCodeType *c=ErrorCodes; c->Code; c++)
 	{
 		if (e == c->Code)
 		{
 			return c->Desc;
 		}
 	}
 	
 	return 0;
 }
 
 /****************************** Helper Functions **************************/
 int64 LFileSize(const char *FileName)
 {
 	struct stat64 s;
 	if (FileName &&
 		stat64(FileName, &s) == 0)
 	{
 		return s.st_size;
 	}
 	
 	return 0;
 }
 
 bool LDirExists(const char *FileName, char *CorrectCase)
 {
 	bool Status = false;
 	
 	if (FileName)
 	{
 		struct stat s;
 		
 		// Check for exact match...
 		if (stat(FileName, &s) == 0)
 		{
 			Status = S_ISDIR(s.st_mode);
 		}
 	}
 	
 	return Status;
 }
 
 bool LFileExists(const char *FileName, char *CorrectCase)
 {
 	bool Status = false;
 	
 	if (FileName)
 	{
 		struct stat s;
 		
 		// Check for exact match...
 		if (stat(FileName, &s) == 0)
 		{
 			Status = true;
 		}
 		else if (strlen(FileName) < MAX_PATH_LEN)
 		{
 			// Look for altenate case by enumerating the directory
 			char d[MAX_PATH_LEN];
 			strcpy_s(d, sizeof(d), FileName);
 			char *e = strrchr(d, DIR_CHAR);
 			if (e)
 			{
 				*e++ = 0;
 				
 				DIR *Dir = opendir(d);
 				if (Dir)
 				{
 					dirent *De;
 					while ((De = readdir(Dir)))
 					{
 						if (stricmp(De->d_name, e) == 0)
 						{
 							try
 							{
 								// Tell the calling program the actual case of the file...
 								e = (char*)strrchr(FileName, DIR_CHAR);
 								
 								// If this crashes because the argument is read only then we get caught by the try catch
 								strcpy(e+1, De->d_name);
 								
 								// It worked!
 								Status = true;
 							}
 							catch (...)
 							{
 								// It didn't work :(
 #ifdef _DEBUG
 								printf("%s,%i - FileExists(%s) found an alternate case version but couldn't return it to the caller.\n",
 									   __FILE__, __LINE__, FileName);
 #endif
 							}
 							
 							break;
 						}
 					}
 					
 					closedir(Dir);
 				}
 			}
 		}
 	}
 	
 	return Status;
 }
 
 bool LResolveShortcut(const char *LinkFile, char *Path, ssize_t Len)
 {
 	return readlink (LinkFile, Path, Len) > 0;
 }
 
 void WriteStr(LFile &f, const char *s)
 {
 	size_t Len = (s) ? strlen(s) : 0;
 	f << Len;
 	if (Len > 0)
 	{
 		f.Write(s, (int)Len);
 	}
 }
 
 char *ReadStr(LFile &f DeclDebugArgs)
 {
 	char *s = 0;
 	
 	// read the strings length...
 	uint32 Len;
 	f >> Len;
 	
 	if (Len > 0)
 	{
 		// 16mb sanity check.... anything over this
 		// is _probably_ an error
 		if (Len >= (16 << 20))
 		{
 			// LgiAssert(0);
 			return 0;
 		}
 		
 		// allocate the memory buffer
 #if defined(_DEBUG) && defined MEMORY_DEBUG
 		s = new(_file, _line) char[Len+1];
 #else
 		s = new char[Len+1];
 #endif
 		if (s)
 		{
 			// read the bytes from disk
 			f.Read(s, Len);
 			s[Len] = 0;
 		}
 		else
 		{
 			// memory allocation error, skip the data
 			// on disk so the caller is where they think
 			// they are in the file.
 			f.Seek(Len, SEEK_CUR);
 		}
 	}
 	
 	return s;
 }
 
 ssize_t SizeofStr(const char *s)
 {
 	return sizeof(uint32) + ((s) ? strlen(s) : 0);
 }
 
 bool LGetDriveInfo
 (
 	char *Path,
 	uint64 *Free,
 	uint64 *Size,
 	uint64 *Available
 )
 {
 	bool Status = false;
 	
 	if (Path)
 	{
 		struct stat s;
 		if (lstat(Path, &s) == 0)
 		{
 			// printf("LGetDriveInfo dev=%i\n", s.st_dev);
 		}
 	}
 	
 	return Status;
 }
 
 /////////////////////////////////////////////////////////////////////////
 #include <sys/types.h>
 #include <pwd.h>
 
 struct LVolumePriv
 {
 	LString Name;
 	LString Path;
 	LVolumeTypes Type = VT_NONE;
 	int Flags = 0;
 	int64 Size = 0;
 	int64 Free = 0;
 	LAutoPtr<LSurface> Icon;
 
 	LSystemPath SysPath = LSP_ROOT;
 	LVolume *Next = NULL, *Child = NULL;
 
 	LVolumePriv(const char *init)
 	{
 		if (init)
 		{
 			Name = LGetLeaf(init);
 			Type = VT_FOLDER;
 			Path = init;
 		}
 	}
 
 	LVolumePriv(LSystemPath type, const char *name)
 	{
 		if (type)
 		{
 			Name = name;
 			switch (SysPath = type)
 			{
 				case LSP_DESKTOP:
 					Type = VT_DESKTOP;
 					break;
 				default:
 					Type = VT_FOLDER;
 					break;
 			}
 			Path = LGetSystemPath(type);
 		}
 	}
 	
 	void Insert(LVolume *v)
 	{
 		if (!Child)
 			Child = v;
 		else
 		{
 			for (auto i = Child; i; i = i->Next())
 			{
 				if (!i->d->Next)
 				{
 					i->d->Next = v;
 					break;
 				}
 			}
 		}
 	}
 };
 
 LVolume::LVolume(const char *init)
 {
 	d = new LVolumePriv(init);
 }
 
 LVolume::LVolume(LSystemPath syspath, const char *name)
 {
 	d = new LVolumePriv(syspath, name);
 }
 
 LVolume::~LVolume()
 {
 	DeleteObj(d->Child);
 	DeleteObj(d->Next);
 	DeleteObj(d);
 }
 
 const char *LVolume::Name() const
 {
 	return d->Name;
 }
 
 const char *LVolume::Path() const
 {
 	return d->Path;
 }
 
 LVolumeTypes LVolume::Type() const
 {
 	return d->Type;
 }
 
 int LVolume::Flags() const
 {
 	return d->Flags;
 }
 
 uint64 LVolume::Size() const
 {
 	return d->Size;
 }
 
 uint64 LVolume::Free() const
 {
 	return d->Free;
 }
 
 LSurface *LVolume::Icon() const
 {
 	return d->Icon;
 }
 
 LDirectory *LVolume::GetContents()
 {
 	LDirectory *Dir = NULL;
 	if (d->Path)
 	{
 		Dir = new LDirectory;
 		if (Dir && !Dir->First(d->Path))
 			DeleteObj(Dir);
 	}
 	return Dir;
 }
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // IDGF Apple.. provide an alternative you dumbass
 
 LVolume *LVolume::First()
 {
 	if (d->SysPath == LSP_DESKTOP &&
 		!d->Child)
 	{
 		LVolume *v = NULL;
 		LString DesktopPath = LGetSystemPath(LSP_DESKTOP);
 
 		// List any favorites
 		UInt32 seed;
 		auto sflRef = LSSharedFileListCreate(NULL, kLSSharedFileListFavoriteItems, NULL);
 		auto items = LSSharedFileListCopySnapshot( sflRef, &seed );
 		for( size_t i = 0; i < CFArrayGetCount(items); i++ )
 		{
 			auto item = (LSSharedFileListItemRef) CFArrayGetValueAtIndex(items, i);
 			if( !item )
 				continue;
 			
 			LString displayName = LSSharedFileListItemCopyDisplayName(item);
 			
 			auto outURL = LSSharedFileListItemCopyResolvedURL(item, kLSSharedFileListNoUserInteraction, NULL);
 			if( !outURL )
 				continue;
 							
 			auto itemPath = CFURLCopyFileSystemPath(outURL, kCFURLPOSIXPathStyle);
 			LString s = itemPath;
 
 			if (displayName ||
 				(s && !s.Equals(DesktopPath))) // This is the root item, don't duplicate
 			{
 				v = new LVolume();
 				if (v)
 				{
 					v->d->Path = s;
 					v->d->Name = displayName && !displayName.Equals("/") ? displayName : (LString)LGetLeaf(s);
 					v->d->Type = VT_FOLDER;
 					
 					printf("Vol: %s -> %s\n",
 						s.Get(), v->d->Name.Get());
 
 					auto IcoRef = LSSharedFileListItemCopyIconRef(item);
 					if (IcoRef)
 					{
 						auto img = [[NSImage alloc] initWithIconRef:IcoRef];
 						v->d->Icon.Reset(new LMemDC(img));
 						[img release];
 					}
 
 					d->Insert(v);
 				}
 			}
 
 			CFRelease(outURL);
 			CFRelease(itemPath);
 		}
 
 		CFRelease(items);
 		CFRelease(sflRef);
 	}
 	
 	return d->Child;
 }
 
 LVolume *LVolume::Next()
 {
 	if (d->SysPath == LSP_DESKTOP &&
 		!d->Next)
 	{
 		d->Next = new LVolume("/Volumes");
 		
 		// List the local hard disks
 		auto      *ws = [NSWorkspace sharedWorkspace];
 		auto    *vols = [ws mountedLocalVolumePaths];
 		auto	  *fm = [NSFileManager defaultManager];
 
 		for (NSString *path in vols)
 		{
 			NSDictionary* fsAttributes;
 			NSString *description, *type, *volName;
 			BOOL removable, writable, unmountable, res;
 
 			res = [ws getFileSystemInfoForPath:path
 								   isRemovable:&removable
 									isWritable:&writable
 								 isUnmountable:&unmountable
 								   description:&description
 										  type:&type];
 			if (!res) continue;
 			// fsAttributes = [fm fileSystemAttributesAtPath:path];
 			NSError *err  = nil;
 			fsAttributes  = [fm attributesOfFileSystemForPath:path error:&err];
 			volName            = [fm displayNameAtPath:path];
 			NSNumber *size     = [fsAttributes objectForKey:NSFileSystemSize];
 			NSNumber *freeSize = [fsAttributes objectForKey:NSFileSystemFreeSize];
 
 			#if 0
 			NSLog(@"path=%@\nname=%@\nremovable=%d\nwritable=%d\nunmountable=%d\n"
 				   "description=%@\ntype=%@, size=%@\n\n",
 				  path, name, removable, writable, unmountable, description, type, size);
 			#endif
 			
 			LString s = [type UTF8String];
 			LString p = [path UTF8String];
 			LString name = [volName UTF8String];
 			if (!s.Equals("autofs") &&
 				p.Find("/System/Volumes") < 0 &&
 				p.Find("/private") < 0)
 			{
 				auto v = new LVolume();
 				if (v)
 				{
 					v->d->Path = p;
 					v->d->Name = name;
 					v->d->Type = VT_HARDDISK;
 					v->d->Size = size.longLongValue;
 					v->d->Free = freeSize.longLongValue;
 					d->Next->d->Insert(v);
 					
 					// printf("Vol: s=%s p=%s name=%s\n", s.Get(), p.Get(), v->d->Name.Get());
 				}
 			}
 		}
 	}
 
 	return d->Next;
 }
 
 #pragma GCC diagnostic pop
 
 bool LVolume::IsMounted() const
 {
 	return false;
 }
 
 bool LVolume::SetMounted(bool Mount)
 {
 	return Mount;
 }
 
 void LVolume::Insert(LAutoPtr<LVolume> v)
 {
 	d->Insert(v.Release());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 LFileSystem::LFileSystem()
 {
 	Instance = this;
 	Root = 0;
 }
 
 LFileSystem::~LFileSystem()
 {
 	DeleteObj(Root);
 }
 
 int FloppyType(int Letter)
 {
 	return 0;
 }
 
 #if 0
 OSType gFinderSignature = 'MACS';
 
 OSStatus MoveFileToTrash(CFURLRef fileURL)
 {
 	AppleEvent event, reply;
 	OSStatus err;
 	FSRef fileRef;
 	AliasHandle fileAlias;
 	
 	if (CFURLGetFSRef(fileURL, &fileRef) == false)
 		return coreFoundationUnknownErr;
 	
 	err = FSNewAliasMinimal(&fileRef, &fileAlias);
 	if (err == noErr)
 	{
 		err = AEBuildAppleEvent(kAECoreSuite,
 								kAEDelete,
 								typeApplSignature,
 								&gFinderSignature,
 								sizeof(OSType),
 								kAutoGenerateReturnID,
 								kAnyTransactionID,
 								&event,
 								NULL,
 								"'----':alis(@@)",
 								fileAlias);
 		if (err == noErr)
 		{
 			err = AESendMessage(&event, &reply, kAEWaitReply, kAEDefaultTimeout);
 			if (err == noErr)
 				AEDisposeDesc(&reply);
 			AEDisposeDesc(&event);
 		}
 		
 		DisposeHandle((Handle)fileAlias);
 	}
 	return err;
 }
 #endif
 
 bool LFileSystem::Copy(const char *From, const char *To, LError *ErrorCode, std::function<bool(uint64_t pos, uint64_t total)> callback)
 {
 	if (!From || !To)
 	{
 		#if LGI_COCOA
 		if (ErrorCode) *ErrorCode = NSFileReadInvalidFileNameError;
 		#else
 		if (ErrorCode) *ErrorCode = paramErr;
 		#endif
 		
 		return false;
 	}
 	
 	LFile In, Out;
 	if (!In.Open(From, O_READ))
 	{
 		if (ErrorCode) *ErrorCode = In.GetError();
 		return false;
 	}
 	
 	if (!Out.Open(To, O_WRITE))
 	{
 		if (ErrorCode) *ErrorCode = Out.GetError();
 		return false;
 	}
 	
 	if (Out.SetSize(0))
 	{
 		if (ErrorCode) *ErrorCode =
 			#if LGI_COCOA
 			NSFileWriteUnknownError;
 			#else
 			writErr;
 			#endif
 		return false;
 	}
 	
 	int64 Size = In.GetSize();
 	if (!Size)
 	{
 		return true;
 	}
 	
 	int64 Block = MIN((1 << 20), Size);
 	char *Buf = new char[Block];
 	if (!Buf)
 	{
 		if (ErrorCode) *ErrorCode =
 			#if LGI_COCOA
 			NSFileWriteOutOfSpaceError;
 			#else
 			notEnoughBufferSpace;
 			#endif
 		return false;
 	}
 	
 	int64 i = 0;
 	while (i < Size)
 	{
 		ssize_t r = In.Read(Buf, Block);
 		if (r > 0)
 		{
 			int Written = 0;
 			while (Written < r)
 			{
 				ssize_t w = Out.Write(Buf + Written, r - Written);
 				if (w > 0)
 				{
 					Written += w;
 				}
 				else
 				{
 					if (ErrorCode) *ErrorCode =
 						#if LGI_COCOA
 						NSFileWriteUnknownError;
 						#else
 						writErr;
 						#endif
 					goto ExitCopyLoop;
 				}
 			}
 			i += Written;
 			
 			if (callback && !callback(i, Size))
 				break;
 		}
 		else break;
 	}
 	
 ExitCopyLoop:
 	DeleteArray(Buf);
 	if (i == Size)
 	{
 		if (ErrorCode) *ErrorCode =	noErr;
 	}
 	else
 	{
 		Out.Close();
 		Delete(To, NULL, false);
 	}
 	
 	return i == Size;
 }
 
 bool LFileSystem::Delete(LArray<const char*> &Files, LArray<LError> *Status, bool ToTrash)
 {
 	bool Error = false;
 	
 	if (ToTrash)
 	{
 #if defined MAC
 		
 		#if LGI_COCOA
 		
 		NSMutableArray *urls = [[NSMutableArray alloc] initWithCapacity:Files.Length()];
 		if (urls)
 		{
 			for (auto f : Files)
 			{
 				id u = (NSURL *)CFURLCreateFromFileSystemRepresentation(NULL, (UInt8 *)f, strlen(f), 0);
 				[urls addObject:u];
 				CFRelease(u);
 			}
 			[[NSWorkspace sharedWorkspace] recycleURLs:urls completionHandler:NULL];
 			[urls release];
 		}
 		
 		#else
 		
 		// Apple events method
 		for (int i=0; i<Files.Length(); i++)
 		{
 			UInt8 *Tmp = (UInt8*) Files[i];
 			CFStringRef s = CFStringCreateWithBytes(kCFAllocatorDefault, (UInt8*)Tmp, strlen(Files[i]), kCFStringEncodingUTF8, false);
 			if (!s)
 			{
 				printf("%s:%i - CFStringCreateWithBytes failed\n", __FILE__, __LINE__);
 				Error = true;
 				break;
 			}
 			
 			CFURLRef f = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, s, kCFURLPOSIXPathStyle, DirExists(Files[i]));
 			CFRelease(s);
 			if (!f)
 			{
 				printf("%s:%i - CFURLCreateWithFileSystemPath failed\n", __FILE__, __LINE__);
 				Error = true;
 				break;
 			}
 			
 			if (MoveFileToTrash(f))
 			{
 				printf("%s:%i - MoveFileToTrash failed\n", __FILE__, __LINE__);
 				Error = true;
 				break;
 			}
 			
 			CFRelease(f);
 		}
 		#endif
 		
 #else
 		// Posix
 		
 		char p[300];
 		if (LgiGetSystemPath(LSP_TRASH, p, sizeof(p)))
 		{
 			for (int i=0; i<Files.Length(); i++)
 			{
 				char *f = strrchr(Files[i], DIR_CHAR);
 				LgiMakePath(p, sizeof(p), p, f?f+1:Files[i]);
 				if (!MoveFile(Files[i], p))
 				{
 					if (Status)
 					{
 						(*Status)[i] = errno;
 					}
 					
 					printf("%s:%i - MoveFile(%s,%s) failed.\n", __FILE__, __LINE__, Files[i], p);
 					Error = true;
 				}
 			}
 		}
 		else
 		{
 			printf("%s:%i - LgiGetSystemPath(LSP_TRASH) failed.\n", __FILE__, __LINE__);
 		}
 #endif
 	}
 	else
 	{
 		for (int i=0; i<Files.Length(); i++)
 		{
 			if (unlink(Files[i]))
 			{
 				if (Status)
 				{
 					(*Status)[i] = errno;
 				}
 				
 				Error = true;
 			}
 		}
 	}
 	
 	return !Error;
 }
 
 bool LFileSystem::CreateFolder(const char *PathName, bool CreateParentFolders, LError *ErrorCode)
 {
 	int r = mkdir(PathName, S_IRWXU | S_IXGRP | S_IXOTH);
 	if (r)
 	{
 		if (ErrorCode)
 			*ErrorCode = errno;
 		if (CreateParentFolders)
 		{
 			char Base[MAX_PATH_LEN];
 			strcpy_s(Base, sizeof(Base), PathName);
 			do
 			{
 				char *Leaf = strrchr(Base, DIR_CHAR);
 				if (!Leaf) return false;
 				*Leaf = 0;
 			}
 			while (!LDirExists(Base));
 			
 			auto Parts = LString(PathName + strlen(Base)).SplitDelimit(DIR_STR);
 			for (int i=0; i<Parts.Length(); i++)
 			{
 				LMakePath(Base, sizeof(Base), Base, Parts[i]);
 				r = mkdir(Base, S_IRWXU | S_IXGRP | S_IXOTH);
 				if (r)
 					break;
 			}
 		}
 	}
 	return r == 0;
 }
 
 bool LFileSystem::RemoveFolder(const char *PathName, bool Recurse)
 {
 	if (Recurse)
 	{
 		LDirectory Dir;
 		if (Dir.First(PathName))
 		{
 			do
 			{
 				char Str[256];
 				Dir.Path(Str, sizeof(Str));
 				
 				if (Dir.IsDir())
 				{
 					RemoveFolder(Str, Recurse);
 				}
 				else
 				{
 					Delete(Str, NULL, false);
 				}
 			}
 			while (Dir.Next());
 		}
 	}
 	
 	return rmdir(PathName) == 0;
 }
 
 bool LFileSystem::Move(const char *OldName, const char *NewName, LError *Err)
 {
 	if (rename(OldName, NewName))
 	{
 		printf("%s:%i - rename failed, error: %s(%i)\n",
 			   _FL,
 			   GetErrorName(errno), errno);
 		return false;
 	}
 	
 	return true;
 }
 
 short DaysInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 int LeapYear(int year)
 {
 	if (year & 3)
 	{
 		return 0;
 	}
 	if ((year % 100 == 0) && !(year % 400 == 0))
 	{
 		return 0;
 	}
 	
 	return 1;
 }
 
 /////////////////////////////////////////////////////////////////////////////////
 class LDirectoryPriv
 {
 public:
 	char			BasePath[512];
 	char			*BaseEnd;
 	DIR				*Dir;
 	struct dirent	*De;
 	struct stat		Stat;
 	char			*Pattern;
 	
 	ssize_t			CachePos;
 	LString::Array	Cache;
 	
 	LDirectoryPriv()
 	{
 		Dir = NULL;
 		De = NULL;
 		BasePath[0] = 0;
 		Pattern = NULL;
 		BaseEnd = NULL;
 		CachePos = -1;
 	}
 	
 	~LDirectoryPriv()
 	{
 		DeleteArray(Pattern);
 	}
 	
 	bool Ignore()
 	{
 		return	De
 		&&
 		(
 		 strcmp(De->d_name, ".") == 0
 		 ||
 		 strcmp(De->d_name, "..") == 0
 		 ||
 		 (
 		  Pattern
 		  &&
 		  !MatchStr(Pattern, De->d_name)
 		  )
 		 );
 	}
 };
 
 LDirectory::LDirectory()
 {
 	d = new LDirectoryPriv;
 }
 
 LDirectory::~LDirectory()
 {
 	Close();
 	DeleteObj(d);
 }
 
 LDirectory *LDirectory::Clone()
 {
 	return new LDirectory;
 }
 
 int LDirectory::First(const char *Name, const char *Pattern)
 {
 	Close();
 	
 	if (Name)
 	{
 		strcpy_s(d->BasePath, sizeof(d->BasePath), Name);
 		d->BaseEnd = d->BasePath + strlen(d->BasePath);
 		
 		if (!Pattern || stricmp(Pattern, LGI_ALL_FILES) == 0)
 		{
 			struct stat S;
 			if (lstat(Name, &S) == 0)
 			{
 				if (S_ISREG(S.st_mode))
 				{
 					char *Dir = strrchr(d->BasePath, DIR_CHAR);
 					if (Dir)
 					{
 						*Dir++ = 0;
 						d->Pattern = NewStr(Dir);
 					}
 				}
 			}
 		}
 		else
 		{
 			d->Pattern = NewStr(Pattern);
 		}
 		
 		auto e = d->BasePath + strlen(d->BasePath);
 		while (e > d->BasePath && e[-1] == DIR_CHAR)
 			*--e = 0;
 		
 		d->Dir = opendir(d->BasePath);
 		if (d->Dir)
 		{
 			d->De = readdir(d->Dir);
 			if (d->De)
 			{
 				char s[512];
 				LMakePath(s, sizeof(s), d->BasePath, GetName());
 				lstat(s, &d->Stat);
 				
 				if (d->Ignore())
 				{
 					if (!Next())
 					{
 						return false;
 					}
 				}
 			}
 		}
 		else if (!Stricmp(Name, "/"))
 		{
 			// Really Apple? REALLY???
 			// Can't opendir("/")... sigh. Clearly there is more than one way to get this done.
 			LSubProcess p("ls", "-l /");
 			LStringPipe o;
 			if (p.Start() && p.Communicate(&o) == 0)
 			{
 				strcpy_s(d->BasePath, sizeof(d->BasePath), Name);
 				d->BaseEnd = d->BasePath + strlen(d->BasePath);
 				
 				d->Cache.SetFixedLength(false);
 				auto Lines = o.NewLStr().Split("\n");
 				for (auto Ln: Lines)
 				{
 					auto p = Ln.SplitDelimit(" \t", 8);
 					if (p.Length() > 8)
 					{
 						auto Name = p.Last();
 						auto Lnk = Name.Split(" -> ");
 						if (Lnk.Length() > 1)
 							d->Cache.New().Printf("/%s", Lnk.Last().Get());
 						else
 							d->Cache.New().Printf("/%s", Name.Get());
 					}
 				}
 				
 				d->CachePos = 0;
 				return !lstat(d->Cache[d->CachePos], &d->Stat);
 			}
 			else printf("%s:%i - ls failed.\n", _FL);
 		}
 		else
 		{
 			printf("%s:%i - opendir(%s) failed with %i\n", _FL, d->BasePath, errno);
 		}
 	}
 	
 	return d->Dir != 0 && d->De != 0;
 }
 
 int LDirectory::Next()
 {
 	int Status = false;
 	char s[512];
 
 	if (d->CachePos >= 0)
 	{
 		d->CachePos++;
 		if (d->CachePos >= d->Cache.Length())
 			Status = false;
 		else
 		{
 			*d->BaseEnd = 0;
 			auto &c = d->Cache[d->CachePos];
 			if (!lstat(c, &d->Stat))
 				Status = true;
 		}
 	}
 	else
 	{
 		while (d->Dir && d->De)
 		{
 			if ((d->De = readdir(d->Dir)))
 			{
 				*d->BaseEnd = 0;
 				LMakePath(s, sizeof(s), d->BasePath, GetName());
 				lstat(s, &d->Stat);
 				if (!d->Ignore())
 				{
 					Status = true;
 					break;
 				}
 			}
 		}
 	}
 	
 	return Status;
 }
 
 int LDirectory::Close()
 {
 	if (d->Dir)
 	{
 		closedir(d->Dir);
 		d->Dir = 0;
 	}
 	d->De = 0;
 	
 	return true;
 }
 
 bool LDirectory::Path(char *s, int BufLen) const
 {
 	if (!s)
 	{
 		return false;
 	}
 	
 	return LMakePath(s, BufLen, d->BasePath, GetName());
 }
 
 LVolumeTypes LDirectory::GetType() const
 {
 	return IsDir() ? VT_FOLDER : VT_FILE;
 }
 
 int LDirectory::GetUser(bool Group) const
 {
 	if (Group)
 	{
 		return d->Stat.st_gid;
 	}
 	else
 	{
 		return d->Stat.st_uid;
 	}
 }
 
 bool LDirectory::IsReadOnly() const
 {
 	if (getuid() == d->Stat.st_uid)
 	{
 		// Check user perms
 		return !TestFlag(GetAttributes(), S_IWUSR);
 	}
 	else if (getgid() == d->Stat.st_gid)
 	{
 		// Check group perms
 		return !TestFlag(GetAttributes(), S_IWGRP);
 	}
 	
 	// Check global perms
 	return !TestFlag(GetAttributes(), S_IWOTH);
 }
 
 bool LDirectory::IsSymLink() const
 {
 	long a = GetAttributes();
 	return S_ISLNK(a);
 }
 
 bool LDirectory::IsHidden() const
 {
 	return GetName() && GetName()[0] == '.';
 }
 
 bool LDirectory::IsDir() const
 {
 	long a = GetAttributes();
 	return !S_ISLNK(a) && S_ISDIR(a);
 }
 
 long LDirectory::GetAttributes() const
 {
 	return d->Stat.st_mode;
 }
 
 const char *LDirectory::GetName() const
 {
 	if (d->CachePos >= 0)
 		return d->Cache[d->CachePos];
 	if (d->De)
 		return d->De->d_name;
 
 	LAssert(!"Invalid state.");
 	return NULL;
 }
 
 uint64 LDirectory::GetCreationTime() const
 {
 	return (uint64)d->Stat.st_ctime * 1000;
 }
 
 uint64 LDirectory::GetLastAccessTime() const
 {
 	return (uint64)d->Stat.st_atime * 1000;
 }
 
 uint64 LDirectory::GetLastWriteTime() const
 {
 	return (uint64)d->Stat.st_mtime * 1000;
 }
 
 uint64 LDirectory::GetSize() const
 {
 	return d->Stat.st_size;
 }
 
 int64 LDirectory::GetSizeOnDisk()
 {
 	return d->Stat.st_size;
 }
 
 const char *LDirectory::FullPath()
 {
 	auto n = GetName();
 	if (!n)
 		return NULL;
 	
 	char *s = d->BaseEnd;
 	char *e = d->BasePath + sizeof(d->BasePath);
 	if (s > d->BasePath &&
 		s[-1] != DIR_CHAR)
 		*s++ = DIR_CHAR;
 	strncpy(s, n, e - s);
 	return d->BasePath;
 }
 
 LString LDirectory::FileName() const
 {
 	return GetName();
 }
 
 int64_t LDirectory::TsToUnix(uint64_t timeStamp)
 {
 	return timeStamp / 1000;
 }
 
 LDateTime LDirectory::TsToDateTime(uint64_t timeStamp, bool convertToLocalTz)
 {
 	LDateTime dt;
 	dt.SetTimeZone(0, false); // UTC
 	dt.Set(timeStamp);
 
-	LArray<LDateTime::LDstInfo> dst;
+	LArray<LDstInfo> dst;
 	if (convertToLocalTz &&
-		LDateTime::GetDaylightSavingsInfo(dst, dt))
+		LTimeZone::GetDaylightSavingsInfo(dst, dt))
 	{
 		// Convert to local using the timezone in effect at 'dt'
-		LDateTime::DstToLocal(dst, dt);
+		LTimeZone::DstToLocal(dst, dt);
 	}
 	else
 	{
 		// Without knowing the timezone at 'dt' just leave it as UTC...
 		// The caller will have to figure it out.
 	}
 	return dt;
 }
 
 /////////////////////////////////////////////////////////////////////////////////
 class LFilePrivate
 {
 public:
 	int hFile;
 	char *Name;
 	bool Swap;
 	int Status;
 	int Attributes;
 	int LastError;
 	
 	LFilePrivate()
 	{
 		hFile = INVALID_HANDLE;
 		Name = 0;
 		Swap = false;
 		Status = true;
 		Attributes = 0;
 		#if LGI_COCOA
 		LastError = 0;
 		#else
 		LastError = noErr;
 		#endif
 	}
 	
 	~LFilePrivate()
 	{
 		DeleteArray(Name);
 	}
 };
 
 LFile::LFile(const char *path, int mode)
 {
 	d = new LFilePrivate;
 	if (path)
 		Open(path, mode);
 }
 
 LFile::~LFile()
 {
 	if (d && ValidHandle(d->hFile))
 	{
 		Close();
 	}
 	DeleteObj(d);
 }
 
 int LFile::GetError()
 {
 	return d->LastError;
 }
 
 OsFile LFile::Handle()
 {
 	return d->hFile;
 }
 
 bool LFile::IsOpen()
 {
 	return ValidHandle(d->hFile);
 }
 
 uint64_t LFile::GetModifiedTime()
 {
 	struct stat s;
     stat(d->Name, &s);
     return s.st_mtime;
 }
 
 bool LFile::SetModifiedTime(uint64_t dt)
 {
 	struct stat s;
     stat(d->Name, &s);
     
     struct timeval times[2] = {};
     times[0].tv_sec = s.st_atime;
     times[1].tv_sec = dt;
     
 	int r = utimes(d->Name, times);
 	
 	return r == 0;
 }
 
 void LFile::ChangeThread()
 {
 }
 
 // #define _FILE_OPEN
 #ifdef _FILE_OPEN
 GSemaphore _FileLock;
 GHashTable _FileOpen;
 
 LgiFunc void _DumpOpenFiles()
 {
 	if (_FileLock.Lock(_FL))
 	{
 		char *k;
 		int i=0;
 		for (void *p=_FileOpen.First(&k); p; p=_FileOpen.Next(&k))
 		{
 			printf("File[%i]='%s'\n", i++, k);
 		}
 		_FileLock.Unlock();
 	}
 }
 #endif
 
 int LFile::Open(const char *File, int Mode)
 {
 	if (!File)
 	{
 		#if LGI_COCOA
 		d->LastError = NSFileReadInvalidFileNameError;
 		#else
 		d->LastError = paramErr;
 		#endif
 		return false;
 	}
 	
 	if (TestFlag(Mode, O_WRITE) ||
 		TestFlag(Mode, O_READWRITE))
 	{
 		Mode |= O_CREAT;
 	}
 	
 	Close();
 	d->hFile = open(File, Mode | O_LARGEFILE, S_IRUSR | S_IWUSR);
 	if (!ValidHandle(d->hFile))
 	{
 		d->LastError = errno;
 		printf("LFile::Open failed\n\topen(%s,%8.8x) = %i\n\terrno=%s (%s)\n", File, Mode, d->hFile, GetErrorName(errno), GetErrorDesc(errno));
 		return false;
 	}
 	
 #ifdef _FILE_OPEN
 	if (_FileLock.Lock(_FL))
 	{5
 		_FileOpen.Add(File, this);
 		_FileLock.Unlock();
 	}
 #endif
 	
 	d->Attributes = Mode;
 	d->Name = new char[strlen(File)+1];
 	if (d->Name)
 	{
 		strcpy(d->Name, File);
 	}
 	d->Status = true;
 	
 	return true;
 }
 
 int LFile::Close()
 {
 	if (ValidHandle(d->hFile))
 	{
 #ifdef _FILE_OPEN
 		if (_FileLock.Lock(_FL))
 		{
 			_FileOpen.Delete(d->Name);
 			_FileLock.Unlock();
 		}
 #endif
 		
 		close(d->hFile);
 		d->hFile = INVALID_HANDLE;
 		DeleteArray(d->Name);
 	}
 	
 	return true;
 }
 
 #define CHUNK		0xFFF0
 
 ssize_t LFile::Read(void *Buffer, ssize_t Size, int Flags)
 {
 	ssize_t Red = 0;
 	
 	if (Buffer && Size > 0)
 	{
 		Red = read(d->hFile, Buffer, Size);
 #ifdef _DEBUG
 		if (Red < 0)
 		{
 			int Err = errno;
 			int64 Pos = GetPos();
 			printf("Read error: %i, " LPrintfInt64 "\n", Err, Pos);
 		}
 #endif
 	}
 	d->Status = Red == Size;
 	
 	return MAX(Red, 0);
 }
 
 ssize_t LFile::Write(const void *Buffer, ssize_t Size, int Flags)
 {
 	ssize_t Written = 0;
 	
 	if (Buffer && Size > 0)
 	{
 		Written = write(d->hFile, Buffer, Size);
 #ifdef _DEBUG
 		if (Written < 0)
 		{
 			int Err = errno;
 			int64 Pos = GetPos();
 			printf("Write error: %i, " LPrintfInt64 "\n", Err, Pos);
 		}
 #endif
 	}
 	d->Status = Written == Size;
 	
 	return MAX(Written, 0);
 }
 
 int64 LFile::Seek(int64 To, int Whence)
 {
 #if LINUX64
 	return lseek64(d->hFile, To, Whence); // If this doesn't compile, switch off LINUX64
 #else
 	return lseek(d->hFile, To, Whence);
 #endif
 }
 
 int64 LFile::SetPos(int64 Pos)
 {
 #if LINUX64
 	int64 p = lseek64(d->hFile, Pos, SEEK_SET);
 	if (p < 0)
 	{
 		int e = errno;
 		printf("%s:%i - lseek64(%Lx) failed (error %i: %s).\n",
 			   __FILE__, __LINE__,
 			   Pos, e, GetErrorName(e));
 		
 	}
 #else
 	return lseek(d->hFile, Pos, SEEK_SET);
 #endif
 }
 
 int64 LFile::GetPos()
 {
 #if LINUX64
 	int64 p = lseek64(d->hFile, 0, SEEK_CUR);
 	if (p < 0)
 	{
 		int e = errno;
 		printf("%s:%i - lseek64 failed (error %i: %s).\n",
 			   __FILE__, __LINE__,
 			   e, GetErrorName(e));
 		
 	}
 	return p;
 #else
 	return lseek(d->hFile, 0, SEEK_CUR);
 #endif
 }
 
 int64 LFile::GetSize()
 {
 	int64 Here = GetPos();
 #if LINUX64
 	int64 Ret = lseek64(d->hFile, 0, SEEK_END);
 #else
 	off_t Ret = lseek(d->hFile, 0, SEEK_END);
 #endif
 	SetPos(Here);
 	return Ret;
 }
 
 int64 LFile::SetSize(int64 Size)
 {
 	if (ValidHandle(d->hFile))
 	{
 		int64 Pos = GetPos();
 		
 		/*
 		 close(d->hFile);
 		 if (d->Name)
 		 {
 			#if LINUX64
 			truncate64(Name, Size);
 			#else
 			truncate(Name, Size);
 			#endif
 		 }
 		 d->hFile = open(Name, Attributes, 0);
 		 */
 		
 #if LINUX64
 		ftruncate64(d->hFile, Size);
 #else
 		ftruncate(d->hFile, Size);
 #endif
 		
 		if (d->hFile)
 		{
 			SetPos(Pos);
 		}
 	}
 	
 	return GetSize();
 }
 
 bool LFile::Eof()
 {
 	return GetPos() >= GetSize();
 }
 
 ssize_t LFile::SwapRead(uchar *Buf, ssize_t Size)
 {
 	ssize_t r = Read(Buf, Size);
 	if (r == Size)
 	{
 		uint8 *s = Buf, *e = Buf + r - 1;
 		for (; s < e; s++, e--)
 		{
 			uchar c = *s;
 			*s = *e;
 			*e = c;
 		}
 	}
 	else return 0;
 	
 	return r;
 }
 
 ssize_t LFile::SwapWrite(uchar *Buf, ssize_t Size)
 {
 	switch (Size)
 	{
 		case 1:
 		{
 			return Write(Buf, Size);
 			break;
 		}
 		case 2:
 		{
 			uint16 i = *((uint16*)Buf);
 			i = LgiSwap16(i);
 			return Write(&i, Size);
 			break;
 		}
 		case 4:
 		{
 			uint32 i = *((uint32*)Buf);
 			i = LgiSwap32(i);
 			return Write(&i, Size);
 			break;
 		}
 		case 8:
 		{
 			uint64 i = *((uint64*)Buf);
 			i = LgiSwap64(i);
 			return Write(&i, Size);
 			break;
 		}
 		default:
 		{
 			ssize_t i, n;
 			for (i=0, n=Size-1; i<n; i++, n--)
 			{
 				uchar c = Buf[i];
 				Buf[i] = Buf[n];
 				Buf[n] = c;
 			}
 			
 			ssize_t w = Write(Buf, Size);
 			
 			for (i=0, n=Size-1; i<n; i++, n--)
 			{
 				uchar c = Buf[i];
 				Buf[i] = Buf[n];
 				Buf[n] = c;
 			}
 			
 			return w;
 			break;
 		}
 	}
 	
 	return 0;
 }
 
 ssize_t LFile::ReadStr(char *Buf, ssize_t Size)
 {
 	ssize_t i = 0;
 	ssize_t r = 0;
 	if (Buf && Size > 0)
 	{
 		char c;
 		
 		Size--;
 		
 		do
 		{
 			r = read(d->hFile, &c, 1);
 			if (Eof())
 			{
 				break;
 			}
 			
 			*Buf++ = c;
 			i++;
 			
 		} while (i < Size - 1 && c != '\n');
 		
 		*Buf = 0;
 	}
 	
 	return i;
 }
 
 ssize_t LFile::WriteStr(char *Buf, ssize_t Size)
 {
 	ssize_t i = 0;
 	ssize_t w;
 	
 	while (i <= Size)
 	{
 		w = write(d->hFile, Buf, 1);
 		Buf++;
 		i++;
 		if (*Buf == '\n') break;
 	}
 	
 	return i;
 }
 
 void LFile::SetStatus(bool s)
 {
 	d->Status = s;
 }
 
 bool LFile::GetStatus()
 {
 	return d->Status;
 }
 
 void LFile::SetSwap(bool s)
 {
 	d->Swap = s;
 }
 
 bool LFile::GetSwap()
 {
 	return d->Swap;
 }
 
 int LFile::GetOpenMode()
 {
 	return d->Attributes;
 }
 
 const char *LFile::GetName()
 {
 	return d->Name;
 }
 
 #define GFileOp(type)	LFile &LFile::operator >> (type &i) \
 	{ \
 		d->Status |= ((d->Swap) ? SwapRead((uchar*) &i, sizeof(i)) : Read(&i, sizeof(i))) != sizeof(i); \
 		return *this; \
 	}
 GFileOps();
 #undef GFileOp
 
 #define GFileOp(type)	LFile &LFile::operator << (type i) \
 	{ \
 		d->Status |= ((d->Swap) ? SwapWrite((uchar*) &i, sizeof(i)) : Write(&i, sizeof(i))) != sizeof(i); \
 		return *this; \
 	}
 GFileOps();
 #undef GFileOp
 
diff --git a/src/mac/cocoa/LgiCocoa.xcodeproj/project.pbxproj b/src/mac/cocoa/LgiCocoa.xcodeproj/project.pbxproj
--- a/src/mac/cocoa/LgiCocoa.xcodeproj/project.pbxproj
+++ b/src/mac/cocoa/LgiCocoa.xcodeproj/project.pbxproj
@@ -1,1214 +1,1226 @@
 // !$*UTF8*$!
 {
 	archiveVersion = 1;
 	classes = {
 	};
 	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		340833152698F8FF0028012F /* FontPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 340833122698F8FE0028012F /* FontPriv.h */; };
 		340833162698F8FF0028012F /* FontType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340833132698F8FE0028012F /* FontType.cpp */; };
 		340833172698F8FF0028012F /* TypeFace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340833142698F8FE0028012F /* TypeFace.cpp */; };
 		3409C0CA27580ED60050302A /* ListItemRadioBtn.h in Headers */ = {isa = PBXBuildFile; fileRef = 3409C0C727580ED60050302A /* ListItemRadioBtn.h */; };
 		3409C0CB27580ED60050302A /* List.h in Headers */ = {isa = PBXBuildFile; fileRef = 3409C0C827580ED60050302A /* List.h */; };
 		3409C0CC27580ED60050302A /* ListItemCheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 3409C0C927580ED60050302A /* ListItemCheckBox.h */; };
 		3409C0D0275812CB0050302A /* Profile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3409C0CF275812CB0050302A /* Profile.h */; };
 		34109857217A9805007020CE /* LCocoaView.h in Sources */ = {isa = PBXBuildFile; fileRef = 34109856217A9805007020CE /* LCocoaView.h */; };
 		34114C8B23091E6E00F342B1 /* LgiClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = 34114C8A23091E6E00F342B1 /* LgiClasses.h */; };
 		3413170E23068FFE008CE982 /* FileSelect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3413170D23068FFE008CE982 /* FileSelect.cpp */; };
 		34131710230694D1008CE982 /* Gel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3413170F230694D1008CE982 /* Gel.cpp */; };
 		3415168F26EC32E7007EE35F /* TextView4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3415168E26EC32E7007EE35F /* TextView4.cpp */; };
 		3415169326EC32FF007EE35F /* TextView3.h in Headers */ = {isa = PBXBuildFile; fileRef = 3415169126EC32FF007EE35F /* TextView3.h */; };
 		3415169426EC32FF007EE35F /* TextView4.h in Headers */ = {isa = PBXBuildFile; fileRef = 3415169226EC32FF007EE35F /* TextView4.h */; };
 		3418EBCF25D9FEA600EA168A /* Progress.h in Headers */ = {isa = PBXBuildFile; fileRef = 3418EBCE25D9FEA600EA168A /* Progress.h */; };
 		3418EBD125D9FEF500EA168A /* ProgressDlg.h in Headers */ = {isa = PBXBuildFile; fileRef = 3418EBD025D9FEF500EA168A /* ProgressDlg.h */; };
 		3427064727A0E20C0043F733 /* CocoaView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3427064627A0E20C0043F733 /* CocoaView.mm */; };
+		3428D9212BCDD7D7008E5A2A /* TimeZone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3428D9202BCDD7D7008E5A2A /* TimeZone.cpp */; };
 		343874B5230F46B200CF96B4 /* Window.h in Headers */ = {isa = PBXBuildFile; fileRef = 343874B1230F46B200CF96B4 /* Window.h */; };
 		343874B6230F46B200CF96B4 /* View.h in Headers */ = {isa = PBXBuildFile; fileRef = 343874B2230F46B200CF96B4 /* View.h */; };
 		343874B7230F46B200CF96B4 /* App.h in Headers */ = {isa = PBXBuildFile; fileRef = 343874B3230F46B200CF96B4 /* App.h */; };
 		343874B8230F46B200CF96B4 /* Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 343874B4230F46B200CF96B4 /* Layout.h */; };
 		343BE8C72355D0CE00742E21 /* PopupList.h in Headers */ = {isa = PBXBuildFile; fileRef = 343BE8C62355D0CE00742E21 /* PopupList.h */; };
 		3449B8CE26BBF6B10022A9B8 /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 3449B8CD26BBF6B10022A9B8 /* Notifications.h */; };
 		344CFBC8237365B800AE6B35 /* ClipBoard.h in Headers */ = {isa = PBXBuildFile; fileRef = 344CFBC7237365B800AE6B35 /* ClipBoard.h */; };
 		345920FF1F25649000098DFD /* Font.h in Headers */ = {isa = PBXBuildFile; fileRef = 345920FC1F25649000098DFD /* Font.h */; };
 		345921001F25649000098DFD /* FontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 345920FD1F25649000098DFD /* FontCache.h */; };
 		345921011F25649000098DFD /* FontSelect.h in Headers */ = {isa = PBXBuildFile; fileRef = 345920FE1F25649000098DFD /* FontSelect.h */; };
 		345EB84E235C6C01007D05DB /* Popup.h in Headers */ = {isa = PBXBuildFile; fileRef = 345EB84D235C6C01007D05DB /* Popup.h */; };
 		346DDEC1240C882900751380 /* RadioGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 346DDEC0240C882900751380 /* RadioGroup.h */; };
 		346FACE71D3C720B00FFEBCE /* Message.h in Headers */ = {isa = PBXBuildFile; fileRef = 346FACE61D3C720B00FFEBCE /* Message.h */; };
 		346FACEB1D3C75AE00FFEBCE /* Uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346FACE91D3C75AE00FFEBCE /* Uri.cpp */; };
 		346FACEC1D3C75AE00FFEBCE /* MDStringToDigest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346FACEA1D3C75AE00FFEBCE /* MDStringToDigest.cpp */; };
 		3471868823A9AF8900F8C952 /* SubProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3471868723A9AF8900F8C952 /* SubProcess.cpp */; };
 		3477C2751CBF07DD0028B84B /* App.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2741CBF07DD0028B84B /* App.mm */; };
 		3477C2781CBF08050028B84B /* ClipBoard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2761CBF08050028B84B /* ClipBoard.mm */; };
 		3477C2821CBF086A0028B84B /* General.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27A1CBF086A0028B84B /* General.mm */; };
 		3477C2831CBF086A0028B84B /* Layout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27B1CBF086A0028B84B /* Layout.mm */; };
 		3477C2841CBF086A0028B84B /* Menu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27C1CBF086A0028B84B /* Menu.mm */; };
 		3477C2851CBF086A0028B84B /* Printer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27D1CBF086A0028B84B /* Printer.mm */; };
 		3477C2861CBF086A0028B84B /* Thread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27E1CBF086A0028B84B /* Thread.mm */; };
 		3477C2871CBF086A0028B84B /* View.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27F1CBF086A0028B84B /* View.mm */; };
 		3477C2881CBF086A0028B84B /* Widgets.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2801CBF086A0028B84B /* Widgets.mm */; };
 		3477C2891CBF086A0028B84B /* Window.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2811CBF086A0028B84B /* Window.mm */; };
 		3477C28F1CBF08C10028B84B /* Gdc2.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C28B1CBF08C10028B84B /* Gdc2.mm */; };
 		3477C2901CBF08C10028B84B /* MemDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C28C1CBF08C10028B84B /* MemDC.cpp */; };
 		3477C2911CBF08C10028B84B /* PrintDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C28D1CBF08C10028B84B /* PrintDC.cpp */; };
 		3477C2921CBF08C10028B84B /* ScreenDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C28E1CBF08C10028B84B /* ScreenDC.cpp */; };
 		3477C2971CBF09320028B84B /* File.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2941CBF09320028B84B /* File.mm */; };
 		3477C2981CBF09320028B84B /* Mem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2951CBF09320028B84B /* Mem.mm */; };
 		3477C2991CBF09320028B84B /* ShowFileProp_Mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2961CBF09320028B84B /* ShowFileProp_Mac.mm */; };
 		3477C2A11CBF0A920028B84B /* Mem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29B1CBF0A920028B84B /* Mem.h */; };
 		3477C2A21CBF0A920028B84B /* SymLookup.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29C1CBF0A920028B84B /* SymLookup.h */; };
 		3477C2A31CBF0A920028B84B /* LgiMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29D1CBF0A920028B84B /* LgiMac.h */; };
 		3477C2A41CBF0A920028B84B /* LgiOs.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29E1CBF0A920028B84B /* LgiOs.h */; };
 		3477C2A51CBF0A920028B84B /* LgiOsClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29F1CBF0A920028B84B /* LgiOsClasses.h */; };
 		3477C2A61CBF0A920028B84B /* LgiOsDefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2A01CBF0A920028B84B /* LgiOsDefs.h */; };
 		3477C2A81CBF0AAF0028B84B /* Lgi.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2A71CBF0AAF0028B84B /* Lgi.h */; };
 		3477C2AA1CBF22A00028B84B /* File.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2A91CBF22A00028B84B /* File.h */; };
 		3477C2AC1CBF72170028B84B /* ViewPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2AB1CBF72170028B84B /* ViewPriv.h */; };
 		3477C2AF1CBF96B90028B84B /* LgiRes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2AE1CBF96B90028B84B /* LgiRes.cpp */; };
 		3477C2B11CBF96C40028B84B /* Res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2B01CBF96C40028B84B /* Res.cpp */; };
 		3477C2B41CBF96F20028B84B /* LMsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2B31CBF96F20028B84B /* LMsg.cpp */; };
 		3477C2B71CBF973F0028B84B /* GuiUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2B61CBF973F0028B84B /* GuiUtils.cpp */; };
 		3477C2B91CBF977F0028B84B /* LgiCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2B81CBF977F0028B84B /* LgiCommon.cpp */; };
 		3477C2BB1CBF97C80028B84B /* GdcCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2BA1CBF97C80028B84B /* GdcCommon.cpp */; };
 		3477C2C11CBF9A040028B84B /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C01CBF9A040028B84B /* String.cpp */; };
 		3477C2C81CC046310028B84B /* TextView3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C41CC046310028B84B /* TextView3.cpp */; };
 		3477C2C91CC046310028B84B /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C51CC046310028B84B /* Unicode.cpp */; };
 		3477C2CA1CC046310028B84B /* Utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C61CC046310028B84B /* Utf8.cpp */; };
 		3477C2CB1CC046310028B84B /* XmlTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C71CC046310028B84B /* XmlTree.cpp */; };
 		3477C2CE1CC047BE0028B84B /* Charset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2CD1CC047BE0028B84B /* Charset.cpp */; };
 		3477C2D01CC047F50028B84B /* ToolBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2CF1CC047F50028B84B /* ToolBar.cpp */; };
 		3477C2D31CC048100028B84B /* Containers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2D21CC048100028B84B /* Containers.cpp */; };
 		3477C2D51CC0481B0028B84B /* Array.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2D41CC0481B0028B84B /* Array.h */; };
 		3477C2D71CC048390028B84B /* Popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2D61CC048390028B84B /* Popup.cpp */; };
 		3477C2DB1CC048F90028B84B /* DisplayString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2D81CC048F90028B84B /* DisplayString.cpp */; };
 		3477C2DC1CC048F90028B84B /* Font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2D91CC048F90028B84B /* Font.cpp */; };
 		3477C2DD1CC048F90028B84B /* FontSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2DA1CC048F90028B84B /* FontSystem.cpp */; };
 		3477C2DF1CC04A030028B84B /* ScrollBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2DE1CC04A030028B84B /* ScrollBar.cpp */; };
 		3477C2E11CC04A3C0028B84B /* FontSelect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E01CC04A3C0028B84B /* FontSelect.cpp */; };
 		3477C2E31CC04A5C0028B84B /* Stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E21CC04A5C0028B84B /* Stream.cpp */; };
 		3477C2E51CC04A7F0028B84B /* ViewCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E41CC04A7F0028B84B /* ViewCommon.cpp */; };
 		3477C2E71CC04B1E0028B84B /* Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E61CC04B1E0028B84B /* Surface.cpp */; };
 		3477C2E91CC04B5D0028B84B /* Rand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E81CC04B5D0028B84B /* Rand.cpp */; };
 		3477C2EB1CC04B890028B84B /* Filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2EA1CC04B890028B84B /* Filter.cpp */; };
 		3477C2EF1CC04BBB0028B84B /* ItemContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2EC1CC04BBB0028B84B /* ItemContainer.cpp */; };
 		3477C2F01CC04BBB0028B84B /* List.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2ED1CC04BBB0028B84B /* List.cpp */; };
 		3477C2F11CC04BBB0028B84B /* Tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2EE1CC04BBB0028B84B /* Tree.cpp */; };
 		3477C2FF1CC04BF00028B84B /* Bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F21CC04BF00028B84B /* Bitmap.cpp */; };
 		3477C3001CC04BF00028B84B /* Box.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F31CC04BF00028B84B /* Box.cpp */; };
 		3477C3011CC04BF00028B84B /* Button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F41CC04BF00028B84B /* Button.cpp */; };
 		3477C3021CC04BF00028B84B /* CheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F51CC04BF00028B84B /* CheckBox.cpp */; };
 		3477C3031CC04BF00028B84B /* Combo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F61CC04BF00028B84B /* Combo.cpp */; };
 		3477C3041CC04BF00028B84B /* Edit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F71CC04BF00028B84B /* Edit.cpp */; };
 		3477C3051CC04BF00028B84B /* Panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F81CC04BF00028B84B /* Panel.cpp */; };
 		3477C3061CC04BF00028B84B /* Progress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F91CC04BF00028B84B /* Progress.cpp */; };
 		3477C3071CC04BF00028B84B /* RadioGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FA1CC04BF00028B84B /* RadioGroup.cpp */; };
 		3477C3081CC04BF00028B84B /* Splitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FB1CC04BF00028B84B /* Splitter.cpp */; };
 		3477C3091CC04BF00028B84B /* TableLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FC1CC04BF00028B84B /* TableLayout.cpp */; };
 		3477C30A1CC04BF00028B84B /* TabView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FD1CC04BF00028B84B /* TabView.cpp */; };
 		3477C30B1CC04BF00028B84B /* TextLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FE1CC04BF00028B84B /* TextLabel.cpp */; };
 		3477C30D1CC04C560028B84B /* FindReplace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C30C1CC04C560028B84B /* FindReplace.cpp */; };
 		3477C3101CC04C790028B84B /* Css.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C30E1CC04C790028B84B /* Css.cpp */; };
 		3477C3111CC04C790028B84B /* CssTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C30F1CC04C790028B84B /* CssTools.cpp */; };
 		3477C3131CC04CB10028B84B /* Rect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3121CC04CB10028B84B /* Rect.cpp */; };
 		3477C3161CC04CCB0028B84B /* Library.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3151CC04CCB0028B84B /* Library.cpp */; };
 		3477C3191CC04CF10028B84B /* ThreadCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3181CC04CF10028B84B /* ThreadCommon.cpp */; };
 		3477C31D1CC04D3F0028B84B /* Net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C31B1CC04D3F0028B84B /* Net.cpp */; };
 		3477C3201CC04D630028B84B /* ThreadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C31F1CC04D630028B84B /* ThreadEvent.cpp */; };
 		3477C3221CC04DA00028B84B /* Colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3211CC04DA00028B84B /* Colour.cpp */; };
 		3477C3241CC04DD70028B84B /* Object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3231CC04DD70028B84B /* Object.cpp */; };
 		3477C3261CC04DE20028B84B /* Mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3251CC04DE20028B84B /* Mutex.cpp */; };
 		3477C3281CC04E020028B84B /* Variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3271CC04E020028B84B /* Variant.cpp */; };
 		3477C3311CC04E120028B84B /* 8Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3291CC04E120028B84B /* 8Bit.cpp */; };
 		3477C3321CC04E120028B84B /* 64Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32A1CC04E120028B84B /* 64Bit.cpp */; };
 		3477C3331CC04E120028B84B /* 16Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32B1CC04E120028B84B /* 16Bit.cpp */; };
 		3477C3341CC04E120028B84B /* 24Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32C1CC04E120028B84B /* 24Bit.cpp */; };
 		3477C3351CC04E120028B84B /* 32Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32D1CC04E120028B84B /* 32Bit.cpp */; };
 		3477C3361CC04E120028B84B /* 48Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32E1CC04E120028B84B /* 48Bit.cpp */; };
 		3477C3381CC04E120028B84B /* Alpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3301CC04E120028B84B /* Alpha.cpp */; };
 		3477C33A1CC04ED90028B84B /* DragAndDrop.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3391CC04ED90028B84B /* DragAndDrop.mm */; };
 		3477C33D1CC088590028B84B /* FileCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C33C1CC088590028B84B /* FileCommon.cpp */; };
 		3477C33F1CC0A6780028B84B /* Token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C33E1CC0A6780028B84B /* Token.cpp */; };
 		3477C3411CC0A68E0028B84B /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3401CC0A68E0028B84B /* DateTime.cpp */; };
 		3477C3431CC0A6B90028B84B /* DocView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3421CC0A6B90028B84B /* DocView.cpp */; };
 		3477C3451CC0A9DE0028B84B /* Input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3441CC0A9DE0028B84B /* Input.cpp */; };
 		3477C3471CC0AA220028B84B /* WindowCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3461CC0AA220028B84B /* WindowCommon.cpp */; };
 		3477C3491CC0AA7E0028B84B /* ProgressDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3481CC0AA7E0028B84B /* ProgressDlg.cpp */; };
 		3477C34B1CC0AB0B0028B84B /* ToolTip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C34A1CC0AB0B0028B84B /* ToolTip.cpp */; };
 		3477C34D1CC0ACED0028B84B /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 3477C34C1CC0ACED0028B84B /* md5.c */; };
 		3477C3501CC0C3D60028B84B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3477C34F1CC0C3D60028B84B /* Cocoa.framework */; };
 		3477C35B1CC1AEEA0028B84B /* LgiInc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C35A1CC1AEEA0028B84B /* LgiInc.h */; };
 		3477C35D1CC2253E0028B84B /* LgiInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C35C1CC2253E0028B84B /* LgiInterfaces.h */; };
 		3477C43A1CC234750028B84B /* MemStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C4391CC234750028B84B /* MemStream.cpp */; };
 		3477C46D1CC26DEB0028B84B /* Alert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C46C1CC26DEB0028B84B /* Alert.cpp */; };
 		3477C4ED1CC27F1C0028B84B /* TrayIcon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C4EC1CC27F1C0028B84B /* TrayIcon.cpp */; };
 		3477C5171CC303B70028B84B /* LgiUiBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C5161CC303B70028B84B /* LgiUiBase.h */; };
 		347AFB9827A0DC5E00BE4ABE /* 15Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347AFB9727A0DC5E00BE4ABE /* 15Bit.cpp */; };
 		348362421F233A77003B2A6D /* Stream.h in Headers */ = {isa = PBXBuildFile; fileRef = 348362411F233A77003B2A6D /* Stream.h */; };
 		34837C4925C677ED00D103B4 /* AppPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 34837C4825C677ED00D103B4 /* AppPriv.h */; };
 		348CD46A25C63E56001AA32B /* AppCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 348CD46925C63E56001AA32B /* AppCommon.cpp */; };
 		348E99CE2876850F0067E92A /* ObjCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 348E99CD2876850F0067E92A /* ObjCWrapper.h */; };
 		3491A28523678DB800604C29 /* DropFiles.h in Headers */ = {isa = PBXBuildFile; fileRef = 3491A28423678DB700604C29 /* DropFiles.h */; };
 		349F939E2B92CBAD002410A2 /* TextConvert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 349F939D2B92CBAD002410A2 /* TextConvert.cpp */; };
 		34A3ACE820568D5800B1D62A /* StringLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34A3ACE720568D5800B1D62A /* StringLayout.cpp */; };
 		34A3ACEA20568D9700B1D62A /* MenuCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34A3ACE920568D9700B1D62A /* MenuCommon.cpp */; };
 		34B14E3426951C6E004C22CC /* Slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34B14E3326951C6E004C22CC /* Slider.cpp */; };
 		34B531D822F65734002B50F7 /* Menu.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B531D722F65734002B50F7 /* Menu.h */; };
 		34B6B19123CFD0F100C24906 /* DragAndDropCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34B6B19023CFD0F100C24906 /* DragAndDropCommon.cpp */; };
 		34B6F5502BA3A81A0095B1C5 /* UnrolledList.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B6F54F2BA3A81A0095B1C5 /* UnrolledList.h */; };
 		34BF15072871503B001B4CA5 /* DrawListSurface.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BF15062871503B001B4CA5 /* DrawListSurface.h */; };
 		34C072C12369878100E1E222 /* DropFiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C072C02369878100E1E222 /* DropFiles.cpp */; };
 		34C81A5A25DA0AA10053F93A /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C81A5925DA0AA10053F93A /* Base64.cpp */; };
 		34CD9F7223D5768B0039F259 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CD9F7123D5768B0039F259 /* Unicode.h */; };
 		34D1B3C121748A2800BC6B58 /* Path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34D1B3C021748A2800BC6B58 /* Path.cpp */; };
 		34D21CEC217981AE003D1EA6 /* EventTargetThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D21CEB217981AE003D1EA6 /* EventTargetThread.h */; };
 		34D28926275B3D9F005961A8 /* DateTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D28925275B3D9F005961A8 /* DateTime.h */; };
 		34D28929275B3DB0005961A8 /* Variant.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D28928275B3DB0005961A8 /* Variant.h */; };
 		34D6AA1722D3749A005D739E /* Gdc2.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D6AA1622D3749A005D739E /* Gdc2.h */; };
 		34EE8BB12748A55600F12915 /* TextFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 34EE8BB02748A55600F12915 /* TextFile.h */; };
 		34F3EC4329BD374E00BB9B58 /* Rect.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F3EC4229BD374E00BB9B58 /* Rect.h */; };
 		34F6151F27E55C5D00FE5B0C /* Thread.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F6151D27E55C5D00FE5B0C /* Thread.h */; };
 		34F6152027E55C5D00FE5B0C /* ThreadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F6151E27E55C5D00FE5B0C /* ThreadEvent.h */; };
 		34F6153E27E5628600FE5B0C /* Token.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F6153D27E5628600FE5B0C /* Token.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		340833122698F8FE0028012F /* FontPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontPriv.h; path = ../../../private/common/FontPriv.h; sourceTree = SOURCE_ROOT; };
 		340833132698F8FE0028012F /* FontType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontType.cpp; path = ../../common/Gdc2/Font/FontType.cpp; sourceTree = SOURCE_ROOT; };
 		340833142698F8FE0028012F /* TypeFace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TypeFace.cpp; path = ../../common/Gdc2/Font/TypeFace.cpp; sourceTree = SOURCE_ROOT; };
 		3409C0C727580ED60050302A /* ListItemRadioBtn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ListItemRadioBtn.h; path = ../../../include/lgi/common/ListItemRadioBtn.h; sourceTree = SOURCE_ROOT; };
 		3409C0C827580ED60050302A /* List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = List.h; path = ../../../include/lgi/common/List.h; sourceTree = SOURCE_ROOT; };
 		3409C0C927580ED60050302A /* ListItemCheckBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ListItemCheckBox.h; path = ../../../include/lgi/common/ListItemCheckBox.h; sourceTree = SOURCE_ROOT; };
 		3409C0CF275812CB0050302A /* Profile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Profile.h; path = ../../../include/lgi/common/Profile.h; sourceTree = "<group>"; };
 		34109853217A975E007020CE /* View.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = View.h; path = ../../../include/lgi/common/View.h; sourceTree = SOURCE_ROOT; };
 		34109856217A9805007020CE /* LCocoaView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LCocoaView.h; path = ../../../include/lgi/mac/cocoa/LCocoaView.h; sourceTree = SOURCE_ROOT; };
 		34114C8A23091E6E00F342B1 /* LgiClasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiClasses.h; path = ../../../include/lgi/common/LgiClasses.h; sourceTree = "<group>"; };
 		3413170D23068FFE008CE982 /* FileSelect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileSelect.cpp; path = ../../common/Lgi/FileSelect.cpp; sourceTree = SOURCE_ROOT; };
 		3413170F230694D1008CE982 /* Gel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Gel.cpp; path = ../../common/Skins/Gel/Gel.cpp; sourceTree = SOURCE_ROOT; };
 		3415168E26EC32E7007EE35F /* TextView4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextView4.cpp; path = ../../common/Text/TextView4.cpp; sourceTree = SOURCE_ROOT; };
 		3415169126EC32FF007EE35F /* TextView3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextView3.h; path = ../../../include/lgi/common/TextView3.h; sourceTree = SOURCE_ROOT; };
 		3415169226EC32FF007EE35F /* TextView4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextView4.h; path = ../../../include/lgi/common/TextView4.h; sourceTree = SOURCE_ROOT; };
 		3418EBCE25D9FEA600EA168A /* Progress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Progress.h; path = ../../../include/lgi/common/Progress.h; sourceTree = "<group>"; };
 		3418EBD025D9FEF500EA168A /* ProgressDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressDlg.h; path = ../../../include/lgi/common/ProgressDlg.h; sourceTree = "<group>"; };
 		3427064627A0E20C0043F733 /* CocoaView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CocoaView.mm; sourceTree = SOURCE_ROOT; };
+		3428D9202BCDD7D7008E5A2A /* TimeZone.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = TimeZone.cpp; path = ../../../common/General/TimeZone.cpp; sourceTree = "<group>"; };
 		343874B1230F46B200CF96B4 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Window.h; path = ../../../include/lgi/common/Window.h; sourceTree = SOURCE_ROOT; };
 		343874B2230F46B200CF96B4 /* View.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = View.h; path = ../../../include/lgi/common/View.h; sourceTree = "<group>"; };
 		343874B3230F46B200CF96B4 /* App.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = App.h; path = ../../../include/lgi/common/App.h; sourceTree = SOURCE_ROOT; };
 		343874B4230F46B200CF96B4 /* Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Layout.h; path = ../../../include/lgi/common/Layout.h; sourceTree = "<group>"; };
 		343BE8C62355D0CE00742E21 /* PopupList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PopupList.h; path = ../../../include/lgi/common/PopupList.h; sourceTree = "<group>"; };
 		3449B8CD26BBF6B10022A9B8 /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = ../../../include/lgi/common/Notifications.h; sourceTree = "<group>"; };
 		344CFBC7237365B800AE6B35 /* ClipBoard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClipBoard.h; path = ../../../include/lgi/common/ClipBoard.h; sourceTree = "<group>"; };
 		345920FC1F25649000098DFD /* Font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Font.h; path = ../../../include/lgi/common/Font.h; sourceTree = SOURCE_ROOT; };
 		345920FD1F25649000098DFD /* FontCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontCache.h; path = ../../../include/lgi/common/FontCache.h; sourceTree = SOURCE_ROOT; };
 		345920FE1F25649000098DFD /* FontSelect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontSelect.h; path = ../../../include/lgi/common/FontSelect.h; sourceTree = SOURCE_ROOT; };
 		345EB84D235C6C01007D05DB /* Popup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Popup.h; path = ../../../include/lgi/common/Popup.h; sourceTree = SOURCE_ROOT; };
 		346DDEC0240C882900751380 /* RadioGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RadioGroup.h; path = ../../../include/lgi/common/RadioGroup.h; sourceTree = SOURCE_ROOT; };
 		346FACE61D3C720B00FFEBCE /* Message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Message.h; path = ../../../include/lgi/common/Message.h; sourceTree = "<group>"; };
 		346FACE91D3C75AE00FFEBCE /* Uri.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Uri.cpp; path = ../../common/Net/Uri.cpp; sourceTree = SOURCE_ROOT; };
 		346FACEA1D3C75AE00FFEBCE /* MDStringToDigest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MDStringToDigest.cpp; path = ../../common/Net/MDStringToDigest.cpp; sourceTree = SOURCE_ROOT; };
 		3471868723A9AF8900F8C952 /* SubProcess.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = SubProcess.cpp; path = ../../posix/SubProcess.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2681CBF020F0028B84B /* LgiCocoa.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LgiCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3477C26D1CBF020F0028B84B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		3477C2741CBF07DD0028B84B /* App.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = App.mm; sourceTree = SOURCE_ROOT; };
 		3477C2761CBF08050028B84B /* ClipBoard.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipBoard.mm; sourceTree = SOURCE_ROOT; };
 		3477C27A1CBF086A0028B84B /* General.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = General.mm; sourceTree = SOURCE_ROOT; };
 		3477C27B1CBF086A0028B84B /* Layout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Layout.mm; sourceTree = SOURCE_ROOT; };
 		3477C27C1CBF086A0028B84B /* Menu.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Menu.mm; sourceTree = SOURCE_ROOT; };
 		3477C27D1CBF086A0028B84B /* Printer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Printer.mm; sourceTree = SOURCE_ROOT; };
 		3477C27E1CBF086A0028B84B /* Thread.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Thread.mm; sourceTree = SOURCE_ROOT; };
 		3477C27F1CBF086A0028B84B /* View.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = View.mm; sourceTree = SOURCE_ROOT; };
 		3477C2801CBF086A0028B84B /* Widgets.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Widgets.mm; sourceTree = SOURCE_ROOT; };
 		3477C2811CBF086A0028B84B /* Window.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Window.mm; sourceTree = SOURCE_ROOT; };
 		3477C28B1CBF08C10028B84B /* Gdc2.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Gdc2.mm; sourceTree = SOURCE_ROOT; };
 		3477C28C1CBF08C10028B84B /* MemDC.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = MemDC.cpp; path = ../common/MemDC.cpp; sourceTree = SOURCE_ROOT; };
 		3477C28D1CBF08C10028B84B /* PrintDC.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = PrintDC.cpp; path = ../common/PrintDC.cpp; sourceTree = SOURCE_ROOT; };
 		3477C28E1CBF08C10028B84B /* ScreenDC.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = ScreenDC.cpp; path = ../common/ScreenDC.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2941CBF09320028B84B /* File.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = File.mm; sourceTree = SOURCE_ROOT; };
 		3477C2951CBF09320028B84B /* Mem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Mem.mm; sourceTree = SOURCE_ROOT; };
 		3477C2961CBF09320028B84B /* ShowFileProp_Mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ShowFileProp_Mac.mm; sourceTree = SOURCE_ROOT; };
 		3477C29B1CBF0A920028B84B /* Mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mem.h; path = ../../../include/lgi/common/Mem.h; sourceTree = "<group>"; };
 		3477C29C1CBF0A920028B84B /* SymLookup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SymLookup.h; path = ../../../include/lgi/mac/cocoa/SymLookup.h; sourceTree = "<group>"; };
 		3477C29D1CBF0A920028B84B /* LgiMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiMac.h; path = ../../../include/lgi/mac/cocoa/LgiMac.h; sourceTree = "<group>"; };
 		3477C29E1CBF0A920028B84B /* LgiOs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiOs.h; path = ../../../include/lgi/mac/cocoa/LgiOs.h; sourceTree = "<group>"; };
 		3477C29F1CBF0A920028B84B /* LgiOsClasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiOsClasses.h; path = ../../../include/lgi/mac/cocoa/LgiOsClasses.h; sourceTree = "<group>"; };
 		3477C2A01CBF0A920028B84B /* LgiOsDefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiOsDefs.h; path = ../../../include/lgi/mac/cocoa/LgiOsDefs.h; sourceTree = "<group>"; };
 		3477C2A71CBF0AAF0028B84B /* Lgi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Lgi.h; path = ../../../include/lgi/common/Lgi.h; sourceTree = "<group>"; };
 		3477C2A91CBF22A00028B84B /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = File.h; path = ../../../include/lgi/common/File.h; sourceTree = SOURCE_ROOT; };
 		3477C2AB1CBF72170028B84B /* ViewPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewPriv.h; path = ../../../private/common/ViewPriv.h; sourceTree = SOURCE_ROOT; };
 		3477C2AE1CBF96B90028B84B /* LgiRes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LgiRes.cpp; path = ../../common/Resource/LgiRes.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2B01CBF96C40028B84B /* Res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Res.cpp; path = ../../common/Resource/Res.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2B31CBF96F20028B84B /* LMsg.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = LMsg.cpp; path = ../../common/Lgi/LMsg.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2B61CBF973F0028B84B /* GuiUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = GuiUtils.cpp; path = ../../common/Lgi/GuiUtils.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2B81CBF977F0028B84B /* LgiCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = LgiCommon.cpp; path = ../../common/Lgi/LgiCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2BA1CBF97C80028B84B /* GdcCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = GdcCommon.cpp; path = ../../common/Gdc2/GdcCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C01CBF9A040028B84B /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = String.cpp; path = ../../common/Text/String.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C41CC046310028B84B /* TextView3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextView3.cpp; path = ../../common/Text/TextView3.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C51CC046310028B84B /* Unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unicode.cpp; path = ../../common/Text/Unicode.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C61CC046310028B84B /* Utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Utf8.cpp; path = ../../common/Text/Utf8.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C71CC046310028B84B /* XmlTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XmlTree.cpp; path = ../../common/Text/XmlTree.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2CD1CC047BE0028B84B /* Charset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Charset.cpp; path = ../../common/Gdc2/Font/Charset.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2CF1CC047F50028B84B /* ToolBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ToolBar.cpp; path = ../../common/Widgets/ToolBar.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2D21CC048100028B84B /* Containers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Containers.cpp; path = ../../common/General/Containers.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2D41CC0481B0028B84B /* Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Array.h; path = ../../../include/lgi/common/Array.h; sourceTree = SOURCE_ROOT; };
 		3477C2D61CC048390028B84B /* Popup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = Popup.cpp; path = ../../common/Widgets/Popup.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2D81CC048F90028B84B /* DisplayString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DisplayString.cpp; path = ../../common/Gdc2/Font/DisplayString.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2D91CC048F90028B84B /* Font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Font.cpp; path = ../../common/Gdc2/Font/Font.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2DA1CC048F90028B84B /* FontSystem.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = FontSystem.cpp; path = ../../common/Gdc2/Font/FontSystem.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2DE1CC04A030028B84B /* ScrollBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScrollBar.cpp; path = ../../common/Widgets/ScrollBar.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E01CC04A3C0028B84B /* FontSelect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontSelect.cpp; path = ../../common/Lgi/FontSelect.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E21CC04A5C0028B84B /* Stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Stream.cpp; path = ../../common/Lgi/Stream.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E41CC04A7F0028B84B /* ViewCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = ViewCommon.cpp; path = ../../common/Lgi/ViewCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E61CC04B1E0028B84B /* Surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Surface.cpp; path = ../../common/Gdc2/Surface.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E81CC04B5D0028B84B /* Rand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rand.cpp; path = ../../common/Lgi/Rand.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2EA1CC04B890028B84B /* Filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Filter.cpp; path = ../../common/Gdc2/Filters/Filter.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2EC1CC04BBB0028B84B /* ItemContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ItemContainer.cpp; path = ../../common/Widgets/ItemContainer.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2ED1CC04BBB0028B84B /* List.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = List.cpp; path = ../../common/Widgets/List.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2EE1CC04BBB0028B84B /* Tree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tree.cpp; path = ../../common/Widgets/Tree.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F21CC04BF00028B84B /* Bitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Bitmap.cpp; path = ../../common/Widgets/Bitmap.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F31CC04BF00028B84B /* Box.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Box.cpp; path = ../../common/Widgets/Box.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F41CC04BF00028B84B /* Button.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Button.cpp; path = ../../common/Widgets/Button.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F51CC04BF00028B84B /* CheckBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CheckBox.cpp; path = ../../common/Widgets/CheckBox.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F61CC04BF00028B84B /* Combo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Combo.cpp; path = ../../common/Widgets/Combo.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F71CC04BF00028B84B /* Edit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Edit.cpp; path = ../../common/Widgets/Edit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F81CC04BF00028B84B /* Panel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Panel.cpp; path = ../../common/Widgets/Panel.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F91CC04BF00028B84B /* Progress.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Progress.cpp; path = ../../common/Widgets/Progress.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FA1CC04BF00028B84B /* RadioGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RadioGroup.cpp; path = ../../common/Widgets/RadioGroup.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FB1CC04BF00028B84B /* Splitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Splitter.cpp; path = ../../common/Widgets/Splitter.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FC1CC04BF00028B84B /* TableLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TableLayout.cpp; path = ../../common/Widgets/TableLayout.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FD1CC04BF00028B84B /* TabView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TabView.cpp; path = ../../common/Widgets/TabView.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FE1CC04BF00028B84B /* TextLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextLabel.cpp; path = ../../common/Widgets/TextLabel.cpp; sourceTree = SOURCE_ROOT; };
 		3477C30C1CC04C560028B84B /* FindReplace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FindReplace.cpp; path = ../../common/Lgi/FindReplace.cpp; sourceTree = SOURCE_ROOT; };
 		3477C30E1CC04C790028B84B /* Css.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Css.cpp; path = ../../common/Lgi/Css.cpp; sourceTree = SOURCE_ROOT; };
 		3477C30F1CC04C790028B84B /* CssTools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CssTools.cpp; path = ../../common/Lgi/CssTools.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3121CC04CB10028B84B /* Rect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rect.cpp; path = ../../common/Gdc2/Rect.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3151CC04CCB0028B84B /* Library.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Library.cpp; path = ../../common/Lgi/Library.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3181CC04CF10028B84B /* ThreadCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadCommon.cpp; path = ../../common/Lgi/ThreadCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C31B1CC04D3F0028B84B /* Net.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Net.cpp; path = ../../common/Net/Net.cpp; sourceTree = SOURCE_ROOT; };
 		3477C31F1CC04D630028B84B /* ThreadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadEvent.cpp; path = ../../common/Lgi/ThreadEvent.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3211CC04DA00028B84B /* Colour.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Colour.cpp; path = ../../common/Gdc2/Colour.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3231CC04DD70028B84B /* Object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Object.cpp; path = ../../common/Lgi/Object.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3251CC04DE20028B84B /* Mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mutex.cpp; path = ../../common/Lgi/Mutex.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3271CC04E020028B84B /* Variant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Variant.cpp; path = ../../common/Lgi/Variant.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3291CC04E120028B84B /* 8Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 8Bit.cpp; path = ../../common/Gdc2/8Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32A1CC04E120028B84B /* 64Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 64Bit.cpp; path = ../../common/Gdc2/64Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32B1CC04E120028B84B /* 16Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 16Bit.cpp; path = ../../common/Gdc2/16Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32C1CC04E120028B84B /* 24Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 24Bit.cpp; path = ../../common/Gdc2/24Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32D1CC04E120028B84B /* 32Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 32Bit.cpp; path = ../../common/Gdc2/32Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32E1CC04E120028B84B /* 48Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 48Bit.cpp; path = ../../common/Gdc2/48Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3301CC04E120028B84B /* Alpha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Alpha.cpp; path = ../../common/Gdc2/Alpha.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3391CC04ED90028B84B /* DragAndDrop.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = DragAndDrop.mm; sourceTree = SOURCE_ROOT; };
 		3477C33C1CC088590028B84B /* FileCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileCommon.cpp; path = ../../common/General/FileCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C33E1CC0A6780028B84B /* Token.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Token.cpp; path = ../../common/Text/Token.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3401CC0A68E0028B84B /* DateTime.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = DateTime.cpp; path = ../../common/General/DateTime.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3421CC0A6B90028B84B /* DocView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DocView.cpp; path = ../../common/Text/DocView.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3441CC0A9DE0028B84B /* Input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Input.cpp; path = ../../common/Lgi/Input.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3461CC0AA220028B84B /* WindowCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = WindowCommon.cpp; path = ../../common/Lgi/WindowCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3481CC0AA7E0028B84B /* ProgressDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ProgressDlg.cpp; path = ../../common/Widgets/ProgressDlg.cpp; sourceTree = SOURCE_ROOT; };
 		3477C34A1CC0AB0B0028B84B /* ToolTip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ToolTip.cpp; path = ../../common/Lgi/ToolTip.cpp; sourceTree = SOURCE_ROOT; };
 		3477C34C1CC0ACED0028B84B /* md5.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = md5.c; path = ../../common/Hash/md5/md5.c; sourceTree = SOURCE_ROOT; };
 		3477C34F1CC0C3D60028B84B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = ../../../../../../../../System/Library/Frameworks/Cocoa.framework; sourceTree = "<group>"; };
 		3477C35A1CC1AEEA0028B84B /* LgiInc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiInc.h; path = ../../../include/lgi/common/LgiInc.h; sourceTree = "<group>"; };
 		3477C35C1CC2253E0028B84B /* LgiInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiInterfaces.h; path = ../../../include/lgi/common/LgiInterfaces.h; sourceTree = "<group>"; };
 		3477C4391CC234750028B84B /* MemStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MemStream.cpp; path = ../../common/Lgi/MemStream.cpp; sourceTree = SOURCE_ROOT; };
 		3477C46C1CC26DEB0028B84B /* Alert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Alert.cpp; path = ../../common/Lgi/Alert.cpp; sourceTree = SOURCE_ROOT; };
 		3477C4EC1CC27F1C0028B84B /* TrayIcon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = TrayIcon.cpp; path = ../../common/Lgi/TrayIcon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C5161CC303B70028B84B /* LgiUiBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiUiBase.h; path = ../../../include/lgi/common/LgiUiBase.h; sourceTree = "<group>"; };
 		347AFB9727A0DC5E00BE4ABE /* 15Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 15Bit.cpp; path = ../../common/Gdc2/15Bit.cpp; sourceTree = SOURCE_ROOT; };
 		348362411F233A77003B2A6D /* Stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Stream.h; path = ../../../include/lgi/common/Stream.h; sourceTree = SOURCE_ROOT; };
 		34837C4825C677ED00D103B4 /* AppPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppPriv.h; path = ../../../private/mac/AppPriv.h; sourceTree = SOURCE_ROOT; };
 		348CD46925C63E56001AA32B /* AppCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = AppCommon.cpp; path = ../../common/Lgi/AppCommon.cpp; sourceTree = SOURCE_ROOT; };
 		348E99CD2876850F0067E92A /* ObjCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjCWrapper.h; path = ../../../include/lgi/mac/cocoa/ObjCWrapper.h; sourceTree = "<group>"; };
 		3491A28423678DB700604C29 /* DropFiles.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = DropFiles.h; path = ../../../include/lgi/common/DropFiles.h; sourceTree = SOURCE_ROOT; };
-		349F939D2B92CBAD002410A2 /* TextConvert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextConvert.cpp; path = ../../../common/Text/TextConvert.cpp; sourceTree = "<group>"; };
+		349F939D2B92CBAD002410A2 /* TextConvert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextConvert.cpp; path = ../../common/Text/TextConvert.cpp; sourceTree = SOURCE_ROOT; };
 		34A3ACE720568D5800B1D62A /* StringLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringLayout.cpp; path = ../../common/Gdc2/Font/StringLayout.cpp; sourceTree = SOURCE_ROOT; };
 		34A3ACE920568D9700B1D62A /* MenuCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MenuCommon.cpp; path = ../../common/Lgi/MenuCommon.cpp; sourceTree = SOURCE_ROOT; };
 		34B14E3326951C6E004C22CC /* Slider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Slider.cpp; path = ../../common/Widgets/Slider.cpp; sourceTree = SOURCE_ROOT; };
 		34B531D722F65734002B50F7 /* Menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Menu.h; path = ../../../include/lgi/common/Menu.h; sourceTree = "<group>"; };
 		34B6B19023CFD0F100C24906 /* DragAndDropCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DragAndDropCommon.cpp; path = ../../common/Lgi/DragAndDropCommon.cpp; sourceTree = SOURCE_ROOT; };
 		34B6F54F2BA3A81A0095B1C5 /* UnrolledList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UnrolledList.h; path = ../../../include/lgi/common/UnrolledList.h; sourceTree = "<group>"; };
 		34BF15062871503B001B4CA5 /* DrawListSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DrawListSurface.h; path = ../../../../../lgi/trunk/include/lgi/common/DrawListSurface.h; sourceTree = "<group>"; };
 		34C072C02369878100E1E222 /* DropFiles.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = DropFiles.cpp; path = ../../common/Lgi/DropFiles.cpp; sourceTree = SOURCE_ROOT; };
 		34C81A5925DA0AA10053F93A /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Base64.cpp; path = ../../common/Net/Base64.cpp; sourceTree = SOURCE_ROOT; };
 		34CD9F7123D5768B0039F259 /* Unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Unicode.h; path = ../../../include/lgi/common/Unicode.h; sourceTree = SOURCE_ROOT; };
 		34D1B3C021748A2800BC6B58 /* Path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Path.cpp; path = ../../common/Gdc2/Path/Path.cpp; sourceTree = SOURCE_ROOT; };
 		34D21CEB217981AE003D1EA6 /* EventTargetThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EventTargetThread.h; path = ../../../include/lgi/common/EventTargetThread.h; sourceTree = SOURCE_ROOT; };
 		34D28925275B3D9F005961A8 /* DateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DateTime.h; path = ../../../include/lgi/common/DateTime.h; sourceTree = SOURCE_ROOT; };
 		34D28928275B3DB0005961A8 /* Variant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Variant.h; path = ../../../include/lgi/common/Variant.h; sourceTree = SOURCE_ROOT; };
 		34D6AA1622D3749A005D739E /* Gdc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Gdc2.h; path = ../../../include/lgi/common/Gdc2.h; sourceTree = SOURCE_ROOT; };
 		34EE8BB02748A55600F12915 /* TextFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextFile.h; path = ../../../include/lgi/common/TextFile.h; sourceTree = "<group>"; };
 		34F3EC4229BD374E00BB9B58 /* Rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rect.h; path = ../../../include/lgi/common/Rect.h; sourceTree = SOURCE_ROOT; };
-		34F6151D27E55C5D00FE5B0C /* Thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Thread.h; path = ../../../../../lgi/trunk/include/lgi/common/Thread.h; sourceTree = "<group>"; };
-		34F6151E27E55C5D00FE5B0C /* ThreadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadEvent.h; path = ../../../../../lgi/trunk/include/lgi/common/ThreadEvent.h; sourceTree = "<group>"; };
+		34F6151D27E55C5D00FE5B0C /* Thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Thread.h; path = ../../../include/lgi/common/Thread.h; sourceTree = SOURCE_ROOT; };
+		34F6151E27E55C5D00FE5B0C /* ThreadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadEvent.h; path = ../../../include/lgi/common/ThreadEvent.h; sourceTree = SOURCE_ROOT; };
 		34F6153D27E5628600FE5B0C /* Token.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Token.h; path = ../../../../../lgi/trunk/include/lgi/common/Token.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		3477C2641CBF020F0028B84B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				3477C3501CC0C3D60028B84B /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
 		3415168D26EC32C8007EE35F /* TextCtrls */ = {
 			isa = PBXGroup;
 			children = (
 				3415169126EC32FF007EE35F /* TextView3.h */,
 				3415169226EC32FF007EE35F /* TextView4.h */,
 				3415168E26EC32E7007EE35F /* TextView4.cpp */,
 				3477C2C41CC046310028B84B /* TextView3.cpp */,
 			);
 			name = TextCtrls;
 			sourceTree = "<group>";
 		};
+		3428D91F2BCDD762008E5A2A /* DateTime */ = {
+			isa = PBXGroup;
+			children = (
+				3428D9202BCDD7D7008E5A2A /* TimeZone.cpp */,
+				3477C3401CC0A68E0028B84B /* DateTime.cpp */,
+				34D28925275B3D9F005961A8 /* DateTime.h */,
+			);
+			name = DateTime;
+			sourceTree = "<group>";
+		};
 		345BABCE2B78952D005795A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		346FACE81D3C723700FFEBCE /* Resources */ = {
 			isa = PBXGroup;
 			children = (
 				3477C26D1CBF020F0028B84B /* Info.plist */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
 		};
 		3477C25E1CBF020F0028B84B = {
 			isa = PBXGroup;
 			children = (
 				346FACE81D3C723700FFEBCE /* Resources */,
 				3477C26A1CBF020F0028B84B /* Classes */,
 				3477C29A1CBF0A700028B84B /* Headers */,
 				3477C34E1CC0C3A30028B84B /* Link */,
 				3477C2691CBF020F0028B84B /* Products */,
 				345BABCE2B78952D005795A0 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
 		3477C2691CBF020F0028B84B /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2681CBF020F0028B84B /* LgiCocoa.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 		3477C26A1CBF020F0028B84B /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				3428D91F2BCDD762008E5A2A /* DateTime */,
 				3477C2B21CBF96E60028B84B /* Dialogs */,
 				3477C33B1CC0881E0028B84B /* Files */,
 				3477C2931CBF09240028B84B /* General */,
 				3477C28A1CBF08760028B84B /* Graphics */,
 				3477C2731CBF07410028B84B /* Interface_Cocoa */,
 				3477C2B51CBF972B0028B84B /* Interface_XP */,
 				3477C3141CC04CC00028B84B /* Libraries */,
 				3477C2D11CC048000028B84B /* Memory */,
 				3477C31A1CC04D290028B84B /* Network */,
 				3477C4051CC22F920028B84B /* Process */,
 				3477C2AD1CBF96AA0028B84B /* Resources */,
 				3477C2BF1CBF99F00028B84B /* Text */,
 				3477C3171CC04CDE0028B84B /* Threads */,
 				3477C2CC1CC046370028B84B /* Widgets */,
 			);
 			name = Classes;
 			path = Lgi;
 			sourceTree = SOURCE_ROOT;
 			usesTabs = 1;
 		};
 		3477C2731CBF07410028B84B /* Interface_Cocoa */ = {
 			isa = PBXGroup;
 			children = (
 				343874B3230F46B200CF96B4 /* App.h */,
 				3477C2741CBF07DD0028B84B /* App.mm */,
 				344CFBC7237365B800AE6B35 /* ClipBoard.h */,
 				3477C2761CBF08050028B84B /* ClipBoard.mm */,
 				3427064627A0E20C0043F733 /* CocoaView.mm */,
 				3477C3391CC04ED90028B84B /* DragAndDrop.mm */,
 				3477C27A1CBF086A0028B84B /* General.mm */,
 				343874B4230F46B200CF96B4 /* Layout.h */,
 				3477C27B1CBF086A0028B84B /* Layout.mm */,
 				34109856217A9805007020CE /* LCocoaView.h */,
 				3477C27C1CBF086A0028B84B /* Menu.mm */,
 				3477C27D1CBF086A0028B84B /* Printer.mm */,
 				343874B2230F46B200CF96B4 /* View.h */,
 				3477C27F1CBF086A0028B84B /* View.mm */,
 				3477C2AB1CBF72170028B84B /* ViewPriv.h */,
 				3477C2801CBF086A0028B84B /* Widgets.mm */,
 				343874B1230F46B200CF96B4 /* Window.h */,
 				3477C2811CBF086A0028B84B /* Window.mm */,
 				34109853217A975E007020CE /* View.h */,
 			);
 			name = Interface_Cocoa;
 			sourceTree = "<group>";
 		};
 		3477C28A1CBF08760028B84B /* Graphics */ = {
 			isa = PBXGroup;
 			children = (
 				34F3EC4229BD374E00BB9B58 /* Rect.h */,
 				3413170F230694D1008CE982 /* Gel.cpp */,
 				34D6AA1622D3749A005D739E /* Gdc2.h */,
 				34D1B3C021748A2800BC6B58 /* Path.cpp */,
 				3477C3211CC04DA00028B84B /* Colour.cpp */,
 				3477C2BA1CBF97C80028B84B /* GdcCommon.cpp */,
 				3477C2EA1CC04B890028B84B /* Filter.cpp */,
 				3477C3121CC04CB10028B84B /* Rect.cpp */,
 				3477C28B1CBF08C10028B84B /* Gdc2.mm */,
 				3477C2BE1CBF97E20028B84B /* Applicators */,
 				3477C2BD1CBF97DA0028B84B /* Fonts */,
 				3477C2BC1CBF97D10028B84B /* Surfaces */,
 			);
 			name = Graphics;
 			sourceTree = "<group>";
 		};
 		3477C2931CBF09240028B84B /* General */ = {
 			isa = PBXGroup;
 			children = (
 				34C81A5925DA0AA10053F93A /* Base64.cpp */,
-				3477C3401CC0A68E0028B84B /* DateTime.cpp */,
-				34D28925275B3D9F005961A8 /* DateTime.h */,
 				3477C3421CC0A6B90028B84B /* DocView.cpp */,
 				3477C2951CBF09320028B84B /* Mem.mm */,
 				3477C34C1CC0ACED0028B84B /* md5.c */,
 				3477C3231CC04DD70028B84B /* Object.cpp */,
 				3477C2E81CC04B5D0028B84B /* Rand.cpp */,
-				3477C2961CBF09320028B84B /* ShowFileProp_Mac.mm */,
 				3477C3271CC04E020028B84B /* Variant.cpp */,
 				34D28928275B3DB0005961A8 /* Variant.h */,
 			);
 			name = General;
 			sourceTree = "<group>";
 		};
 		3477C29A1CBF0A700028B84B /* Headers */ = {
 			isa = PBXGroup;
 			children = (
 				34B6F54F2BA3A81A0095B1C5 /* UnrolledList.h */,
 				348E99CD2876850F0067E92A /* ObjCWrapper.h */,
 				34BF15062871503B001B4CA5 /* DrawListSurface.h */,
 				3477C2A71CBF0AAF0028B84B /* Lgi.h */,
 				34114C8A23091E6E00F342B1 /* LgiClasses.h */,
 				3477C35A1CC1AEEA0028B84B /* LgiInc.h */,
 				3477C35C1CC2253E0028B84B /* LgiInterfaces.h */,
 				3477C29D1CBF0A920028B84B /* LgiMac.h */,
 				3477C29E1CBF0A920028B84B /* LgiOs.h */,
 				3477C29F1CBF0A920028B84B /* LgiOsClasses.h */,
 				3477C2A01CBF0A920028B84B /* LgiOsDefs.h */,
 				3477C5161CC303B70028B84B /* LgiUiBase.h */,
 				3477C29B1CBF0A920028B84B /* Mem.h */,
 				3449B8CD26BBF6B10022A9B8 /* Notifications.h */,
 				3409C0CF275812CB0050302A /* Profile.h */,
 				3477C29C1CBF0A920028B84B /* SymLookup.h */,
 				34EE8BB02748A55600F12915 /* TextFile.h */,
-				34F6151D27E55C5D00FE5B0C /* Thread.h */,
-				34F6151E27E55C5D00FE5B0C /* ThreadEvent.h */,
 				34F6153D27E5628600FE5B0C /* Token.h */,
 			);
 			name = Headers;
 			sourceTree = "<group>";
 		};
 		3477C2AD1CBF96AA0028B84B /* Resources */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2B01CBF96C40028B84B /* Res.cpp */,
 				3477C2AE1CBF96B90028B84B /* LgiRes.cpp */,
 			);
 			name = Resources;
 			path = ../../common/Gdc2/Rect.cpp;
 			sourceTree = SOURCE_ROOT;
 		};
 		3477C2B21CBF96E60028B84B /* Dialogs */ = {
 			isa = PBXGroup;
 			children = (
 				3413170D23068FFE008CE982 /* FileSelect.cpp */,
 				3477C46C1CC26DEB0028B84B /* Alert.cpp */,
 				3477C3481CC0AA7E0028B84B /* ProgressDlg.cpp */,
 				3477C3441CC0A9DE0028B84B /* Input.cpp */,
 				3477C30C1CC04C560028B84B /* FindReplace.cpp */,
 				3477C2E01CC04A3C0028B84B /* FontSelect.cpp */,
 				3477C2B31CBF96F20028B84B /* LMsg.cpp */,
 			);
 			name = Dialogs;
 			sourceTree = "<group>";
 		};
 		3477C2B51CBF972B0028B84B /* Interface_XP */ = {
 			isa = PBXGroup;
 			children = (
 				34837C4825C677ED00D103B4 /* AppPriv.h */,
 				348CD46925C63E56001AA32B /* AppCommon.cpp */,
 				34B6B19023CFD0F100C24906 /* DragAndDropCommon.cpp */,
 				3491A28423678DB700604C29 /* DropFiles.h */,
 				34C072C02369878100E1E222 /* DropFiles.cpp */,
 				34B531D722F65734002B50F7 /* Menu.h */,
 				34A3ACE920568D9700B1D62A /* MenuCommon.cpp */,
 				346FACE61D3C720B00FFEBCE /* Message.h */,
 				3477C4EC1CC27F1C0028B84B /* TrayIcon.cpp */,
 				3477C34A1CC0AB0B0028B84B /* ToolTip.cpp */,
 				3477C3461CC0AA220028B84B /* WindowCommon.cpp */,
 				3477C2E41CC04A7F0028B84B /* ViewCommon.cpp */,
 				3477C2B81CBF977F0028B84B /* LgiCommon.cpp */,
 				3477C2B61CBF973F0028B84B /* GuiUtils.cpp */,
 			);
 			name = Interface_XP;
 			sourceTree = "<group>";
 		};
 		3477C2BC1CBF97D10028B84B /* Surfaces */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2E61CC04B1E0028B84B /* Surface.cpp */,
 				3477C28E1CBF08C10028B84B /* ScreenDC.cpp */,
 				3477C28C1CBF08C10028B84B /* MemDC.cpp */,
 				3477C28D1CBF08C10028B84B /* PrintDC.cpp */,
 			);
 			name = Surfaces;
 			sourceTree = "<group>";
 		};
 		3477C2BD1CBF97DA0028B84B /* Fonts */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2CD1CC047BE0028B84B /* Charset.cpp */,
 				3477C2D81CC048F90028B84B /* DisplayString.cpp */,
 				3477C2D91CC048F90028B84B /* Font.cpp */,
 				345920FC1F25649000098DFD /* Font.h */,
 				345920FD1F25649000098DFD /* FontCache.h */,
 				340833122698F8FE0028012F /* FontPriv.h */,
 				345920FE1F25649000098DFD /* FontSelect.h */,
 				3477C2DA1CC048F90028B84B /* FontSystem.cpp */,
 				340833132698F8FE0028012F /* FontType.cpp */,
 				34A3ACE720568D5800B1D62A /* StringLayout.cpp */,
 				340833142698F8FE0028012F /* TypeFace.cpp */,
 			);
 			name = Fonts;
 			sourceTree = "<group>";
 		};
 		3477C2BE1CBF97E20028B84B /* Applicators */ = {
 			isa = PBXGroup;
 			children = (
 				3477C3291CC04E120028B84B /* 8Bit.cpp */,
 				347AFB9727A0DC5E00BE4ABE /* 15Bit.cpp */,
 				3477C32B1CC04E120028B84B /* 16Bit.cpp */,
 				3477C32C1CC04E120028B84B /* 24Bit.cpp */,
 				3477C32D1CC04E120028B84B /* 32Bit.cpp */,
 				3477C32E1CC04E120028B84B /* 48Bit.cpp */,
 				3477C32A1CC04E120028B84B /* 64Bit.cpp */,
 				3477C3301CC04E120028B84B /* Alpha.cpp */,
 			);
 			name = Applicators;
 			sourceTree = "<group>";
 		};
 		3477C2BF1CBF99F00028B84B /* Text */ = {
 			isa = PBXGroup;
 			children = (
 				349F939D2B92CBAD002410A2 /* TextConvert.cpp */,
 				3477C30E1CC04C790028B84B /* Css.cpp */,
 				3477C30F1CC04C790028B84B /* CssTools.cpp */,
 				3477C2C01CBF9A040028B84B /* String.cpp */,
 				3477C33E1CC0A6780028B84B /* Token.cpp */,
 				3477C2C51CC046310028B84B /* Unicode.cpp */,
 				34CD9F7123D5768B0039F259 /* Unicode.h */,
 				3477C2C61CC046310028B84B /* Utf8.cpp */,
 				3477C2C71CC046310028B84B /* XmlTree.cpp */,
 			);
 			name = Text;
 			sourceTree = "<group>";
 		};
 		3477C2CC1CC046370028B84B /* Widgets */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2F21CC04BF00028B84B /* Bitmap.cpp */,
 				3477C2F31CC04BF00028B84B /* Box.cpp */,
 				3477C2F41CC04BF00028B84B /* Button.cpp */,
 				3477C2F51CC04BF00028B84B /* CheckBox.cpp */,
 				3477C2F61CC04BF00028B84B /* Combo.cpp */,
 				3477C2F71CC04BF00028B84B /* Edit.cpp */,
 				3477C2EC1CC04BBB0028B84B /* ItemContainer.cpp */,
 				3477C2ED1CC04BBB0028B84B /* List.cpp */,
 				3409C0C827580ED60050302A /* List.h */,
 				3409C0C927580ED60050302A /* ListItemCheckBox.h */,
 				3409C0C727580ED60050302A /* ListItemRadioBtn.h */,
 				3477C2F81CC04BF00028B84B /* Panel.cpp */,
 				3477C2D61CC048390028B84B /* Popup.cpp */,
 				345EB84D235C6C01007D05DB /* Popup.h */,
 				343BE8C62355D0CE00742E21 /* PopupList.h */,
 				3477C2F91CC04BF00028B84B /* Progress.cpp */,
 				3418EBCE25D9FEA600EA168A /* Progress.h */,
 				3418EBD025D9FEF500EA168A /* ProgressDlg.h */,
 				3477C2FA1CC04BF00028B84B /* RadioGroup.cpp */,
 				346DDEC0240C882900751380 /* RadioGroup.h */,
 				3477C2DE1CC04A030028B84B /* ScrollBar.cpp */,
 				34B14E3326951C6E004C22CC /* Slider.cpp */,
 				3477C2FB1CC04BF00028B84B /* Splitter.cpp */,
 				3477C2FC1CC04BF00028B84B /* TableLayout.cpp */,
 				3477C2FD1CC04BF00028B84B /* TabView.cpp */,
 				3415168D26EC32C8007EE35F /* TextCtrls */,
 				3477C2FE1CC04BF00028B84B /* TextLabel.cpp */,
 				3477C2CF1CC047F50028B84B /* ToolBar.cpp */,
 				3477C2EE1CC04BBB0028B84B /* Tree.cpp */,
 			);
 			name = Widgets;
 			sourceTree = "<group>";
 		};
 		3477C2D11CC048000028B84B /* Memory */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2D41CC0481B0028B84B /* Array.h */,
 				3477C2D21CC048100028B84B /* Containers.cpp */,
 				3477C4391CC234750028B84B /* MemStream.cpp */,
 				3477C2E21CC04A5C0028B84B /* Stream.cpp */,
 				348362411F233A77003B2A6D /* Stream.h */,
 			);
 			name = Memory;
 			sourceTree = "<group>";
 		};
 		3477C3141CC04CC00028B84B /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
 				3477C3151CC04CCB0028B84B /* Library.cpp */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
 		};
 		3477C3171CC04CDE0028B84B /* Threads */ = {
 			isa = PBXGroup;
 			children = (
+				34F6151D27E55C5D00FE5B0C /* Thread.h */,
+				34F6151E27E55C5D00FE5B0C /* ThreadEvent.h */,
 				34D21CEB217981AE003D1EA6 /* EventTargetThread.h */,
 				3477C27E1CBF086A0028B84B /* Thread.mm */,
 				3477C3251CC04DE20028B84B /* Mutex.cpp */,
 				3477C31F1CC04D630028B84B /* ThreadEvent.cpp */,
 				3477C3181CC04CF10028B84B /* ThreadCommon.cpp */,
 			);
 			name = Threads;
 			sourceTree = "<group>";
 		};
 		3477C31A1CC04D290028B84B /* Network */ = {
 			isa = PBXGroup;
 			children = (
 				346FACE91D3C75AE00FFEBCE /* Uri.cpp */,
 				346FACEA1D3C75AE00FFEBCE /* MDStringToDigest.cpp */,
 				3477C31B1CC04D3F0028B84B /* Net.cpp */,
 			);
 			name = Network;
 			sourceTree = "<group>";
 		};
 		3477C33B1CC0881E0028B84B /* Files */ = {
 			isa = PBXGroup;
 			children = (
+				3477C2961CBF09320028B84B /* ShowFileProp_Mac.mm */,
 				3477C33C1CC088590028B84B /* FileCommon.cpp */,
 				3477C2A91CBF22A00028B84B /* File.h */,
 				3477C2941CBF09320028B84B /* File.mm */,
 			);
 			name = Files;
 			sourceTree = "<group>";
 		};
 		3477C34E1CC0C3A30028B84B /* Link */ = {
 			isa = PBXGroup;
 			children = (
 				3477C34F1CC0C3D60028B84B /* Cocoa.framework */,
 			);
 			name = Link;
 			sourceTree = "<group>";
 		};
 		3477C4051CC22F920028B84B /* Process */ = {
 			isa = PBXGroup;
 			children = (
 				3471868723A9AF8900F8C952 /* SubProcess.cpp */,
 			);
 			name = Process;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
 		3477C2651CBF020F0028B84B /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				344CFBC8237365B800AE6B35 /* ClipBoard.h in Headers */,
 				3449B8CE26BBF6B10022A9B8 /* Notifications.h in Headers */,
 				343874B8230F46B200CF96B4 /* Layout.h in Headers */,
 				3477C2AC1CBF72170028B84B /* ViewPriv.h in Headers */,
 				3409C0CA27580ED60050302A /* ListItemRadioBtn.h in Headers */,
 				3477C35D1CC2253E0028B84B /* LgiInterfaces.h in Headers */,
 				34F6153E27E5628600FE5B0C /* Token.h in Headers */,
 				3477C2A51CBF0A920028B84B /* LgiOsClasses.h in Headers */,
 				3491A28523678DB800604C29 /* DropFiles.h in Headers */,
 				3415169326EC32FF007EE35F /* TextView3.h in Headers */,
 				34B531D822F65734002B50F7 /* Menu.h in Headers */,
 				34114C8B23091E6E00F342B1 /* LgiClasses.h in Headers */,
 				34D28926275B3D9F005961A8 /* DateTime.h in Headers */,
 				3477C35B1CC1AEEA0028B84B /* LgiInc.h in Headers */,
 				34F6152027E55C5D00FE5B0C /* ThreadEvent.h in Headers */,
 				348362421F233A77003B2A6D /* Stream.h in Headers */,
 				3477C2A61CBF0A920028B84B /* LgiOsDefs.h in Headers */,
 				3409C0CC27580ED60050302A /* ListItemCheckBox.h in Headers */,
 				345EB84E235C6C01007D05DB /* Popup.h in Headers */,
 				34BF15072871503B001B4CA5 /* DrawListSurface.h in Headers */,
 				34F6151F27E55C5D00FE5B0C /* Thread.h in Headers */,
 				34D21CEC217981AE003D1EA6 /* EventTargetThread.h in Headers */,
 				343BE8C72355D0CE00742E21 /* PopupList.h in Headers */,
 				34EE8BB12748A55600F12915 /* TextFile.h in Headers */,
 				34CD9F7223D5768B0039F259 /* Unicode.h in Headers */,
 				34837C4925C677ED00D103B4 /* AppPriv.h in Headers */,
 				34F3EC4329BD374E00BB9B58 /* Rect.h in Headers */,
 				3409C0D0275812CB0050302A /* Profile.h in Headers */,
 				3477C2A11CBF0A920028B84B /* Mem.h in Headers */,
 				3477C2D51CC0481B0028B84B /* Array.h in Headers */,
 				3477C5171CC303B70028B84B /* LgiUiBase.h in Headers */,
 				3477C2AA1CBF22A00028B84B /* File.h in Headers */,
 				343874B5230F46B200CF96B4 /* Window.h in Headers */,
 				34D28929275B3DB0005961A8 /* Variant.h in Headers */,
 				348E99CE2876850F0067E92A /* ObjCWrapper.h in Headers */,
 				3477C2A21CBF0A920028B84B /* SymLookup.h in Headers */,
 				34D6AA1722D3749A005D739E /* Gdc2.h in Headers */,
 				3477C2A41CBF0A920028B84B /* LgiOs.h in Headers */,
 				340833152698F8FF0028012F /* FontPriv.h in Headers */,
 				343874B7230F46B200CF96B4 /* App.h in Headers */,
 				3418EBCF25D9FEA600EA168A /* Progress.h in Headers */,
 				346DDEC1240C882900751380 /* RadioGroup.h in Headers */,
 				345921011F25649000098DFD /* FontSelect.h in Headers */,
 				346FACE71D3C720B00FFEBCE /* Message.h in Headers */,
 				3477C2A31CBF0A920028B84B /* LgiMac.h in Headers */,
 				3418EBD125D9FEF500EA168A /* ProgressDlg.h in Headers */,
 				343874B6230F46B200CF96B4 /* View.h in Headers */,
 				34B6F5502BA3A81A0095B1C5 /* UnrolledList.h in Headers */,
 				345920FF1F25649000098DFD /* Font.h in Headers */,
 				3415169426EC32FF007EE35F /* TextView4.h in Headers */,
 				3477C2A81CBF0AAF0028B84B /* Lgi.h in Headers */,
 				345921001F25649000098DFD /* FontCache.h in Headers */,
 				3409C0CB27580ED60050302A /* List.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
 		3477C2671CBF020F0028B84B /* LgiCocoa */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3477C2701CBF020F0028B84B /* Build configuration list for PBXNativeTarget "LgiCocoa" */;
 			buildPhases = (
 				3477C2631CBF020F0028B84B /* Sources */,
 				3477C2641CBF020F0028B84B /* Frameworks */,
 				3477C2651CBF020F0028B84B /* Headers */,
 				3477C2661CBF020F0028B84B /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = LgiCocoa;
 			productName = Lgi;
 			productReference = 3477C2681CBF020F0028B84B /* LgiCocoa.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		3477C25F1CBF020F0028B84B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1420;
 				ORGANIZATIONNAME = Memecode;
 				TargetAttributes = {
 					3477C2671CBF020F0028B84B = {
 						CreatedOnToolsVersion = 7.3;
 					};
 				};
 			};
 			buildConfigurationList = 3477C2621CBF020F0028B84B /* Build configuration list for PBXProject "LgiCocoa" */;
 			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
 			);
 			mainGroup = 3477C25E1CBF020F0028B84B;
 			productRefGroup = 3477C2691CBF020F0028B84B /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				3477C2671CBF020F0028B84B /* LgiCocoa */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
 		3477C2661CBF020F0028B84B /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
 		3477C2631CBF020F0028B84B /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				349F939E2B92CBAD002410A2 /* TextConvert.cpp in Sources */,
 				3477C2CE1CC047BE0028B84B /* Charset.cpp in Sources */,
 				3477C3111CC04C790028B84B /* CssTools.cpp in Sources */,
 				34A3ACE820568D5800B1D62A /* StringLayout.cpp in Sources */,
 				3477C2DB1CC048F90028B84B /* DisplayString.cpp in Sources */,
 				34B14E3426951C6E004C22CC /* Slider.cpp in Sources */,
 				3477C33A1CC04ED90028B84B /* DragAndDrop.mm in Sources */,
 				3477C2DC1CC048F90028B84B /* Font.cpp in Sources */,
 				3477C2831CBF086A0028B84B /* Layout.mm in Sources */,
 				3477C34D1CC0ACED0028B84B /* md5.c in Sources */,
 				3477C2C81CC046310028B84B /* TextView3.cpp in Sources */,
 				3477C2861CBF086A0028B84B /* Thread.mm in Sources */,
 				3477C2821CBF086A0028B84B /* General.mm in Sources */,
 				3477C3131CC04CB10028B84B /* Rect.cpp in Sources */,
 				3477C3451CC0A9DE0028B84B /* Input.cpp in Sources */,
 				34B6B19123CFD0F100C24906 /* DragAndDropCommon.cpp in Sources */,
 				3477C31D1CC04D3F0028B84B /* Net.cpp in Sources */,
 				3477C28F1CBF08C10028B84B /* Gdc2.mm in Sources */,
 				3477C30A1CC04BF00028B84B /* TabView.cpp in Sources */,
 				3427064727A0E20C0043F733 /* CocoaView.mm in Sources */,
 				3477C33F1CC0A6780028B84B /* Token.cpp in Sources */,
 				3477C2D01CC047F50028B84B /* ToolBar.cpp in Sources */,
 				3477C3011CC04BF00028B84B /* Button.cpp in Sources */,
 				3477C3061CC04BF00028B84B /* Progress.cpp in Sources */,
 				3477C3001CC04BF00028B84B /* Box.cpp in Sources */,
 				3477C2871CBF086A0028B84B /* View.mm in Sources */,
 				3477C3021CC04BF00028B84B /* CheckBox.cpp in Sources */,
 				3477C2BB1CBF97C80028B84B /* GdcCommon.cpp in Sources */,
 				3477C2E51CC04A7F0028B84B /* ViewCommon.cpp in Sources */,
 				347AFB9827A0DC5E00BE4ABE /* 15Bit.cpp in Sources */,
 				34131710230694D1008CE982 /* Gel.cpp in Sources */,
 				3477C2D71CC048390028B84B /* Popup.cpp in Sources */,
 				3477C3091CC04BF00028B84B /* TableLayout.cpp in Sources */,
 				3477C2E11CC04A3C0028B84B /* FontSelect.cpp in Sources */,
 				3477C2DF1CC04A030028B84B /* ScrollBar.cpp in Sources */,
 				3477C2F11CC04BBB0028B84B /* Tree.cpp in Sources */,
 				3413170E23068FFE008CE982 /* FileSelect.cpp in Sources */,
 				3477C3281CC04E020028B84B /* Variant.cpp in Sources */,
 				3477C2AF1CBF96B90028B84B /* LgiRes.cpp in Sources */,
 				3471868823A9AF8900F8C952 /* SubProcess.cpp in Sources */,
 				3477C3161CC04CCB0028B84B /* Library.cpp in Sources */,
 				3477C3051CC04BF00028B84B /* Panel.cpp in Sources */,
 				3477C2901CBF08C10028B84B /* MemDC.cpp in Sources */,
 				34C072C12369878100E1E222 /* DropFiles.cpp in Sources */,
 				3477C30D1CC04C560028B84B /* FindReplace.cpp in Sources */,
 				3477C34B1CC0AB0B0028B84B /* ToolTip.cpp in Sources */,
 				3415168F26EC32E7007EE35F /* TextView4.cpp in Sources */,
 				3477C3201CC04D630028B84B /* ThreadEvent.cpp in Sources */,
 				3477C3031CC04BF00028B84B /* Combo.cpp in Sources */,
 				3477C30B1CC04BF00028B84B /* TextLabel.cpp in Sources */,
 				3477C2B71CBF973F0028B84B /* GuiUtils.cpp in Sources */,
 				3477C2911CBF08C10028B84B /* PrintDC.cpp in Sources */,
 				3477C2B91CBF977F0028B84B /* LgiCommon.cpp in Sources */,
 				34D1B3C121748A2800BC6B58 /* Path.cpp in Sources */,
 				3477C2CA1CC046310028B84B /* Utf8.cpp in Sources */,
 				3477C2971CBF09320028B84B /* File.mm in Sources */,
 				3477C43A1CC234750028B84B /* MemStream.cpp in Sources */,
 				3477C3191CC04CF10028B84B /* ThreadCommon.cpp in Sources */,
 				3477C2781CBF08050028B84B /* ClipBoard.mm in Sources */,
 				346FACEC1D3C75AE00FFEBCE /* MDStringToDigest.cpp in Sources */,
 				3477C3491CC0AA7E0028B84B /* ProgressDlg.cpp in Sources */,
 				346FACEB1D3C75AE00FFEBCE /* Uri.cpp in Sources */,
 				3477C2B11CBF96C40028B84B /* Res.cpp in Sources */,
 				340833162698F8FF0028012F /* FontType.cpp in Sources */,
 				3477C4ED1CC27F1C0028B84B /* TrayIcon.cpp in Sources */,
 				3477C2991CBF09320028B84B /* ShowFileProp_Mac.mm in Sources */,
 				3477C2921CBF08C10028B84B /* ScreenDC.cpp in Sources */,
 				3477C2981CBF09320028B84B /* Mem.mm in Sources */,
 				3477C2CB1CC046310028B84B /* XmlTree.cpp in Sources */,
 				3477C2EF1CC04BBB0028B84B /* ItemContainer.cpp in Sources */,
 				3477C3081CC04BF00028B84B /* Splitter.cpp in Sources */,
 				34109857217A9805007020CE /* LCocoaView.h in Sources */,
 				3477C46D1CC26DEB0028B84B /* Alert.cpp in Sources */,
 				3477C3381CC04E120028B84B /* Alpha.cpp in Sources */,
 				3477C2EB1CC04B890028B84B /* Filter.cpp in Sources */,
 				3477C3321CC04E120028B84B /* 64Bit.cpp in Sources */,
 				3477C3041CC04BF00028B84B /* Edit.cpp in Sources */,
 				3477C3361CC04E120028B84B /* 48Bit.cpp in Sources */,
 				3477C3261CC04DE20028B84B /* Mutex.cpp in Sources */,
 				3477C2851CBF086A0028B84B /* Printer.mm in Sources */,
 				3477C33D1CC088590028B84B /* FileCommon.cpp in Sources */,
 				3477C3471CC0AA220028B84B /* WindowCommon.cpp in Sources */,
 				3477C3071CC04BF00028B84B /* RadioGroup.cpp in Sources */,
 				3477C2FF1CC04BF00028B84B /* Bitmap.cpp in Sources */,
 				3477C2E91CC04B5D0028B84B /* Rand.cpp in Sources */,
 				3477C2E71CC04B1E0028B84B /* Surface.cpp in Sources */,
 				3477C3241CC04DD70028B84B /* Object.cpp in Sources */,
 				3477C2E31CC04A5C0028B84B /* Stream.cpp in Sources */,
 				34A3ACEA20568D9700B1D62A /* MenuCommon.cpp in Sources */,
 				3477C3341CC04E120028B84B /* 24Bit.cpp in Sources */,
 				3477C3351CC04E120028B84B /* 32Bit.cpp in Sources */,
 				3477C2881CBF086A0028B84B /* Widgets.mm in Sources */,
 				340833172698F8FF0028012F /* TypeFace.cpp in Sources */,
 				3477C2891CBF086A0028B84B /* Window.mm in Sources */,
 				3477C3431CC0A6B90028B84B /* DocView.cpp in Sources */,
 				3477C2841CBF086A0028B84B /* Menu.mm in Sources */,
 				3477C2B41CBF96F20028B84B /* LMsg.cpp in Sources */,
 				3477C3311CC04E120028B84B /* 8Bit.cpp in Sources */,
 				3477C2DD1CC048F90028B84B /* FontSystem.cpp in Sources */,
 				3477C3101CC04C790028B84B /* Css.cpp in Sources */,
 				3477C2C91CC046310028B84B /* Unicode.cpp in Sources */,
+				3428D9212BCDD7D7008E5A2A /* TimeZone.cpp in Sources */,
 				3477C3221CC04DA00028B84B /* Colour.cpp in Sources */,
 				3477C2D31CC048100028B84B /* Containers.cpp in Sources */,
 				3477C2F01CC04BBB0028B84B /* List.cpp in Sources */,
 				3477C3331CC04E120028B84B /* 16Bit.cpp in Sources */,
 				3477C2751CBF07DD0028B84B /* App.mm in Sources */,
 				348CD46A25C63E56001AA32B /* AppCommon.cpp in Sources */,
 				3477C3411CC0A68E0028B84B /* DateTime.cpp in Sources */,
 				34C81A5A25DA0AA10053F93A /* Base64.cpp in Sources */,
 				3477C2C11CBF9A040028B84B /* String.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
 		3477C26E1CBF020F0028B84B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MODULEMAP_FILE = module.modulemap;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Debug;
 		};
 		3477C26F1CBF020F0028B84B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MODULEMAP_FILE = module.modulemap;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
 		3477C2711CBF020F0028B84B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES_NONAGGRESSIVE;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 2AV9WN2LD8;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				GCC_C_LANGUAGE_STANDARD = c11;
 				HEADER_SEARCH_PATHS = (
 					../../../include,
 					../../../include/lgi/mac/cocoa,
 					../../../private/mac,
 					../../../private/common,
 				);
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
 				OTHER_CFLAGS = (
 					"-DMAC",
 					"-DLGI_COCOA=1",
 					"-DLGI_LIBRARY",
 					"-D_DEBUG",
 					"-DLGI_UNIT_TESTS",
 				);
 				OTHER_CODE_SIGN_FLAGS = "--timestamp --deep";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMAC",
 					"-DLGI_COCOA=1",
 					"-DLGI_LIBRARY",
 					"-D_DEBUG",
 					"-DLGI_UNIT_TESTS",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.memecode.Lgi;
 				PRODUCT_NAME = LgiCocoa;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				WARNING_CFLAGS = "-Wno-nullability-completeness";
 			};
 			name = Debug;
 		};
 		3477C2721CBF020F0028B84B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES_NONAGGRESSIVE;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 2AV9WN2LD8;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				GCC_C_LANGUAGE_STANDARD = c11;
 				HEADER_SEARCH_PATHS = (
 					../../../include,
 					../../../include/lgi/mac/cocoa,
 					../../../private/mac,
 					../../../private/common,
 				);
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
 				OTHER_CFLAGS = (
 					"-DMAC",
 					"-DLGI_COCOA=1",
 					"-DLGI_LIBRARY",
 				);
 				OTHER_CODE_SIGN_FLAGS = "--timestamp --deep";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMAC",
 					"-DLGI_COCOA=1",
 					"-DLGI_LIBRARY",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.memecode.Lgi;
 				PRODUCT_NAME = LgiCocoa;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				WARNING_CFLAGS = "-Wno-nullability-completeness";
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 		3477C2621CBF020F0028B84B /* Build configuration list for PBXProject "LgiCocoa" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3477C26E1CBF020F0028B84B /* Debug */,
 				3477C26F1CBF020F0028B84B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		3477C2701CBF020F0028B84B /* Build configuration list for PBXNativeTarget "LgiCocoa" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3477C2711CBF020F0028B84B /* Debug */,
 				3477C2721CBF020F0028B84B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 3477C25F1CBF020F0028B84B /* Project object */;
 }