Skip to content

Commit

Permalink
UI design and link document import
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicholas O'Connor committed May 11, 2016
1 parent 71eb9ef commit 9f599f5
Show file tree
Hide file tree
Showing 13 changed files with 781 additions and 22 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
### A drop in replacement for TileCreator Proxy

This project uses the following external libraries:
* [rapidjson](https://github.com/miloyip/rapidjson)
* [rapidjson (Tilandis, C++)](https://github.com/miloyip/rapidjson)
* Newtonsoft.Json (via NuGet, TilandisGUI, C#)
34 changes: 17 additions & 17 deletions Tilandis.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tilandis", "Tilandis\Tilandis.vcxproj", "{59649EC5-2A97-4BA9-AD93-B7BDBE665F71}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TilandisGUI", "TilandisGUI\TilandisGUI.csproj", "{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TilandisGUI", "TilandisGUI\TilandisGUI.csproj", "{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -31,22 +31,22 @@ Global
{59649EC5-2A97-4BA9-AD93-B7BDBE665F71}.Release|x64.Build.0 = Release|x64
{59649EC5-2A97-4BA9-AD93-B7BDBE665F71}.Release|x86.ActiveCfg = Release|Win32
{59649EC5-2A97-4BA9-AD93-B7BDBE665F71}.Release|x86.Build.0 = Release|Win32
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Debug|ARM.ActiveCfg = Debug|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Debug|ARM.Build.0 = Debug|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Debug|x64.ActiveCfg = Debug|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Debug|x64.Build.0 = Debug|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Debug|x86.ActiveCfg = Debug|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Debug|x86.Build.0 = Debug|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Release|Any CPU.Build.0 = Release|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Release|ARM.ActiveCfg = Release|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Release|ARM.Build.0 = Release|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Release|x64.ActiveCfg = Release|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Release|x64.Build.0 = Release|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Release|x86.ActiveCfg = Release|Any CPU
{0BDA5788-1561-4BC1-B0E4-EAA1FC9ADF70}.Release|x86.Build.0 = Release|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Debug|ARM.ActiveCfg = Debug|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Debug|ARM.Build.0 = Debug|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Debug|x64.ActiveCfg = Debug|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Debug|x64.Build.0 = Debug|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Debug|x86.ActiveCfg = Debug|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Debug|x86.Build.0 = Debug|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Release|Any CPU.Build.0 = Release|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Release|ARM.ActiveCfg = Release|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Release|ARM.Build.0 = Release|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Release|x64.ActiveCfg = Release|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Release|x64.Build.0 = Release|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Release|x86.ActiveCfg = Release|Any CPU
{797C89EC-FBF5-4C75-A7A4-DF0AD54349EF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
254 changes: 254 additions & 0 deletions TilandisGUI/Form1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions TilandisGUI/Form1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Runtime.InteropServices;
using System.IO;
using Newtonsoft.Json;

namespace TilandisGUI {
public partial class frm_tilandisgui : Form {
[DllImport("user32.dll")]
public static extern int SendMessage(IntPtr hWnd, int wMsg, IntPtr wParam, IntPtr lParam);

public frm_tilandisgui() {
InitializeComponent();
}

private void Form1_Load(object sender, EventArgs e) {
// TODO: fix this crap
//Bitmap img_shield = new Bitmap(SystemIcons.Shield.ToBitmap(), new Size(12, 16));
//cbx_asadmin.Image = img_shield;

using (StreamReader r = new StreamReader("links.json")) {
string str_linksjson = r.ReadToEnd();
dynamic json_links = JsonConvert.DeserializeObject(str_linksjson);
}
}
}
}
Loading

0 comments on commit 9f599f5

Please sign in to comment.