Winify – Diff between revs 15 and 21

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 15 Rev 21
Line 10... Line 10...
10 { 10 {
11 public partial class SettingsForm : Form 11 public partial class SettingsForm : Form
12 { 12 {
13 #region Private Delegates, Events, Enums, Properties, Indexers and Fields 13 #region Private Delegates, Events, Enums, Properties, Indexers and Fields
Line -... Line 14...
-   14  
-   15 private readonly BindingSource _announcementBindingSource;
14   16  
-   17 private readonly Announcements.Announcements _announcements;
-   18  
Line 15... Line 19...
15 private readonly Announcements.Announcements _notifications; 19 private readonly BindingSource _serverBindingSource;
Line -... Line 20...
-   20  
-   21 private readonly global::Servers.Servers _servers;
-   22  
-   23 private Announcement _announcement;
16   24  
Line 17... Line 25...
17 private readonly global::Servers.Servers _servers; 25 private Server _server;
Line 18... Line 26...
18   26  
19 #endregion 27 #endregion
20   28  
21 #region Constructors, Destructors and Finalizers 29 #region Constructors, Destructors and Finalizers
Line 22... Line 30...
22   30  
23 private SettingsForm() 31 private SettingsForm()
24 { 32 {
-   33 InitializeComponent();
-   34 }
-   35  
-   36 public SettingsForm(global::Servers.Servers servers, Announcements.Announcements announcements) : this()
-   37 {
-   38 _servers = servers;
-   39 _server = _servers.Server.FirstOrDefault() ?? new Server();
-   40  
-   41 _serverBindingSource = new BindingSource();
-   42 _serverBindingSource.DataSource = _server;
-   43  
-   44 serverNameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Name), true,
-   45 DataSourceUpdateMode.OnPropertyChanged));
-   46 serverUrlTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Url), true,
-   47 DataSourceUpdateMode.OnPropertyChanged));
Line 25... Line 48...
25 InitializeComponent(); 48 serverUsernameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Username),
26 } 49 true,
27   50 DataSourceUpdateMode.OnPropertyChanged));
28 public SettingsForm(global::Servers.Servers servers, Announcements.Announcements notifications) : this() 51 serverPasswordTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Password),
Line 29... Line 52...
29 { 52 true,
-   53 DataSourceUpdateMode.OnPropertyChanged));
-   54  
-   55 listBox1.DataSource = _servers.Server;
-   56 listBox1.DisplayMember = "Name";
-   57 listBox1.DataBindings.Add(new Binding("Text", _servers.Server, "Name", true,
-   58 DataSourceUpdateMode.OnPropertyChanged));
-   59  
-   60 _announcements = announcements;
-   61 _announcement = _announcements.Announcement.FirstOrDefault() ?? new Announcement();
-   62  
-   63 _announcementBindingSource = new BindingSource();
-   64 _announcementBindingSource.DataSource = _announcement;
-   65  
-   66 appIdTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, nameof(_announcement.AppId),
30 _servers = servers; 67 true,
31   68 DataSourceUpdateMode.OnPropertyChanged));
32 listBox1.DataSource = _servers.Server; 69 lingerTimeTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource,
33 listBox1.DisplayMember = "Name"; 70 nameof(_announcement.LingerTime), true,
34 listBox1.DataBindings.Add(new Binding("Text", _servers.Server, "Name", true, 71 DataSourceUpdateMode.OnPropertyChanged));
Line 35... Line 72...
35 DataSourceUpdateMode.OnPropertyChanged)); 72 speakTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, nameof(_announcement.Speak),
Line 52... Line 89...
52 Miscellaneous.LaunchOnBootSet(Settings.Default.LaunchOnBoot); 89 Miscellaneous.LaunchOnBootSet(Settings.Default.LaunchOnBoot);
53 } 90 }
Line 54... Line 91...
54   91  
55 private void Button1_Click(object sender, EventArgs e) 92 private void Button1_Click(object sender, EventArgs e)
56 { -  
57 var name = serverNameTextBox.Text; 93 {
58 var url = serverUrlTextBox.Text; -  
59 var username = serverUsernameTextBox.Text; -  
60 var password = serverPasswordTextBox.Text; -  
61   -  
62 if (string.IsNullOrEmpty(name) || -  
63 string.IsNullOrEmpty(url) || -  
64 string.IsNullOrEmpty(username) || -  
65 string.IsNullOrEmpty(password)) -  
66 { -  
67 return; -  
Line 68... Line -...
68 } -  
69   -  
70 var server = new Server(name, url, username, password); -  
71   -  
72 var update = _servers.Server.FirstOrDefault(select => select.Name == server.Name); -  
73 switch (update) -  
74 { -  
75 default: -  
76 _servers.Server.Remove(update); -  
77 update.Url = server.Url; -  
78 update.Username = server.Username; -  
79 update.Password = server.Password; -  
80 _servers.Server.Add(update); -  
81 break; 94 var server = new Server();
82 case null: -  
83 _servers.Server.Add(server); -  
84 break; 95  
Line 85... Line 96...
85 } 96 _servers.Server.Add(server);
86 } 97 }
87   98  
88 private void Button2_Click(object sender, EventArgs e) 99 private void Button2_Click(object sender, EventArgs e)
89 { -  
90 listBox1.InvokeIfRequired(listBox => -  
91 { 100 {
92 var item = listBox.SelectedItem; 101 if (listBox1.SelectedItem is Server server)
93   102 {
Line 94... Line 103...
94 _servers.Server.Remove((Server) item); 103 _servers.Server.Remove(server);
95 }); 104 }
96 } 105 }
Line 97... Line 106...
97   106  
98 private void ListBox1_SelectedIndexChanged(object sender, EventArgs e) 107 private void ListBox1_SelectedIndexChanged(object sender, EventArgs e)
99 { -  
100 var listBox = (ListBox) sender; 108 {
101   -  
102 if (listBox.SelectedIndex == -1) -  
Line 103... Line 109...
103 { 109 var listBox = (ListBox) sender;
104 serverNameTextBox.Text = string.Empty; 110  
105 serverUrlTextBox.Text = string.Empty; -  
106 serverUsernameTextBox.Text = string.Empty; -  
107 serverPasswordTextBox.Text = string.Empty; -  
108   -  
109 return; -  
110 } -  
111   -  
112 var server = (Server) listBox.SelectedItem; 111 if (listBox.SelectedItem is Server server)
Line 113... Line 112...
113   112 {
114 serverNameTextBox.Text = server.Name; 113 _server = server;
115 serverUrlTextBox.Text = server.Url; 114  
116 serverUsernameTextBox.Text = server.Username; 115 _serverBindingSource.DataSource = _server;
117 serverPasswordTextBox.Text = server.Password; -  
118 } -  
119   116 }
120 private void Button3_Click(object sender, EventArgs e) 117 }
121 { 118  
Line 122... Line 119...
122 listBox2.InvokeIfRequired(listbox => 119 private void Button3_Click(object sender, EventArgs e)
123 { 120 {
124 var item = listbox.SelectedItem; -  
125   121 if (listBox2.SelectedItem is Announcement announcement)
126 _notifications.Announcement.Remove((Announcement) item); -  
127 }); -  
128 } -  
129   -  
130 private void Button4_Click(object sender, EventArgs e) -  
131 { -  
132 var appId = appIdTextBox.Text; -  
133 var lingerTime = lingerTimeTextBox.Text; -  
134 var speak = speakTextBox.Text; -  
135   -  
136 if (string.IsNullOrEmpty(appId) || -  
137 !int.TryParse(appId, out var numAppId) || -  
Line 138... Line -...
138 string.IsNullOrEmpty(lingerTime) || -  
139 !int.TryParse(lingerTime, out var numLingerTime) || -  
140 string.IsNullOrEmpty(speak)) -  
141 { -  
142 return; -  
143 } -  
144   -  
145 var notification = new Announcement(numAppId, numLingerTime, speak); -  
146   -  
147 var update = _notifications.Announcement.FirstOrDefault(select => select.Id == notification.Id); -  
148 switch (update) -  
149 { 122 {
150 default: -  
151 _notifications.Announcement.Remove(update); -  
152 update.AppId = numAppId; 123 _announcements.Announcement.Remove(announcement);
Line 153... Line 124...
153 update.LingerTime = numLingerTime; 124 }
154 update.Speak = speak; 125 }
155 _notifications.Announcement.Add(update); 126  
Line 156... Line 127...
156 break; 127 private void Button4_Click(object sender, EventArgs e)
157 case null: 128 {
158 _notifications.Announcement.Add(notification); -  
159 break; -  
160 } 129 var announcement = new Announcement();
Line 161... Line 130...
161 } 130  
162   131 _announcements.Announcement.Add(announcement);
163 private void ListBox2_SelectedIndexChanged(object sender, EventArgs e) -  
164 { -  
165 var listBox = (ListBox) sender; -  
166   -  
167 if (listBox.SelectedIndex == -1) -  
168 { -  
169 appIdTextBox.Text = string.Empty; 132 }
Line 170... Line 133...
170 lingerTimeTextBox.Text = string.Empty; 133  
171 speakTextBox.Text = string.Empty; 134 private void ListBox2_SelectedIndexChanged(object sender, EventArgs e)
172   135 {
173 return; 136 var listBox = (ListBox) sender;