Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into csv-robust

Browse Source
This commit is contained in:
Thomas Nind
2022-12-04 14:43:51 +00:00
committed by GitHub
parent 8a6dfe75db 254b26a13d
commit 4120e1e39f
7 changed files with 287 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Terminal.Gui/Views/ComboBox.cs
View File

@@ -749,7 +749,7 @@ namespace Terminal.Gui {
}
SetValue (searchset [listview.SelectedItem]);
search.CursorPosition = search.Text.RuneCount;
search.CursorPosition = search.Text.ConsoleWidth;
Search_Changed (search.Text);
OnOpenSelectedItem ();
Reset (keepSearchText: true);
@@ -825,7 +825,12 @@ namespace Terminal.Gui {
}
}
ShowList ();
if (HasFocus) {
ShowList ();
} else if (autoHide) {
isShow = false;
HideList ();
}
}
/// <summary>

10
Terminal.Gui/Windows/Dialog.cs
View File

@@ -20,7 +20,7 @@ namespace Terminal.Gui {
/// or buttons added to the dialog calls <see cref="Application.RequestStop"/>.
/// </remarks>
public class Dialog : Window {
List<Button> buttons = new List<Button> ();
internal List<Button> buttons = new List<Button> ();
const int padding = 0;
/// <summary>
@@ -164,7 +164,11 @@ namespace Terminal.Gui {
for (int i = buttons.Count - 1; i >= 0; i--) {
Button button = buttons [i];
shiftLeft += button.Frame.Width + (i == buttons.Count - 1 ? 0 : 1);
button.X = Pos.AnchorEnd (shiftLeft);
if (shiftLeft > -1) {
button.X = Pos.AnchorEnd (shiftLeft);
} else {
button.X = Frame.Width - shiftLeft;
}
button.Y = Pos.AnchorEnd (1);
}
break;
@@ -173,7 +177,7 @@ namespace Terminal.Gui {
// Justify Buttons
// leftmost and rightmost buttons are hard against edges. The rest are evenly spaced.
var spacing = (int)Math.Ceiling ((double)(Bounds.Width - buttonsWidth - 2) / (buttons.Count - 1));
var spacing = (int)Math.Ceiling ((double)(Bounds.Width - buttonsWidth - (Border.DrawMarginFrame ? 2 : 0)) / (buttons.Count - 1));
for (int i = buttons.Count - 1; i >= 0; i--) {
Button button = buttons [i];
if (i == buttons.Count - 1) {

33
Terminal.Gui/Windows/FileDialog.cs
View File

@@ -662,12 +662,17 @@ namespace Terminal.Gui {
X = Pos.Right (nameEntry) + 2,
Y = Pos.Top (nameEntry),
Width = Dim.Fill (1),
Height = allowedTypes != null ? allowedTypes.Count + 1 : 1,
Height = SetComboBoxHeight (allowedTypes),
Text = allowedTypes?.Count > 0 ? allowedTypes [0] : string.Empty,
ReadOnly = true
SelectedItem = allowedTypes?.Count > 0 ? 0 : -1,
ReadOnly = true,
HideDropdownListOnClick = true
};
cmbAllowedTypes.SetSource (allowedTypes ?? new List<string> ());
cmbAllowedTypes.OpenSelectedItem += (e) => AllowedFileTypes = cmbAllowedTypes.Text.ToString ().Split (';');
cmbAllowedTypes.OpenSelectedItem += (e) => {
dirListView.AllowedFileTypes = cmbAllowedTypes.Text.ToString ().Split (';');
dirListView.Reload ();
};
Add (cmbAllowedTypes);
dirListView = new DirListView (this) {
@@ -679,7 +684,7 @@ namespace Terminal.Gui {
DirectoryPath = Path.GetFullPath (Environment.CurrentDirectory);
Add (dirListView);
AllowedFileTypes = cmbAllowedTypes.Text.ToString ().Split (';');
AllowedFileTypes = allowedTypes?.Count > 0 ? allowedTypes?.ToArray () : null;
dirListView.DirectoryChanged = (dir) => { nameEntry.Text = ustring.Empty; dirEntry.Text = dir; };
dirListView.FileChanged = (file) => nameEntry.Text = file == ".." ? "" : file;
dirListView.SelectedChanged = (file) => nameEntry.Text = file.Item1 == ".." ? "" : file.Item1;
@@ -744,6 +749,11 @@ namespace Terminal.Gui {
}
}
private static int SetComboBoxHeight (List<string> allowedTypes)
{
return allowedTypes != null ? Math.Min (allowedTypes.Count + 1, 8) : 8;
}
internal bool canceled;
///<inheritdoc/>
@@ -827,13 +837,24 @@ namespace Terminal.Gui {
}
}
private string [] allowedFileTypes;
/// <summary>
/// The array of filename extensions allowed, or null if all file extensions are allowed.
/// </summary>
/// <value>The allowed file types.</value>
public string [] AllowedFileTypes {
get => dirListView.AllowedFileTypes;
set => dirListView.AllowedFileTypes = value;
get => allowedFileTypes;
set {
allowedFileTypes = value;
var selected = cmbAllowedTypes.SelectedItem;
cmbAllowedTypes.SetSource (value);
cmbAllowedTypes.SelectedItem = selected > -1 ? selected : 0;
SetComboBoxHeight (value?.ToList ());
dirListView.AllowedFileTypes = value != null
? value [cmbAllowedTypes.SelectedItem].Split (';')
: null;
}
}
/// <summary>

2
Terminal.Gui/Windows/MessageBox.cs
View File

@@ -303,7 +303,7 @@ namespace Terminal.Gui {
if (width == 0 & height == 0) {
// Dynamically size Width
d.Width = Math.Min (Math.Max (maxWidthLine, Math.Max (title.ConsoleWidth, Math.Max (textWidth + 2, d.GetButtonsWidth ()))), Application.Driver.Cols); // textWidth + (left + padding + padding + right)
d.Width = Math.Min (Math.Max (maxWidthLine, Math.Max (title.ConsoleWidth, Math.Max (textWidth + 2, d.GetButtonsWidth () + d.buttons.Count + 2))), Application.Driver.Cols); // textWidth + (left + padding + padding + right)
}
// Setup actions

324
UICatalog/Scenarios/CsvEditor.cs
View File

@@ -21,8 +21,7 @@ namespace UICatalog.Scenarios {
[ScenarioCategory ("Dialogs")]
[ScenarioCategory ("Top Level Windows")]
[ScenarioCategory ("Files and IO")]
public class CsvEditor : Scenario
{
public class CsvEditor : Scenario {
TableView tableView;
private string currentFile;
private MenuItem miLeft;
@@ -32,7 +31,7 @@ namespace UICatalog.Scenarios {
public override void Setup ()
{
Win.Title = this.GetName();
Win.Title = this.GetName ();
Win.Y = 1; // menu
Win.Height = Dim.Fill (1); // status bar
Application.Top.LayoutSubviews ();
@@ -82,22 +81,22 @@ namespace UICatalog.Scenarios {
Win.Add (tableView);
selectedCellLabel = new TextField(){
selectedCellLabel = new TextField () {
X = 0,
Y = Pos.Bottom(tableView),
Y = Pos.Bottom (tableView),
Text = "0,0",
Width = Dim.Fill(),
TextAlignment = TextAlignment.Right
Width = Dim.Fill (),
TextAlignment = TextAlignment.Right
};
selectedCellLabel.TextChanged += SelectedCellLabel_TextChanged;
Win.Add(selectedCellLabel);
Win.Add (selectedCellLabel);
tableView.SelectedCellChanged += OnSelectedCellChanged;
tableView.CellActivated += EditCurrentCell;
tableView.KeyPress += TableViewKeyPress;
SetupScrollBar();
SetupScrollBar ();
}
private void SelectedCellLabel_TextChanged (ustring last)
@@ -105,10 +104,10 @@ namespace UICatalog.Scenarios {
// if user is in the text control and editing the selected cell
if (!selectedCellLabel.HasFocus)
return;
// change selected cell to the one the user has typed into the box
var match = Regex.Match (selectedCellLabel.Text.ToString(), "^(\\d+),(\\d+)$");
if(match.Success) {
var match = Regex.Match (selectedCellLabel.Text.ToString (), "^(\\d+),(\\d+)$");
if (match.Success) {
tableView.SelectedColumn = int.Parse (match.Groups [1].Value);
tableView.SelectedRow = int.Parse (match.Groups [2].Value);
@@ -120,149 +119,147 @@ namespace UICatalog.Scenarios {
// only update the text box if the user is not manually editing it
if (!selectedCellLabel.HasFocus)
selectedCellLabel.Text = $"{tableView.SelectedRow},{tableView.SelectedColumn}";
if(tableView.Table == null || tableView.SelectedColumn == -1)
if (tableView.Table == null || tableView.SelectedColumn == -1)
return;
var col = tableView.Table.Columns[tableView.SelectedColumn];
var col = tableView.Table.Columns [tableView.SelectedColumn];
var style = tableView.Style.GetColumnStyleIfAny (col);
var style = tableView.Style.GetColumnStyleIfAny(col);
miLeft.Checked = style?.Alignment == TextAlignment.Left;
miRight.Checked = style?.Alignment == TextAlignment.Right;
miCentered.Checked = style?.Alignment == TextAlignment.Centered;
miCentered.Checked = style?.Alignment == TextAlignment.Centered;
}
private void RenameColumn ()
{
if(NoTableLoaded()) {
if (NoTableLoaded ()) {
return;
}
var currentCol = tableView.Table.Columns[tableView.SelectedColumn];
var currentCol = tableView.Table.Columns [tableView.SelectedColumn];
if(GetText("Rename Column","Name:",currentCol.ColumnName,out string newName)) {
if (GetText ("Rename Column", "Name:", currentCol.ColumnName, out string newName)) {
currentCol.ColumnName = newName;
tableView.Update();
tableView.Update ();
}
}
private void DeleteColum()
private void DeleteColum ()
{
if(NoTableLoaded()) {
if (NoTableLoaded ()) {
return;
}
if(tableView.SelectedColumn == -1) {
MessageBox.ErrorQuery("No Column","No column selected", "Ok");
if (tableView.SelectedColumn == -1) {
MessageBox.ErrorQuery ("No Column", "No column selected", "Ok");
return;
}
try {
tableView.Table.Columns.RemoveAt(tableView.SelectedColumn);
tableView.Update();
tableView.Table.Columns.RemoveAt (tableView.SelectedColumn);
tableView.Update ();
} catch (Exception ex) {
MessageBox.ErrorQuery("Could not remove column",ex.Message, "Ok");
MessageBox.ErrorQuery ("Could not remove column", ex.Message, "Ok");
}
}
private void MoveColumn ()
{
if(NoTableLoaded()) {
if (NoTableLoaded ()) {
return;
}
if(tableView.SelectedColumn == -1) {
MessageBox.ErrorQuery("No Column","No column selected", "Ok");
if (tableView.SelectedColumn == -1) {
MessageBox.ErrorQuery ("No Column", "No column selected", "Ok");
return;
}
try{
var currentCol = tableView.Table.Columns[tableView.SelectedColumn];
try {
if(GetText("Move Column","New Index:",currentCol.Ordinal.ToString(),out string newOrdinal)) {
var currentCol = tableView.Table.Columns [tableView.SelectedColumn];
var newIdx = Math.Min(Math.Max(0,int.Parse(newOrdinal)),tableView.Table.Columns.Count-1);
if (GetText ("Move Column", "New Index:", currentCol.Ordinal.ToString (), out string newOrdinal)) {
currentCol.SetOrdinal(newIdx);
var newIdx = Math.Min (Math.Max (0, int.Parse (newOrdinal)), tableView.Table.Columns.Count - 1);
tableView.SetSelection(newIdx,tableView.SelectedRow,false);
tableView.EnsureSelectedCellIsVisible();
tableView.SetNeedsDisplay();
currentCol.SetOrdinal (newIdx);
tableView.SetSelection (newIdx, tableView.SelectedRow, false);
tableView.EnsureSelectedCellIsVisible ();
tableView.SetNeedsDisplay ();
}
}catch(Exception ex)
{
MessageBox.ErrorQuery("Error moving column",ex.Message, "Ok");
} catch (Exception ex) {
MessageBox.ErrorQuery ("Error moving column", ex.Message, "Ok");
}
}
private void Sort (bool asc)
{
if(NoTableLoaded()) {
if (NoTableLoaded ()) {
return;
}
if(tableView.SelectedColumn == -1) {
MessageBox.ErrorQuery("No Column","No column selected", "Ok");
if (tableView.SelectedColumn == -1) {
MessageBox.ErrorQuery ("No Column", "No column selected", "Ok");
return;
}
var colName = tableView.Table.Columns[tableView.SelectedColumn].ColumnName;
var colName = tableView.Table.Columns [tableView.SelectedColumn].ColumnName;
tableView.Table.DefaultView.Sort = colName + (asc ? " asc" : " desc");
tableView.Table = tableView.Table.DefaultView.ToTable();
tableView.Table = tableView.Table.DefaultView.ToTable ();
}
private void MoveRow ()
{
if(NoTableLoaded()) {
if (NoTableLoaded ()) {
return;
}
if(tableView.SelectedRow == -1) {
MessageBox.ErrorQuery("No Rows","No row selected", "Ok");
if (tableView.SelectedRow == -1) {
MessageBox.ErrorQuery ("No Rows", "No row selected", "Ok");
return;
}
try{
try {
int oldIdx = tableView.SelectedRow;
var currentRow = tableView.Table.Rows[oldIdx];
var currentRow = tableView.Table.Rows [oldIdx];
if(GetText("Move Row","New Row:",oldIdx.ToString(),out string newOrdinal)) {
if (GetText ("Move Row", "New Row:", oldIdx.ToString (), out string newOrdinal)) {
var newIdx = Math.Min(Math.Max(0,int.Parse(newOrdinal)),tableView.Table.Rows.Count-1);
var newIdx = Math.Min (Math.Max (0, int.Parse (newOrdinal)), tableView.Table.Rows.Count - 1);
if(newIdx == oldIdx)
if (newIdx == oldIdx)
return;
var arrayItems = currentRow.ItemArray;
tableView.Table.Rows.Remove(currentRow);
tableView.Table.Rows.Remove (currentRow);
// Removing and Inserting the same DataRow seems to result in it loosing its values so we have to create a new instance
var newRow = tableView.Table.NewRow();
var newRow = tableView.Table.NewRow ();
newRow.ItemArray = arrayItems;
tableView.Table.Rows.InsertAt(newRow,newIdx);
tableView.SetSelection(tableView.SelectedColumn,newIdx,false);
tableView.EnsureSelectedCellIsVisible();
tableView.SetNeedsDisplay();
tableView.Table.Rows.InsertAt (newRow, newIdx);
tableView.SetSelection (tableView.SelectedColumn, newIdx, false);
tableView.EnsureSelectedCellIsVisible ();
tableView.SetNeedsDisplay ();
}
}catch(Exception ex)
{
MessageBox.ErrorQuery("Error moving column",ex.Message, "Ok");
} catch (Exception ex) {
MessageBox.ErrorQuery ("Error moving column", ex.Message, "Ok");
}
}
@@ -272,43 +269,43 @@ namespace UICatalog.Scenarios {
return;
}
var col = tableView.Table.Columns[tableView.SelectedColumn];
var col = tableView.Table.Columns [tableView.SelectedColumn];
var style = tableView.Style.GetOrCreateColumnStyle(col);
var style = tableView.Style.GetOrCreateColumnStyle (col);
style.Alignment = newAlignment;
miLeft.Checked = style.Alignment == TextAlignment.Left;
miRight.Checked = style.Alignment == TextAlignment.Right;
miCentered.Checked = style.Alignment == TextAlignment.Centered;
tableView.Update();
miCentered.Checked = style.Alignment == TextAlignment.Centered;
tableView.Update ();
}
private void SetFormat()
private void SetFormat ()
{
if (NoTableLoaded ()) {
return;
}
var col = tableView.Table.Columns[tableView.SelectedColumn];
var col = tableView.Table.Columns [tableView.SelectedColumn];
if(col.DataType == typeof(string)) {
MessageBox.ErrorQuery("Cannot Format Column","String columns cannot be Formatted, try adding a new column to the table with a date/numerical Type","Ok");
if (col.DataType == typeof (string)) {
MessageBox.ErrorQuery ("Cannot Format Column", "String columns cannot be Formatted, try adding a new column to the table with a date/numerical Type", "Ok");
return;
}
var style = tableView.Style.GetOrCreateColumnStyle(col);
var style = tableView.Style.GetOrCreateColumnStyle (col);
if(GetText("Format","Pattern:",style.Format ?? "",out string newPattern)) {
if (GetText ("Format", "Pattern:", style.Format ?? "", out string newPattern)) {
style.Format = newPattern;
tableView.Update();
tableView.Update ();
}
}
private bool NoTableLoaded ()
{
if(tableView.Table == null) {
MessageBox.ErrorQuery("No Table Loaded","No table has currently be opened","Ok");
if (tableView.Table == null) {
MessageBox.ErrorQuery ("No Table Loaded", "No table has currently be opened", "Ok");
return true;
}
@@ -317,52 +314,56 @@ namespace UICatalog.Scenarios {
private void AddRow ()
{
if(NoTableLoaded()) {
if (NoTableLoaded ()) {
return;
}
var newRow = tableView.Table.NewRow();
var newRow = tableView.Table.NewRow ();
var newRowIdx = Math.Min(Math.Max(0,tableView.SelectedRow+1),tableView.Table.Rows.Count);
var newRowIdx = Math.Min (Math.Max (0, tableView.SelectedRow + 1), tableView.Table.Rows.Count);
tableView.Table.Rows.InsertAt(newRow,newRowIdx);
tableView.Update();
tableView.Table.Rows.InsertAt (newRow, newRowIdx);
tableView.Update ();
}
private void AddColumn ()
{
if(NoTableLoaded()) {
if (NoTableLoaded ()) {
return;
}
if(GetText("Enter column name","Name:","",out string colName)) {
if (GetText ("Enter column name", "Name:", "", out string colName)) {
var col = new DataColumn(colName);
var col = new DataColumn (colName);
var newColIdx = Math.Min(Math.Max(0,tableView.SelectedColumn + 1),tableView.Table.Columns.Count);
int result = MessageBox.Query(40,15,"Column Type","Pick a data type for the column",new ustring[]{"Date","Integer","Double","Text","Cancel"});
var newColIdx = Math.Min (Math.Max (0, tableView.SelectedColumn + 1), tableView.Table.Columns.Count);
if(result <= -1 || result >= 4)
int result = MessageBox.Query ("Column Type", "Pick a data type for the column", new ustring [] { "Date", "Integer", "Double", "Text", "Cancel" });
if (result <= -1 || result >= 4)
return;
switch(result) {
case 0: col.DataType = typeof(DateTime);
break;
case 1: col.DataType = typeof(int);
break;
case 2: col.DataType = typeof(double);
break;
case 3: col.DataType = typeof(string);
break;
switch (result) {
case 0:
col.DataType = typeof (DateTime);
break;
case 1:
col.DataType = typeof (int);
break;
case 2:
col.DataType = typeof (double);
break;
case 3:
col.DataType = typeof (string);
break;
}
tableView.Table.Columns.Add(col);
col.SetOrdinal(newColIdx);
tableView.Update();
tableView.Table.Columns.Add (col);
col.SetOrdinal (newColIdx);
tableView.Update ();
}
}
private void Save ()
@@ -387,18 +388,19 @@ namespace UICatalog.Scenarios {
}
writer.NextRecord ();
}
}
private void Open()
private void Open ()
{
var ofd = new FileDialog("Select File","Open","File","Select a CSV file to open (does not support newlines, escaping etc)");
ofd.AllowedFileTypes = new string[]{".csv" };
var ofd = new FileDialog ("Select File", "Open", "File", "Select a CSV file to open (does not support newlines, escaping etc)") {
AllowedFileTypes = new string [] { ".csv" }
};
Application.Run(ofd);
if(!ofd.Canceled && !string.IsNullOrWhiteSpace(ofd.FilePath?.ToString()))
{
Open(ofd.FilePath.ToString());
Application.Run (ofd);
if (!ofd.Canceled && !string.IsNullOrWhiteSpace (ofd.FilePath?.ToString ())) {
Open (ofd.FilePath.ToString ());
}
}
@@ -412,7 +414,8 @@ namespace UICatalog.Scenarios {
try {
var dt = new DataTable ();
reader.Read ();
reader.Read ();
if (reader.ReadHeader ()) {
foreach (var h in reader.HeaderRecord) {
@@ -460,45 +463,42 @@ namespace UICatalog.Scenarios {
};*/
tableView.DrawContent += (e) => {
_scrollBar.Size = tableView.Table?.Rows?.Count ??0;
_scrollBar.Size = tableView.Table?.Rows?.Count ?? 0;
_scrollBar.Position = tableView.RowOffset;
// _scrollBar.OtherScrollBarView.Size = _listView.Maxlength - 1;
// _scrollBar.OtherScrollBarView.Position = _listView.LeftItem;
// _scrollBar.OtherScrollBarView.Size = _listView.Maxlength - 1;
// _scrollBar.OtherScrollBarView.Position = _listView.LeftItem;
_scrollBar.Refresh ();
};
}
private void TableViewKeyPress (View.KeyEventEventArgs e)
{
if(e.KeyEvent.Key == Key.DeleteChar){
if (e.KeyEvent.Key == Key.DeleteChar) {
if(tableView.FullRowSelect)
{
if (tableView.FullRowSelect) {
// Delete button deletes all rows when in full row mode
foreach(int toRemove in tableView.GetAllSelectedCells().Select(p=>p.Y).Distinct().OrderByDescending(i=>i))
tableView.Table.Rows.RemoveAt(toRemove);
}
else{
foreach (int toRemove in tableView.GetAllSelectedCells ().Select (p => p.Y).Distinct ().OrderByDescending (i => i))
tableView.Table.Rows.RemoveAt (toRemove);
} else {
// otherwise set all selected cells to null
foreach(var pt in tableView.GetAllSelectedCells())
{
tableView.Table.Rows[pt.Y][pt.X] = DBNull.Value;
foreach (var pt in tableView.GetAllSelectedCells ()) {
tableView.Table.Rows [pt.Y] [pt.X] = DBNull.Value;
}
}
tableView.Update();
tableView.Update ();
e.Handled = true;
}
}
private void ClearColumnStyles ()
{
tableView.Style.ColumnStyles.Clear();
tableView.Update();
tableView.Style.ColumnStyles.Clear ();
tableView.Update ();
}
private void CloseExample ()
{
@@ -509,7 +509,7 @@ namespace UICatalog.Scenarios {
{
Application.RequestStop ();
}
private bool GetText(string title, string label, string initialText, out string enteredText)
private bool GetText (string title, string label, string initialText, out string enteredText)
{
bool okPressed = false;
@@ -519,44 +519,42 @@ namespace UICatalog.Scenarios {
cancel.Clicked += () => { Application.RequestStop (); };
var d = new Dialog (title, 60, 20, ok, cancel);
var lbl = new Label() {
var lbl = new Label () {
X = 0,
Y = 1,
Text = label
};
var tf = new TextField()
{
Text = initialText,
X = 0,
Y = 2,
Width = Dim.Fill()
};
d.Add (lbl,tf);
tf.SetFocus();
var tf = new TextField () {
Text = initialText,
X = 0,
Y = 2,
Width = Dim.Fill ()
};
d.Add (lbl, tf);
tf.SetFocus ();
Application.Run (d);
enteredText = okPressed? tf.Text.ToString() : null;
enteredText = okPressed ? tf.Text.ToString () : null;
return okPressed;
}
private void EditCurrentCell (TableView.CellActivatedEventArgs e)
{
if(e.Table == null)
if (e.Table == null)
return;
var oldValue = e.Table.Rows[e.Row][e.Col].ToString();
var oldValue = e.Table.Rows [e.Row] [e.Col].ToString ();
if(GetText("Enter new value",e.Table.Columns[e.Col].ColumnName,oldValue, out string newText)) {
if (GetText ("Enter new value", e.Table.Columns [e.Col].ColumnName, oldValue, out string newText)) {
try {
e.Table.Rows[e.Row][e.Col] = string.IsNullOrWhiteSpace(newText) ? DBNull.Value : (object)newText;
e.Table.Rows [e.Row] [e.Col] = string.IsNullOrWhiteSpace (newText) ? DBNull.Value : (object)newText;
} catch (Exception ex) {
MessageBox.ErrorQuery (60, 20, "Failed to set text", ex.Message, "Ok");
}
catch(Exception ex) {
MessageBox.ErrorQuery(60,20,"Failed to set text", ex.Message,"Ok");
}
tableView.Update();
tableView.Update ();
}
}
}

2
UICatalog/Scenarios/Editor.cs
View File

@@ -365,7 +365,7 @@ namespace UICatalog.Scenarios {
if (!CanCloseFile ()) {
return;
}
var aTypes = new List<string> () { ".txt;.bin;.xml;.json", ".txt", ".bin", ".xml", ".*" };
var aTypes = new List<string> () { ".txt;.bin;.xml;.json", ".txt", ".bin", ".xml", ".json", ".*" };
var d = new OpenDialog ("Open", "Choose the path where to open the file.", aTypes) { AllowsMultipleSelection = false };
Application.Run (d);

104
UnitTests/DialogTests.cs
View File

@@ -142,15 +142,15 @@ namespace Terminal.Gui.Views {
Dialog dlg = null;
Button button1, button2;
//// Default (Center)
//button1 = new Button (btn1Text);
//button2 = new Button (btn2Text);
//(runstate, dlg) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, button1, button2);
//button1.Visible = false;
//Application.RunMainLoopIteration (ref runstate, true, ref firstIteration);
//buttonRow = $@"{d.VLine} {btn2} {d.VLine}";
//DriverAsserts.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
//Application.End (runstate);
// Default (Center)
button1 = new Button (btn1Text);
button2 = new Button (btn2Text);
(runstate, dlg) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, button1, button2);
button1.Visible = false;
Application.RunMainLoopIteration (ref runstate, true, ref firstIteration);
buttonRow = $@"{d.VLine} {btn2} {d.VLine}";
TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
Application.End (runstate);
// Justify
Assert.Equal (width, buttonRow.Length);
@@ -163,19 +163,26 @@ namespace Terminal.Gui.Views {
TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
Application.End (runstate);
//// Right
//buttonRow = $@"{d.VLine} {btn1} {btn2}{d.VLine}";
//Assert.Equal (width, buttonRow.Length);
//(runstate, dlg) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btn1Text), new Button (btn2Text));
//DriverAsserts.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
//Application.End (runstate);
// Right
Assert.Equal (width, buttonRow.Length);
button1 = new Button (btn1Text);
button2 = new Button (btn2Text);
(runstate, dlg) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, button1, button2);
button1.Visible = false;
Application.RunMainLoopIteration (ref runstate, true, ref firstIteration);
TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
Application.End (runstate);
//// Left
//buttonRow = $@"{d.VLine}{btn1} {btn2} {d.VLine}";
//Assert.Equal (width, buttonRow.Length);
//(runstate, dlg) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btn1Text), new Button (btn2Text));
//DriverAsserts.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
//Application.End (runstate);
// Left
Assert.Equal (width, buttonRow.Length);
button1 = new Button (btn1Text);
button2 = new Button (btn2Text);
(runstate, dlg) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, button1, button2);
button1.Visible = false;
Application.RunMainLoopIteration (ref runstate, true, ref firstIteration);
buttonRow = $@"{d.VLine} {btn2} {d.VLine}";
TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
Application.End (runstate);
}
[Fact]
@@ -281,6 +288,61 @@ namespace Terminal.Gui.Views {
Application.End (runstate);
}
[Fact]
[AutoInitShutdown]
public void ButtonAlignment_Four_On_Smaller_Width ()
{
Application.RunState runstate = null;
var d = ((FakeDriver)Application.Driver);
var title = "1234";
// E.g "|[ yes ][ no ][ maybe ][ never ]|"
var btn1Text = "yes";
var btn1 = $"{d.LeftBracket} {btn1Text} {d.RightBracket}";
var btn2Text = "no";
var btn2 = $"{d.LeftBracket} {btn2Text} {d.RightBracket}";
var btn3Text = "maybe";
var btn3 = $"{d.LeftBracket} {btn3Text} {d.RightBracket}";
var btn4Text = "never";
var btn4 = $"{d.LeftBracket} {btn4Text} {d.RightBracket}";
var buttonRow = $"{d.VLine} {btn1} {btn2} {btn3} {btn4} {d.VLine}";
var width = buttonRow.Length;
var topRow = "34 ───────────────────────────";
var bottomRow = "──────────────────────────────";
d.SetBufferSize (30, 3);
// Default - Center
buttonRow = $"yes ] {btn2} {btn3} [ never";
Assert.NotEqual (width, buttonRow.Length);
(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
Application.End (runstate);
// Justify
buttonRow = $"es ] {btn2} {btn3} [ neve";
Assert.NotEqual (width, buttonRow.Length);
(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
Application.End (runstate);
// Right
buttonRow = $" yes ] {btn2} {btn3} [ neve";
Assert.NotEqual (width, buttonRow.Length);
(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
Application.End (runstate);
// Left
buttonRow = $"es ] {btn2} {btn3} [ never ";
Assert.NotEqual (width, buttonRow.Length);
(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
Application.End (runstate);
}
[Fact]
[AutoInitShutdown]
public void ButtonAlignment_Four_Wider ()