Skip to content

Commit

Permalink
visual studio isn't staging all my changes for some reason
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicholas O'Connor committed May 11, 2016
1 parent 9f599f5 commit 118f1bb
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 17 deletions.
42 changes: 29 additions & 13 deletions TilandisGUI/Form1.Designer.cs

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

17 changes: 13 additions & 4 deletions TilandisGUI/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Windows.Forms;
using System.Runtime.InteropServices;
using System.IO;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace TilandisGUI {
public partial class frm_tilandisgui : Form {
Expand All @@ -25,9 +25,18 @@ private void Form1_Load(object sender, EventArgs e) {
//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);
StreamReader r = new StreamReader("links.json");
string str_linksjson = r.ReadToEnd();
JObject json_links = JObject.Parse(str_linksjson);
r.Close();

foreach (JProperty prop_curitem in json_links.Properties()) {
ListViewItem lvi_curitem = new ListViewItem(prop_curitem.Name);
JObject prop_linksettings = (JObject) prop_curitem.Value;

lvi_curitem.SubItems.Add(prop_linksettings.Value<string>("path"));

lst_links.Items.Add(lvi_curitem);
}
}
}
Expand Down

0 comments on commit 118f1bb

Please sign in to comment.