Winify – Diff between revs 50 and 55

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 50 Rev 55
Line 19... Line 19...
19   19  
Line 20... Line 20...
20 #region Private Delegates, Events, Enums, Properties, Indexers and Fields 20 #region Private Delegates, Events, Enums, Properties, Indexers and Fields
Line 21... Line 21...
21   21  
Line 22... Line 22...
22 private readonly BindingSource _announcementBindingSource; 22 private readonly BindingSource _announcementBindingSource;
Line 23... Line 23...
23   23  
Line 24... Line 24...
24 private readonly Announcements.Announcements _announcements; 24 private Announcements.Announcements _announcements;
Line 25... Line 25...
25   25  
26 private readonly BindingSource _serverBindingSource; 26 private readonly BindingSource _serverBindingSource;
Line 40... Line 40...
40 #region Constructors, Destructors and Finalizers 40 #region Constructors, Destructors and Finalizers
Line 41... Line 41...
41   41  
42 public SettingsForm() 42 public SettingsForm()
43 { 43 {
44 InitializeComponent(); -  
45 Utilities.WindowState.FormTracker.Track(this); -  
Line 46... Line 44...
46 } 44 InitializeComponent();
47   -  
48 public SettingsForm(MainForm mainForm) : this() -  
49 { 45  
Line 50... Line 46...
50 _mainForm = mainForm; 46 Utilities.WindowState.FormTracker.Track(this);
51 } 47 }
52   48  
-   49 public SettingsForm(MainForm mainForm, Servers.Servers servers, Announcements.Announcements announcements,
53 public SettingsForm(MainForm mainForm, Servers.Servers servers, Announcements.Announcements announcements, 50 CancellationToken cancellationToken) : this()
54 CancellationToken cancellationToken) : this(mainForm) 51 {
55 { 52 _mainForm = mainForm;
Line 56... Line -...
56 _servers = servers; -  
57 _server = _servers.Server.FirstOrDefault() ?? new Server(); -  
58 _cancellationToken = cancellationToken; 53 _servers = servers;
59   54 _announcements = announcements;
-   55 _cancellationToken = cancellationToken;
60 _serverBindingSource = new BindingSource(); 56  
61 _serverBindingSource.DataSource = _server; 57 _configurationBindingSource = new BindingSource();
Line 62... Line -...
62 _configurationBindingSource = new BindingSource(); -  
63 _configurationBindingSource.DataSource = _mainForm.Configuration; -  
64 _configurationProxyBindingSource = new BindingSource(); -  
65 _configurationProxyBindingSource.DataSource = _mainForm.Configuration.Proxy; -  
66   -  
67 checkBox3.DataBindings.Add( 58 _configurationBindingSource.DataSource = _mainForm.Configuration;
68 new Binding("Checked", _configurationProxyBindingSource, nameof(_mainForm.Configuration.Proxy.Enable), true, -  
69 DataSourceUpdateMode.OnPropertyChanged)); -  
70 textBox1.DataBindings.Add( -  
71 new Binding("Text", _configurationProxyBindingSource, nameof(_mainForm.Configuration.Proxy.Url), true, -  
72 DataSourceUpdateMode.OnPropertyChanged)); -  
73 textBox2.DataBindings.Add( -  
74 new Binding("Text", _configurationProxyBindingSource, nameof(_mainForm.Configuration.Proxy.Username), true, -  
75 DataSourceUpdateMode.OnPropertyChanged)); -  
76 textBox3.DataBindings.Add( -  
77 new Binding("Text", _configurationProxyBindingSource, nameof(_mainForm.Configuration.Proxy.Password), true, -  
78 DataSourceUpdateMode.OnPropertyChanged)); -  
79   -  
80 checkBox1.DataBindings.Add(new Binding("Checked", _configurationBindingSource, -  
81 nameof(_mainForm.Configuration.LaunchOnBoot), true, DataSourceUpdateMode.OnPropertyChanged)); -  
82   -  
83 checkBox2.DataBindings.Add(new Binding("Checked", _configurationBindingSource, -  
84 nameof(_mainForm.Configuration.IgnoreSelfSignedCertificates), true, DataSourceUpdateMode.OnPropertyChanged)); -  
85   -  
86 serverNameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Name), true, -  
87 DataSourceUpdateMode.OnPropertyChanged)); -  
88 serverUrlTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Url), true, -  
89 DataSourceUpdateMode.OnPropertyChanged)); -  
90 serverUsernameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Username), -  
91 true, -  
92 DataSourceUpdateMode.OnPropertyChanged)); 59  
93 serverPasswordTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Password), -  
94 true, -  
95 DataSourceUpdateMode.OnPropertyChanged)); -  
96   -  
97 listBox1.DataSource = _servers.Server; -  
98 listBox1.DisplayMember = "Name"; -  
Line 99... Line 60...
99 listBox1.DataBindings.Add(new Binding("Text", _servers.Server, "Name", true, 60 _configurationProxyBindingSource = new BindingSource();
100 DataSourceUpdateMode.OnPropertyChanged)); 61 _configurationProxyBindingSource.DataSource = _mainForm.Configuration.Proxy;
101   -  
102 _announcements = announcements; -  
103 _announcement = _announcements.Announcement.FirstOrDefault() ?? new Announcement(); -  
104   -  
105 _announcementBindingSource = new BindingSource(); -  
106 _announcementBindingSource.DataSource = _announcement; -  
107   -  
108 appIdTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, nameof(_announcement.AppId), -  
109 true, -  
110 DataSourceUpdateMode.OnPropertyChanged)); -  
111 lingerTimeTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, -  
112 nameof(_announcement.LingerTime), true, -  
113 DataSourceUpdateMode.OnPropertyChanged)); 62  
Line 114... Line 63...
114   63 _serverBindingSource = new BindingSource();
Line 115... Line 64...
115 listBox2.DataSource = _announcements.Announcement; 64 _serverBindingSource.DataSource = _server;
Line 116... Line 65...
116 listBox2.DisplayMember = "Id"; 65  
117 listBox2.DataBindings.Add(new Binding("Text", _announcements.Announcement, "Id", true, 66 _announcementBindingSource = new BindingSource();
118 DataSourceUpdateMode.OnPropertyChanged)); -  
119 } 67 _announcementBindingSource.DataSource = _announcement;
120   -  
121 #endregion -  
122   -  
123 #region Event Handlers -  
124   68 }
Line 125... Line 69...
125 private void CheckBox1_CheckedChanged(object sender, EventArgs e) 69  
126 { 70 #endregion
127 _mainForm.Configuration.LaunchOnBoot = ((CheckBox)sender).Checked; 71  
Line 223... Line 167...
223 Save?.Invoke(this, new SettingsSavedEventArgs(_servers, _announcements)); 167 Save?.Invoke(this, new SettingsSavedEventArgs(_servers, _announcements));
Line 224... Line 168...
224   168  
225 Close(); 169 Close();
Line -... Line 170...
-   170 }
-   171  
226 } 172 #endregion
227   173  
-   174 private void checkBox4_CheckedStateChanged(object sender, EventArgs e)
-   175 {
-   176 var checkBox = (CheckBox)sender;
-   177 var state = checkBox.Checked;
228 private void SettingsForm_Load(object sender, EventArgs e) 178 if (state)
-   179 {
-   180 ToggleTableRow(tableLayoutPanel13, 0, false);
-   181  
-   182 return;
-   183 }
229 { 184  
Line -... Line 185...
-   185 ToggleTableRow(tableLayoutPanel13, 0, true);
-   186 }
-   187  
-   188 private static void ToggleTableRow(TableLayoutPanel tableLayoutPanel, int row, bool enable)
230 checkBox1.Checked = _mainForm.Configuration.LaunchOnBoot; 189 {
-   190 var count = tableLayoutPanel.RowCount;
-   191 foreach (var i in Enumerable.Range(0, count))
-   192 {
-   193 var control = tableLayoutPanel.GetControlFromPosition(i, row);
Line 231... Line 194...
231 } 194 control.Enabled = enable;
232   195 }
-   196 }
-   197  
-   198 private void SettingsForm_Load(object sender, EventArgs e)
-   199 {
-   200 // Databindings.
-   201 numericUpDown1.DataBindings.Add(new Binding("Value", _configurationBindingSource,
-   202 nameof(_mainForm.Configuration.ToastDuration), true,
-   203 DataSourceUpdateMode.OnPropertyChanged));
-   204  
-   205 checkBox4.DataBindings.Add(
-   206 new Binding("Checked", _configurationBindingSource, nameof(_mainForm.Configuration.InfiniteToastDuration), true,
-   207 DataSourceUpdateMode.OnPropertyChanged));
-   208  
233 #endregion 209 checkBox1.DataBindings.Add(new Binding("Checked", _configurationBindingSource,
-   210 nameof(_mainForm.Configuration.LaunchOnBoot), true, DataSourceUpdateMode.OnPropertyChanged));
-   211  
-   212 checkBox2.DataBindings.Add(new Binding("Checked", _configurationBindingSource,
-   213 nameof(_mainForm.Configuration.IgnoreSelfSignedCertificates), true,
-   214 DataSourceUpdateMode.OnPropertyChanged));
-   215  
-   216 checkBox3.DataBindings.Add(
-   217 new Binding("Checked", _configurationProxyBindingSource, nameof(_mainForm.Configuration.Proxy.Enable), true,
-   218 DataSourceUpdateMode.OnPropertyChanged));
-   219 textBox1.DataBindings.Add(
-   220 new Binding("Text", _configurationProxyBindingSource, nameof(_mainForm.Configuration.Proxy.Url), true,
-   221 DataSourceUpdateMode.OnPropertyChanged));
-   222 textBox2.DataBindings.Add(
-   223 new Binding("Text", _configurationProxyBindingSource, nameof(_mainForm.Configuration.Proxy.Username), true,
-   224 DataSourceUpdateMode.OnPropertyChanged));
-   225 textBox3.DataBindings.Add(
-   226 new Binding("Text", _configurationProxyBindingSource, nameof(_mainForm.Configuration.Proxy.Password), true,
-   227 DataSourceUpdateMode.OnPropertyChanged));
-   228  
-   229 switch (_servers?.Server == null)
-   230 {
-   231 case true:
-   232 _servers = new Servers.Servers();
-   233 _server = new Server();
-   234 _servers.Server.Add(_server);
-   235 break;
-   236 default:
-   237 _server = _servers.Server.FirstOrDefault();
-   238 break;
-   239 }
-   240  
-   241 serverNameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Name), true,
-   242 DataSourceUpdateMode.OnPropertyChanged));
-   243 serverUrlTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Url), true,
-   244 DataSourceUpdateMode.OnPropertyChanged));
-   245 serverUsernameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Username),
-   246 true,
-   247 DataSourceUpdateMode.OnPropertyChanged));
-   248 serverPasswordTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Password),
-   249 true,
-   250 DataSourceUpdateMode.OnPropertyChanged));
-   251  
-   252 listBox1.DataSource = _servers.Server;
-   253 listBox1.DisplayMember = "Name";
-   254 listBox1.DataBindings.Add(new Binding("Text", _servers.Server, "Name", true,
-   255 DataSourceUpdateMode.OnPropertyChanged));
-   256  
-   257 switch (_announcements?.Announcement == null)
-   258 {
-   259 case true:
-   260 _announcements = new Announcements.Announcements();
-   261 _announcement = new Announcement();
-   262 _announcements.Announcement.Add(_announcement);
-   263 break;
-   264 default:
-   265 _announcement = _announcements.Announcement.FirstOrDefault();
-   266 break;
-   267 }
-   268  
-   269 appIdTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, nameof(_announcement.AppId),
-   270 true,
-   271 DataSourceUpdateMode.OnPropertyChanged));
-   272 lingerTimeTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource,
-   273 nameof(_announcement.LingerTime), true,
-   274 DataSourceUpdateMode.OnPropertyChanged));
-   275  
Line 234... Line 276...
234   276 listBox2.DataSource = _announcements.Announcement;
235 private void CheckBox2_CheckedChanged(object sender, EventArgs e) 277 listBox2.DisplayMember = "Id";
236 { 278 listBox2.DataBindings.Add(new Binding("Text", _announcements.Announcement, "Id", true,
237 _mainForm.Configuration.IgnoreSelfSignedCertificates = ((CheckBox)sender).Checked; 279 DataSourceUpdateMode.OnPropertyChanged));
238   280  
239 _mainForm.ChangedConfigurationContinuation.Schedule(TimeSpan.FromSeconds(1), 281 // Miscellaneous.