kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove obsolete properties & fix NRE

Browse Source
This commit is contained in:
ZavaruKitsu
2022-10-08 20:37:35 +03:00
parent d566cf858e
commit 8d02b54b05
9 changed files with 28 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TelegramBotBase/Controls/Hybrid/ButtonGrid.cs
+1 -10
View File
@@ -55,15 +55,6 @@ public class ButtonGrid : ControlBase
public string ConfirmationText { get; set; } = "";
/// <summary>
/// </summary>
[Obsolete("This property is obsolete. Please use the DataSource property instead.")]
public ButtonForm ButtonsForm
{
get => DataSource.ButtonForm;
set => DataSource = new ButtonFormDataSource(value);
}
/// <summary>
/// Data source of the items.
/// </summary>
@@ -746,4 +737,4 @@ public class ButtonGrid : ControlBase
break;
}
}
}
}
TelegramBotBase/Controls/Hybrid/CheckedButtonList.cs
+5 -12
View File
@@ -55,13 +55,6 @@ public class CheckedButtonList : ControlBase
public string ConfirmationText { get; set; } = "";
[Obsolete("This property is obsolete. Please use the DataSource property instead.")]
public ButtonForm ButtonsForm
{
get => DataSource.ButtonForm;
set => DataSource = new ButtonFormDataSource(value);
}
/// <summary>
/// Data source of the items.
/// </summary>
@@ -277,7 +270,7 @@ public class CheckedButtonList : ControlBase
foreach (var c in CheckedRows)
{
lst.Add(ButtonsForm[c][0]);
lst.Add(DataSource.ButtonForm[c][0]);
}
return lst;
@@ -418,7 +411,7 @@ public class CheckedButtonList : ControlBase
Updated();
await OnCheckedChanged(new CheckedChangedEventArgs(ButtonsForm[index], index, false));
await OnCheckedChanged(new CheckedChangedEventArgs(DataSource.ButtonForm[index], index, false));
}
else if (result.MessageText.EndsWith(UncheckedIconLabel))
{
@@ -435,7 +428,7 @@ public class CheckedButtonList : ControlBase
Updated();
await OnCheckedChanged(new CheckedChangedEventArgs(ButtonsForm[index], index, true));
await OnCheckedChanged(new CheckedChangedEventArgs(DataSource.ButtonForm[index], index, true));
}
//else if (this.EnableSearch)
//{
@@ -589,7 +582,7 @@ public class CheckedButtonList : ControlBase
Updated();
await OnCheckedChanged(new CheckedChangedEventArgs(ButtonsForm[index], index, true));
await OnCheckedChanged(new CheckedChangedEventArgs(DataSource.ButtonForm[index], index, true));
}
break;
@@ -604,7 +597,7 @@ public class CheckedButtonList : ControlBase
Updated();
await OnCheckedChanged(new CheckedChangedEventArgs(ButtonsForm[index], index, false));
await OnCheckedChanged(new CheckedChangedEventArgs(DataSource.ButtonForm[index], index, false));
}
break;
TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
+1 -8
View File
@@ -63,13 +63,6 @@ public class TaggedButtonGrid : MultiView
public string ConfirmationText { get; set; }
[Obsolete("This property is obsolete. Please use the DataSource property instead.")]
public ButtonForm ButtonsForm
{
get => DataSource.ButtonForm;
set => DataSource = new ButtonFormDataSource(value);
}
/// <summary>
/// Data source of the items.
/// </summary>
@@ -1017,4 +1010,4 @@ public class TaggedButtonGrid : MultiView
}
#endregion
}
}