Winify – Diff between revs 15 and 21

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 15 Rev 21
1 using System; 1 using System;
2 using System.Linq; 2 using System.Linq;
3 using System.Windows.Forms; 3 using System.Windows.Forms;
4 using Announcements; 4 using Announcements;
5 using Servers; 5 using Servers;
6 using Winify.Properties; 6 using Winify.Properties;
7 using Winify.Utilities; 7 using Winify.Utilities;
8   8  
9 namespace Winify 9 namespace Winify
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
-   14  
-   15 private readonly BindingSource _announcementBindingSource;
14   16  
-   17 private readonly Announcements.Announcements _announcements;
-   18  
15 private readonly Announcements.Announcements _notifications; 19 private readonly BindingSource _serverBindingSource;
16   20  
17 private readonly global::Servers.Servers _servers; 21 private readonly global::Servers.Servers _servers;
-   22  
-   23 private Announcement _announcement;
-   24  
-   25 private Server _server;
18   26  
19 #endregion 27 #endregion
20   28  
21 #region Constructors, Destructors and Finalizers 29 #region Constructors, Destructors and Finalizers
22   30  
23 private SettingsForm() 31 private SettingsForm()
24 { 32 {
25 InitializeComponent(); 33 InitializeComponent();
26 } 34 }
27   35  
28 public SettingsForm(global::Servers.Servers servers, Announcements.Announcements notifications) : this() 36 public SettingsForm(global::Servers.Servers servers, Announcements.Announcements announcements) : this()
29 { 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));
-   48 serverUsernameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Username),
-   49 true,
-   50 DataSourceUpdateMode.OnPropertyChanged));
-   51 serverPasswordTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Password),
-   52 true,
30 _servers = servers; 53 DataSourceUpdateMode.OnPropertyChanged));
31   54  
32 listBox1.DataSource = _servers.Server; 55 listBox1.DataSource = _servers.Server;
33 listBox1.DisplayMember = "Name"; 56 listBox1.DisplayMember = "Name";
34 listBox1.DataBindings.Add(new Binding("Text", _servers.Server, "Name", true, 57 listBox1.DataBindings.Add(new Binding("Text", _servers.Server, "Name", true,
35 DataSourceUpdateMode.OnPropertyChanged)); 58 DataSourceUpdateMode.OnPropertyChanged));
36   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),
-   67 true,
-   68 DataSourceUpdateMode.OnPropertyChanged));
-   69 lingerTimeTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource,
-   70 nameof(_announcement.LingerTime), true,
-   71 DataSourceUpdateMode.OnPropertyChanged));
-   72 speakTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, nameof(_announcement.Speak),
-   73 true, DataSourceUpdateMode.OnPropertyChanged));
37 _notifications = notifications; 74  
38 listBox2.DataSource = _notifications.Announcement; 75 listBox2.DataSource = _announcements.Announcement;
39 listBox2.DisplayMember = "Id"; 76 listBox2.DisplayMember = "Id";
40 listBox2.DataBindings.Add(new Binding("Text", _notifications.Announcement, "Id", true, 77 listBox2.DataBindings.Add(new Binding("Text", _announcements.Announcement, "Id", true,
41 DataSourceUpdateMode.OnPropertyChanged)); 78 DataSourceUpdateMode.OnPropertyChanged));
42 } 79 }
43   80  
44 #endregion 81 #endregion
45   82  
46 #region Event Handlers 83 #region Event Handlers
47   84  
48 private void CheckBox1_CheckedChanged(object sender, EventArgs e) 85 private void CheckBox1_CheckedChanged(object sender, EventArgs e)
49 { 86 {
50 Settings.Default.LaunchOnBoot = ((CheckBox) sender).Checked; 87 Settings.Default.LaunchOnBoot = ((CheckBox) sender).Checked;
51   88  
52 Miscellaneous.LaunchOnBootSet(Settings.Default.LaunchOnBoot); 89 Miscellaneous.LaunchOnBootSet(Settings.Default.LaunchOnBoot);
53 } 90 }
54   91  
55 private void Button1_Click(object sender, EventArgs e) 92 private void Button1_Click(object sender, EventArgs e)
56 { 93 {
57 var name = serverNameTextBox.Text; -  
58 var url = serverUrlTextBox.Text; 94 var server = new Server();
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; -  
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; -  
82 case null: 95  
83 _servers.Server.Add(server); -  
84 break; -  
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 { 100 {
90 listBox1.InvokeIfRequired(listBox => 101 if (listBox1.SelectedItem is Server server)
91 { 102 {
92 var item = listBox.SelectedItem; -  
93   -  
94 _servers.Server.Remove((Server) item); 103 _servers.Server.Remove(server);
95 }); 104 }
96 } 105 }
97   106  
98 private void ListBox1_SelectedIndexChanged(object sender, EventArgs e) 107 private void ListBox1_SelectedIndexChanged(object sender, EventArgs e)
99 { 108 {
100 var listBox = (ListBox) sender; 109 var listBox = (ListBox) sender;
101   110  
102 if (listBox.SelectedIndex == -1) 111 if (listBox.SelectedItem is Server server)
103 { -  
104 serverNameTextBox.Text = string.Empty; 112 {
105 serverUrlTextBox.Text = string.Empty; -  
106 serverUsernameTextBox.Text = string.Empty; -  
107 serverPasswordTextBox.Text = string.Empty; 113 _server = server;
108   114  
109 return; -  
110 } -  
111   -  
112 var server = (Server) listBox.SelectedItem; -  
113   -  
114 serverNameTextBox.Text = server.Name; -  
115 serverUrlTextBox.Text = server.Url; -  
116 serverUsernameTextBox.Text = server.Username; 115 _serverBindingSource.DataSource = _server;
117 serverPasswordTextBox.Text = server.Password; 116 }
118 } 117 }
119   118  
120 private void Button3_Click(object sender, EventArgs e) 119 private void Button3_Click(object sender, EventArgs e)
121 { 120 {
122 listBox2.InvokeIfRequired(listbox => 121 if (listBox2.SelectedItem is Announcement announcement)
123 { 122 {
124 var item = listbox.SelectedItem; -  
125   -  
126 _notifications.Announcement.Remove((Announcement) item); 123 _announcements.Announcement.Remove(announcement);
127 }); 124 }
128 } 125 }
129   126  
130 private void Button4_Click(object sender, EventArgs e) 127 private void Button4_Click(object sender, EventArgs e)
131 { 128 {
132 var appId = appIdTextBox.Text; -  
133 var lingerTime = lingerTimeTextBox.Text; 129 var announcement = new Announcement();
134 var speak = speakTextBox.Text; -  
135   -  
136 if (string.IsNullOrEmpty(appId) || -  
137 !int.TryParse(appId, out var numAppId) || -  
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 { -  
150 default: -  
151 _notifications.Announcement.Remove(update); -  
152 update.AppId = numAppId; -  
153 update.LingerTime = numLingerTime; -  
154 update.Speak = speak; -  
155 _notifications.Announcement.Add(update); -  
156 break; -  
157 case null: 130  
158 _notifications.Announcement.Add(notification); -  
159 break; -  
160 } 131 _announcements.Announcement.Add(announcement);
161 } 132 }
162   133  
163 private void ListBox2_SelectedIndexChanged(object sender, EventArgs e) 134 private void ListBox2_SelectedIndexChanged(object sender, EventArgs e)
164 { 135 {
165 var listBox = (ListBox) sender; 136 var listBox = (ListBox) sender;
166   137  
167 if (listBox.SelectedIndex == -1) 138 if (listBox.SelectedItem is Announcement announcement)
168 { -  
169 appIdTextBox.Text = string.Empty; -  
170 lingerTimeTextBox.Text = string.Empty; 139 {
171 speakTextBox.Text = string.Empty; 140 _announcement = announcement;
172   141  
173 return; -  
174 } -  
175   -  
176 var notification = (Announcement) listBox.SelectedItem; -  
177   -  
178 appIdTextBox.Text = notification.AppId.ToString(); -  
179 lingerTimeTextBox.Text = notification.LingerTime.ToString(); 142 _announcementBindingSource.DataSource = _announcement;
180 speakTextBox.Text = notification.Speak; 143 }
181 } 144 }
182   145  
183 #endregion 146 #endregion
184 } 147 }
185 } 148 }
186   149  
187
Generated by GNU Enscript 1.6.5.90.
 150
Generated by GNU Enscript 1.6.5.90.
188   151  
189   152  
190   153