From 20443073626574315e967746602d7fb8fe200b4a Mon Sep 17 00:00:00 2001 From: LoLlYdE Date: Wed, 26 Jul 2017 13:44:59 +0200 Subject: [PATCH 1/3] Made TextBox colorable --- Source/ConsoleDraw/Inputs/TextBox.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/ConsoleDraw/Inputs/TextBox.cs b/Source/ConsoleDraw/Inputs/TextBox.cs index 832001a..930fdcc 100644 --- a/Source/ConsoleDraw/Inputs/TextBox.cs +++ b/Source/ConsoleDraw/Inputs/TextBox.cs @@ -18,8 +18,8 @@ public class TextBox : Input private int Offset = 0; private String Text = ""; - private ConsoleColor TextColour = ConsoleColor.White; - private ConsoleColor BackgroundColour = ConsoleColor.DarkGray; + public ConsoleColor TextColour = ConsoleColor.White; + public ConsoleColor BackgroundColour = ConsoleColor.DarkGray; private Cursor cursor = new Cursor(); From 229ce8908a2a26be482a3531fcb893d26d7e838c Mon Sep 17 00:00:00 2001 From: LoLlYdE Date: Wed, 26 Jul 2017 16:17:24 +0200 Subject: [PATCH 2/3] More liberal coloring policies. --- Source/ConsoleDraw/Inputs/Button.cs | 6 +++--- Source/ConsoleDraw/Inputs/CheckBox.cs | 6 +++--- Source/ConsoleDraw/Inputs/Dropdown/Dropdown.cs | 8 ++++---- Source/ConsoleDraw/Inputs/Dropdown/DropdownItem.cs | 8 ++++---- Source/ConsoleDraw/Inputs/Label.cs | 2 +- Source/ConsoleDraw/Inputs/Menu/Menu.cs | 8 ++++---- Source/ConsoleDraw/Inputs/Menu/MenuItem.cs | 8 ++++---- Source/ConsoleDraw/Inputs/RadioButton.cs | 6 +++--- Source/ConsoleDraw/Inputs/TextArea.cs | 2 +- Source/ConsoleDraw/Inputs/TextBox.cs | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Source/ConsoleDraw/Inputs/Button.cs b/Source/ConsoleDraw/Inputs/Button.cs index 8b0d248..1e9d990 100644 --- a/Source/ConsoleDraw/Inputs/Button.cs +++ b/Source/ConsoleDraw/Inputs/Button.cs @@ -12,10 +12,10 @@ public class Button : Input { private String Text; public ConsoleColor BackgroundColour = ConsoleColor.Gray; - private ConsoleColor TextColour = ConsoleColor.Black; + public ConsoleColor TextColour = ConsoleColor.Black; - private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; - private ConsoleColor SelectedTextColour = ConsoleColor.White; + public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; + public ConsoleColor SelectedTextColour = ConsoleColor.White; private bool Selected = false; diff --git a/Source/ConsoleDraw/Inputs/CheckBox.cs b/Source/ConsoleDraw/Inputs/CheckBox.cs index 45e7a8c..b703872 100644 --- a/Source/ConsoleDraw/Inputs/CheckBox.cs +++ b/Source/ConsoleDraw/Inputs/CheckBox.cs @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs public class CheckBox : Input { public ConsoleColor BackgroundColour = ConsoleColor.Gray; - private ConsoleColor TextColour = ConsoleColor.Black; + public ConsoleColor TextColour = ConsoleColor.Black; - private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; - private ConsoleColor SelectedTextColour = ConsoleColor.White; + public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; + public ConsoleColor SelectedTextColour = ConsoleColor.White; private bool Selected = false; public bool Checked = false; diff --git a/Source/ConsoleDraw/Inputs/Dropdown/Dropdown.cs b/Source/ConsoleDraw/Inputs/Dropdown/Dropdown.cs index 64c4622..db50b28 100644 --- a/Source/ConsoleDraw/Inputs/Dropdown/Dropdown.cs +++ b/Source/ConsoleDraw/Inputs/Dropdown/Dropdown.cs @@ -10,10 +10,10 @@ namespace ConsoleDraw.Inputs { public class Dropdown : Input { - private ConsoleColor TextColour = ConsoleColor.Black; - private ConsoleColor BackgroudColour = ConsoleColor.Gray; - private ConsoleColor SelectedTextColour = ConsoleColor.White; - private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; + public ConsoleColor TextColour = ConsoleColor.Black; + public ConsoleColor BackgroudColour = ConsoleColor.Gray; + public ConsoleColor SelectedTextColour = ConsoleColor.White; + public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; private bool Selected = false; public List DropdownItems = new List(); diff --git a/Source/ConsoleDraw/Inputs/Dropdown/DropdownItem.cs b/Source/ConsoleDraw/Inputs/Dropdown/DropdownItem.cs index 1f46d27..19d9487 100644 --- a/Source/ConsoleDraw/Inputs/Dropdown/DropdownItem.cs +++ b/Source/ConsoleDraw/Inputs/Dropdown/DropdownItem.cs @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs public class DropdownItem : Input { public String Text = ""; - private ConsoleColor TextColour = ConsoleColor.White; - private ConsoleColor BackgroudColour = ConsoleColor.DarkGray; - private ConsoleColor SelectedTextColour = ConsoleColor.Black; - private ConsoleColor SelectedBackgroundColour = ConsoleColor.Gray; + public ConsoleColor TextColour = ConsoleColor.White; + public ConsoleColor BackgroudColour = ConsoleColor.DarkGray; + public ConsoleColor SelectedTextColour = ConsoleColor.Black; + public ConsoleColor SelectedBackgroundColour = ConsoleColor.Gray; private bool Selected = false; public Action Action; diff --git a/Source/ConsoleDraw/Inputs/Label.cs b/Source/ConsoleDraw/Inputs/Label.cs index 86485fe..c78eaae 100644 --- a/Source/ConsoleDraw/Inputs/Label.cs +++ b/Source/ConsoleDraw/Inputs/Label.cs @@ -11,7 +11,7 @@ namespace ConsoleDraw.Inputs public class Label : Input { private String Text = ""; - private ConsoleColor TextColour = ConsoleColor.Black; + public ConsoleColor TextColour = ConsoleColor.Black; public ConsoleColor BackgroundColour = ConsoleColor.Gray; public Label(String text, int x, int y, String iD, Window parentWindow) : base(x, y, 1, text.Count(), parentWindow, iD) diff --git a/Source/ConsoleDraw/Inputs/Menu/Menu.cs b/Source/ConsoleDraw/Inputs/Menu/Menu.cs index 771e0da..aae75fc 100644 --- a/Source/ConsoleDraw/Inputs/Menu/Menu.cs +++ b/Source/ConsoleDraw/Inputs/Menu/Menu.cs @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs public class Menu : Input { private String Text = ""; - private ConsoleColor TextColour = ConsoleColor.Black; - private ConsoleColor BackgroudColour = ConsoleColor.Gray; - private ConsoleColor SelectedTextColour = ConsoleColor.White; - private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; + public ConsoleColor TextColour = ConsoleColor.Black; + public ConsoleColor BackgroudColour = ConsoleColor.Gray; + public ConsoleColor SelectedTextColour = ConsoleColor.White; + public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; private bool Selected = false; public List MenuItems = new List(); diff --git a/Source/ConsoleDraw/Inputs/Menu/MenuItem.cs b/Source/ConsoleDraw/Inputs/Menu/MenuItem.cs index 7c3fc49..b1bfc82 100644 --- a/Source/ConsoleDraw/Inputs/Menu/MenuItem.cs +++ b/Source/ConsoleDraw/Inputs/Menu/MenuItem.cs @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs public class MenuItem : Input { private String Text = ""; - private ConsoleColor TextColour = ConsoleColor.White; - private ConsoleColor BackgroudColour = ConsoleColor.DarkGray; - private ConsoleColor SelectedTextColour = ConsoleColor.Black; - private ConsoleColor SelectedBackgroundColour = ConsoleColor.Gray; + public ConsoleColor TextColour = ConsoleColor.White; + public ConsoleColor BackgroudColour = ConsoleColor.DarkGray; + public ConsoleColor SelectedTextColour = ConsoleColor.Black; + public ConsoleColor SelectedBackgroundColour = ConsoleColor.Gray; private bool Selected = false; public Action Action; diff --git a/Source/ConsoleDraw/Inputs/RadioButton.cs b/Source/ConsoleDraw/Inputs/RadioButton.cs index 514d2f6..39e61b7 100644 --- a/Source/ConsoleDraw/Inputs/RadioButton.cs +++ b/Source/ConsoleDraw/Inputs/RadioButton.cs @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs public class RadioButton : Input { public ConsoleColor BackgroundColour = ConsoleColor.Gray; - private ConsoleColor TextColour = ConsoleColor.Black; + public ConsoleColor TextColour = ConsoleColor.Black; - private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; - private ConsoleColor SelectedTextColour = ConsoleColor.White; + public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray; + public ConsoleColor SelectedTextColour = ConsoleColor.White; private bool Selected = false; public bool Checked = false; diff --git a/Source/ConsoleDraw/Inputs/TextArea.cs b/Source/ConsoleDraw/Inputs/TextArea.cs index 51b9735..892855f 100644 --- a/Source/ConsoleDraw/Inputs/TextArea.cs +++ b/Source/ConsoleDraw/Inputs/TextArea.cs @@ -37,7 +37,7 @@ private String Text { } private String TextWithoutNewLine { get { return RemoveNewLine(Text); } } - private ConsoleColor TextColour = ConsoleColor.White; + public ConsoleColor TextColour = ConsoleColor.White; public ConsoleColor BackgroundColour = ConsoleColor.Blue; private Cursor cursor = new Cursor(); diff --git a/Source/ConsoleDraw/Inputs/TextBox.cs b/Source/ConsoleDraw/Inputs/TextBox.cs index 832001a..930fdcc 100644 --- a/Source/ConsoleDraw/Inputs/TextBox.cs +++ b/Source/ConsoleDraw/Inputs/TextBox.cs @@ -18,8 +18,8 @@ public class TextBox : Input private int Offset = 0; private String Text = ""; - private ConsoleColor TextColour = ConsoleColor.White; - private ConsoleColor BackgroundColour = ConsoleColor.DarkGray; + public ConsoleColor TextColour = ConsoleColor.White; + public ConsoleColor BackgroundColour = ConsoleColor.DarkGray; private Cursor cursor = new Cursor(); From 6b4bb1384caba1ac98227334acd3bdcc9fc71ed8 Mon Sep 17 00:00:00 2001 From: LoLlYdE Date: Fri, 4 Aug 2017 20:07:30 +0200 Subject: [PATCH 3/3] freeest colour policies --- Source/ConsoleDraw/Windows/LoadMenu.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/ConsoleDraw/Windows/LoadMenu.cs b/Source/ConsoleDraw/Windows/LoadMenu.cs index 3b01a5a..e097c92 100644 --- a/Source/ConsoleDraw/Windows/LoadMenu.cs +++ b/Source/ConsoleDraw/Windows/LoadMenu.cs @@ -54,6 +54,7 @@ public LoadMenu(String path, Dictionary fileTypes, Window parent CurrentlySelected = fileSelect; + UpdateFileTypeFilter(); Draw(); MainLoop(); } @@ -86,8 +87,8 @@ private void LoadFile() } var file = Path.Combine(fileSelect.CurrentPath, fileSelect.CurrentlySelectedFile); - String text = System.IO.File.ReadAllText(file); - + //String text = System.IO.File.ReadAllText(file); + String text = ""; /*var mainWindow = (MainWindow)ParentWindow; mainWindow.textArea.SetText(text); mainWindow.fileLabel.SetText(fileSelect.CurrentlySelectedFile);*/